Quest rebalancing/bugfixes

rvanasa · Jul 26, 2021 · b6f4150 · b6f4150
1 parent ad6d457
commit b6f4150
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 27 deletions.
diff --git a/1.3/Defs/Duties.xml b/1.3/Defs/Duties.xml
@@ -7,8 +7,8 @@
     <thinkNode Class="ThinkNode_Priority">
       <subNodes>
         <li Class="JobGiver_AIFightEnemies">
-          <targetAcquireRadius>80</targetAcquireRadius>
-          <targetKeepRadius>100</targetKeepRadius>
+          <targetAcquireRadius>60</targetAcquireRadius>
+          <targetKeepRadius>80</targetKeepRadius>
         </li>
         <li Class="JobGiver_AIGotoNearestHostile" />
         <li Class="ThinkNode_Subtree">

diff --git a/1.3/Defs/Incidents.xml b/1.3/Defs/Incidents.xml
@@ -89,7 +89,7 @@
 				<messageType>NegativeEvent</messageType>
 			</li>
 		</questParts>
-		<baseChance>0.1</baseChance>
+		<baseChance>0.08</baseChance>
 	</IncidentDef>
 
   <IncidentDef Class="Cities.QuestDef">
@@ -131,7 +131,7 @@
 				<messageType>NegativeEvent</messageType>
 			</li>
 		</questParts>
-		<baseChance>0.02</baseChance>
+		<baseChance>0.03</baseChance>
 		<EnterCityLabel>Defend City</EnterCityLabel>
 	</IncidentDef>
 
@@ -156,7 +156,7 @@
 				<messageType>NegativeEvent</messageType>
 			</li>
 		</questParts>
-		<baseChance>0.1</baseChance>
+		<baseChance>0.05</baseChance>
 		<EnterCityLabel>Prison Break</EnterCityLabel>
 	</IncidentDef>
 

diff --git a/Source/Incident/IncidentWorker_Quest.cs b/Source/Incident/IncidentWorker_Quest.cs
@@ -15,22 +15,27 @@ public class IncidentWorker_Quest : IncidentWorker_Cached {
         public override LookTargets LetterTargets => quest.Targets;
         public override NamedArgument[] LetterParams => quest.FormatArgs;
 
-        public override bool CheckIncident(IncidentParms parms) {
-            if (!Config_Cities.Instance.enableQuestSystem) {
-                return false;
-            }
-
+        void SetupQuest(IncidentParms parms) {
             if (quest == null || quest.Started) {
                 var questDef = Def;
                 quest = (Quest) System.Activator.CreateInstance(questDef.questClass);
                 quest.def = questDef;
             }
-
             quest.ChooseParts();
+        }
+
+        public override bool CheckIncident(IncidentParms parms) {
+            if (!Config_Cities.Instance.enableQuestSystem) {
+                return false;
+            }
+            SetupQuest(parms);
             return quest.CanReceiveRandomly();
         }
 
         public override bool StartIncident(IncidentParms parms) {
+            if (quest == null || quest.Started) {
+                SetupQuest(parms);
+            }
             if (quest.AllPartsValid()) {
                 quest.Start();
                 return true;

diff --git a/Source/Quest/City/Quest_Assassinate.cs b/Source/Quest/City/Quest_Assassinate.cs
@@ -19,16 +19,16 @@ public override void ExposeData() {
             Scribe_References.Look(ref city, "city");
             Scribe_References.Look(ref pawn, "pawn");
 
-            if (pawn == null && city?.Faction != null && handle != null)
-            {
+            if (pawn == null && city?.Faction != null && handle != null) {
                 GeneratePawn();
 
                 // regenerate quest description
                 handle.description = DetailText;
 
                 // remove any QuestParts
-                foreach (var part in handle.PartsListForReading.ToArray())
+                foreach (var part in handle.PartsListForReading.ToArray()) {
                     handle.RemovePart(part);
+                }
 
                 // add new QuestParts
                 OnSetupHandle(handle);
@@ -39,19 +39,17 @@ public override void ChooseParts() {
             base.ChooseParts();
             city = Find.WorldObjects.Settlements
                 .OfType<City>()
-                .Where(s => s.Visitable && !s.Abandoned && !s.HasMap && !(s is Citadel))
+                .Where(s => s.Visitable && !s.Abandoned && !s.HasMap && !(s is Citadel) && s.FindQuests().Count == 0)
                 .RandomByDistance(HomeMap?.Parent, 80);
             if (city == null)
                 return;
 
             GeneratePawn();
         }
 
-        private void GeneratePawn()
-        {
+        void GeneratePawn() {
             var faction = city.Faction;
-            pawn = PawnGenerator.GeneratePawn(new PawnGenerationRequest(faction.RandomPawnKind(), faction,
-                PawnGenerationContext.NonPlayer, city.Tile));
+            pawn = PawnGenerator.GeneratePawn(new PawnGenerationRequest(faction.RandomPawnKind(), faction, PawnGenerationContext.NonPlayer, city.Tile));
         }
 
         public override bool AllPartsValid() {

diff --git a/Source/Quest/City/Quest_Assault.cs b/Source/Quest/City/Quest_Assault.cs
@@ -27,7 +27,7 @@ public override void ChooseParts() {
             alliedFaction = Find.FactionManager.RandomAlliedFaction(minTechLevel: TechLevel.Industrial);
             target = Find.WorldObjects.Settlements
                 .OfType<City>()
-                .Where(s => s.Faction.HostileTo(Faction.OfPlayer) && !s.HasMap && !(s is Citadel))
+                .Where(s => s.Faction.HostileTo(Faction.OfPlayer) && !s.HasMap && !(s is Citadel) && s.FindQuests().Count == 0)
                 .RandomByDistance(HomeMap?.Parent, 80);
         }
 

diff --git a/Source/Quest/City/Quest_Defend.cs b/Source/Quest/City/Quest_Defend.cs
@@ -36,7 +36,7 @@ public override void ChooseParts() {
             enemyFaction = Find.FactionManager.RandomEnemyFaction(minTechLevel: TechLevel.Industrial);
             city = Find.WorldObjects.Settlements
                 .OfType<City>()
-                .Where(s => s.Visitable && !s.Abandoned && !s.HasMap && !(s is Citadel))
+                .Where(s => s.Visitable && !s.Abandoned && !s.HasMap && !(s is Citadel) && s.FindQuests().Count == 0)
                 .RandomByDistance(HomeMap?.Parent, 80);
         }
 

diff --git a/Source/Quest/City/Quest_Hostages.cs b/Source/Quest/City/Quest_Hostages.cs
@@ -49,7 +49,7 @@ public override void ChooseParts() {
             base.ChooseParts();
             city = Find.WorldObjects.Settlements
                 .OfType<City>()
-                .Where(s => s.Visitable && !s.Abandoned && !s.HasMap && !(s is Citadel))
+                .Where(s => s.Visitable && !s.Abandoned && !s.HasMap && !(s is Citadel) && s.FindQuests().Count == 0)
                 .RandomByDistance(HomeMap?.Parent, Rand.RangeInclusive(20, 100));
             if (city == null) {
                 return;

diff --git a/Source/Quest/City/Quest_PrisonBreak.cs b/Source/Quest/City/Quest_PrisonBreak.cs
@@ -9,6 +9,7 @@ public class Quest_PrisonBreak : Quest {
         City city;
 
         public override int MinCapableColonists => 1;
+        public override int ChallengeRating => 3;
 
         public override LookTargets Targets => city;
 
@@ -23,7 +24,8 @@ public override void ExposeData() {
         public override void ChooseParts() {
             base.ChooseParts();
             city = Find.WorldObjects.Settlements
-                .Where(s => s is City city && city.Visitable && city.inhabitantFaction != null && city.inhabitantFaction.PlayerGoodwill < 50 && !(s is Citadel)
+                .OfType<City>()
+                .Where(s => s.Visitable && s.inhabitantFaction != null && s.inhabitantFaction.PlayerGoodwill < 50 && !(s is Citadel) && s.FindQuests().Count == 0
                             && QuestUtility.Reachable(HomeMap?.Parent, s, 80)
                             && !s.HasMap)
                 .RandomElementWithFallback() as City;

diff --git a/Source/Quest/City/Quest_Sabotage.cs b/Source/Quest/City/Quest_Sabotage.cs
@@ -23,7 +23,7 @@ public override void ChooseParts() {
             base.ChooseParts();
             target = Find.WorldObjects.Settlements
                 .OfType<City>()
-                .Where(s => s.Visitable && s.inhabitantFaction != null && s.inhabitantFaction.PlayerGoodwill < 50 && !s.HasMap && !(s is Citadel))
+                .Where(s => s.Visitable && s.inhabitantFaction != null && s.inhabitantFaction.PlayerGoodwill < 50 && !s.HasMap && !(s is Citadel) && s.FindQuests().Count == 0)
                 .RandomByDistance(HomeMap?.Parent, 80);
         }
 

diff --git a/Source/Quest/Quest.cs b/Source/Quest/Quest.cs
@@ -85,8 +85,7 @@ public virtual void ExposeData() {
         }
 
         protected virtual bool IsValidHome(Map map) {
-            return map?.Parent?.Faction != null && !map.ParentFaction.HostileTo(Faction.OfPlayer) &&
-                   HasSufficientColonists(map);
+            return map?.Parent?.Faction != null && !map.ParentFaction.HostileTo(Faction.OfPlayer) && HasSufficientColonists(map);
         }
 
         protected virtual bool HasSufficientColonists(Map map) {

diff --git a/Source/Util/GenCity.cs b/Source/Util/GenCity.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using RimWorld;
 using RimWorld.BaseGen;
 using Verse;

diff --git a/Source/World/City.cs b/Source/World/City.cs
@@ -147,5 +147,11 @@ public virtual IntVec3 ChooseMapSize(IntVec3 mapSize) {
             }
             return mapSize;
         }
+
+        public List<Quest> FindQuests() {
+            return Find.World.GetComponent<WorldComponent_QuestTracker>().quests
+                .Where(quest => !quest.Ended && quest.Targets.targets.Any(target => target.WorldObject == this))
+                .ToList();
+        }
     }
 }