Fixed issue with scientist contract.

jrossignol · Sep 2, 2015 · 70b6d7d · 70b6d7d
1 parent 10c8e00
commit 70b6d7d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,6 @@
+ContractPack-FieldResearch 1.1.1
+- Fixed issue with scientist contract under New Horizons (thanks zeropositivo).
+
 ContractPack-FieldResearch 1.1.0
 - Support for New Horizons.
 - Make Hard Science waypoints more clear that they are only a suggestion.

diff --git a/GameData/ContractPacks/FieldResearch/Scientist.cfg b/GameData/ContractPacks/FieldResearch/Scientist.cfg
@@ -132,20 +132,10 @@ CONTRACT_TYPE
         experienceTrait = Scientist
     }
 
+    // Done a flyby of at least one child body
     REQUIREMENT
     {
-        type = Any 
-
-        REQUIREMENT
-        {
-            type = FlyBy
-            targetBody = HomeWorld().Children().First()
-        }
-
-        REQUIREMENT
-        {
-            type = FlyBy
-            targetBody = HomeWorld().Children().Last()
-        }
+        type = Expression
+        expression = AllBodies().Where(cb => cb.Parent() == (@FieldResearch:homeIsMoon ? HomeWorld().Parent() : HomeWorld()) && cb.HaveReached()).Count() > 0
     }
 }
diff --git a/GameData/ContractPacks/FieldResearch/Scraps.cfg b/GameData/ContractPacks/FieldResearch/Scraps.cfg
@@ -32,7 +32,7 @@ CONTRACT_TYPE
     {
         type = List<CelestialBody>
 
-        validBodies = Prestige() == Trivial ? [ HomeWorld() ] : Prestige() == Significant ? @FieldResearch:l2Bodies.Random() : @FieldResearch:l3Bodies.Random()
+        validBodies = Prestige() == Trivial ? [ HomeWorld() ] : Prestige() == Significant ? @FieldResearch:l2Bodies : @FieldResearch:l3Bodies
     }
 
     DATA
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ CONTRACT_TYPE @@
         {
             type = List<CelestialBody>
-            validBodies = Prestige() == Trivial ? [ HomeWorld() ] : Prestige() == Significant ? @FieldResearch:l2Bodies.Random() : @FieldResearch:l3Bodies.Random()
+            validBodies = Prestige() == Trivial ? [ HomeWorld() ] : Prestige() == Significant ? @FieldResearch:l2Bodies : @FieldResearch:l3Bodies
         }
         DATA
@@ Expand Down @@