Finished warehouse quests for RoPP

jwvhewitt · Feb 23, 2025 · cb2b2ac · cb2b2ac
1 parent aa96454
commit cb2b2ac
Show file tree

Hide file tree

Showing 22 changed files with 3,764 additions and 54 deletions.
diff --git a/data/PLOTCREATOR_ropp.json b/data/PLOTCREATOR_ropp.json
diff --git a/game/combat/__init__.py b/game/combat/__init__.py
@@ -748,7 +748,7 @@ def step(self, chara, dest):
         # in a threatened area as well.
         # threat_area = self.get_threatened_area( chara )
         # started_in_threat = chara.pos in threat_area
-        chara.move(dest, pbge.my_state.view, 0.25)
+        chara.move(dest, pbge.my_state.view, 0.4)
         pbge.my_state.view.handle_anim_sequence()
         self.cstat[chara].moves_this_round += 1
 

diff --git a/game/content/ghplots/dd_intro.py b/game/content/ghplots/dd_intro.py
@@ -55,7 +55,7 @@ def custom_init( self, nart ):
         myroom.contents.append(ghwaypoints.ClosedBoardingChute())
         myroom.contents.append(ghwaypoints.VentFan())
 
-        #myroom.contents.append(game.content.ghterrain.PersonalCargoContainerTerrset())
+        #myroom.contents.append(game.content.ghwaypoints.FusionCore())
 
         npc = self.register_element("SHERIFF",
                             gears.selector.random_character(45, local_tags=self.elements["LOCALE"].attributes,

diff --git a/game/content/ghplots/randomplots.py b/game/content/ghplots/randomplots.py
@@ -560,7 +560,7 @@ def _attempt_analysis(self, camp: gears.GearHeadCampaign):
                         **self.elements))
                 ghcutscene.SimpleMonologueDisplay(
                     "Well that's disappointing. Still, here's a reward for helping with my research.", npc)(camp)
-            camp.credits += self.reward
+            plotutility.CashRewardWithNotification(camp, self.reward)
             pbge.BasicNotification("You earn ${:,}.".format(self.reward))
             relationship = camp.get_relationship(npc)
             relationship.reaction_mod += random.randint(5, 10)
@@ -725,18 +725,17 @@ def _play_concert(self, camp: gears.GearHeadCampaign):
             ghcutscene.SimpleMonologueDisplay(
                 "[THAT_WAS_INCREDIBLE] Here, you attracted so many people that I can pay twice what we agreed to.",
                 npc)(camp)
-            camp.credits += self.reward * 2
-            pbge.BasicNotification("You earn ${:,}.".format(self.reward * 2))
+            plotutility.CashRewardWithNotification(camp, self.reward*2)
             relationship = camp.get_relationship(npc)
             relationship.reaction_mod += random.randint(5, 10)
             self.elements["METRO"].local_reputation += random.randint(1, 6)
             camp.dole_xp(50)
 
         elif skroll > gears.stats.get_skill_target(self.rank, gears.stats.DIFFICULTY_AVERAGE):
             pbge.alert(random.choice(self.AVERAGE_CONCERT).format(**self.elements))
+            plotutility.CashRewardWithNotification(camp, self.reward)
             ghcutscene.SimpleMonologueDisplay("[GOOD_JOB] Here's the pay we agreed to.", npc)(camp)
-            camp.credits += self.reward
-            pbge.BasicNotification("You earn ${:,}.".format(self.reward))
+
             relationship = camp.get_relationship(npc)
             relationship.reaction_mod += random.randint(1, 8)
             camp.dole_xp(50)
@@ -750,7 +749,7 @@ def _play_concert(self, camp: gears.GearHeadCampaign):
             relationship.reaction_mod -= random.randint(1, 10)
             for pc in camp.get_lancemates():
                 relationship = camp.get_relationship(pc)
-                relationship.reaction_mod -= random.randint(1, 6)
+                relationship.reaction_mod -= random.randint(1, 8)
             camp.renown -= random.randint(1, 4)
             camp.dole_xp(50)
 
@@ -813,8 +812,7 @@ def _attempt_repair(self, camp: gears.GearHeadCampaign):
         if skroll > gears.stats.get_skill_target(self.rank, gears.stats.DIFFICULTY_AVERAGE):
             pbge.alert("You fix it!")
             ghcutscene.SimpleMonologueDisplay("[THANKS_FOR_HELP] Here's a reward for you.", npc)(camp)
-            camp.credits += self.reward
-            pbge.BasicNotification("You earn ${:,}.".format(self.reward))
+            plotutility.CashRewardWithNotification(camp, self.reward)
             relationship = camp.get_relationship(npc)
             relationship.reaction_mod += random.randint(1, 4)
             camp.dole_xp(25)