mollusk/trinket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Calculate initiative every round of battle

See merge request mollusk/trinket!2
This commit is contained in:
Mollusk 2017-10-26 09:12:33 +00:00
commit 8171922eed
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
battle.go
View File

@ -11,6 +11,9 @@ func Battle(hero, enemy Character) {
heroDamage := hero.Damage + hero.Weapons[hero.Gear.Weapon.Name].Damage heroDamage := hero.Damage + hero.Weapons[hero.Gear.Weapon.Name].Damage
enemyDamage := enemy.Damage + enemy.Weapons[enemy.Gear.Weapon.Name].Damage enemyDamage := enemy.Damage + enemy.Weapons[enemy.Gear.Weapon.Name].Damage
damage := 0
for {
heroInitiative := rand.Intn(7) + hero.Initiative heroInitiative := rand.Intn(7) + hero.Initiative
enemyInitiative := rand.Intn(7) + enemy.Initiative enemyInitiative := rand.Intn(7) + enemy.Initiative
@ -21,9 +24,6 @@ func Battle(hero, enemy Character) {
enemyInitiative -= 1 enemyInitiative -= 1
} }
} }
damage := 0
for {
printCombatantStats(&hero, &enemy, heroInitiative, enemyInitiative) printCombatantStats(&hero, &enemy, heroInitiative, enemyInitiative)
if heroInitiative > enemyInitiative { if heroInitiative > enemyInitiative {