diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw index e0805d6edd2965b365883dfce3d15104556eb1cc..407029b3257cf50608c1d518ca54ac9f8ef55ded 100644 --- a/src/SecExp/attackHandler.tw +++ b/src/SecExp/attackHandler.tw @@ -307,7 +307,7 @@ <</if>> <<if $Bodyguard.intelligence <= -3>> <<set _woundChance += 1>> - <</if>> + <</if>> <<if random(1,100) <= _woundChance>> <<set $leaderWounded = 1>> <<set _militiaMod -= 0.2>> @@ -316,19 +316,23 @@ <<set _SFMod -= 0.2>> <<set _enemyMod += 0.2>> <<set $woundType = random(1,10)>> - <<if $woundType == 1>> - <<set $Bodyguard.voice = 0>> - <<elseif $woundType == 2>> - <<set $Bodyguard.eyes = -2>> - <<elseif $woundType == 3>> - <<set $Bodyguard.amp = 1>> - <<elseif $woundType >= 4>> - <<if $Bodyguard.health >= -60>> - <<set $Bodyguard.health -= 30>> - <<else>> - <<set $Bodyguard.health -= Math.abs(90 - $Bodyguard.health)>> + <<for _i = 0; _i < $slaves.length; _i++>> + <<if $slaves[_i].ID == $Bodyguard.ID>> + <<if $woundType == 1>> + <<set $slaves[_i].voice = 0>> + <<elseif $woundType == 2>> + <<set $slaves[_i].eyes = -2>> + <<elseif $woundType == 3>> + <<set $slaves[_i].amp = 1>> + <<elseif $woundType >= 4>> + <<if $slaves[_i].health >= -60>> + <<set $slaves[_i].health -= 30>> + <<else>> + <<set $slaves[_i].health -= Math.abs(90 - $slaves[_i].health)>> + <</if>> + <</if>> <</if>> - <</if>> + <</for>> <</if>> /* 60% chance of getting combat skill if not already have it */ <<if $Bodyguard.combatSkill == 0 && random(1,100) <= 60>> @@ -435,15 +439,23 @@ <<set _SFMod -= 0.2>> <<set _enemyMod += 0.2>> <<set $woundType = random(1,10)>> - <<if $woundType == 1>> - <<set $HeadGirl.voice = 0>> - <<elseif $woundType == 2>> - <<set $HeadGirl.eyes = -2>> - <<elseif $woundType == 3>> - <<set $HeadGirl.amp = 1>> - <<elseif $woundType >= 4>> - <<set $HeadGirl.health -= 40>> - <</if>> + <<for _i = 0; _i < $slaves.length; _i++>> + <<if $slaves[_i].ID == $HeadGirl.ID>> + <<if $woundType == 1>> + <<set $slaves[_i].voice = 0>> + <<elseif $woundType == 2>> + <<set $slaves[_i].eyes = -2>> + <<elseif $woundType == 3>> + <<set $slaves[_i].amp = 1>> + <<elseif $woundType >= 4>> + <<if $slaves[_i].health >= -60>> + <<set $slaves[_i].health -= 30>> + <<else>> + <<set $slaves[_i].health -= Math.abs(90 - $slaves[_i].health)>> + <</if>> + <</if>> + <</if>> + <</for>> <</if>> /* 60% chance of getting combat skill if nto already have it */ <<if $HeadGirl.combatSkill == 0 && random(1,100) <= 60>> @@ -970,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 */ @@ -997,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>> diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw index 8f8be1e18839e57df60344c76f0ec72ee67f9ff1..892578cd904f72e0d4a20d49ddc398ca036419c3 100644 --- a/src/SecExp/secBarracks.tw +++ b/src/SecExp/secBarracks.tw @@ -481,7 +481,7 @@ __Militia__ <<set _elimUnit = $militiaUnits[_i]>> <<set _newMilitiaUnits = []>> <<for _y = 0; _y < _sL; _y++>> - <<if $slaveUnits[_y] != _elimUnit>> + <<if $militiaUnits[_y] != _elimUnit>> <<set _newMilitiaUnits.push($militiaUnits[_y])>> <</if>> <</for>> diff --git a/src/uncategorized/pSchoolSuggestion.tw b/src/uncategorized/pSchoolSuggestion.tw index 5aa0451486ee0ae3ff6abebfcf71d0c0de6c11b0..ee1a81816ecaea6e950d9369a5b6356782f1b141 100644 --- a/src/uncategorized/pSchoolSuggestion.tw +++ b/src/uncategorized/pSchoolSuggestion.tw @@ -29,8 +29,6 @@ The unusually competent young heiress standing next to him snickers. "If you're <</if>> <br><br> "If you like them soft and mellow, you got to go with The Cattle Ranch," a portly man blurts loudly while slamming down his emtpy mug. "I've got a pair of 'em for my bedroom; they are so loving after a good milking. Taste good too." His drinking budy retorts, "Too much work is what they are. They might as well be animals with how they act." - - <br><br> The older gentleman who seems to have been acting as unofficial moderator before you came in turns to you. "In any case, <<if $PC.title == 1>>sir<<else>>madam<</if>>, we agreed before you came in. We'd like to get together and pay half the cost of encouraging a slave school to set up a branch campus here, if you'd be willing to pay the other half and choose which. I think ¤10000 from you would cover it." He looks around the group. "Before we started this little debate, we all agreed to chip in regardless of which you chose." @@ -62,6 +60,7 @@ The older gentleman who seems to have been acting as unofficial moderator before <</replace>> <</link>> <</if>> + <<if $seeDicks != 0>> <<if $seeDicks != 100>><br><</if>> <<link "L'Ecole des Enculees">>