diff --git a/handlers/add_monster_handler.go b/handlers/add_monster_handler.go index f2a7e92..5174c3a 100644 --- a/handlers/add_monster_handler.go +++ b/handlers/add_monster_handler.go @@ -98,12 +98,12 @@ func parseMonster(r *http.Request) model.Monster { Wis: parseInt(r.FormValue("wis")), Cha: parseInt(r.FormValue("cha")), Save: model.Save{ - Dex: r.FormValue("saveDex"), - Con: r.FormValue("saveCon"), - Wis: r.FormValue("saveWis"), - Str: r.FormValue("saveStr"), - Cha: r.FormValue("saveCha"), - Int: r.FormValue("saveInt"), + Dex: checkCheckbox("savedex", r), + Con: checkCheckbox("savecon", r), + Wis: checkCheckbox("savewis", r), + Str: checkCheckbox("savestr", r), + Cha: checkCheckbox("savecha", r), + Int: checkCheckbox("saveint", r), }, Skill: model.Skill{ Perception: checkCheckbox("perception", r), diff --git a/handlers/skill_calculation_handler.go b/handlers/skill_calculation_handler.go index b7bc109..55ce57b 100644 --- a/handlers/skill_calculation_handler.go +++ b/handlers/skill_calculation_handler.go @@ -68,12 +68,12 @@ func SkillCalculationHandler(content embed.FS) http.HandlerFunc { "sleightOfHand": strconv.Itoa(calcAbilityScore(dex) + crBonus), "stealth": strconv.Itoa(calcAbilityScore(dex) + crBonus), "survival": strconv.Itoa(calcAbilityScore(wis) + crBonus), - "saveStr": strconv.Itoa(calcAbilityScore(str)), - "saveWis": strconv.Itoa(calcAbilityScore(wis)), - "saveCon": strconv.Itoa(calcAbilityScore(con)), - "saveInt": strconv.Itoa(calcAbilityScore(int)), - "saveCha": strconv.Itoa(calcAbilityScore(cha)), - "saveDex": strconv.Itoa(calcAbilityScore(dex)), + "saveStr": strconv.Itoa(calcAbilityScore(str) + crBonus), + "saveWis": strconv.Itoa(calcAbilityScore(wis) + crBonus), + "saveCon": strconv.Itoa(calcAbilityScore(con) + crBonus), + "saveInt": strconv.Itoa(calcAbilityScore(int) + crBonus), + "saveCha": strconv.Itoa(calcAbilityScore(cha) + crBonus), + "saveDex": strconv.Itoa(calcAbilityScore(dex) + crBonus), } // Execute template with skill values. diff --git a/templates/main.html b/templates/main.html index 53884fd..1687e93 100644 --- a/templates/main.html +++ b/templates/main.html @@ -88,7 +88,7 @@ Save Con Save Wis Save Str - Save Con + Save Int Save Cha Perception Stealth diff --git a/templates/monster.html b/templates/monster.html index d3a59d6..ecd2f58 100644 --- a/templates/monster.html +++ b/templates/monster.html @@ -24,7 +24,7 @@ {{.Save.Con}} {{.Save.Wis}} {{.Save.Str}} - {{.Save.Con}} + {{.Save.Int}} {{.Save.Cha}} {{.Skill.Perception}} {{.Skill.Stealth}} diff --git a/templates/monsterForm.html b/templates/monsterForm.html index ba8212b..96e245d 100644 --- a/templates/monsterForm.html +++ b/templates/monsterForm.html @@ -1,315 +1,313 @@ {{ define "monsterform" }}
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
-
- +
+
+ +
+ +
-
-
-
-
- -
- -
+
+
+ +
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
-
-

- Speed -

-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
-
-
- {{ template "skills" }} + {{ template "skills" }} +
+
+
+

+ Speed +

+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
-
-
- -
- -
+
+
+ +
+ +
+
-
{{end}} diff --git a/templates/skills.html b/templates/skills.html index 9512855..3994276 100644 --- a/templates/skills.html +++ b/templates/skills.html @@ -1,254 +1,282 @@ {{ define "skills" }}
-
-
-

- Save -

-
-
-
-
-
-
- -
- +
+
+

+ Save +

+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
-
-
-
-
- -
- +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
-
-

- Skill -

-
-
-
-
-
-
- -
- +
+

+ Skill +

+
+
+
+
+
+
+ +
+ -
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
{{ end }}