Merge pull request #36 from Sigma88/Development

v0.4.1
Sigma88 · Jul 2, 2017 · e67b61c · e67b61c
2 parents 62326f7 + 9e81f28
commit e67b61c
Show file tree

Hide file tree

Showing 28 changed files with 54 additions and 38 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,11 @@
+**v0.4.1**
+
+- Added compatibility with Gameslinx's Planet Overhaul
+- Fixed compatibility with TextureReplacer
+- Fixed realistic star flares
+- Changed some star descriptions
+
+
 **v0.4.0**
 
 - Updated to KSP 1.3.0 and Kopernicus 1.3.0-4

diff --git a/GameData/GalacticNeighborhood/Configs/Core/SystemSetup/KerbinTemplateFix.cfg b/GameData/GalacticNeighborhood/Configs/Core/SystemSetup/KerbinTemplateFix.cfg
@@ -6,5 +6,9 @@
 		{
 			@name = Laythe
 		}
+		@Orbit
+		{
+			&semiMajorAxis = 13599840256
+		}
 	}
 }
diff --git a/GameData/GalacticNeighborhood/Configs/Core/UserSettings/ProceduralRealisticStar.cfg b/GameData/GalacticNeighborhood/Configs/Core/UserSettings/ProceduralRealisticStar.cfg
@@ -1,4 +1,4 @@
-@Kopernicus:HAS[#RealisticStars[True]]:AFTER[SGN]
+@Kopernicus:HAS[#RealisticStars[True]]:FOR[KopernicusAfter]
 {
 	@Body:HAS[#ProceduralStar[True]]
 	{

diff --git a/GameData/GalacticNeighborhood/Configs/Core/UserSettings/ProceduralStarRealColor.cfg b/GameData/GalacticNeighborhood/Configs/Core/UserSettings/ProceduralStarRealColor.cfg
@@ -1,4 +1,4 @@
-@Kopernicus:HAS[#RealisticStars[True]]:AFTER[SGN]
+@Kopernicus:HAS[#RealisticStars[True]]:FOR[KopernicusAfter]
 {
 	@Body:HAS[#ProceduralStar[True]]
 	{

diff --git a/GameData/GalacticNeighborhood/Configs/Core/UserSettings/ProceduralStarRealCorona.cfg b/GameData/GalacticNeighborhood/Configs/Core/UserSettings/ProceduralStarRealCorona.cfg
@@ -1,4 +1,4 @@
-@Kopernicus:HAS[#RealisticStars[True]]:AFTER[SGN]
+@Kopernicus:HAS[#RealisticStars[True]]:FOR[KopernicusAfter]
 {
 	@Body:HAS[#ProceduralStar[True]]
 	{

diff --git a/GameData/GalacticNeighborhood/Configs/Core/UserSettings/ProceduralStarRealFlare.cfg b/GameData/GalacticNeighborhood/Configs/Core/UserSettings/ProceduralStarRealFlare.cfg
@@ -1,4 +1,4 @@
-@Kopernicus:HAS[#RealisticStars[True]]:AFTER[SGN]
+@Kopernicus:HAS[#RealisticStars[True]]:FOR[KopernicusAfter]
 {
 	@Body:HAS[#ProceduralStar[True]]
 	{

diff --git a/GameData/GalacticNeighborhood/Configs/Extras/TextureReplacer.cfg b/GameData/GalacticNeighborhood/Configs/Extras/TextureReplacer.cfg
@@ -0,0 +1,4 @@
+TextureReplacer
+{
+    keepLoaded = ^GalacticNeighborhood/
+}
diff --git a/GameData/GalacticNeighborhood/Configs/PlanetPacks/ArkasSystem/Arkas_AddStar.cfg b/GameData/GalacticNeighborhood/Configs/PlanetPacks/ArkasSystem/Arkas_AddStar.cfg
@@ -20,7 +20,7 @@
 			temperature = 2822
 
 			// Custom Settings
-			description = Osmis, an F6 V yellow-white main sequence dwarf.
+			description = Osmis, an F6 V yellow-white main sequence star.
 			sphereOfInfluence = 2e12
 		}
 	}

diff --git a/GameData/GalacticNeighborhood/Configs/PlanetPacks/AsclepiusSystem/Asclepius_AddStar.cfg b/GameData/GalacticNeighborhood/Configs/PlanetPacks/AsclepiusSystem/Asclepius_AddStar.cfg
@@ -20,7 +20,7 @@
 			temperature = 34000
 
 			// Custom Settings
-			description = Tyfon, an O8 IV blue sub-giant.
+			description = Tyfon, an O8 IV blue subgiant.
 			sphereOfInfluence = 2e12
 		}
 	}

diff --git a/GameData/GalacticNeighborhood/Configs/PlanetPacks/ChaniSystem/Chani_AddStar.cfg b/GameData/GalacticNeighborhood/Configs/PlanetPacks/ChaniSystem/Chani_AddStar.cfg
@@ -20,7 +20,7 @@
 			temperature = 12460
 
 			// Custom Settings
-			description = Lapiun, a B7 V blue-white main sequence dwarf.
+			description = Lapiun, a B7 V blue-white main sequence star.
 			sphereOfInfluence = 2e12
 		}
 	}

diff --git a/GameData/GalacticNeighborhood/Configs/PlanetPacks/GameslinxSystem/Gameslinx_AddStar.cfg b/GameData/GalacticNeighborhood/Configs/PlanetPacks/GameslinxSystem/Gameslinx_AddStar.cfg
@@ -2,7 +2,7 @@
 {
 	Body
 	{
-		name = Star23
+		name = Azure
 		ProceduralStar = True
 		orbitIndex = 23
 		@orbitIndex:NEEDS[!Olei] = 123
@@ -20,13 +20,13 @@
 			temperature = 22900
 
 			// Custom Settings
-			description = Star23, a B2 II blue white bright giant.
+			description = Azure, a B2 II blue white bright giant.
 			sphereOfInfluence = 2e12
 		}
 	}
 }
 
 @Kopernicus:HAS[~LoadAllStars[True]]:NEEDS[!Olei]:AFTER[Kopernicus]
 {
-	!Body[Star23] {}
+	!Body[Azure] {}
 }
diff --git a/GameData/GalacticNeighborhood/Configs/PlanetPacks/GameslinxSystem/Gameslinx_PlanetFix.cfg b/GameData/GalacticNeighborhood/Configs/PlanetPacks/GameslinxSystem/Gameslinx_PlanetFix.cfg
@@ -4,63 +4,63 @@
 	{
 		@Orbit
 		{
-			@referenceBody = Star23
+			@referenceBody = Azure
 		}
 	}
 	@Body[Niebos]
 	{
 		@Orbit
 		{
-			@referenceBody = Star23
+			@referenceBody = Azure
 		}
 	}
 	@Body[Sonus]
 	{
 		@Orbit
 		{
-			@referenceBody = Star23
+			@referenceBody = Azure
 		}
 	}
 	@Body[Olu'um]
 	{
 		@Orbit
 		{
-			@referenceBody = Star23
+			@referenceBody = Azure
 		}
 	}
 	@Body[Scorch]
 	{
 		@Orbit
 		{
-			@referenceBody = Star23
+			@referenceBody = Azure
 		}
 	}
 	@Body[Butai]
 	{
 		@Orbit
 		{
-			@referenceBody = Star23
+			@referenceBody = Azure
 		}
 	}
 	@Body[Flak]
 	{
 		@Orbit
 		{
-			@referenceBody = Star23
+			@referenceBody = Azure
 		}
 	}
 	@Body[Quarta]
 	{
 		@Orbit
 		{
-			@referenceBody = Star23
+			@referenceBody = Azure
 		}
 	}
 	@Body[Thelai]
 	{
 		@Orbit
 		{
-			@referenceBody = Star23
+			@referenceBody = Azure
 		}
 	}
 	@Body[Gol]
@@ -98,15 +98,15 @@
 		}
 		@Orbit
 		{
-			@referenceBody = Star23
+			@referenceBody = Azure
 		}
 		!SpaceCenter,* {}
 	}
 	@Body[Dread]
 	{
 		@Orbit
 		{
-			%referenceBody = Star23
+			%referenceBody = Azure
 			%inclination = 5
 			%eccentricity = 0.145
 			%semiMajorAxis = 40839348203

diff --git a/GameData/GalacticNeighborhood/Configs/PlanetPacks/JungisSystem/Jungis_AddStar.cfg b/GameData/GalacticNeighborhood/Configs/PlanetPacks/JungisSystem/Jungis_AddStar.cfg
@@ -21,7 +21,7 @@
 			temperature = 8500
 
 			// Custom Settings
-			description = Eol, an A7 V white main sequence dwarf.
+			description = Eol, an A7 V white main sequence star.
 			sphereOfInfluence = 2e12
 			rotationPeriod = 32040
 		}

diff --git a/GameData/GalacticNeighborhood/Configs/PlanetPacks/KPSystem/KP_AddStar.cfg b/GameData/GalacticNeighborhood/Configs/PlanetPacks/KPSystem/KP_AddStar.cfg
@@ -20,7 +20,7 @@
 			temperature = 6350
 
 			// Custom Settings
-			description = Kerbol, an F6 IV yellow-white sub-giant.
+			description = Kerbol, an F6 IV yellow-white subgiant.
 			sphereOfInfluence = 2e12
 		}
 	}

diff --git a/GameData/GalacticNeighborhood/Configs/PlanetPacks/NHSystem/NH_AddStar.cfg b/GameData/GalacticNeighborhood/Configs/PlanetPacks/NHSystem/NH_AddStar.cfg
@@ -20,7 +20,7 @@
 			temperature = 33000
 
 			// Custom Settings
-			description = Horizon, an O9.5 V main sequence blue dwarf.
+			description = Horizon, an O9.5 V main sequence blue star.
 			sphereOfInfluence = 2e12
 		}
 	}

diff --git a/GameData/GalacticNeighborhood/Configs/PlanetPacks/PKSystem/PK_AddStar1.cfg b/GameData/GalacticNeighborhood/Configs/PlanetPacks/PKSystem/PK_AddStar1.cfg
@@ -20,7 +20,7 @@
 			temperature = 16823
 
 			// Custom Settings
-			description = Umbra, a B3 V blue-white main sequence dwarf.
+			description = Umbra, a B3 V blue-white main sequence star.
 			sphereOfInfluence = 2e12
 		}
 	}

diff --git a/GameData/GalacticNeighborhood/Configs/PlanetPacks/SaruSystem/Saru_AddStar.cfg b/GameData/GalacticNeighborhood/Configs/PlanetPacks/SaruSystem/Saru_AddStar.cfg
@@ -20,7 +20,7 @@
 			temperature = 8590
 
 			// Custom Settings
-			description = Paribo, an A3 V white main sequence dwarf.
+			description = Paribo, an A3 V white main sequence star.
 			sphereOfInfluence = 2e12
 		}
 	}

diff --git a/GameData/GalacticNeighborhood/Configs/PlanetPacks/ULSystem/UL_AddStar.cfg b/GameData/GalacticNeighborhood/Configs/PlanetPacks/ULSystem/UL_AddStar.cfg
@@ -20,7 +20,7 @@
 			temperature = 3550
 
 			// Custom Settings
-			description = Snu, an M1 VI red sub-dwarf.
+			description = Snu, an M1 VI red subdwarf.
 			sphereOfInfluence = 2e12
 		}
 	}

diff --git a/GameData/GalacticNeighborhood/Configs/StarSystems/Algok/AddStar_AlgokA.cfg b/GameData/GalacticNeighborhood/Configs/StarSystems/Algok/AddStar_AlgokA.cfg
@@ -19,7 +19,7 @@
 
 			// Custom Settings
 			displayName = Algok A
-			description = Algok A, a B8 V blue-white main sequence dwarf.
+			description = Algok A, a B8 V blue-white main sequence star.
 			sphereOfInfluence = 2e12
 		}
 		Orbit

diff --git a/GameData/GalacticNeighborhood/Configs/StarSystems/Algok/AddStar_AlgokB.cfg b/GameData/GalacticNeighborhood/Configs/StarSystems/Algok/AddStar_AlgokB.cfg
@@ -20,7 +20,7 @@
 
 			// Custom Settings
 			displayName = Algok B
-			description = Algok B, a K0 IV orange sub-giant.
+			description = Algok B, a K0 IV orange subgiant.
 			radius = 2315160000
 			mass = 1.7346099e+28
 		}

diff --git a/GameData/GalacticNeighborhood/Configs/StarSystems/K-Stor/AddStar_KStorAa.cfg b/GameData/GalacticNeighborhood/Configs/StarSystems/K-Stor/AddStar_KStorAa.cfg
@@ -19,7 +19,7 @@
 
 			// Custom Settings
 			displayName = K-stor Aa
-			description = K-stor Aa, an A1V white main sequence dwarf.
+			description = K-stor Aa, an A1V white main sequence star.
 			sphereOfInfluence = 2e12
 		}
 		Orbit

diff --git a/GameData/GalacticNeighborhood/Configs/StarSystems/K-Stor/AddStar_KStorBa.cfg b/GameData/GalacticNeighborhood/Configs/StarSystems/K-Stor/AddStar_KStorBa.cfg
@@ -19,7 +19,7 @@
 
 			// Custom Settings
 			displayName = K-stor Ba
-			description = K-stor Ba, an A3 V white main sequence dwarf.
+			description = K-stor Ba, an A3 V white main sequence star.
 			sphereOfInfluence = 19004672922
 		}
 		Orbit

diff --git a/GameData/GalacticNeighborhood/GalacticNeighborhood.version b/GameData/GalacticNeighborhood/GalacticNeighborhood.version
@@ -13,7 +13,7 @@
 	{
 		"MAJOR": 0,
 		"MINOR": 4,
-		"PATCH": 0,
+		"PATCH": 1,
 		"BUILD": 0
 	},
 	"KSP_VERSION":

diff --git a/GameData/GalacticNeighborhood/Plugins/GalacticNeighborhood.dll b/GameData/GalacticNeighborhood/Plugins/GalacticNeighborhood.dll
diff --git a/GameData/GalacticNeighborhood/Plugins/GalacticNeighborhood.version b/GameData/GalacticNeighborhood/Plugins/GalacticNeighborhood.version
@@ -13,7 +13,7 @@
 	{
 		"MAJOR": 0,
 		"MINOR": 4,
-		"PATCH": 0,
+		"PATCH": 1,
 		"BUILD": 0
 	},
 	"KSP_VERSION":

diff --git a/README.md b/README.md
@@ -15,10 +15,10 @@ Dev version: https://github.com/Sigma88/Galactic-Neighborhood/tree/Development
 
 | | |Hypergiants|Supergiants|Bright giants|Giants|Subgiants|Dwarfs|Subdwarfs|White Dwarfs|
 |---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-|<b><sub><sup>TOTAL</sup></sub><br>39&nbsp;</b>| |0|1|0|2|3|28|1|4|
+|<b><sub><sup>TOTAL</sup></sub><br>40&nbsp;</b>| |0|1|1|2|3|28|1|4|
 | | |**0**|**I**|**II**|**III**|**IV**|**V**|**VI**|**VII**|**
 |2|**O**| | | | |1|1| | |
-|3|**B**| | | | | |3| | |
+|4|**B**| | |1| | |3| | |
 |8|**A**| | | | | |4| |4|
 |3|**F**| |1| | |1|1| | |
 |7|**G**| | | | | |7| | |
@@ -34,10 +34,10 @@ Dev version: https://github.com/Sigma88/Galactic-Neighborhood/tree/Development
 
 | | |Hypergiants|Supergiants|Bright giants|Giants|Subgiants|Dwarfs|Subdwarfs|White Dwarfs|
 |---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-|<b><sub><sup>TOTAL</sup></sub><br>24&nbsp;</b>| |0|0|0|2|2|18|1|1|
+|<b><sub><sup>TOTAL</sup></sub><br>25&nbsp;</b>| |0|0|1|2|2|18|1|1|
 | | |**0**|**I**|**II**|**III**|**IV**|**V**|**VI**|**VII**|**
 |2|**O**| | | | |1|1| | |
-|2|**B**| | | | | |2| | |
+|3|**B**| | |1| | |2| | |
 |3|**A**| | | | | |2| |1|
 |2|**F**| | | | |1|1| | |
 |5|**G**| | | | | |5| | |

diff --git a/[Source]/Distribution/GalacticNeighborhood.dll b/[Source]/Distribution/GalacticNeighborhood.dll
diff --git a/[Source]/GalacticNeighborhood/ProceduralStars.cs b/[Source]/GalacticNeighborhood/ProceduralStars.cs
@@ -56,7 +56,7 @@ void IParserEventSubscriber.PostApply(ConfigNode node)
 
             if (material != null)
             {
-                if (emitColor0 != null)
+                if (emitColor0?.value != null)
                 {
                     Color color = Pick(emitColor0);
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,5 +6,9 @@ @@
     		{
     			@name = Laythe
     		}
+    		@Orbit
+    		{
+    			&semiMajorAxis = 13599840256
+    		}
     	}
     }