Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fc-pregmod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pregmodfan
fc-pregmod
Commits
6b425c88
Commit
6b425c88
authored
6 years ago
by
x
Browse files
Options
Downloads
Patches
Plain Diff
comma num support
parent
7b7f510c
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!2508
SF overhual sec exp
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/SecExp/attackHandler.tw
+12
-12
12 additions, 12 deletions
src/SecExp/attackHandler.tw
src/SecExp/rebellionHandler.tw
+11
-11
11 additions, 11 deletions
src/SecExp/rebellionHandler.tw
with
23 additions
and
23 deletions
src/SecExp/attackHandler.tw
+
12
−
12
View file @
6b425c88
...
@@ -1113,14 +1113,14 @@ __Difficulty__:
...
@@ -1113,14 +1113,14 @@ __Difficulty__:
<br>
<br>
<br>
<br>
__Army__:
__Army__:
<br>troops: <<print $troopCount>>
<br>troops: <<print
commaNum(Math.round(
$troopCount
))
>>
<br>attack: <<print Math.round(_attack)>>
<br>attack: <<print
commaNum(
Math.round(_attack)
)
>>
<br>defense: <<print Math.round(_defense)>>
<br>defense: <<print
commaNum(
Math.round(_defense)
)
>>
<br>hp: <<print Math.round(_hp)>>
<br>hp: <<print
commaNum(
Math.round(_hp)
)
>>
<br>morale: <<print Math.round(_morale)>>
<br>morale: <<print
commaNum(
Math.round(_morale)
)
>>
<br>attack modifier: <<if _atkMod > 0>>+<</if>>_atkMod%
<br>attack modifier: <<if _atkMod > 0>>+<</if>>_atkMod%
<br>defense modifier: <<if _defMod > 0>>+<</if>>_defMod%
<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>militia morale modifier: <<if _militiaMod > 0>>+<</if>>_militiaMod%
<br>slaves morale modifier: <<if _slaveMod > 0>>+<</if>>_slaveMod%
<br>slaves morale modifier: <<if _slaveMod > 0>>+<</if>>_slaveMod%
<br>mercenaries morale modifier: <<if _mercMod > 0>>+<</if>>_mercMod%
<br>mercenaries morale modifier: <<if _mercMod > 0>>+<</if>>_mercMod%
...
@@ -1136,17 +1136,17 @@ __Army__:
...
@@ -1136,17 +1136,17 @@ __Army__:
<br>
<br>
<br>
<br>
__Tactics__:
__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>was tactic chosen successful?: <<if $tacticsSuccessful == 1>> yes <<else>> no<</if>>
<br>
<br>
<br>
<br>
__Enemy__:
__Enemy__:
<br>enemy troops: <<print $attackTroops>>
<br>enemy troops: <<print $attackTroops>>
<br>enemy attack: <<print Math.round(_enemyAttack)>>
<br>enemy attack: <<print
commaNum(
Math.round(_enemyAttack)
)
>>
<br>enemy defense: <<print Math.round(_enemyDefense)>>
<br>enemy defense: <<print
commaNum(
Math.round(_enemyDefense)
)
>>
<br>enemy Hp: <<print Math.round(_enemyHp)>>
<br>enemy Hp: <<print
commaNum(
Math.round(_enemyHp)
)
>>
<br>enemy morale: <<print Math.round(_enemyMorale)>>
<br>enemy morale: <<print
commaNum(
Math.round(_enemyMorale)
)
>>
<br>enemy base Hp: <<print Math.round(_enemyBaseHp)>>
<br>enemy base Hp: <<print
commaNum(
Math.round(_enemyBaseHp)
)
>>
<br>enemy morale modifier: <<if _enemyMod > 0>>+<</if>>_enemyMod%
<br>enemy morale modifier: <<if _enemyMod > 0>>+<</if>>_enemyMod%
<<if _enemyMoraleTroopMod > 0>>
<<if _enemyMoraleTroopMod > 0>>
<br>enemy morale increase due to troop numbers: +<<print _enemyMoraleTroopMod>>%
<br>enemy morale increase due to troop numbers: +<<print _enemyMoraleTroopMod>>%
...
...
This diff is collapsed.
Click to expand it.
src/SecExp/rebellionHandler.tw
+
11
−
11
View file @
6b425c88
...
@@ -318,13 +318,13 @@ __Difficulty__:
...
@@ -318,13 +318,13 @@ __Difficulty__:
<br>
<br>
<br>
<br>
__Army__:
__Army__:
<br>troops: <<print $troopCount>>
<br>troops: <<print
commaNum(Math.round(
$troopCount
))
>>
<br>attack: <<print Math.round(_attack)>>
<br>attack: <<print
commaNum(
Math.round(_attack)
)
>>
<br>defense: <<print Math.round(_defense)>>
<br>defense: <<print
commaNum(
Math.round(_defense)
)
>>
<br>engagement rule modifier: <<if _engageMod > 0>>+<</if>><<print _engageMod>>%
<br>engagement rule modifier: <<if _engageMod > 0>>+<</if>><<print _engageMod>>%
<br>Hp: <<print Math.round(_hp)>>
<br>Hp: <<print
commaNum(
Math.round(_hp)
)
>>
<br>base HP: <<print Math.round(_baseHp)>>
<br>base HP: <<print
commaNum(
Math.round(_baseHp)
)
>>
<br>morale: <<print Math.round(_morale)>>
<br>morale: <<print
commaNum(
Math.round(_morale)
)
>>
<<if _enemyMoraleTroopMod > 0>>
<<if _enemyMoraleTroopMod > 0>>
<br>morale increase due to troop numbers: +<<print _moraleTroopMod>>%
<br>morale increase due to troop numbers: +<<print _moraleTroopMod>>%
<</if>>
<</if>>
...
@@ -332,11 +332,11 @@ __Army__:
...
@@ -332,11 +332,11 @@ __Army__:
<br>
<br>
__Rebels__:
__Rebels__:
<br>enemy troops: <<print $attackTroops>>
<br>enemy troops: <<print $attackTroops>>
<br>enemy attack: <<print Math.round(_enemyAttack)>>
<br>enemy attack: <<print
commaNum(
Math.round(_enemyAttack)
)
>>
<br>enemy defense: <<print Math.round(_enemyDefense)>>
<br>enemy defense: <<print
commaNum(
Math.round(_enemyDefense)
)
>>
<br>enemy Hp: <<print Math.round(_enemyHp)>>
<br>enemy Hp: <<print
commaNum(
Math.round(_enemyHp)
)
>>
<br>enemy base Hp: <<print Math.round(_enemyBaseHp)>>
<br>enemy base Hp: <<print
commaNum(
Math.round(_enemyBaseHp)
)
>>
<br>enemy morale: <<print Math.round(_enemyMorale)>>
<br>enemy morale: <<print
commaNum(
Math.round(_enemyMorale)
)
>>
<<if _enemyMoraleTroopMod > 0>>
<<if _enemyMoraleTroopMod > 0>>
<br>enemy morale increase due to troop numbers: +<<print _enemyMoraleTroopMod>>%
<br>enemy morale increase due to troop numbers: +<<print _enemyMoraleTroopMod>>%
<</if>>
<</if>>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment