[#12] Support for new horizons.

jrossignol · Aug 7, 2015 · da7f9fe · da7f9fe
1 parent 649fc5a
commit da7f9fe
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,7 @@
 ContractPack-Tourism 1.2.0
 - Tourist contracts no longer ask for as many tourists at once until bigger pods get unlocked.
 - Reduced grindiness - advanced tourism contracts no longer require lots of tourist contracts to be done.
+- Support for New Horizons.
 
 ContractPack-Tourism 1.1.8
 - Fixed badly broken investor tour contract (thanks BT3).

diff --git a/GameData/ContractPacks/Tourism/GasGiantMoons.cfg b/GameData/ContractPacks/Tourism/GasGiantMoons.cfg
@@ -14,7 +14,7 @@ CONTRACT_TYPE
     // Level 3 prestige
     prestige = Exceptional
 
-    targetBody = AllBodies().Where(b => !b.HasSurface() && b.IsPlanet() && b.Children().Count() > 0).Random()
+    targetBody = AllBodies().Where(b => !b.HasSurface() && b.IsPlanet() && b.Children().Count() > 0 && b != HomeWorld().Parent()).Random()
 
     agent = Kerbal Space Tourism
 

diff --git a/GameData/ContractPacks/Tourism/Moons.cfg b/GameData/ContractPacks/Tourism/Moons.cfg
@@ -14,7 +14,7 @@ CONTRACT_TYPE
     // Level 2 prestige
     prestige = Significant
 
-    targetBody = HomeWorld().Children().Random()
+    targetBody = @parentBody.Children().Random()
 
     agent = Kerbal Space Tourism
 
@@ -26,6 +26,13 @@ CONTRACT_TYPE
     rewardReputation = 1.0
     failureReputation = 10.0
 
+    DATA
+    {
+        type = CelestialBody
+
+        parentBody = HomeWorld().Parent().IsPlanet() ? HomeWorld().Parent() : HomeWorld()
+    }
+
     PARAMETER
     {
         name = VesselParameterGroup

diff --git a/GameData/ContractPacks/Tourism/TwoMoons.cfg b/GameData/ContractPacks/Tourism/TwoMoons.cfg
@@ -14,7 +14,7 @@ CONTRACT_TYPE
     // Level 3 prestige
     prestige = Exceptional
 
-    targetBody = HomeWorld()
+    targetBody = HomeWorld().Parent().IsPlanet() ? HomeWorld().Parent() : HomeWorld()
 
     agent = Kerbal Space Tourism
 
@@ -66,7 +66,75 @@ CONTRACT_TYPE
             disableOnStateChange = true
 
             maxAltitude = @/targetBody.Children().Last().Radius() / 2.0
-            targetBody = @/targetBody.Children().Last()
+            targetBody = @/targetBody.Children().ElementAt(1)
+        }
+
+        PARAMETER
+        {
+            name = ReachState
+            type = ReachState
+
+            disableOnStateChange = true
+
+            maxAltitude = @/targetBody.Children().Last().Radius() / 2.0
+            targetBody = @/targetBody.Children().ElementAt(2)
+
+            REQUIREMENT
+            {
+                type = Expression
+                expression= @/targetBody.Children().Count() > 2
+            }
+        }
+
+        PARAMETER
+        {
+            name = ReachState
+            type = ReachState
+
+            disableOnStateChange = true
+
+            maxAltitude = @/targetBody.Children().Last().Radius() / 2.0
+            targetBody = @/targetBody.Children().ElementAt(3)
+
+            REQUIREMENT
+            {
+                type = Expression
+                expression= @/targetBody.Children().Count() > 3
+            }
+        }
+
+        PARAMETER
+        {
+            name = ReachState
+            type = ReachState
+
+            disableOnStateChange = true
+
+            maxAltitude = @/targetBody.Children().Last().Radius() / 2.0
+            targetBody = @/targetBody.Children().ElementAt(4)
+
+            REQUIREMENT
+            {
+                type = Expression
+                expression= @/targetBody.Children().Count() > 4
+            }
+        }
+
+        PARAMETER
+        {
+            name = ReachState
+            type = ReachState
+
+            disableOnStateChange = true
+
+            maxAltitude = @/targetBody.Children().Last().Radius() / 2.0
+            targetBody = @/targetBody.Children().ElementAt(5)
+
+            REQUIREMENT
+            {
+                type = Expression
+                expression= @/targetBody.Children().Count() > 5
+            }
         }
     }
 
@@ -106,6 +174,14 @@ CONTRACT_TYPE
         expression = TouristMoonsCount > 0 || OrbitedBodies().Count() > 2
     }
 
+    REQUIREMENT
+    {
+        name = Expression
+        type = Expression
+
+        expression = @/targetBody.Children().Count() > 1
+    }
+
     REQUIREMENT
     {
         name = AnyStarter