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

Merge branch 'pregmod-master' into 'pregmod-master' 

formatting and new settings

See merge request pregmodfan/fc-pregmod!1099
parents 7e87c8c8 caaf524f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 138 additions and 37 deletions
src/SecExp/SecExpBackwardCompatibility.tw
+ 6
− 0
View file @ a1d5c10a
......@@ -103,6 +103,12 @@
<<if ndef $allowPrestigeFromBattles>>
<<set $allowPrestigeFromBattles = 1>>
<</if>>
<<if ndef $battleFrequency>>
<<set $battleFrequency = 1>>
<</if>>
<<if ndef $rebellionSpeed>>
<<set $rebellionSpeed = 1>>
<</if>>
/* edicts */
<<if ndef $edictsUpkeep>>
......
src/SecExp/attackGenerator.tw
+ 5
− 3
View file @ a1d5c10a
......@@ -16,13 +16,15 @@
<<else>>
<<set _attackChance =20>>
<</if>>
<<if $lastAttackWeeks >= 15>>
<<set _attackChance += 5>>
<</if>>
<<if $hasFoughtOnce == 1>>
<<set _attackChance = 25>>
<</if>>
<<if $lastAttackWeeks >= 10>>
<<set _attackChance += 5>>
<</if>>
<</if>>
/* battle frequency */
<<set _attackChance *= $battleFrequency>>
<<if $forceBattle == 1 && $forceRebellion != 1 && $foughtThisWeek == 0>>
<<set _attackChance = 100>>
......
src/SecExp/attackOptions.tw
+ 2
− 15
View file @ a1d5c10a
......@@ -472,22 +472,9 @@ Offensive Tactics
<<goto "attackReport">>
<</link>>
<br>
/* calculates bribe cost */
<<if $week <= 30>>
<<set $bribeCost = 5000 + $baseBribePerAttacker * $attackTroops>>
<<elseif $week <= 30>>
<<set $bribeCost = 10000 + $baseBribePerAttacker * $attackTroops>>
<<elseif $week <= 30>>
<<set $bribeCost = 15000 + $baseBribePerAttacker * $attackTroops>>
<<elseif $week <= 30>>
<<set $bribeCost = 20000 + $baseBribePerAttacker * $attackTroops>>
<<elseif $week <= 30>>
<<set $bribeCost = 25000 + $baseBribePerAttacker * $attackTroops>>
<</if>>
<<if $majorBattle == 1>>
<<set $bribeCost *= 3>>
<</if>>
/* calculates bribe cost */
<<calcBribe>>
<<link "Attempt to bribe">>
<<set $battleResult = 1>>
<<if $hasFoughtOnce == 0>>
......
src/SecExp/rebellionGenerator.tw
+ 2
− 2
View file @ a1d5c10a
......@@ -132,9 +132,9 @@
<</if>>
<<set _roll = random(1,_slave + _citizen)>>
<<if $brainImplant == 106>>
<<set _slave = Math.trunc(_slave * 0.2), _citizen = Math.trunc(_citizen * 0.2)>>
<<set _slave = Math.trunc(_slave * 0.5 * $rebellionSpeed), _citizen = Math.trunc(_citizen * 0.5 * $rebellionSpeed)>>
<<else>>
<<set _slave = Math.trunc(_slave * 0.75), _citizen = Math.trunc(_citizen * 0.75)>>
<<set _slave = Math.trunc(_slave * $rebellionSpeed), _citizen = Math.trunc(_citizen * $rebellionSpeed)>>
<</if>>
<<if _roll <= _slave>>
<<if random(1,100) < _slave>>
......
src/SecExp/secExpOptions.tw
+ 101
− 15
View file @ a1d5c10a
......@@ -185,7 +185,22 @@ __Rebellions__:
<</link>>
<</if>>
<br>&nbsp;&nbsp;&nbsp;&nbsp;//Enable/disable rebellions.//
<br>
<<if $rebellionsEnabled == 1>>
<<if $rebellionGameOver == 0>>
Rebellions can cause gameover is @@.red;FALSE@@.
<<link "Activate game loss in case of rebellions succeeding">>
<<set $rebellionGameOver = 1>>
<<goto "secExpOptions">>
<</link>>
<<elseif $rebellionGameOver == 1>>
Rebellions can cause gameover is @@.cyan;TRUE@@.
<<link "Deactivate game loss in case of rebellions succeeding">>
<<set $rebellionGameOver = 0>>
<<goto "secExpOptions">>
<</link>>
<</if>>
<br>&nbsp;&nbsp;&nbsp;&nbsp;//Determines wheter a total defeat in a rebellion will cause a gameover.//
<br>
<<if $forceRebellion == 0>>
Rebellions guaranteed this week is @@.red;FALSE@@.
......@@ -201,21 +216,6 @@ __Rebellions__:
<</link>>
<</if>>
<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will force rebellions to happen every week. Rebellions will take precedence over battles.//
<br>
<<if $rebellionGameOver == 0>>
Rebellions can cause gameover is @@.red;FALSE@@.
<<link "Activate game loss in case of rebellions succeeding">>
<<set $rebellionGameOver = 1>>
<<goto "secExpOptions">>
<</link>>
<<elseif $rebellionGameOver == 1>>
Rebellions can cause gameover is @@.cyan;TRUE@@.
<<link "Deactivate game loss in case of rebellions succeeding">>
<<set $rebellionGameOver = 0>>
<<goto "secExpOptions">>
<</link>>
<</if>>
<br>&nbsp;&nbsp;&nbsp;&nbsp;//Determines wheter a total defeat in a rebellion will cause a gameover.//
<</if>>
<<if $showBattleStatistics == 0 &&($battlesEnabled == 1 || $rebellionsEnabled == 1)>>
......@@ -304,6 +304,92 @@ __Battles/Rebellions Difficulty__:
@@.darkred;Very hard@@
<</replace>>
<</link>>
<br>
<br>
__Battles frequency__:
<br>Battle frequency is set to:<span id="battleFrequency">
<<if $battleFrequency == 0.5>>
@@.green;Very infrequent@@
<<elseif $battleFrequency == 0.75>>
@@.limegreen;Infrequent@@
<<elseif $battleFrequency == 1>>
@@.yellow;Normal@@
<<elseif $battleFrequency == 1.25>>
@@.red;Frequent@@
<<else>>
@@.darkred;Very frequent@@
<</if>>
</span>
<br>
<<link "Very infrequent">>
<<set $battleFrequency = 0.5>>
<<replace "#battleFrequency">>
@@.green;Very infrequent@@
<</replace>>
<</link>> | <<link "Infrequent">>
<<set $battleFrequency = 0.75>>
<<replace "#battleFrequency">>
@@.limegreen;Infrequent@@
<</replace>>
<</link>> | <<link "Normal">>
<<set $battleFrequency = 1>>
<<replace "#battleFrequency">>
@@.yellow;Normal@@
<</replace>>
<</link>> | <<link "Frequent">>
<<set $battleFrequency = 1.25>>
<<replace "#battleFrequency">>
@@.red;Frequent@@
<</replace>>
<</link>> | <<link "Very frequent">>
<<set $battleFrequency = 1.5>>
<<replace "#battleFrequency">>
@@.darkred;Very frequent@@
<</replace>>
<</link>>
<br>
<br>
__Rebellions buildup speed__:
<br>Rebellion speed is set to:<span id="rebellionSpeed">
<<if $rebellionSpeed == 0.5>>
@@.green;Very slow@@
<<elseif $rebellionSpeed == 0.75>>
@@.limegreen;Slow@@
<<elseif $rebellionSpeed == 1>>
@@.yellow;Normal@@
<<elseif $rebellionSpeed == 1.25>>
@@.red;Fast@@
<<else>>
@@.darkred;Very fast@@
<</if>>
</span>
<br>
<<link "Very slow">>
<<set $rebellionSpeed = 0.5>>
<<replace "#rebellionSpeed">>
@@.green;Very slow@@
<</replace>>
<</link>> | <<link "Slow">>
<<set $rebellionSpeed = 0.75>>
<<replace "#rebellionSpeed">>
@@.limegreen;Slow@@
<</replace>>
<</link>> | <<link "Normal">>
<<set $rebellionSpeed = 1>>
<<replace "#rebellionSpeed">>
@@.yellow;Normal@@
<</replace>>
<</link>> | <<link "Fast">>
<<set $rebellionSpeed = 1.25>>
<<replace "#rebellionSpeed">>
@@.red;Fast@@
<</replace>>
<</link>> | <<link "Very fast">>
<<set $rebellionSpeed = 1.5>>
<<replace "#rebellionSpeed">>
@@.darkred;Very fast@@
<</replace>>
<</link>>
<br>
......
src/SecExp/secInit.tw
+ 2
− 0
View file @ a1d5c10a
......@@ -35,6 +35,8 @@
<<set $forceRebellion = 0>>
<<set $rebellionGameOver = 1>>
<<set $allowPrestigeFromBattles = 1>>
<<set $battleFrequency = 1>>
<<set $rebellionSpeed = 1>>
/* edicts */
<<set $edictsUpkeep = 0>>
......
src/SecExp/widgets/battleWidgets.tw
+ 18
− 0
View file @ a1d5c10a
......@@ -119,4 +119,22 @@
<<else>>
<br>@@.red;Error: widget called outside battle@@
<</if>>
<</widget>>
<<widget "calcBribe">>
<<if $week <= 30>>
<<set $bribeCost = 5000 + $baseBribePerAttacker * $attackTroops>>
<<elseif $week <= 30>>
<<set $bribeCost = 10000 + $baseBribePerAttacker * $attackTroops>>
<<elseif $week <= 30>>
<<set $bribeCost = 15000 + $baseBribePerAttacker * $attackTroops>>
<<elseif $week <= 30>>
<<set $bribeCost = 20000 + $baseBribePerAttacker * $attackTroops>>
<<elseif $week <= 30>>
<<set $bribeCost = 25000 + $baseBribePerAttacker * $attackTroops>>
<</if>>
<<if $majorBattle == 1>>
<<set $bribeCost *= 3>>
<</if>>
<<set $bribeCost = Math.trunc(Math.clamp($bribeCost,0,1000000))>>
<</widget>>
\ No newline at end of file
src/uncategorized/storyCaption.tw
+ 2
− 2
View file @ a1d5c10a
......@@ -443,7 +443,7 @@
<<if $riotCenter == 1>>
<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
<</if>>
<span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<</if>>
<<if $cyberMod != 0 && $researchLab.built == "true">>
......@@ -480,7 +480,7 @@
<<if $riotCenter == 1>>
<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
<</if>>
<span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@
<</if>>
<<if $cyberMod != 0 && $researchLab.built == "true">>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment