Skip to content

Commit

Permalink
Merge pull request #8 from Sigma88/Development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
Sigma88 committed Jan 29, 2016
2 parents e1971bd + b10605b commit 33c3a88
Show file tree
Hide file tree
Showing 16 changed files with 230 additions and 155 deletions.
10 changes: 10 additions & 0 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
**v0.4.0**

- Added 'atmoASL' parameter
- Added 'tempASL' parameter
- Improved Planet Specific Changes
- Improved the parameters code for easier modification
- Improved calculation of AtmosphereFromGround
- Added conversion of meanAnomalyAtEpochD (deg) to meanAnomalyAtEpoch (rad)


**v0.3.0**

- Removed 'HeightColorFix' parameter
Expand Down
12 changes: 12 additions & 0 deletions GameData/Sigma/Dimensions/Configs/General/massFix.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@
@mass *= 9.81
}
}
// This part converts meanAnomalyAtEpochD (deg) to meanAnomalyAtEpoch (rad)
@Body,*
{
@Orbit:HAS[#meanAnomalyAtEpochD[*]]
{
%meanAnomalyAtEpoch = #$meanAnomalyAtEpochD$
@meanAnomalyAtEpoch *= 0.0174532925199433
!meanAnomalyAtEpochD = DEL
}
}
// This part defines the values needed
// It won't overwrite user defined values
Expand Down
104 changes: 10 additions & 94 deletions GameData/Sigma/Dimensions/Configs/ReDimension/advancedSettings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -42,111 +42,27 @@
{
%CustomRingSize = 0
}

// Create PlanetDimensions parameter

@SigmaDimensions:HAS[~PlanetDimensions[*]]:AFTER[SigDim]
@SigmaDimensions:HAS[~atmoASL[>0]]:AFTER[SigDim]
{
%PlanetDimensions = #$Resize$,$Rescale$,$Atmosphere$,$dayLengthMultiplier$,$geeASLmultiplier$,$landscape$,$atmoVisualEffect$,$resizeScatter$,$CustomSoISize$,$CustomRingSize$
%atmoASL = 1
}
@Kopernicus:AFTER[SigDim]
@SigmaDimensions:HAS[~tempASL[>0]]:AFTER[SigDim]
{
@Body:HAS[~PlanetDimensions[*]]
{
%PlanetDimensions = Resize,Rescale,Atmosphere,dayLengthMultiplier,geeASLmultiplier,landscape,atmoVisualEffect,resizeScatter,CustomSoISize,CustomRingSize
}
%tempASL = 1
}

// Set PlanetDimensions for each planet
// Create PlanetDimensions parameter

@Kopernicus:AFTER[SigDim]
@SigmaDimensions:AFTER[SigDim]
{
@Body:HAS[#PlanetDimensions[Resize,*]]
{
@PlanetDimensions[0] = #$@SigmaDimensions/PlanetDimensions[0]$
}
@Body:HAS[#PlanetDimensions[*,Rescale,*]]
{
@PlanetDimensions[1] = #$@SigmaDimensions/PlanetDimensions[1]$
}
@Body:HAS[#PlanetDimensions[*,Atmosphere,*]]
{
@PlanetDimensions[2] = #$@SigmaDimensions/PlanetDimensions[2]$
}
@Body:HAS[#PlanetDimensions[*,dayLengthMultiplier,*]]
{
@PlanetDimensions[3] = #$@SigmaDimensions/PlanetDimensions[3]$
}
@Body:HAS[#PlanetDimensions[*,geeASLmultiplier,*]]
{
@PlanetDimensions[4] = #$@SigmaDimensions/PlanetDimensions[4]$
}
@Body:HAS[#PlanetDimensions[*,landscape,*]]
{
@PlanetDimensions[5] = #$@SigmaDimensions/PlanetDimensions[5]$
}
@Body:HAS[#PlanetDimensions[*,atmoVisualEffect,*]]
{
@PlanetDimensions[6] = #$@SigmaDimensions/PlanetDimensions[6]$
}
@Body:HAS[#PlanetDimensions[*,resizeScatter,*]]
{
@PlanetDimensions[7] = #$@SigmaDimensions/PlanetDimensions[7]$
}
@Body:HAS[#PlanetDimensions[*,CustomSoISize,*]]
{
@PlanetDimensions[8] = #$@SigmaDimensions/PlanetDimensions[8]$
}
@Body:HAS[#PlanetDimensions[*,CustomRingSize]]
{
@PlanetDimensions[9] = #$@SigmaDimensions/PlanetDimensions[9]$
}
%PlanetDimensions = #$Resize$,$Rescale$,$Atmosphere$,$dayLengthMultiplier$,$geeASLmultiplier$,$landscape$,$atmoVisualEffect$,$resizeScatter$,$CustomSoISize$,$CustomRingSize$,$atmoASL$,$tempASL$
}

// Apply changes needed for advanced settings

@Kopernicus:AFTER[SigDim]
{
@Body:HAS[#PlanetDimensions[*,*,*,*,*,*,*,*,0,*]]
{
@PlanetDimensions[8] = #$PlanetDimensions[1]$
}
@Body:HAS[#PlanetDimensions[*,0]]
{
@PlanetDimensions[9] = #$PlanetDimensions[1]$
@PlanetDimensions[9] /= #$PlanetDimensions[0]$
}
@Body:HAS[#PlanetDimensions[*,*,*,*,*,*,*,0,*,*]]
{
@PlanetDimensions = #$PlanetDimensions$,1,$PlanetDimensions[0]$
%CheckResize = #$PlanetDimensions[0]$
}
@Body:HAS[#CheckResize[>1]]
{
@PlanetDimensions[11] != 2
}
@Body:HAS[#CheckResize[<1]]
{
@PlanetDimensions[11] *= 0.5
@PlanetDimensions[11] += 0.5
}
@Body:HAS[#PlanetDimensions[*,*,*,*,*,*,*,1,*,*],~CheckResize[*]]
{
@PlanetDimensions = #$PlanetDimensions$,$PlanetDimensions[0]$,$PlanetDimensions[0]$
@PlanetDimensions[11] != 2
}
@Body:HAS[#CheckResize[*]]
{
!CheckResize = DEL
}
@Body:HAS[#PlanetDimensions[1,*,*,*,*,1,*,*,*,*,*,*]]
{
// NEEDS NEW CACHE = FALSE
@PlanetDimensions = #$PlanetDimensions$,False
}
@Body:HAS[~PlanetDimensions[*False]]
@Body,*
{
// NEEDS NEW CACHE = TRUE
@PlanetDimensions = #$PlanetDimensions$,True
%PlanetDimensions = #$@SigmaDimensions/PlanetDimensions$
%PlanetMultiplier = 1,1,1,1,1,1,1,1,1,1,1,1
}
}
80 changes: 80 additions & 0 deletions GameData/Sigma/Dimensions/Configs/ReDimension/applySettings.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
// Multiply Dimensions

@Kopernicus:FOR[SigDim2]
{
@Body,*
{
@PlanetDimensions[0] *= #$PlanetMultiplier[0]$
@PlanetDimensions[1] *= #$PlanetMultiplier[1]$
@PlanetDimensions[2] *= #$PlanetMultiplier[2]$
@PlanetDimensions[3] *= #$PlanetMultiplier[3]$
@PlanetDimensions[4] *= #$PlanetMultiplier[4]$
@PlanetDimensions[5] *= #$PlanetMultiplier[5]$
@PlanetDimensions[6] *= #$PlanetMultiplier[6]$
@PlanetDimensions[8] *= #$PlanetMultiplier[8]$
@PlanetDimensions[9] *= #$PlanetMultiplier[9]$
@PlanetDimensions[10] *= #$PlanetMultiplier[10]$
@PlanetDimensions[11] *= #$PlanetMultiplier[11]$
}
}

// Apply changes needed for advanced settings

@Kopernicus:FOR[SigDim2]
{
// SCATTER SIZE
@Body:HAS[#PlanetDimensions[*,*,*,*,*,*,*,*,0,*,*,*]]
{
// Set SphereOfInfluence multiplier
@PlanetDimensions[8] = #$PlanetDimensions[1]$
}
@Body:HAS[#PlanetDimensions[*,*,*,*,*,*,*,*,*,0,*,*]]
{
// Set Ring size multiplier
@PlanetDimensions[9] = #$PlanetDimensions[1]$
@PlanetDimensions[9] /= #$PlanetDimensions[0]$
}
@Body:HAS[#PlanetDimensions[*,*,*,*,*,*,*,0,*,*,*,*]]
{
// define PlanetDimensions2[0] = changeScatterSize
// define PlanetDimensions2[1] = changeScatterDensity

%PlanetDimensions2 = #1,$PlanetDimensions[0]$
%CheckResize = #$PlanetDimensions[0]$
}
@Body:HAS[#CheckResize[>1]]
{
@PlanetDimensions2[1] != 2
}
@Body:HAS[#CheckResize[<1]]
{
@PlanetDimensions2[1] *= 0.5
@PlanetDimensions2[1] += 0.5
}
@Body:HAS[#PlanetDimensions[*,*,*,*,*,*,*,1,*,*,*,*],~CheckResize[*]]
{
// define PlanetDimensions2[0] = changeScatterSize
// define PlanetDimensions2[1] = changeScatterDensity

%PlanetDimensions2 = #$PlanetDimensions[0]$,$PlanetDimensions[0]$
@PlanetDimensions2[1] != 2
}
@Body:HAS[#CheckResize[*]]
{
!CheckResize = DEL
}
@Body:HAS[#PlanetDimensions[1,*,*,*,*,1,*,*,*,*,*,*]]
{
// define PlanetDimensions2[2] = needsCache
// NEEDS NEW CACHE = FALSE

@PlanetDimensions2 = #$PlanetDimensions2$,False
}
@Body:HAS[~PlanetDimensions[*False]]
{
// define PlanetDimensions2[2] = needsCache
// NEEDS NEW CACHE = TRUE

@PlanetDimensions2 = #$PlanetDimensions2$,True
}
}
72 changes: 48 additions & 24 deletions GameData/Sigma/Dimensions/Configs/ReDimension/atmoScale.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Kopernicus:AFTER[SigDim]
@Kopernicus:FOR[SigDim2]
{
@Body,*
{
Expand Down Expand Up @@ -49,11 +49,19 @@
}
@AtmosphereFromGround:HAS[~sunAtmo[True]]
{
// inner radius
@innerRadius -= #$../../Properties/radius$
@innerRadius *= #$../../PlanetDimensions[2]$
@innerRadius *= #$../../PlanetDimensions[6]$
@innerRadius /= #$../../PlanetDimensions[0]$
@innerRadius += #$../../Properties/radius$
@innerRadius *= #$../../PlanetDimensions[0]$

// outer radius
@outerRadius -= #$../../Properties/radius$
@outerRadius *= #$../../PlanetDimensions[2]$
@outerRadius *= #$../../PlanetDimensions[6]$
%transformScale = #$outerRadius$
@transformScale *= #$../../PlanetDimensions[6]$
@innerRadius *= #$../../PlanetDimensions[0]$
@outerRadius /= #$../../PlanetDimensions[0]$
@outerRadius += #$../../Properties/radius$
@outerRadius *= #$../../PlanetDimensions[0]$
Expand All @@ -76,20 +84,40 @@
!sunAtmo = DEL
%transformScale = 0,0,0
}

// pressure ASL

@pressureCurve
{
@key,* ^= :$: 0 0 0 x:
@key,*[1, ] *= #$../../PlanetDimensions[10]$
@key,*[2, ] *= #$../../PlanetDimensions[10]$
@key,*[3, ] *= #$../../PlanetDimensions[10]$
@key,* ^= : 0 0 0 x$: :
}

// temperature ASL

@temperatureCurve
{
@key,* ^= :$: 0 0 0 x:
@key,*[1, ] *= #$../../PlanetDimensions[11]$
@key,*[2, ] *= #$../../PlanetDimensions[11]$
@key,*[3, ] *= #$../../PlanetDimensions[11]$
@key,* ^= : 0 0 0 x$: :
}
}
@Atmosphere:HAS[~pressureCurveIsNormalized[True]]
{
// pressureCurve

@pressureCurve
{
@key,* ^= : :,:
@key,* ^= :$:,0,0,x:
@key,*[0] *= #$../../PlanetDimensions[2]$
@key,*[2] /= #$../../PlanetDimensions[2]$
@key,*[3] /= #$../../PlanetDimensions[2]$
@key,* ^= :,0,0,x$: :
@key,* ^= :,: :
@key,* ^= :$: 0 0 0 x:
@key,*[0, ] *= #$../../PlanetDimensions[2]$
@key,*[2, ] /= #$../../PlanetDimensions[2]$
@key,*[3, ] /= #$../../PlanetDimensions[2]$
@key,* ^= : 0 0 0 x$: :
}
}
@Atmosphere:HAS[~temperatureCurveIsNormalized[True]]
Expand All @@ -98,13 +126,11 @@

@temperatureCurve
{
@key,* ^= : :,:
@key,* ^= :$:,0,0,x:
@key,*[0] *= #$../../PlanetDimensions[2]$
@key,*[2] /= #$../../PlanetDimensions[2]$
@key,*[3] /= #$../../PlanetDimensions[2]$
@key,* ^= :,0,0,x$: :
@key,* ^= :,: :
@key,* ^= :$: 0 0 0 x:
@key,*[0, ] *= #$../../PlanetDimensions[2]$
@key,*[2, ] /= #$../../PlanetDimensions[2]$
@key,*[3, ] /= #$../../PlanetDimensions[2]$
@key,* ^= : 0 0 0 x$: :
}
}
@Atmosphere
Expand All @@ -113,13 +139,11 @@

@temperatureSunMultCurve
{
@key,* ^= : :,:
@key,* ^= :$:,0,0,x:
@key,*[0] *= #$../../PlanetDimensions[2]$
@key,*[2] /= #$../../PlanetDimensions[2]$
@key,*[3] /= #$../../PlanetDimensions[2]$
@key,* ^= :,0,0,x$: :
@key,* ^= :,: :
@key,* ^= :$: 0 0 0 x:
@key,*[0, ] *= #$../../PlanetDimensions[2]$
@key,*[2, ] /= #$../../PlanetDimensions[2]$
@key,*[3, ] /= #$../../PlanetDimensions[2]$
@key,* ^= : 0 0 0 x$: :
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Kopernicus:AFTER[SigDim]
@Kopernicus:FOR[SigDim2]
{
@Body:HAS[@Template:HAS[#name[Bop],~removeAllPQSMods[*],~removePQSMods[*LandControl*]]]
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@Kopernicus:AFTER[SigDim]
@Kopernicus:FOR[SigDim2]
{
@Body:HAS[#PlanetDimensions[*,True],~cacheFile[*]]
@Body:HAS[#PlanetDimensions2[*,True],~cacheFile[*]]
{
cacheFile = #Kopernicus/Cache/$name$.bin
}
@Body:HAS[#PlanetDimensions[*,True]]
@Body:HAS[#PlanetDimensions2[*,True]]
{
@cacheFile = #Sigma/Dimensions/Cache/§$PlanetDimensions[0]$x]Resize/§$PlanetDimensions[5]$x]landscape/$cacheFile$
@cacheFile ^= :§:[:
}
}
}
Loading

0 comments on commit 33c3a88

Please sign in to comment.