Merge branch 'rival-fix' into 'pregmod-master'

rival skip fix

Closes #124

See merge request pregmodfan/fc-pregmod!1948

src/uncategorized/neighborsDevelopment.tw

@@ -512,13 +512,13 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
 		<<set _Catchtchance = 100>>
 	<</if>>
 	<<set $arcologies[$i].prosperity -= $arcologies[0].CyberEconomic*2, _WarSpoils = 10+Math.max((500*$arcologies[$i].prosperity*$arcologies[0].CyberEconomic),0)>>
-	<<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 100)>>
+	<<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 300)>>
 	<<if random(0,100) >= _Catchchance-(10*$arcologies[0].CyberEconomic)>>
 		<<set $arcologies[0].prosperity -= $arcologies[0].CyberEconomic*3, $rep -= random(100,200), _redHanded = 1>>
 		<<if $secExp == 1>>
 			 <<set $authority -= random(100,500)*$arcologies[0].CyberEconomic, $crime += random(10,25)>>
 		<</if>>
-		<<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity, 1, 100)>>
+		<<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity, 1, 300)>>
 	<</if>>
 	You target $arcologies[$i].name for @@.yellow;digital economic warfare,@@ successfully raiding its coffers for @@.yellowgreen;<<print cashFormat(_WarSpoils)>>@@ this week.
 	<<if _redHanded == 1>>
@@ -548,13 +548,13 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
 		<<set _Catchtchance = 100>>
 	<</if>>
 	<<set $arcologies[$i].prosperity -= $arcologies[0].CyberReputation, $activeArcology.ownership -= $arcologies[0].CyberReputation>>
-	<<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 100)>>
+	<<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 300)>>
 	<<if random(0,100) >= _Catchchance-(10*$arcologies[0].CyberReputation)>>
 		<<set $arcologies[0].prosperity -= $arcologies[0].CyberReputation*3, $rep -= random(100,200), _redHanded = 1>>
 		<<if $secExp == 1>>
 			 <<set $authority -= random(100,500)*$arcologies[0].CyberReputation, $crime += random(10,25)>>
 		<</if>>
-		<<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity, 1, 100)>>
+		<<set $arcologies[0].prosperity = Math.clamp($arcologies[0].prosperity, 1, 300)>>
 	<</if>>
 	You target $arcologies[$i].name's leadership for @@.yellow;character assassination@@ in an attempt to destabilize the arcology.
 	<<if _redHanded == 1>>
@@ -587,6 +587,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
 	<<if $arcologies[$j].direction != 0>>
 	  <<set $arcologies[$j].prosperity -= $arcologies[$j].embargo*2>>
 	<</if>>
+	<<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 300)>>
 	$arcologies[$i].name targets $arcologies[$j].name for @@.red;economic warfare@@.
   <</if>>
 <</for>>
@@ -2618,6 +2619,10 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
 <</if>>
 <</if>> /* CLOSES INFLUENCE INITIATION */
 
+<<if $arcologies[$i].direction != 0>>
+	<<set $arcologies[$i].prosperity = Math.clamp($arcologies[$i].prosperity, 1, 300)>>
+<</if>>
+
 <br>
 <</for>>