fix: combat formulas and mob attack types (mobs switch attack styles if safespotting)

1 files changed, 14 insertions, 14 deletions

diff --git a/internal/game/act_gather.go b/internal/game/act_gather.go
index c34c6ae..f7a63f6 100644
--- a/internal/game/act_gather.go
+++ b/internal/game/act_gather.go
@@ -114,12 +114,12 @@ func (g *Game) startGather(sess *net.Session, p *player.Player, obj *object.Obje
 	}
 
 	d := &behavior.GatherData{
-		ObjDefID:     obj.ID,
-		InstanceKey:  g.World.ObjStateKey(st.RoomID, st.DefID, st.Index),
-		InstanceIdx:  st.Index + 1,
-		Wait:         wait,
-		Verb:         verb,
-		ToolName:     toolName,
+		ObjDefID:    obj.ID,
+		InstanceKey: g.World.ObjStateKey(st.RoomID, st.DefID, st.Index),
+		InstanceIdx: st.Index + 1,
+		Wait:        wait,
+		Verb:        verb,
+		ToolName:    toolName,
 	}
 	if cfg.DepleteTimer > 0 {
 		d.DepleteTimer = true
@@ -225,14 +225,14 @@ func (g *Game) advanceGather(sess *net.Session, p *player.Player) {
 			}
 			g.AccountStore.SaveCharacter(p)
 
-		msg := drop.SuccessMessage
-		coloredName := g.itemColorize(sess, itemDef, itemName)
-		if msg == "" {
-			msg = fmt.Sprintf("You manage to get some %s.", coloredName)
-		} else {
-			msg = strings.ReplaceAll(msg, "%n", coloredName)
-			msg = color.ExpandTags(g.colorMode(sess), msg)
-		}
+			msg := drop.SuccessMessage
+			coloredName := g.itemColorize(sess, itemDef, itemName)
+			if msg == "" {
+				msg = fmt.Sprintf("You manage to get some %s.", coloredName)
+			} else {
+				msg = strings.ReplaceAll(msg, "%n", coloredName)
+				msg = color.ExpandTags(g.colorMode(sess), msg)
+			}
 			if xp > 0 && p.OptionBool("xp_drops") {
 				msg += g.formatXpDropSingle(sess, p, player.SkillName(cfg.Skill), xp)
 			}