From 6b425c88c8edbb356b648db3ce2c07f5bd098953 Mon Sep 17 00:00:00 2001 From: x <okp57855@psoxs.com> Date: Sun, 19 Aug 2018 23:03:14 +1200 Subject: [PATCH] comma num support --- src/SecExp/attackHandler.tw | 24 ++++++++++++------------ src/SecExp/rebellionHandler.tw | 22 +++++++++++----------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw index a2bd0448483..edb8999e6f2 100644 --- a/src/SecExp/attackHandler.tw +++ b/src/SecExp/attackHandler.tw @@ -1113,14 +1113,14 @@ __Difficulty__: <br> <br> __Army__: -<br>troops: <<print $troopCount>> -<br>attack: <<print Math.round(_attack)>> -<br>defense: <<print Math.round(_defense)>> -<br>hp: <<print Math.round(_hp)>> -<br>morale: <<print Math.round(_morale)>> +<br>troops: <<print commaNum(Math.round($troopCount))>> +<br>attack: <<print commaNum(Math.round(_attack))>> +<br>defense: <<print commaNum(Math.round(_defense))>> +<br>hp: <<print commaNum(Math.round(_hp))>> +<br>morale: <<print commaNum(Math.round(_morale))>> <br>attack modifier: <<if _atkMod > 0>>+<</if>>_atkMod% <br>defense modifier: <<if _defMod > 0>>+<</if>>_defMod% -<br>average base HP: <<print Math.round(_baseHp)>> +<br>average base HP: <<print commaNum(Math.round(_baseHp))>> <br>militia morale modifier: <<if _militiaMod > 0>>+<</if>>_militiaMod% <br>slaves morale modifier: <<if _slaveMod > 0>>+<</if>>_slaveMod% <br>mercenaries morale modifier: <<if _mercMod > 0>>+<</if>>_mercMod% @@ -1136,17 +1136,17 @@ __Army__: <br> <br> __Tactics__: -<br>tactic chance of success: <<print Math.round(_tacChance * 100)>>% +<br>tactic chance of success: <<print commaNum(Math.round(_tacChance * 100))>>% <br>was tactic chosen successful?: <<if $tacticsSuccessful == 1>> yes <<else>> no<</if>> <br> <br> __Enemy__: <br>enemy troops: <<print $attackTroops>> -<br>enemy attack: <<print Math.round(_enemyAttack)>> -<br>enemy defense: <<print Math.round(_enemyDefense)>> -<br>enemy Hp: <<print Math.round(_enemyHp)>> -<br>enemy morale: <<print Math.round(_enemyMorale)>> -<br>enemy base Hp: <<print Math.round(_enemyBaseHp)>> +<br>enemy attack: <<print commaNum(Math.round(_enemyAttack))>> +<br>enemy defense: <<print commaNum(Math.round(_enemyDefense))>> +<br>enemy Hp: <<print commaNum(Math.round(_enemyHp))>> +<br>enemy morale: <<print commaNum(Math.round(_enemyMorale))>> +<br>enemy base Hp: <<print commaNum(Math.round(_enemyBaseHp))>> <br>enemy morale modifier: <<if _enemyMod > 0>>+<</if>>_enemyMod% <<if _enemyMoraleTroopMod > 0>> <br>enemy morale increase due to troop numbers: +<<print _enemyMoraleTroopMod>>% diff --git a/src/SecExp/rebellionHandler.tw b/src/SecExp/rebellionHandler.tw index 6d71865467b..4e128d0aaf2 100644 --- a/src/SecExp/rebellionHandler.tw +++ b/src/SecExp/rebellionHandler.tw @@ -318,13 +318,13 @@ __Difficulty__: <br> <br> __Army__: -<br>troops: <<print $troopCount>> -<br>attack: <<print Math.round(_attack)>> -<br>defense: <<print Math.round(_defense)>> +<br>troops: <<print commaNum(Math.round($troopCount))>> +<br>attack: <<print commaNum(Math.round(_attack))>> +<br>defense: <<print commaNum(Math.round(_defense))>> <br>engagement rule modifier: <<if _engageMod > 0>>+<</if>><<print _engageMod>>% -<br>Hp: <<print Math.round(_hp)>> -<br>base HP: <<print Math.round(_baseHp)>> -<br>morale: <<print Math.round(_morale)>> +<br>Hp: <<print commaNum(Math.round(_hp))>> +<br>base HP: <<print commaNum(Math.round(_baseHp))>> +<br>morale: <<print commaNum(Math.round(_morale))>> <<if _enemyMoraleTroopMod > 0>> <br>morale increase due to troop numbers: +<<print _moraleTroopMod>>% <</if>> @@ -332,11 +332,11 @@ __Army__: <br> __Rebels__: <br>enemy troops: <<print $attackTroops>> -<br>enemy attack: <<print Math.round(_enemyAttack)>> -<br>enemy defense: <<print Math.round(_enemyDefense)>> -<br>enemy Hp: <<print Math.round(_enemyHp)>> -<br>enemy base Hp: <<print Math.round(_enemyBaseHp)>> -<br>enemy morale: <<print Math.round(_enemyMorale)>> +<br>enemy attack: <<print commaNum(Math.round(_enemyAttack))>> +<br>enemy defense: <<print commaNum(Math.round(_enemyDefense))>> +<br>enemy Hp: <<print commaNum(Math.round(_enemyHp))>> +<br>enemy base Hp: <<print commaNum(Math.round(_enemyBaseHp))>> +<br>enemy morale: <<print commaNum(Math.round(_enemyMorale))>> <<if _enemyMoraleTroopMod > 0>> <br>enemy morale increase due to troop numbers: +<<print _enemyMoraleTroopMod>>% <</if>> -- GitLab