Skip to content
Snippets Groups Projects
Commit ac0ca924 authored by Pregmodder's avatar Pregmodder
Browse files

Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

parents dd58bb8d b4ff539d
No related branches found
No related tags found
1 merge request!4188Fix + superfetation work
...@@ -503,23 +503,23 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh ...@@ -503,23 +503,23 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
/* CYBER ECONOMIC WARFARE */ /* CYBER ECONOMIC WARFARE */
<<if $arcologies[$i].direction == $arcologies[0].CyberEconomicTarget>> <<if $arcologies[$i].direction == $arcologies[0].CyberEconomicTarget>>
<<if $PC.hacking == -100>> <<if $PC.hacking == -100>>
<<set _Catchtchance = 10>> <<set _Catchchance = 10>>
<<elseif $PC.hacking <= -75>> <<elseif $PC.hacking <= -75>>
<<set _Catchtchance = 30>> <<set _Catchchance = 30>>
<<elseif $PC.hacking <= -50>> <<elseif $PC.hacking <= -50>>
<<set _Catchtchance = 40>> <<set _Catchchance = 40>>
<<elseif $PC.hacking <= -25>> <<elseif $PC.hacking <= -25>>
<<set _Catchtchance = 45>> <<set _Catchchance = 45>>
<<elseif $PC.hacking == 0>> <<elseif $PC.hacking == 0>>
<<set _Catchtchance = 50>> <<set _Catchchance = 50>>
<<elseif $PC.hacking <= 25>> <<elseif $PC.hacking <= 25>>
<<set _Catchtchance = 60>> <<set _Catchchance = 60>>
<<elseif $PC.hacking <= 50>> <<elseif $PC.hacking <= 50>>
<<set _Catchtchance = 70>> <<set _Catchchance = 70>>
<<elseif $PC.hacking <= 75>> <<elseif $PC.hacking <= 75>>
<<set _Catchtchance = 85>> <<set _Catchchance = 85>>
<<elseif $PC.hacking >= 100>> <<elseif $PC.hacking >= 100>>
<<set _Catchtchance = 100>> <<set _Catchchance = 100>>
<</if>> <</if>>
<<set _weekModifier = Math.max(1, (100-($week*2)))>> <<set _weekModifier = Math.max(1, (100-($week*2)))>>
<<set $arcologies[$i].prosperity -= $arcologies[0].CyberEconomic*2, _WarSpoils = Math.ceil(10+Math.max(((100/_weekModifier)*$arcologies[$i].prosperity*$arcologies[0].CyberEconomic),0))>> <<set $arcologies[$i].prosperity -= $arcologies[0].CyberEconomic*2, _WarSpoils = Math.ceil(10+Math.max(((100/_weekModifier)*$arcologies[$i].prosperity*$arcologies[0].CyberEconomic),0))>>
...@@ -542,23 +542,23 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh ...@@ -542,23 +542,23 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
<</if>> <</if>>
<<elseif $arcologies[$i].direction == $arcologies[0].CyberReputationTarget>> /* REPUTATION WARFARE */ <<elseif $arcologies[$i].direction == $arcologies[0].CyberReputationTarget>> /* REPUTATION WARFARE */
<<if $PC.hacking == -100>> <<if $PC.hacking == -100>>
<<set _Catchtchance = 10>> <<set _Catchchance = 10>>
<<elseif $PC.hacking <= -75>> <<elseif $PC.hacking <= -75>>
<<set _Catchtchance = 30>> <<set _Catchchance = 30>>
<<elseif $PC.hacking <= -50>> <<elseif $PC.hacking <= -50>>
<<set _Catchtchance = 40>> <<set _Catchchance = 40>>
<<elseif $PC.hacking <= -25>> <<elseif $PC.hacking <= -25>>
<<set _Catchtchance = 45>> <<set _Catchchance = 45>>
<<elseif $PC.hacking == 0>> <<elseif $PC.hacking == 0>>
<<set _Catchtchance = 50>> <<set _Catchchance = 50>>
<<elseif $PC.hacking <= 25>> <<elseif $PC.hacking <= 25>>
<<set _Catchtchance = 60>> <<set _Catchchance = 60>>
<<elseif $PC.hacking <= 50>> <<elseif $PC.hacking <= 50>>
<<set _Catchtchance = 70>> <<set _Catchchance = 70>>
<<elseif $PC.hacking <= 75>> <<elseif $PC.hacking <= 75>>
<<set _Catchtchance = 85>> <<set _Catchchance = 85>>
<<elseif $PC.hacking >= 100>> <<elseif $PC.hacking >= 100>>
<<set _Catchtchance = 100>> <<set _Catchchance = 100>>
<</if>> <</if>>
<<set $arcologies[$i].prosperity -= $arcologies[0].CyberReputation>> <<set $arcologies[$i].prosperity -= $arcologies[0].CyberReputation>>
<<if $arcologies[$i].rival != 1>> <<if $arcologies[$i].rival != 1>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment