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

Merge branch 'SecExp-fixes' into 'pregmod-master' 

SecExp-fixes - pricing

See merge request pregmodfan/fc-pregmod!7868
parents 2c46651d ab83ad5e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/Mods/SecExp/buildings/propagandaHub.tw
+ 10
− 10
View file @ dc5cda74
...@@ -86,14 +86,14 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the ...@@ -86,14 +86,14 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<</if>> <</if>>
<br> <br>
<<if $SecExp.buildings.propHub.upgrades.campaign < 5>> <<if $SecExp.buildings.propHub.upgrades.campaign < 5>>
<<set _cost = Math.trunc(5000 * $upgradeMultiplierArcology * ($SecExp.buildings.propHub.upgrades.campaign + 1) * _HistoryDiscount*$HackingSkillMultiplier)>> <<set _costC = Math.trunc(5000 * $upgradeMultiplierArcology * ($SecExp.buildings.propHub.upgrades.campaign + 1) * _HistoryDiscount*$HackingSkillMultiplier)>>
<<link "Invest more resources in the propaganda machine" "propagandaHub">> <<link "Invest more resources in the propaganda machine" "propagandaHub">>
<<run cashX(forceNeg(_cost), "capEx")>> <<run cashX(-_costC, "capEx")>>
<<set $SecExp.buildings.propHub.upgrades.campaign += 1>> <<set $SecExp.buildings.propHub.upgrades.campaign += 1>>
<<= IncreasePCSkills('hacking', 0.5)>> <<= IncreasePCSkills('hacking', 0.5)>>
<</link>> <</link>>
<br>Invest more resources into the project to increase its effectiveness. <br>Invest more resources into the project to increase its effectiveness.
<br>//Costs <<print cashFormat(_cost)>>. Will provide more of the focused resource each week but increase reputation upkeep.// <br>//Costs <<print cashFormat(_costC)>>. Will provide more of the focused resource each week but increase reputation upkeep.//
<<else>> <<else>>
You upgraded your propaganda machine to its limits. You upgraded your propaganda machine to its limits.
<</if>> <</if>>
...@@ -112,13 +112,13 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the ...@@ -112,13 +112,13 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology * _HistoryDiscount))>>. Will provide authority and unlock special upgrades, but will increase upkeep.// <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology * _HistoryDiscount))>>. Will provide authority and unlock special upgrades, but will increase upkeep.//
<<else>> <<else>>
<<if $SecExp.buildings.propHub.upgrades.miniTruth < 5>> <<if $SecExp.buildings.propHub.upgrades.miniTruth < 5>>
<<set _cost = Math.trunc(5000*$upgradeMultiplierArcology * ($SecExp.buildings.propHub.upgrades.miniTruth + 1) * _HistoryDiscount)>> <<set _costM = Math.trunc(5000*$upgradeMultiplierArcology * ($SecExp.buildings.propHub.upgrades.miniTruth + 1) * _HistoryDiscount)>>
<<link "Enlarge the authenticity department" "propagandaHub">> <<link "Enlarge the authenticity department" "propagandaHub">>
<<run cashX(forceNeg(_cost), "capEx")>> <<run cashX(-_costM, "capEx")>>
<<set $SecExp.buildings.propHub.upgrades.miniTruth += 1>> <<set $SecExp.buildings.propHub.upgrades.miniTruth += 1>>
<</link>> <</link>>
<br>Invest more resources into the project to increase its effectiveness. <br>Invest more resources into the project to increase its effectiveness.
<br>//Costs <<print cashFormat(_cost)>>. Will provide more authority each week, but increases upkeep.// <br>//Costs <<print cashFormat(_costM)>>. Will provide more authority each week, but increases upkeep.//
<<else>> <<else>>
You have upgraded the authenticity department to its maximum. You have upgraded the authenticity department to its maximum.
<</if>> <</if>>
...@@ -160,13 +160,13 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the ...@@ -160,13 +160,13 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology * _HistoryDiscount))>>. Will provide authority and unlock special upgrades, but will increase upkeep.// <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology * _HistoryDiscount))>>. Will provide authority and unlock special upgrades, but will increase upkeep.//
<<else>> <<else>>
<<if $SecExp.buildings.propHub.upgrades.secretService < 5 && $rep >= ($SecExp.buildings.propHub.upgrades.secretService * 1000) + 5000>> <<if $SecExp.buildings.propHub.upgrades.secretService < 5 && $rep >= ($SecExp.buildings.propHub.upgrades.secretService * 1000) + 5000>>
<<set _cost = Math.trunc(5000*$upgradeMultiplierArcology * ($SecExp.buildings.propHub.upgrades.secretService + 1) * _HistoryDiscount)>> <<set _costSS = Math.trunc(5000*$upgradeMultiplierArcology * ($SecExp.buildings.propHub.upgrades.secretService + 1) * _HistoryDiscount)>>
<<link "Expand the secret service" "propagandaHub">> <<link "Expand the secret service" "propagandaHub">>
<<run cashX(-_costSS, "capEx")>>
<<set $SecExp.buildings.propHub.upgrades.secretService += 1>> <<set $SecExp.buildings.propHub.upgrades.secretService += 1>>
<<run cashX(forceNeg(_cost), "capEx")>>
<</link>> <</link>>
<br>Invest more resources into the project to increase its effectiveness. <br>Invest more resources into the project to increase its effectiveness.
<br>//Costs <<print cashFormat(_cost)>>. Will provide more authority each week, but increases upkeep.// <br>//Costs <<print cashFormat(_costSS)>>. Will provide more authority each week, but increases upkeep.//
<<elseif $SecExp.buildings.propHub.upgrades.secretService < 5>> <<elseif $SecExp.buildings.propHub.upgrades.secretService < 5>>
You lack the reputation to further expand operations. You lack the reputation to further expand operations.
<<else>> <<else>>
...@@ -195,4 +195,4 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the ...@@ -195,4 +195,4 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<<else>> <<else>>
You have infiltrated the black market and are now in partial control of it. [[Withdraw from the black market|propagandaHub][$SecExp.buildings.propHub.upgrades.marketInfiltration = 0]] You have infiltrated the black market and are now in partial control of it. [[Withdraw from the black market|propagandaHub][$SecExp.buildings.propHub.upgrades.marketInfiltration = 0]]
<</if>> <</if>>
<</if>> <</if>>
\ No newline at end of file
src/Mods/SecExp/buildings/riotControlCenter.tw
+ 17
− 16
View file @ dc5cda74
...@@ -19,14 +19,14 @@ The riot control center opens its guarded doors to you. The great chamber inside ...@@ -19,14 +19,14 @@ The riot control center opens its guarded doors to you. The great chamber inside
<<else>> <<else>>
You are providing free access to many mass media in the arcology. You are providing free access to many mass media in the arcology.
<<if $SecExp.buildings.riotCenter.upgrades.freeMedia < 5>> <<if $SecExp.buildings.riotCenter.upgrades.freeMedia < 5>>
<<set _cost = Math.trunc(5000 * $upgradeMultiplierArcology * ($SecExp.buildings.riotCenter.upgrades.freeMedia + 1)*$HackingSkillMultiplier)>> <<set _costFM = Math.trunc(5000 * $upgradeMultiplierArcology * ($SecExp.buildings.riotCenter.upgrades.freeMedia + 1)*$HackingSkillMultiplier)>>
<br><<link "Invest more resources in the free media project" "riotControlCenter">> <br><<link "Invest more resources in the free media project" "riotControlCenter">>
<<run cashX(-_costFM, "capEx")>>
<<set $SecExp.buildings.riotCenter.upgrades.freeMedia++>> <<set $SecExp.buildings.riotCenter.upgrades.freeMedia++>>
<<run cashX(forceNeg(_cost), "capEx")>>
<<= IncreasePCSkills('hacking', 0.5)>> <<= IncreasePCSkills('hacking', 0.5)>>
<</link>> <</link>>
<br>Invest more resources into the project to increase its effectiveness. <br>Invest more resources into the project to increase its effectiveness.
<br>//Costs <<print cashFormat(_cost)>>. Will accelerate the tension decay, but will increase upkeep costs.// <br>//Costs <<print cashFormat(_costFM)>>. Will accelerate the tension decay, but will increase upkeep costs.//
<<else>> <<else>>
You upgraded your free media scheme to its limits. You upgraded your free media scheme to its limits.
<</if>> <</if>>
...@@ -58,24 +58,24 @@ The riot control center opens its guarded doors to you. The great chamber inside ...@@ -58,24 +58,24 @@ The riot control center opens its guarded doors to you. The great chamber inside
<<else>> <<else>>
You created a rapid deployment riot unit. You created a rapid deployment riot unit.
<<if $SecExp.buildings.riotCenter.upgrades.rapidUnit < 5>> <<if $SecExp.buildings.riotCenter.upgrades.rapidUnit < 5>>
<<set _cost = Math.trunc(5000 * $upgradeMultiplierArcology * ($SecExp.buildings.riotCenter.upgrades.rapidUnit + 1))>> <<set _costRU = Math.trunc(5000 * $upgradeMultiplierArcology * ($SecExp.buildings.riotCenter.upgrades.rapidUnit + 1))>>
<br><<link "Invest more resources in the rapid deployment unit" "riotControlCenter">> <br><<link "Invest more resources in the rapid deployment unit" "riotControlCenter">>
<<run cashX(-_costRU, "capEx")>>
<<set $SecExp.buildings.riotCenter.upgrades.rapidUnit++>> <<set $SecExp.buildings.riotCenter.upgrades.rapidUnit++>>
<<run cashX(forceNeg(_cost), "capEx")>>
<</link>> <</link>>
<br>Invest more resources into the project to increase its effectiveness. <br>Invest more resources into the project to increase its effectiveness.
<br>//Costs <<print cashFormat(_cost)>>. Will lower action costs.// <br>//Costs <<print cashFormat(_costRU)>>. Will lower action costs.//
<<else>> <<else>>
<br>You upgraded your rapid deployment unit to its limits. <br>You upgraded your rapid deployment unit to its limits.
<</if>> <</if>>
<<if $SecExp.buildings.riotCenter.upgrades.rapidUnitSpeed < 2>> <<if $SecExp.buildings.riotCenter.upgrades.rapidUnitSpeed < 2>>
<<set _cost = Math.trunc(5000 * $upgradeMultiplierArcology * ($SecExp.buildings.riotCenter.upgrades.rapidUnitSpeed + 1))>> <<set _costRUS = Math.trunc(5000 * $upgradeMultiplierArcology * ($SecExp.buildings.riotCenter.upgrades.rapidUnitSpeed + 1))>>
<br><<link "Enhance the internal informants network" "riotControlCenter">> <br><<link "Enhance the internal informants network" "riotControlCenter">>
<<run cashX(-_costRUS, "capEx")>>
<<set $SecExp.buildings.riotCenter.upgrades.rapidUnitSpeed++>> <<set $SecExp.buildings.riotCenter.upgrades.rapidUnitSpeed++>>
<<run cashX(forceNeg(_cost), "capEx")>>
<</link>> <</link>>
<br>Invest more resources into the effectiveness of the informants network. <br>Invest more resources into the effectiveness of the informants network.
<br>//Costs <<print cashFormat(_cost)>>. Will reduce cooldown of the rapid deployment riot unit.// <br>//Costs <<print cashFormat(_costRUS)>>. Will reduce cooldown of the rapid deployment riot unit.//
<<else>> <<else>>
<br>You enhanced your informants network to its limits. <br>You enhanced your informants network to its limits.
<</if>> <</if>>
...@@ -137,18 +137,19 @@ The riot control center opens its guarded doors to you. The great chamber inside ...@@ -137,18 +137,19 @@ The riot control center opens its guarded doors to you. The great chamber inside
<</link>> <</link>>
<br>//Will take weeks of work and will cost <<print cashFormat(5000)>> each week, but once finished rebellions will progress a lot slower.// <br>//Will take weeks of work and will cost <<print cashFormat(5000)>> each week, but once finished rebellions will progress a lot slower.//
<<elseif $SecExp.buildings.riotCenter.brainImplantProject < 5>> <<elseif $SecExp.buildings.riotCenter.brainImplantProject < 5>>
<<set _costBIP = Math.trunc(50000 * $upgradeMultiplierArcology * $SecExp.buildings.riotCenter.brainImplantProject*$HackingSkillMultiplier)>>
<<link "Invest more resources in the brain implant project" "riotControlCenter">> <<link "Invest more resources in the brain implant project" "riotControlCenter">>
<<run cashX(-_costBIP, "capEx")>>
<<set $SecExp.buildings.riotCenter.brainImplantProject++>> <<set $SecExp.buildings.riotCenter.brainImplantProject++>>
<<run cashX(forceNeg(Math.trunc(50000 * $upgradeMultiplierArcology * $SecExp.buildings.riotCenter.brainImplantProject*$HackingSkillMultiplier)), "capEx")>>
<<= IncreasePCSkills('hacking', 1)>> <<= IncreasePCSkills('hacking', 1)>>
<</link>> <</link>>
<br>Invest more resources into the project to increase its speed. <br>Invest more resources into the project to increase its speed.
<br>//One-time cost of <<print cashFormat(Math.trunc(50000 * $upgradeMultiplierArcology * $SecExp.buildings.riotCenter.brainImplantProject*$HackingSkillMultiplier))>> with an additional <<print cashFormat(5000)>> each week in maintenance. Will shorten the time required to complete the project.// <br>//One-time cost of <<print cashFormat(_costBIP)>> with an additional <<print cashFormat(5000)>> each week in maintenance. Will shorten the time required to complete the project.//
<<else>> <<else>>
You sped up the project to its maximum. You sped up the project to its maximum.
<</if>> <</if>>
<<if $SecExp.buildings.riotCenter.brainImplant != -1>> <<if $SecExp.buildings.riotCenter.brainImplant != -1>>
<br><br>The great brain implant project is underway. Estimated time to completion: <<print Math.trunc((100 - $SecExp.buildings.riotCenter.brainImplant) / $SecExp.buildings.riotCenter.brainImplantProject)>> <br>The great brain implant project is underway. Estimated time to completion: <<print Math.trunc((100 - $SecExp.buildings.riotCenter.brainImplant) / $SecExp.buildings.riotCenter.brainImplantProject)>>.
<</if>> <</if>>
<<else>> <<else>>
The great brain implant project is completed, rebellions against you will be extremely difficult to organize. The great brain implant project is completed, rebellions against you will be extremely difficult to organize.
...@@ -197,13 +198,13 @@ The riot control center opens its guarded doors to you. The great chamber inside ...@@ -197,13 +198,13 @@ The riot control center opens its guarded doors to you. The great chamber inside
<<if $SF.Toggle && $SF.Active >= 1>> <<if $SF.Toggle && $SF.Active >= 1>>
<br> <br>
<<if $SecExp.edicts.SFSupportLevel >= 4 && $SF.Squad.Armoury >= 8 && !$SecExp.rebellions.sfArmor>> <<if $SecExp.edicts.SFSupportLevel >= 4 && $SF.Squad.Armoury >= 8 && !$SecExp.rebellions.sfArmor>>
<<set _cost = Math.ceil(500000*App.SF.env()*(1.15+($SF.Squad.Armoury/10)))>> <<set _costSFA = Math.ceil(500000*App.SF.env()*(1.15+($SF.Squad.Armoury/10)))>>
<<link "Give the riot unit access to the combat armor suits of $SF.Lower.""riotControlCenter">> <<link "Give the riot unit access to the combat armor suits of $SF.Lower.""riotControlCenter">>
<<set $SecExp.rebellions.sfArmor = 1>> <<set $SecExp.rebellions.sfArmor = 1>>
<<run cashX((-_cost), "capEx")>> <<run cashX(-_costSFA, "capEx")>>
<</link>> <</link>>
//Costs <<print cashFormat(_cost)>> //Costs <<print cashFormat(_costSFA)>>
<<else>> <<else>>
You have given the riot unit access to the combat armor suits of $SF.Lower. You have given the riot unit access to the combat armor suits of $SF.Lower.
<</if>> <</if>>
<</if>> <</if>>
\ No newline at end of file
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