From 012885d7f25f2ebdb58d8887ad85c43ed32b78ba Mon Sep 17 00:00:00 2001 From: hexall90 <hexall90@gmail.com> Date: Thu, 14 Dec 2017 18:13:57 +0100 Subject: [PATCH] fixing fucked up edicts --- src/SecExp/SecExpBackwardCompatibility.tw | 6 ++++++ src/SecExp/edicts.tw | 8 ++++---- src/SecExp/secInit.tw | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw index 3ee639f803f..1a84a94631c 100644 --- a/src/SecExp/SecExpBackwardCompatibility.tw +++ b/src/SecExp/SecExpBackwardCompatibility.tw @@ -198,6 +198,12 @@ <<if ndef $sunTzu>> <<set $sunTzu = 0>> <</if>> +<<if ndef $mamluks>> +<<set $mamluks = 0>> +<</if>> +<<if ndef $pharaonTradition>> +<<set $pharaonTradition = 0>> +<</if>> <<if ndef $weaponsLaw || $wasToggledBefore == 1>> <<set $weaponsLaw = 3>> <</if>> diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw index 50d7371d109..7d527a042c1 100644 --- a/src/SecExp/edicts.tw +++ b/src/SecExp/edicts.tw @@ -190,7 +190,7 @@ <</if>> <<if $pharaonTradition == 1>> - <br>''@@.lime;Legionaries traditions:@@'' you are funding specialized training for your recruits to turn them into an army worthy of a pharaon. + <br>''@@.lime;Pharaonic traditions:@@'' you are funding specialized training for your recruits to turn them into an army worthy of a pharaon. [[Implement|edicts][$pharaonTradition = 0, $edictsUpkeep -= 1000, $militiaBaseAttack -= 2, $militiaBaseDefense -= 2, $militiaBaseMorale -= 10]] <br> //Will increase attack, defense and morale of militia units, but will incur upkeep costs.// <</if>> @@ -207,7 +207,7 @@ <<if $mamluks == 1>> <br>''@@.lime;Mamluks traditions:@@'' you are funding specialized training for your slaves following the Arabian tradition of mamluks slave soldiers. - [[Repeal|edicts][$ronin = 0, $edictsUpkeep -= 1000, $slaveBaseAttack -= 2, $slaveBaseHp--, $slaveBaseMorale -= 10]] + [[Repeal|edicts][$mamluks = 0, $edictsUpkeep -= 1000, $slaveBaseAttack -= 2, $slaveBaseHp--, $slaveBaseMorale -= 10]] <</if>> <<if $sunTzu == 1>> @@ -659,7 +659,7 @@ <<if $arcologies[0].FSEgyptianRevivalist >= 40 && $militiaFounded == 1>> <<if $pharaonTradition == 0>> - <br>''@@.lime;Legionaries traditions:@@'' Fund specialized training for your recruits to turn them into an army worthy of a pharaon. + <br>''@@.lime;Pharaonic traditions:@@'' Fund specialized training for your recruits to turn them into an army worthy of a pharaon. <<if $authority >= 1000>> [[Implement|edicts][$pharaonTradition = 1, $cash -=5000, $authority -= 1000, $edictsUpkeep += 1000, $militiaBaseAttack += 2, $militiaBaseDefense += 2, $militiaBaseMorale += 10]] <<else>> @@ -697,7 +697,7 @@ <<if $mamluks == 0>> <br>''@@.lime;Mamluks traditions:@@'' Fund specialized training for your slaves to turn them into the mamluks slave soldiers of Arabian tradition. <<if $authority >= 1000>> - [[Implement|edicts][$ronin = 1, $cash -=5000, $authority -= 1000, $edictsUpkeep += 1000, $slaveBaseAttack += 2, $slaveBaseHp++, $slaveBaseMorale += 10]] + [[Implement|edicts][$mamluks = 1, $cash -=5000, $authority -= 1000, $edictsUpkeep += 1000, $slaveBaseAttack += 2, $slaveBaseHp++, $slaveBaseMorale += 10]] <<else>> <br>//Not enough Authority.// <</if>> diff --git a/src/SecExp/secInit.tw b/src/SecExp/secInit.tw index 489526b77d6..ded13968eae 100644 --- a/src/SecExp/secInit.tw +++ b/src/SecExp/secInit.tw @@ -68,6 +68,8 @@ <<set $eagleWarriors = 0>> <<set $ronin = 0>> <<set $sunTzu = 0>> +<<set $mamluks = 0>> +<<set $pharaonTradition = 0>> <<set $weaponsLaw = 3>> <<set $soldierWages = 1>> <<set $militiaSoldierPrivilege = 0>> -- GitLab