Fixed UniquenessChecks, fixed missing RNG for LSResupply. Fiddled wit…

…h rewards, increased Waypoint Range. Closes #67 and #68
severedsolo · Dec 29, 2016 · d5184a1 · d5184a1
1 parent bcd2fa5
commit d5184a1
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 16 deletions.
diff --git a/Core Missions/BaseCreate.cfg b/Core Missions/BaseCreate.cfg
@@ -25,7 +25,7 @@ CONTRACT_TYPE
     DATA	
     {
 	    type = Vessel
-		uniquenessCheck = GROUP_ACTIVE
+		uniquenessCheck = CONTRACT_ACTIVE
 		requiredValue = true
         targetVessel1 = [ BaseRover ].Where(v => v.IsLanded()).Random()
 		title = Must have a scout rover deployed
@@ -160,7 +160,7 @@ type = All
         name = VisitWaypoint
 		type = VisitWaypoint
 		index = 0
-		distance = 1000.0
+		distance = 2000.0
 		title = Land near @/targetBody1 Rover
 		showMessages = true
 	}

diff --git a/Core Missions/BaseExpansion.cfg b/Core Missions/BaseExpansion.cfg
@@ -27,7 +27,7 @@ CONTRACT_TYPE
     {
         type = Vessel
         requiredValue = true
-		uniquenessCheck = GROUP_ACTIVE
+		uniquenessCheck = CONTRACT_ACTIVE
         targetVessel1 = AllVessels().Where(v => v.IsLanded() && v.VesselType() == Base && v.EmptyCrewSpace() <4).SelectUnique()
 		title = Must have a base with less than 4 empty seats.
     }	
@@ -72,7 +72,7 @@ CONTRACT_TYPE
         name = VisitWaypoint
 		type = VisitWaypoint
 		index = 0
-		distance = 500.0
+		distance = 2000.0
 		title = Land near the @/targetVessel1
 	}
 		REQUIREMENT

diff --git a/Core Missions/BasePopulation.cfg b/Core Missions/BasePopulation.cfg
@@ -25,7 +25,7 @@ CONTRACT_TYPE
     {
         type = Vessel
         requiredValue = true
-		uniquenessCheck = GROUP_ACTIVE
+		uniquenessCheck = CONTRACT_ACTIVE
         targetVessel1 = AllVessels().Where(v => v.VesselType() == Base && v.IsLanded() && v.CrewCount()<1 && v.EmptyCrewSpace()>0).SelectUnique()
 		title = Must have an uncrewed base, with seats to fill.
     }	

diff --git a/Core Missions/BaseRover.cfg b/Core Missions/BaseRover.cfg
@@ -17,7 +17,7 @@ CONTRACT_TYPE
 	maxSimultaneous = 1  
     rewardScience = 0.0
     rewardReputation = 2.0
-    rewardFunds = Random(40000, 60000)
+    rewardFunds = Random(20000, 24000)
     failureReputation = 20.0
     failureFunds = 10000.0
     advanceFunds = 1000.0
@@ -27,7 +27,7 @@ DATA:NEEDS[!SCANsat]
 	{
 		type = CelestialBody
 		requiredValue = true
-		uniquenessCheck = GROUP_ACTIVE
+		uniquenessCheck = CONTRACT_ACTIVE
 		targetBody1 = LandedBodies().Where(b => b.IsOrbitalSurveyComplete() == true && b.HasSurface()).Random()
 		title = Scanning must be complete on a body with a surface.
 	}

diff --git a/Core Missions/BaseScan.cfg b/Core Missions/BaseScan.cfg
@@ -16,7 +16,7 @@ CONTRACT_TYPE
 	maxSimultaneous = 1    
 	rewardScience = 0.0
 	rewardReputation = 1.0
-	rewardFunds = Random(16000, 24000.0)
+	rewardFunds = Random(20000, 24000.0)
 	failureReputation = 10.0
 	failureFunds = 10000.0
 	advanceFunds = 1000.0
@@ -26,7 +26,7 @@ CONTRACT_TYPE
 	{
 		type = CelestialBody
 		requiredValue = true
-		uniquenessCheck = GROUP_ACTIVE
+		uniquenessCheck = CONTRACT_ACTIVE
 		targetBody1 = OrbitedBodies().Where(b => b.IsOrbitalSurveyComplete() == false && b.HasSurface()).SelectUnique()
 		title = Must have orbited an unscanned body, with a surface.
 	}
@@ -35,9 +35,9 @@ CONTRACT_TYPE
 	{
 		type = CelestialBody
 		requiredValue = true
-		uniquenessCheck = GROUP_ACTIVE
+		uniquenessCheck = CONTRACT_ACTIVE
 		targetBody1 = OrbitedBodies().Where(b => b.SCANsatCoverage("AltimetryHiRes") < 80 && b.HasSurface()).SelectUnique()
-		title = Must have orbited a body, with a surface that hasn't had a HiRes scan an on it.
+		title = Must have orbited a body, with a surface that hasn't had a HiRes scan done on it.
 	}
 
 	PARAMETER:NEEDS[!SCANsat]

diff --git a/Core Missions/BaseScience.cfg b/Core Missions/BaseScience.cfg
@@ -24,7 +24,7 @@ CONTRACT_TYPE
     {
         type = Vessel
         requiredValue = true
-		uniquenessCheck = GROUP_ALL
+		uniquenessCheck = CONTRACT_ALL
         ScienceTarget = AllVessels().Where(v => v.VesselType() == Base && v.IsLanded() && v.CrewCount() > 0).SelectUnique()
 		title = Looking for a base with no science lab.
     }
@@ -62,7 +62,7 @@ CONTRACT_TYPE
         name = VisitWaypoint
 		type = VisitWaypoint
 		index = 0
-		distance = 500.0
+		distance = 2000.0
 	}
 	PARAMETER
 	{

diff --git a/Core Missions/BaseSelf-Sufficiency.cfg b/Core Missions/BaseSelf-Sufficiency.cfg
@@ -24,7 +24,7 @@ CONTRACT_TYPE:NEEDS[TACLifeSupport|USILifeSupport]
     {
         type = Vessel
         requiredValue = false
-		uniquenessCheck = GROUP_ALL
+		uniquenessCheck = CONTRACT_ALL
         LSTarget = AllVessels().Where(v => v.CrewCount()>0 && v.IsLanded() && v.VesselType() == Base).Random()
     }
     DATA
@@ -96,7 +96,7 @@ CONTRACT_TYPE:NEEDS[TACLifeSupport|USILifeSupport]
         name = VisitWaypoint
 		type = VisitWaypoint
 		index = 0
-		distance = 500.0
+		distance = 2000.0
 		title = Land near @/LSTarget 
 	}
 REQUIREMENT:NEEDS[TACLifeSupport]

diff --git a/Core Missions/StationCore.cfg b/Core Missions/StationCore.cfg
@@ -36,7 +36,7 @@ CONTRACT_TYPE
     {
         type = CelestialBody
         requiredValue = true
-        uniquenessCheck = GROUP_ACTIVE
+        uniquenessCheck = CONTRACT_ACTIVE
         targetBody1 = OrbitedBodies().Where(body => @/stations.Where(v => v.CelestialBody() == body).Count() == 0).SelectUnique()
 		title = Must have orbited a Celestial Body, but not have any stations deployed.
     }

diff --git a/MaintenanceMissions/LSResupply.cfg b/MaintenanceMissions/LSResupply.cfg
@@ -95,4 +95,13 @@ DATA
 	minCount = 0
 	cooldownDuration = 10d
 }
+
+REQUIREMENT
+{
+	name = RandomRoll
+	type = Expression
+	checkOnActiveContract = false
+	expression = @BasesandStations:randomRoll >5
+	title = The RNG must like you
+}
 }