diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw
index ae5bd171732a92fd23c9c4a5f1c56b1483d70d68..7796710d8dc8a055b528714e3b4573a96142ea87 100644
--- a/src/SecExp/edicts.tw
+++ b/src/SecExp/edicts.tw
@@ -223,7 +223,7 @@
<<if $alternativeRents == 0>>
<br>''Alternative rent payment:'' allow citizens to pay for their rents in menial slaves rather than cash, if so they wish.
<<if $authority >= 1000>>
- [[Implement|edicts][$alternativeRents = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$alternativeRents = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -233,7 +233,7 @@
<<if $enslavementRights == 0>>
<br>''Enslavement rights:'' the arcology owner will be the only authority able to declare a person enslaved or not.
<<if $authority >= 1000>>
- [[Implement|edicts][$enslavementRights = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsAuthUpkeep += 10]]
+ [[Implement|edicts][$enslavementRights = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsAuthUpkeep += 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -243,7 +243,7 @@
<<if $sellData == 0 && ($secUpgrades.nanoCams == 1 || $secUpgrades.cyberBots == 1 || $secUpgrades.eyeScan == 1 || $secUpgrades.cryptoAnalyzer == 1 || $crimeUpgrades.autoTrial == 1 || $crimeUpgrades.autoArchive == 1 || $crimeUpgrades.worldProfiler == 1 || $crimeUpgrades.advForensic == 1)>>
<br>''Private Data marketization:'' allow the selling of private citizens' data.
<<if $authority >= 1000>>
- [[Implement|edicts][$sellData = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsAuthUpkeep += 10]]
+ [[Implement|edicts][$sellData = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsAuthUpkeep += 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -254,7 +254,7 @@
<<if $propCampaignBoost == 0>>
<br>''Obligatory educational material:'' force residents to read curated educational material about the arcology.
<<if $authority >= 1000>>
- [[Implement|edicts][$propCampaignBoost = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsUpkeep += 1000]]
+ [[Implement|edicts][$propCampaignBoost = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsUpkeep += 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -266,7 +266,7 @@
<<if $tradeLegalAid == 0>>
<br>''Legal aid for new businesses:'' Support new businesses in the arcology by helping them cover legal costs and issues.
<<if $authority >= 1000>>
- [[Implement|edicts][$tradeLegalAid = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsUpkeep += 1000]]
+ [[Implement|edicts][$tradeLegalAid = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsUpkeep += 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -275,7 +275,7 @@
<<if $taxTrade == 0>>
<br>''Trade tariffs:'' all goods transitioning in your arcology will have to pay a transition fee.
<<if $authority >= 1000>>
- [[Implement|edicts][$taxTrade = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$taxTrade = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -287,7 +287,7 @@
<<if $slaveWatch == 0>>
<br>''@@.lime;Slave mistreatment watch:@@'' slaves will be able access a special security service in case of mistreatment.
<<if $authority >= 1000>>
- [[Implement|edicts][$slaveWatch = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsUpkeep += 1000]]
+ [[Implement|edicts][$slaveWatch = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsUpkeep += 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -299,7 +299,7 @@
<<if $subsidyChurch == 0>>
<br>''@@.lime;Religious activities subsidy:@@'' will provide economic support to religious activities following the official dogma.
<<if $authority >= 1000>>
- [[Implement|edicts][$subsidyChurch = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsUpkeep += 1000]]
+ [[Implement|edicts][$subsidyChurch = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsUpkeep += 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -312,7 +312,7 @@
<<if !$SFSupportLevel && $reqMenials > 5>>
<br>''Equipment provision:'' $SF.Caps will provide the security HQ with advanced equipment.
<<if $authority >= 1000>>
- [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "policies"), $authority -= 1000, $SFSupportUpkeep += 1000, $reqMenials -= 5]]
+ [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "edicts"), $authority -= 1000, $SFSupportUpkeep += 1000, $reqMenials -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -320,7 +320,7 @@
<<elseif $SFSupportLevel && $SF.Squad.Firebase >= 4 && $reqMenials > 5>>
<br>''Personnel training:'' $SF.Caps will provide the security HQ personnel with advanced training.
<<if $authority >= 1000>>
- [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "policies"), $authority -= 1000, $SFSupportUpkeep += 2000, $reqMenials -= 5]]
+ [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "edicts"), $authority -= 1000, $SFSupportUpkeep += 2000, $reqMenials -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -328,7 +328,7 @@
<<elseif $SFSupportLevel === 2 && $SF.Squad.Firebase >= 6 && $reqMenials > 5>>
<br>''Troops detachment:'' $SF.Caps will provide troops to the security department.
<<if $authority >= 1000>>
- [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "policies"), $authority -= 1000, $SFSupportUpkeep += 3000, $reqMenials -= 5]]
+ [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "edicts"), $authority -= 1000, $SFSupportUpkeep += 3000, $reqMenials -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -336,7 +336,7 @@
<<elseif $SFSupportLevel === 3 && $SF.Squad.Firebase >= 6 && $reqMenials > 5>>
<br>''Full Support:'' $SF.Caps will give the security department its full support.
<<if $authority >= 1000>>
- [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "policies"), $authority -= 1000, $SFSupportUpkeep += 3000, $reqMenials -= 5]]
+ [[Implement|edicts][$SFSupportLevel++, cashX(-5000, "edicts"), $authority -= 1000, $SFSupportUpkeep += 3000, $reqMenials -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -344,7 +344,7 @@
<<elseif $SFSupportLevel === 4 && $SF.Squad.Firebase === 10 && $reqMenials > 5>>
<br>''Network assistance:'' $SF.Caps will assist the security department with installing a local version of their custom network.
<<if $authority >= 1000>>
- [[Implement|edicts][$SFSupportLevel++, cashX(-50000, "policies"), $authority -= 1000, $SFSupportUpkeep += 4000, $secHQUpkeep += 1000, $reqMenials -= 5]]
+ [[Implement|edicts][$SFSupportLevel++, cashX(-50000, "edicts"), $authority -= 1000, $SFSupportUpkeep += 4000, $secHQUpkeep += 1000, $reqMenials -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -357,7 +357,7 @@
<<if $limitImmigration == 0>>
<br>''Immigration limits:'' institute limits to the amount of people the arcology will accept each week.
<<if $authority >= 1000>>
- [[Implement|edicts][$openBorders = 0, $limitImmigration = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$openBorders = 0, $limitImmigration = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -367,7 +367,7 @@
<<if $openBorders == 0>>
<br>''Open borders:'' considerably lower requirements to become citizens.
<<if $authority >= 1000>>
- [[Implement|edicts][$openBorders = 1, $limitImmigration = 0, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$openBorders = 1, $limitImmigration = 0, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -378,7 +378,7 @@
<<if $weaponsLaw == 3>>
<br>''Heavy weaponry forbidden:'' set the range of weapons allowed within the arcology to non-heavy, non-explosive.
<<if $authority >= 1000>>
- [[Implement|edicts][$weaponsLaw = 2, cashX(-5000, "policies"), $authority -= 1000, $edictsAuthUpkeep += 10]]
+ [[Implement|edicts][$weaponsLaw = 2, cashX(-5000, "edicts"), $authority -= 1000, $edictsAuthUpkeep += 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -386,14 +386,14 @@
<<elseif $weaponsLaw == 2>>
<br>''All weapons allowed:'' allow residents of the arcology to buy, sell and keep weaponry of any kind within the arcology.
<<if $authority >= 1000>>
- [[Implement|edicts][$weaponsLaw = 3, cashX(-5000, "policies"), $authority -= 1000, $edictsAuthUpkeep -= 10]]
+ [[Implement|edicts][$weaponsLaw = 3, cashX(-5000, "edicts"), $authority -= 1000, $edictsAuthUpkeep -= 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
<br> //Will slightly increase prosperity and provide a small weekly amount of reputation, but rebellions will be very well armed.//
<br>''Heavily restricted weaponry:'' set the range of weapons allowed within the arcology to non-automatic, non-high caliber.
<<if $authority >= 1000>>
- [[Implement|edicts][$weaponsLaw = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsAuthUpkeep += 10]]
+ [[Implement|edicts][$weaponsLaw = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsAuthUpkeep += 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -401,14 +401,14 @@
<<elseif $weaponsLaw == 1>>
<br>''Heavy weaponry forbidden:'' set the range of weapons allowed within the arcology to non-heavy, non-explosive.
<<if $authority >= 1000>>
- [[Implement|edicts][$weaponsLaw = 2, cashX(-5000, "policies"), $authority -= 1000, $edictsAuthUpkeep -= 10]]
+ [[Implement|edicts][$weaponsLaw = 2, cashX(-5000, "edicts"), $authority -= 1000, $edictsAuthUpkeep -= 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
<br> //Will slightly increase prosperity, but will cost a small amount of authority each week and will leave rebellions decently armed.//
<br>''Forbid weapons inside the arcology:'' forbid residents to buy, sell and keep weaponry while within the arcology.
<<if $authority >= 1000>>
- [[Implement|edicts][$weaponsLaw = 0, cashX(-5000, "policies"), $authority -= 1000, $edictsAuthUpkeep += 10]]
+ [[Implement|edicts][$weaponsLaw = 0, cashX(-5000, "edicts"), $authority -= 1000, $edictsAuthUpkeep += 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -416,7 +416,7 @@
<<elseif $weaponsLaw == 0>>
<br>''Heavily restricted weaponry:'' set the range of weapons allowed within the arcology to non-automatic, non-high caliber.
<<if $authority >= 1000>>
- [[Implement|edicts][$weaponsLaw = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsAuthUpkeep -= 10]]
+ [[Implement|edicts][$weaponsLaw = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsAuthUpkeep -= 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -429,7 +429,7 @@
<<if $soldierWages == 0>>
<br>''Average wages for soldiers:'' will set the wages paid to the soldiers of the arcology to an average amount.
<<if $authority >= 1000>>
- [[Implement|edicts][$soldierWages += 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$soldierWages += 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -437,14 +437,14 @@
<<elseif $soldierWages == 1>>
<br>''Low wages for soldiers:'' will set the wages paid to the soldiers of the arcology to a low amount.
<<if $authority >= 1000>>
- [[Implement|edicts][$soldierWages -= 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$soldierWages -= 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
<br> //Will lower all units upkeep and push loyalty to low levels.//
<br>''High wages for soldiers:'' will set the wages paid to the soldiers of the arcology to a high amount.
<<if $authority >= 1000>>
- [[Implement|edicts][$soldierWages += 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$soldierWages += 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -452,7 +452,7 @@
<<else>>
<br>''Average wages for soldiers:'' will set the wages paid to the soldiers of the arcology to an average amount.
<<if $authority >= 1000>>
- [[Implement|edicts][$soldierWages -= 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$soldierWages -= 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -462,7 +462,7 @@
<<if $slavesOfficers == 0>>
<br>''Slave Officers:'' allow your trusted slaves to lead the defense forces of the arcology.
<<if $authority >= 1000>>
- [[Implement|edicts][$slavesOfficers = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsAuthUpkeep += 10]]
+ [[Implement|edicts][$slavesOfficers = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsAuthUpkeep += 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -473,7 +473,7 @@
<<if $discountMercenaries == 0>>
<br>''Mercenary subsidy:'' mercenaries willing to immigrate in your arcology will be offered a discount on rent.
<<if $authority >= 1000>>
- [[Implement|edicts][$discountMercenaries = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$discountMercenaries = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -484,7 +484,7 @@
<<if $militiaFounded == 0>>
<br>''Found the militia:'' lay the groundwork for the formation of the arcology's citizens' army.
<<if $authority >= 1000>>
- [[Implement|edicts][$militiaFounded = 1, $recruitVolunteers = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$militiaFounded = 1, $recruitVolunteers = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -495,7 +495,7 @@
<<if $recruitVolunteers == 0>>
<br>''Volunteers' militia:'' only volunteers will be accepted in the militia.
<<if $authority >= 1000>>
- [[Implement|edicts][$militarizedSociety = 0, $militaryService = 0, $conscription = 0, $recruitVolunteers = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$militarizedSociety = 0, $militaryService = 0, $conscription = 0, $recruitVolunteers = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -504,7 +504,7 @@
<<if $conscription == 0>>
<br>''Conscription:'' every citizen is required to train in the militia and serve the arcology if the need arises.
<<if $authority >= 4000>>
- [[Implement|edicts][$militarizedSociety = 0, $militaryService = 0, $conscription = 1, $recruitVolunteers = 0, cashX(-5000, "policies"), $authority -= 4000]]
+ [[Implement|edicts][$militarizedSociety = 0, $militaryService = 0, $conscription = 1, $recruitVolunteers = 0, cashX(-5000, "edicts"), $authority -= 4000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -513,7 +513,7 @@
<<if $militaryService == 0>>
<br>''Obligatory military service:'' every citizen is required to register and serve under the militia.
<<if $authority >= 6000>>
- [[Implement|edicts][$militarizedSociety = 0, $militaryService = 1, $conscription = 0, $recruitVolunteers = 0, cashX(-5000, "policies"), $authority -= 6000]]
+ [[Implement|edicts][$militarizedSociety = 0, $militaryService = 1, $conscription = 0, $recruitVolunteers = 0, cashX(-5000, "edicts"), $authority -= 6000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -522,7 +522,7 @@
<<if $militarizedSociety == 0>>
<br>''Militarized Society:'' every adult citizen is required to train and participate in the defense of the arcology.
<<if $authority >= 8000>>
- [[Implement|edicts][$militarizedSociety = 1, $militaryService = 0, $conscription = 0, $recruitVolunteers = 0, cashX(-5000, "policies"), $authority -= 8000]]
+ [[Implement|edicts][$militarizedSociety = 1, $militaryService = 0, $conscription = 0, $recruitVolunteers = 0, cashX(-5000, "edicts"), $authority -= 8000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -532,7 +532,7 @@
<<if $militaryExemption == 0 && ($conscription == 1 || $militaryService == 1 || $militarizedSociety == 1)>>
<br>''Military exemption:'' allow citizens to avoid military duty by paying a weekly fee.
<<if $authority >= 1000>>
- [[Implement|edicts][$militaryExemption = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$militaryExemption = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -543,7 +543,7 @@
<<if $lowerRquirements == 0>>
<br>''@@.lime;Revised minimum requirements:@@'' will allow citizens outside the normally accepted range to join the militia.
<<if $authority >= 1000>>
- [[Implement|edicts][$lowerRquirements = 1, cashX(-5000, "policies"), $authority -= 1000, $militiaBaseDefense--, $militiaBaseHp--]]
+ [[Implement|edicts][$lowerRquirements = 1, cashX(-5000, "edicts"), $authority -= 1000, $militiaBaseDefense--, $militiaBaseHp--]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -555,7 +555,7 @@
<<if $noSubhumansInArmy == 0>>
<br>''@@.lime;No subhumans in the militia:@@'' prevent subhumans from joining the militia.
<<if $authority >= 1000>>
- [[Implement|edicts][$noSubhumansInArmy = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$noSubhumansInArmy = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -567,7 +567,7 @@
<<if $pregExemption == 0>>
<br>''@@.lime;Military exemption for pregnancies:@@'' pregnant citizens will be allowed, and encouraged, to avoid military service.
<<if $authority >= 1000>>
- [[Implement|edicts][$pregExemption = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$pregExemption = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -579,7 +579,7 @@
<<if $militiaSoldierPrivilege == 0 && $militiaFounded == 1>>
<br>''Special militia privileges'' will allow citizens joining the militia to avoid paying rent.
<<if $authority >= 1000>>
- [[Implement|edicts][$militiaSoldierPrivilege = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$militiaSoldierPrivilege = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -589,7 +589,7 @@
<<if $slaveSoldierPrivilege == 0>>
<br>''Special slaves privileges'' will allow slaves drafted into the army to be able to have material possessions.
<<if $authority >= 1000>>
- [[Implement|edicts][$slaveSoldierPrivilege = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsAuthUpkeep += 10]]
+ [[Implement|edicts][$slaveSoldierPrivilege = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsAuthUpkeep += 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -599,7 +599,7 @@
<<if $mercSoldierPrivilege == 0 && $mercenaries > 0>>
<br>''Special mercenary privileges'' will allow mercenaries under contract to claim part of the loot gained from battles.
<<if $authority >= 1000>>
- [[Implement|edicts][$mercSoldierPrivilege = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$mercSoldierPrivilege = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -610,7 +610,7 @@
<<if $martialSchool == 0>>
<br>''@@.lime;Slave martial schools:@@'' specialized schools will be set up to train slaves in martial arts and bodyguarding.
<<if $authority >= 1000>>
- [[Implement|edicts][$martialSchool = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsUpkeep += 1000, $slaveBaseMorale += 5]]
+ [[Implement|edicts][$martialSchool = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsUpkeep += 1000, $slaveBaseMorale += 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -622,7 +622,7 @@
<<if $eliteOfficers == 0>>
<br>''@@.lime;Elite officers:@@'' officers will be exclusively recruited from the elite of society.
<<if $authority >= 1000>>
- [[Implement|edicts][$eliteOfficers = 1, cashX(-5000, "policies"), $authority -= 1000, $militiaBaseMorale += 5, $slaveBaseMorale -= 5]]
+ [[Implement|edicts][$eliteOfficers = 1, cashX(-5000, "edicts"), $authority -= 1000, $militiaBaseMorale += 5, $slaveBaseMorale -= 5]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -634,7 +634,7 @@
<<if $liveTargets == 0>>
<br>''@@.lime;Live targets drills:@@'' disobedient slaves will be used as live targets at shooting ranges.
<<if $authority >= 1000>>
- [[Implement|edicts][$liveTargets = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ [[Implement|edicts][$liveTargets = 1, cashX(-5000, "edicts"), $authority -= 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -649,7 +649,7 @@
<<if $legionTradition == 0>>
<br>''@@.lime;Legionaries traditions:@@'' Fund specialized training for your recruits to turn them into the professional of Roman tradition.
<<if $authority >= 1000>>
- [[Implement|edicts][$legionTradition = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsUpkeep += 1000, $militiaBaseDefense += 2, $militiaBaseMorale += 5, $militiaBaseHp++]]
+ [[Implement|edicts][$legionTradition = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsUpkeep += 1000, $militiaBaseDefense += 2, $militiaBaseMorale += 5, $militiaBaseHp++]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -661,7 +661,7 @@
<<if $pharaonTradition == 0>>
<br>''@@.lime;Pharaonic traditions:@@'' Fund specialized training for your recruits to turn them into an army worthy of a pharaoh.
<<if $authority >= 1000>>
- [[Implement|edicts][$pharaonTradition = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsUpkeep += 1000, $militiaBaseAttack += 2, $militiaBaseDefense += 2, $militiaBaseMorale += 10]]
+ [[Implement|edicts][$pharaonTradition = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsUpkeep += 1000, $militiaBaseAttack += 2, $militiaBaseDefense += 2, $militiaBaseMorale += 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -673,7 +673,7 @@
<<if $eagleWarriors == 0>>
<br>''@@.lime;Eagle warriors traditions:@@'' Fund specialized training for your mercenaries to turn them into the elite units of Aztec tradition.
<<if $authority >= 1000>>
- [[Implement|edicts][$eagleWarriors = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsUpkeep += 1000, $mercBaseAttack += 4, $mercBaseDefense -= 2, $mercBaseMorale += 10]]
+ [[Implement|edicts][$eagleWarriors = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsUpkeep += 1000, $mercBaseAttack += 4, $mercBaseDefense -= 2, $mercBaseMorale += 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -685,7 +685,7 @@
<<if $ronin == 0>>
<br>''@@.lime;Ronin traditions:@@'' Fund specialized training for your mercenaries to turn them into the errant samurai of Japanese tradition.
<<if $authority >= 1000>>
- [[Implement|edicts][$ronin = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsUpkeep += 1000, $mercBaseAttack += 2, $mercBaseDefense += 2, $mercBaseMorale += 10]]
+ [[Implement|edicts][$ronin = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsUpkeep += 1000, $mercBaseAttack += 2, $mercBaseDefense += 2, $mercBaseMorale += 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -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][$mamluks = 1, cashX(-5000, "policies"), $authority -= 1000, $edictsUpkeep += 1000, $slaveBaseAttack += 2, $slaveBaseHp++, $slaveBaseMorale += 10]]
+ [[Implement|edicts][$mamluks = 1, cashX(-5000, "edicts"), $authority -= 1000, $edictsUpkeep += 1000, $slaveBaseAttack += 2, $slaveBaseHp++, $slaveBaseMorale += 10]]
<<else>>
<br>//Not enough Authority.//
<</if>>
@@ -709,7 +709,7 @@
<<if $sunTzu == 0>>
<br>''@@.lime;Sun Tzu Teachings:@@'' Fund specialized training for your units and officers to conform your army to the teachings of the "Art of War".
<<if $authority >= 1000>>
- [[Implement|edicts][$sunTzu = 1, cashX(-5000, "policies"), $authority -= 1000, $militiaBaseAttack++, $militiaBaseDefense++, $mercBaseAttack++, $mercBaseDefense++, $slaveBaseAttack++, $slaveBaseDefense++, $militiaBaseMorale += 5, $mercBaseMorale += 5, $slaveBaseMorale += 5, $edictsUpkeep += 1000]]
+ [[Implement|edicts][$sunTzu = 1, cashX(-5000, "edicts"), $authority -= 1000, $militiaBaseAttack++, $militiaBaseDefense++, $mercBaseAttack++, $mercBaseDefense++, $slaveBaseAttack++, $slaveBaseDefense++, $militiaBaseMorale += 5, $mercBaseMorale += 5, $slaveBaseMorale += 5, $edictsUpkeep += 1000]]
<<else>>
<br>//Not enough Authority.//
<</if>>
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index f5e2d7ce7e911319b0b0493bdd2366d8baeebd20..487cc9bf57325975f44673088917c5100ad9c237 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1257,9 +1257,9 @@ window.budgetLine = function(category, title) {
<<set ${profits}.${category} = (${income}.${category} + ${expenses}.${category})>>\
<td>\
<<if (${profits}.${category}) > 0>>\
- <span class="yellowgreen"><<print cashFormat(${profits}.${category})>>.</span>
+ <span class="yellowgreen"><<print cashFormat(${profits}.${category})>></span>
<<elseif (${profits}.${category}) < 0>>\
- <span class="red">-<<print cashFormat(Math.abs(${profits}.${category}))>>.</span>
+ <span class="red">-<<print cashFormat(Math.abs(${profits}.${category}))>></span>
<<else>>\
<<print cashFormat(${profits}.${category})>>\
<</if>>\
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 29df7d3a0137cd92f304dd4588f77e19ea1efc9c..d4156f40502640bcfcfefe2190a1589af7963bc6 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -250,6 +250,8 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
[[Engineering trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees
<<elseif ($personalAttention == \"medicine\")>>
[[Medicine trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees
+ <<elseif ($personalAttention == \"hacking\")>>
+ [[Hacking trainer|Personal Attention Select][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] fees
<</if>>
")>>
@@ -282,7 +284,8 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<h2>Policies</h2>
</tr>
- <<print budgetLine("policies", "[[Policies|Policies][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]] and [[Edicts|edicts][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]")>>
+ <<print budgetLine("policies", "[[Policies]]")>>
+ <<print budgetLine("edicts", "<<if $secExp>>[[Edicts|edicts]]<<else>>Edicts<</if>>")>>
<<print budgetLine("futureSocieties", "[[Society shaping|Future Society][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]")>>
@@ -324,7 +327,10 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<print budgetLine("peacekeepers", "Peacekeepers<<if State.variables.peacekeepers.undermining !== 0>>, including undermining<</if>>")>>
-
+ <tr>
+ <h2>Budget Report</h2>
+ </tr>
+
<tr><td></td></tr>
<tr>
<td>Tracked totals</td>
diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw
index 22ec2b669732ffad0e17d9d0b7ab4b680473584e..b4ea2860b934d77ac1efa621f025f292495c96a4 100644
--- a/src/uncategorized/costsWidgets.tw
+++ b/src/uncategorized/costsWidgets.tw
@@ -581,6 +581,7 @@ capEx: 0,
futureSocieties: 0,
schoolBacking: 0,
policies: 0,
+edicts: 0,
/*Personal Finance*/
personalBusiness: 0,
@@ -648,6 +649,7 @@ architecture: 0,
capEx: 0,
futureSocieties: 0,
policies: 0,
+edicts: 0,
war: 0,
food: 0,
diff --git a/src/uncategorized/repBudget.tw b/src/uncategorized/repBudget.tw
index 75e8f0b2c42cac060923421185b27c44ecbd5aab..3de256cd7e63781a8abc9c41a418e7e56e915614 100644
--- a/src/uncategorized/repBudget.tw
+++ b/src/uncategorized/repBudget.tw
@@ -127,6 +127,7 @@ for (var i = 0; i < State.variables.lastWeeksRepIncome.length; i++){
</tr>
<<print budgetLine("policies", "Capital expenses")>>
+ <<print budgetLine("edicts", "<<if $secExp>>[[Edicts|edicts]]<<else>>Edicts<</if>>")>>
<<print budgetLine("capEx", "[[Policies|Policies][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]] and [[Edicts|edicts][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]")>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index d207c15a33f3effd992fda9d2d999096acfdcaca..e4ecaef80f1cd881b843e4e01187c52c35b14e24 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -250,7 +250,7 @@ On formal occasions, you are announced as $PCTitle.
<<if $weaponsLaw == 3>>
The absence of any kind of restriction on weaponry within your arcology is @@.green;welcomed by your citizens@@ as sign of your respect for the ideals the Free Cities stand for.
- <<run repX(20, "architecture")>>
+ <<run repX(20, "edicts")>>
<</if>>
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index a5e87324fa280f881671dd4d0fc32a55f676ad0c..c18436642d6c0fe33e3cc92e8edfa5d04dd13615 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -49,12 +49,12 @@
<<link [[($nextButton)|($nextLink)]]>><</link>>
<</if>>
</strong></span>
- <<if _Pass === "Encyclopedia">> to Free Cities.<</if>> @@.cyan;[Space]@@<br>
+ <<if _Pass === "Encyclopedia">> to Free Cities.<</if>> @@.cyan;[Space]@@<br><br>
<</if>>
<</if>>
<</if>>
-<<if _Pass == "Encyclopedia">> <br>
+<<if _Pass == "Encyclopedia">>
/* Intro, new players, PC/Gameplay focused */
[[Playing Free Cities|Encyclopedia][$encyclopedia = "Playing Free Cities"]]
<br>[[Design your master|Encyclopedia][$encyclopedia = "Design Your Master"]]