itsigo/tallytome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ more error handling and bug fixes

Browse Source
This commit is contained in:
itsig0
2024-03-23 23:54:29 +01:00
parent 201b993974
commit 41e215ddcf
5 changed files with 497 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
handler/tracker.go
View File

@@ -7,7 +7,6 @@ import (
"strconv"
"github.com/gofiber/fiber/v3"
"github.com/gofiber/fiber/v3/log"
"github.com/itsig0/tallytome/view/hptracker"
)
@@ -20,24 +19,25 @@ func Tracker(c fiber.Ctx) error {
hx := len(c.GetReqHeaders()["Hx-Request"]) > 0
data := hptracker.TrackerData{
HP: "0",
HPBase: "0",
HPStartPercentage: "0",
HPPercentage: "0",
Mana: "0",
ManaBase: "0",
ManaRegen: "0",
ManaStartPercentage: "0",
ManaPercentage: "0",
Round: "0",
}
fields := []string{"HP", "HPBase", "HPStartPercentage", "HPPercentage", "Mana", "ManaBase", "ManaRegen", "ManaStartPercentage", "ManaPercentage"}
fields := []string{"HP", "HPBase", "HPStartPercentage", "HPPercentage", "Mana", "ManaBase", "ManaRegen", "ManaStartPercentage", "ManaPercentage", "Round"}
for _, field := range fields {
if val := sess.Get("tracker_" + field); val != nil {
reflect.ValueOf(&data).Elem().FieldByName(field).SetString(fmt.Sprint(val))
}
}
if sess.Get("tracker_Round") == nil {
sess.Set("tracker_Round", "0")
sess.Save()
}
// prevent animation reset
data.HPStartPercentage = data.HPPercentage
data.ManaStartPercentage = data.ManaPercentage
return render(c, hptracker.Show(hx, data))
}
@@ -59,20 +59,47 @@ func TrackerUpdate(c fiber.Ctx) error {
ManaPercentage: "100",
}
bd := hptracker.BaseData{}
mistake := false
if len(data.HP) > 5 || len(data.Mana) > 5 {
bd.Errors = "Einfach nur zu viel."
mistake = true
}
intManaRegen, _ := strconv.Atoi(data.ManaRegen)
if intManaRegen > 100 && !mistake {
bd.Errors = "Mehr als 100% geht nicht"
mistake = true
}
if mistake {
c.Status(422)
c.Append("HX-Retarget", "#baseStats")
c.Append("HX-Reswap", "outerHTML")
return render(c, hptracker.BaseStats(data, bd))
}
pre := "tracker_"
sess.Set(pre+"HP", data.HP)
sess.Set(pre+"HPBase", data.HPBase)
sess.Set(pre+"HPPercentage", data.HPPercentage)
sess.Set(pre+"HPStartPercentage", data.HPStartPercentage)
sess.Set(pre+"HPStartPercentage", data.HPPercentage)
sess.Set(pre+"Mana", data.Mana)
sess.Set(pre+"ManaBase", data.ManaBase)
sess.Set(pre+"ManaRegen", data.ManaRegen)
sess.Set(pre+"ManaStartPercentage", data.ManaStartPercentage)
sess.Set(pre+"ManaStartPercentage", data.ManaPercentage)
sess.Set(pre+"ManaPercentage", data.ManaPercentage)
sess.Set(pre+"Round", "0")
sess.Save()
c.Append("HX-Trigger", "BaseUpdated")
return render(c, hptracker.TrackerColumn(data))
}
@@ -85,10 +112,17 @@ func TrackerDamage(c fiber.Ctx) error {
damage, err := strconv.Atoi(c.FormValue("damageInput"))
if err != nil {
c.Status(422)
return c.SendString(err.Error())
} else if damage <= 0 {
c.Append("HX-Retarget", "#damageInputs")
c.Append("HX-Reswap", "outerHTML")
return render(c, hptracker.Hp(hptracker.DamageData{
Errors: "Einfach nur zu viel.",
}))
}
if damage <= 0 {
c.Status(422)
c.Append("HX-Retarget", "#damageInputs")
c.Append("HX-Reswap", "outerHTML")
return render(c, hptracker.Hp(hptracker.DamageData{
Errors: "Darf nicht 0 oder kleiner sein.",
}))
@@ -98,6 +132,7 @@ func TrackerDamage(c fiber.Ctx) error {
if err != nil {
c.Status(422)
c.Append("HX-Retarget", "#damageInputs")
c.Append("HX-Reswap", "outerHTML")
return render(c, hptracker.Hp(hptracker.DamageData{
Errors: "Standard Werte nicht gesetzt.",
Values: c.FormValue("damageInput"),
@@ -108,8 +143,8 @@ func TrackerDamage(c fiber.Ctx) error {
// no error handling here because it's already done for currentHP
baseHP, _ := strconv.Atoi(fmt.Sprint(sess.Get("tracker_HPBase")))
heal := string(c.FormValue("heal"))
savingThrow := string(c.FormValue("savingthrow"))
heal := c.FormValue("heal")
savingThrow := c.FormValue("savingthrow")
if savingThrow == "on" || heal == "false" {
damageFloat := float64(damage) * 0.33333
@@ -155,33 +190,50 @@ func TrackerMana(c fiber.Ctx) error {
return err
}
manaData := hptracker.ManaData{}
mana, err := strconv.Atoi(c.FormValue("manaInput"))
if err != nil {
c.Status(422)
return c.SendString(err.Error())
} else if mana <= 0 {
c.Append("HX-Retarget", "#manaInputs")
manaData.Errors = "Einfach nur zu viel."
return render(c, hptracker.Mana(manaData))
}
if mana <= 0 {
c.Status(422)
// c.Append("HX-Retarget", "#damageInputs")
// return render(c, hptracker.Hp(hptracker.DamageData{
// Errors: "Darf nicht 0 oder kleiner sein.",
// }))
return nil
c.Append("HX-Retarget", "#manaInputs")
manaData.Errors = "Darf nicht 0 oder kleiner sein."
return render(c, hptracker.Mana(manaData))
}
currentMana, err := strconv.Atoi(fmt.Sprint(sess.Get("tracker_Mana")))
if err != nil {
c.Status(422)
// c.Append("HX-Retarget", "#manaInputs")
// return render(c, hptracker.Mana(hptracker.DamageData{
// Errors: "Standard Werte nicht gesetzt.",
// }))
return err
c.Append("HX-Retarget", "#manaInputs")
manaData.Errors = "Standard Werte nicht gesetzt."
manaData.Values = c.FormValue("manaInput")
return render(c, hptracker.Mana(manaData))
}
baseMana, _ := strconv.Atoi(fmt.Sprint(sess.Get("tracker_ManaBase")))
add := c.FormValue("add")
if add == "true" {
mana *= -1
}
newMana := currentMana - mana
if newMana < 0 {
newMana = 0
}
if newMana > baseMana {
newMana = baseMana
}
newPercentage := (newMana * 100) / baseMana
data := hptracker.TrackerData{
@@ -196,14 +248,65 @@ func TrackerMana(c fiber.Ctx) error {
sess.Save()
c.Append("HX-Trigger", "ManaUpdated")
return render(c, hptracker.ManaTracker(data))
}
func CheckStore(c fiber.Ctx) error {
func TrackerRound(c fiber.Ctx) error {
sess, err := store.Get(c)
if err != nil {
return err
}
log.Info(sess.Keys())
return nil
data := hptracker.TrackerData{}
fields := []string{"HP", "HPBase", "HPStartPercentage", "HPPercentage", "Mana", "ManaBase", "ManaRegen", "ManaStartPercentage", "ManaPercentage", "Round"}
for _, field := range fields {
if val := sess.Get("tracker_" + field); val != nil {
reflect.ValueOf(&data).Elem().FieldByName(field).SetString(fmt.Sprint(val))
}
}
mana, _ := strconv.Atoi(data.Mana)
manaBase, _ := strconv.Atoi(data.ManaBase)
manaRegen, _ := strconv.Atoi(data.ManaRegen)
round, _ := strconv.Atoi(data.Round)
if manaBase == 0 || manaRegen == 0 {
c.Status(418)
return render(c, hptracker.TrackerHeader(data))
}
mana += (manaRegen * manaBase) / 100
if mana > manaBase {
mana = manaBase
}
// hp stays the same for now
data.HPStartPercentage = data.HPPercentage
data.Mana = fmt.Sprint(mana)
data.Round = fmt.Sprint(round + 1)
data.ManaStartPercentage = data.ManaPercentage
data.ManaPercentage = fmt.Sprint((mana * 100) / manaBase)
sess.Set("tracker_Mana", data.Mana)
sess.Set("tracker_ManaPercentage", data.ManaPercentage)
sess.Set("tracker_ManaStartPercentage", data.ManaStartPercentage)
sess.Set("tracker_Round", data.Round)
sess.Save()
return render(c, hptracker.TrackerHeader(data))
}
func TrackerReset(c fiber.Ctx) error {
sess, err := store.Get(c)
if err != nil {
return err
}
sess.Reset()
return render(c, hptracker.Show(true, hptracker.TrackerData{Round: "0"}))
}