diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw index 78f610f16309813d39a47f5d40e1ad959d9ec798..407029b3257cf50608c1d518ca54ac9f8ef55ded 100644 --- a/src/SecExp/attackHandler.tw +++ b/src/SecExp/attackHandler.tw @@ -982,7 +982,7 @@ <<set $troopCount = 0>> <<calcTroopCount>> -<<set _moraleTroopMod = Math.clamp($troopCount / 100,1,10)>> +<<set _moraleTroopMod = Math.clamp($troopCount / 100,1,5)>> <<set _morale = ($secBotsMorale * $deployingBots + $militiaBaseMorale * _militiaMod * $deployingMilitia + $slaveBaseMorale * _slaveMod * $deployingSlaves + $mercBaseMorale * _mercMod * $deployingMercs + $SFBaseMorale * $SFIntervention * _SFMod) / ($deployingBots + $deployingMilitia +$deployingSlaves + $deployingMercs + $SFIntervention)>> <<set _morale = _morale + _morale * $secBarracksUpgrades.luxury * 0.05>> /* barracks bonus */ @@ -1009,7 +1009,7 @@ <<set _armyMod = 1>> <</if>> -<<set _enemyMoraleTroopMod = Math.clamp($attackTroops / 200,1,5)>> +<<set _enemyMoraleTroopMod = Math.clamp($attackTroops / 100,1,5)>> <<if $attackType == "raiders">> <<set _enemyAttack = ($raBaseAttack + $weapManu * $sellTo.raiders + $raBaseAttack * $attackEquip * $equipMod) * _armyMod>> diff --git a/src/SecExp/rebellionHandler.tw b/src/SecExp/rebellionHandler.tw index c33b93b649dc0adcd3468c12c034bbb8b5c8dc83..2ba68cb9104774bec8c3689ad1aa6813bf8ce0f1 100644 --- a/src/SecExp/rebellionHandler.tw +++ b/src/SecExp/rebellionHandler.tw @@ -259,7 +259,7 @@ <</if>> <</for>> -<<set _enemyMoraleTroopMod = Math.clamp($attackTroops / 200,1,10)>> +<<set _enemyMoraleTroopMod = Math.clamp($attackTroops / 100,1,10)>> <<set _enemyMorale = 1.5 * ($militiaBaseMorale * $rebellingMilitia + $slaveBaseMorale * $rebellingSlaves + $mercBaseMorale * $rebellingMercs) / ($rebellingMilitia + $rebellingSlaves + $rebellingMercs)>> <<set _enemyMorale *= _enemyMoraleTroopMod>>