Fixed issue with satellite contracts.

jrossignol · Jul 25, 2016 · 0efb172 · 0efb172
1 parent 7e5c7ee
commit 0efb172
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 271 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,6 @@
+ContractPack-RemoteTech 2.1.1
+- Fixed issue where inner/outer system sat contracts can never be offered.
+
 ContractPack-RemoteTech 2.1.0
 - Rework for Contract Configurator 1.15.x
 - Fixed DDS settings on agency icon.

diff --git a/GameData/ContractPacks/RemoteTech/ContractPack-RemoteTech.version b/GameData/ContractPacks/RemoteTech/ContractPack-RemoteTech.version
@@ -2,7 +2,7 @@
      "NAME":"Contract Pack: RemoteTech",
 	 "URL":"https://raw.githubusercontent.com/jrossignol/ContractPack-RemoteTech/master/GameData/ContractPacks/RemoteTech/ContractPack-RemoteTech.version",
 	 "DOWNLOAD":"https://github.com/jrossignol/ContractPack-RemoteTech/releases",
-     "CHANGE_LOG_URL":"https://raw.githubusercontent.com/jrossignol/ContractPack-RemoteTech/2.1.0/CHANGES.txt",
+     "CHANGE_LOG_URL":"https://raw.githubusercontent.com/jrossignol/ContractPack-RemoteTech/2.1.1/CHANGES.txt",
      "GITHUB":{
          "USERNAME":"jrossignol",
          "REPOSITORY":"ContractPack-RemoteTech",
@@ -11,13 +11,13 @@
      "VERSION":{
          "MAJOR":2,
          "MINOR":1,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":1,
-         "PATCH":0
+         "PATCH":3
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,

diff --git a/GameData/ContractPacks/RemoteTech/EverythingSat.cfg b/GameData/ContractPacks/RemoteTech/EverythingSat.cfg
@@ -91,141 +91,12 @@ CONTRACT_TYPE:NEEDS[RemoteTech]
             type = HasAntenna
 
             antennaType = Dish
-            targetBody = @/allBodies.ElementAt(0)
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(1)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 1
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(2)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 2
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(3)
+            targetBody = @target
 
-            REQUIREMENT
+            ITERATOR
             {
-                type = Expression
-                expression = @/allBodies.Count() > 3
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(4)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 4
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(5)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 5
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(6)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 6
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(7)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 7
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(8)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 8
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(9)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 9
+                type = CelestialBody
+                target = @/targetBodies
             }
         }
     }
@@ -266,141 +137,12 @@ CONTRACT_TYPE:NEEDS[RemoteTech]
             type = HasAntenna
 
             antennaType = Dish
-            targetBody = @/allBodies.ElementAt(0)
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(1)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 1
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(2)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 2
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(3)
+            targetBody = @target
 
-            REQUIREMENT
+            ITERATOR
             {
-                type = Expression
-                expression = @/allBodies.Count() > 3
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(4)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 4
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(5)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 5
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(6)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 6
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(7)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 7
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(8)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 8
-            }
-        }
-
-        PARAMETER
-        {
-            name = HasAntenna
-            type = HasAntenna
-
-            antennaType = Dish
-            targetBody = @/allBodies.ElementAt(9)
-
-            REQUIREMENT
-            {
-                type = Expression
-                expression = @/allBodies.Count() > 9
+                type = CelestialBody
+                target = @/targetBodies
             }
         }
     }

diff --git a/GameData/ContractPacks/RemoteTech/InnerSystemSat.cfg b/GameData/ContractPacks/RemoteTech/InnerSystemSat.cfg
@@ -83,11 +83,12 @@ CONTRACT_TYPE:NEEDS[RemoteTech]
                 type = HasAntenna
 
                 antennaType = Dish
+                targetBody = @target
 
                 ITERATOR
                 {
                     type = CelestialBody
-                    targetBody = @/targetBodies
+                    target = @/targetBodies
                 }
             }
         }

diff --git a/GameData/ContractPacks/RemoteTech/OuterSystemSat.cfg b/GameData/ContractPacks/RemoteTech/OuterSystemSat.cfg
@@ -83,11 +83,12 @@ CONTRACT_TYPE:NEEDS[RemoteTech]
                 type = HasAntenna
 
                 antennaType = Dish
+                targetBody = @target
 
                 ITERATOR
                 {
                     type = CelestialBody
-                    targetBody = @/targetBodies
+                    target = @/targetBodies
                 }
             }
         }