diff --git a/src/SecExp/rebellionHandler.tw b/src/SecExp/rebellionHandler.tw index 7c1daf7a0ddd55010e7bed98f74b6a7d868fc39f..c388a4d38730b1206544aeaac09b58b3cb17a4aa 100644 --- a/src/SecExp/rebellionHandler.tw +++ b/src/SecExp/rebellionHandler.tw @@ -373,11 +373,11 @@ __Rebels__: <</if>> <br> <<if $showBattleStatistics == 1>> enemy damage: <<print Math.round(_damage)>><</if>> - <<set _hp -= _damage>> + <<if $SFGear>> <<set _S = .85>> <<else>> <<set _S = 1>> <</if>> + <<set _hp -= _damage*_S>> <br> <<if $showBattleStatistics == 1>> remaining hp: <<print Math.round(_hp)>><</if>> - <<if $SF.Toggle && $SF.Active >= 1 && $SFSupportLevel >= 4 && $SFGear>> <<set _S = .85>> <<else>> _S = 1<</if>> - <<set $losses += (_damage / _baseHp)*_S>> + <<set $losses += _damage / _baseHp>> <<set _moraleDamage = Math.clamp(_damage / 2 + _damage / _baseHp,0,_damage*1.5)>> <<set _morale -= _moraleDamage>> <br> diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw index 86a1884c95745e8a6b84bac6ddfeff7d6cd81d6a..c5195debe8728415c6d8066dfd2a197e26fc2449 100644 --- a/src/SecExp/rebellionReport.tw +++ b/src/SecExp/rebellionReport.tw @@ -83,14 +83,14 @@ <<if $slaveRebellion == 1>> Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print commaNum(Math.trunc($attackTroops))>> rebels from all over the structure dared rise up against their owners and conquer their freedom through blood. Our defense force, <<print commaNum(Math.trunc($troopCount))>> strong, fought with them street by street - <<if $SF.Toggle && $SF.Active >= 1 && $SFSupportLevel >= 4 && $SFGear>> - More units were able to surive thanks to wearining $SF.Lower's combat armour suits. - <</if>> <<if $enemyLosses != $attackTroops>> inflicting <<print commaNum(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves. <<else>> completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>> <</if>> + <<if $SFGear>> + More units were able to survive thanks to wearining $SF.Lower's combat armour suits. + <</if>> <<set $ASlaves -= $enemyLosses>> <<if $battleResult == 3>> <<if $battleTurns <= 5>> @@ -185,8 +185,8 @@ <<else>> completely annihilating their troops, while sustaining <<if $losses > 1>> <<print commaNum(Math.trunc($losses))>> casualties <<else>> a casualty.<</if>> <</if>> - <<if $SF.Toggle && $SF.Active >= 1 && $SFSupportLevel >= 4 && $SFGear>> - More units were able to surive thanks to wearining $SF.Lower's combat armour suits. + <<if $SFGear>> + More units were able to survive thanks to wearining $SF.Lower's combat armour suits. <</if>> <<set $ASlaves -= $enemyLosses>> <<if $battleResult == 3>> diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw index c6ad5292029f4af6c0636361a0b7a2ebc60166b2..341faa3c666679351028fa78012f6849cca710a6 100644 --- a/src/SecExp/riotControlCenter.tw +++ b/src/SecExp/riotControlCenter.tw @@ -208,6 +208,8 @@ The riot control center opens its guarded doors to you. The great chamber inside <</if>> <<if $SF.Toggle && $SF.Active >= 1 && $SFSupportLevel >= 4 && !$SFGear && $SFUnit.Armoury >= 8>> <<= Count()>> - <br><br> [[Give the riot unit access to $SF.Lower's combat armour suits|riotControlCenter][$SFGear = 1,$riotUpkeep += 15000,$cash -= Math.ceil(250000*_Env*(1.15+($SFUnit.Armoury/10)))]] - <br>//Costs <<print cashFormat(Math.ceil(250000*_Env*(1.15+($SFUnit.Armoury/10))))>> + <br><br> <<link "Give the riot unit access to the combat armour suits of $SF.Lower.""riotControlCenter">> <<set $SFGear = 1,$riotUpkeep += 15000,$cash -= Math.ceil(500000*_Env*(1.15+($SFUnit.Armoury/10)))>> <</link>> + <br>//Costs <<print cashFormat(Math.ceil(500000*_Env*(1.15+($SFUnit.Armoury/10))))>> +<<else>> + <br><br>//You have given the riot unit access to the combat armour suits of $SF.Lower.// <</if>> \ No newline at end of file