From a5ffdf50d98c6965c0b12f59407654eb7c2e2322 Mon Sep 17 00:00:00 2001
From: regret-index <cloudofregret@hotmail.com>
Date: Sat, 16 Nov 2024 08:35:51 -0330
Subject: [PATCH] Fiddle with a variety of monster attack type messages

Alembics and blazehearts both punching were using attack types not actually
in active use previously, as were dream sheep headbutting foes. In this
same spirit of being a little more specific with reasonably straightforward
attack types, the following not-weapon-using enemies now use attack types
and words other than "hit":

* iron golems punch both times,
* draconian monks punch for their first hit (and still kick + tailslap
  after),
* ushabti headbutt (they're too rigid to do much else),
* spatial maelstroms and thermic dynamos touch and engulf,
* and toenail golems gore.

None of these should affect gameplay- even if one dragged an undying
armoury over to draconian monks, they already preferred their bare fists
before any other weapons.
---
 crawl-ref/source/dat/mons/draconian-monk.yaml    | 2 +-
 crawl-ref/source/dat/mons/iron-golem.yaml        | 4 ++--
 crawl-ref/source/dat/mons/spatial-maelstrom.yaml | 4 ++--
 crawl-ref/source/dat/mons/thermic-dynamo.yaml    | 4 ++--
 crawl-ref/source/dat/mons/toenail-golem.yaml     | 2 +-
 crawl-ref/source/dat/mons/ushabti.yaml           | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/crawl-ref/source/dat/mons/draconian-monk.yaml b/crawl-ref/source/dat/mons/draconian-monk.yaml
index 2989d00a51e..789af3efa7e 100644
--- a/crawl-ref/source/dat/mons/draconian-monk.yaml
+++ b/crawl-ref/source/dat/mons/draconian-monk.yaml
@@ -4,7 +4,7 @@ flags: [fighter, speaks, cold_blood]
 species: draconian
 will: 40
 attacks:
- - {type: hit, flavour: flank, damage: 35}
+ - {type: punch, flavour: flank, damage: 35}
  - {type: kick, damage: 20}
  - {type: tail_slap, damage: 15}
 hd: 16
diff --git a/crawl-ref/source/dat/mons/iron-golem.yaml b/crawl-ref/source/dat/mons/iron-golem.yaml
index 020bf673a9b..3667621a7b7 100644
--- a/crawl-ref/source/dat/mons/iron-golem.yaml
+++ b/crawl-ref/source/dat/mons/iron-golem.yaml
@@ -5,8 +5,8 @@ genus: golem
 holiness: [nonliving]
 will: invuln
 attacks:
- - {type: hit, damage: 50}
- - {type: hit, damage: 50}
+ - {type: punch, damage: 50}
+ - {type: punch, damage: 50}
 hd: 15
 hp_10x: 2700
 ac: 24
diff --git a/crawl-ref/source/dat/mons/spatial-maelstrom.yaml b/crawl-ref/source/dat/mons/spatial-maelstrom.yaml
index daed1275635..64bdb6b0099 100644
--- a/crawl-ref/source/dat/mons/spatial-maelstrom.yaml
+++ b/crawl-ref/source/dat/mons/spatial-maelstrom.yaml
@@ -6,8 +6,8 @@ xp_mult: 5
 holiness: [nonliving]
 will: invuln
 attacks:
- - {type: hit, flavour: distort, damage: 20}
- - {type: hit, flavour: distort, damage: 20}
+ - {type: touch, flavour: distort, damage: 20}
+ - {type: engulf, flavour: distort, damage: 20}
 hd: 10
 hp_10x: 750
 ac: 0
diff --git a/crawl-ref/source/dat/mons/thermic-dynamo.yaml b/crawl-ref/source/dat/mons/thermic-dynamo.yaml
index cff6e91284b..e07e749e75f 100644
--- a/crawl-ref/source/dat/mons/thermic-dynamo.yaml
+++ b/crawl-ref/source/dat/mons/thermic-dynamo.yaml
@@ -7,8 +7,8 @@ genus: fire_vortex
 holiness: [nonliving]
 will: invuln
 attacks:
- - {type: hit, flavour: fire, damage: 18}
- - {type: hit, flavour: cold, damage: 14}
+ - {type: touch, flavour: fire, damage: 18}
+ - {type: engulf, flavour: cold, damage: 14}
 hd: 10
 hp_10x: 380
 ac: 4
diff --git a/crawl-ref/source/dat/mons/toenail-golem.yaml b/crawl-ref/source/dat/mons/toenail-golem.yaml
index fce1235aeec..d50eba31f47 100644
--- a/crawl-ref/source/dat/mons/toenail-golem.yaml
+++ b/crawl-ref/source/dat/mons/toenail-golem.yaml
@@ -5,7 +5,7 @@ genus: golem
 holiness: [nonliving]
 will: invuln
 attacks:
- - {type: hit, damage: 13}
+ - {type: gore, damage: 13}
 hd: 9
 hp_10x: 585
 ac: 8
diff --git a/crawl-ref/source/dat/mons/ushabti.yaml b/crawl-ref/source/dat/mons/ushabti.yaml
index b9088ef8d86..a3ab457af8e 100644
--- a/crawl-ref/source/dat/mons/ushabti.yaml
+++ b/crawl-ref/source/dat/mons/ushabti.yaml
@@ -6,7 +6,7 @@ genus: golem
 holiness: [nonliving]
 will: invuln
 attacks:
- - {type: hit, damage: 30}
+ - {type: headbutt, damage: 30}
 hd: 7
 hp_10x: 455
 ac: 9