Skip to content

Commit 9e7d2da

Browse files
committed
Cosmetic edits to simalq.tile.monster.
1 parent 82b281a commit 9e7d2da

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

simalq/tile/monster.hy

+15-10
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
(setv
3838
damage-melee None
3939
; How much damage the monster does with its basic melee attack.
40-
; This can be `None`, one number, or a tuple of numbers, with
41-
; element 0 giving damage when the monster is at 1 HP, element 1
42-
; at 2 HP, etc. (the last element being implicitly repeated as
43-
; required).
40+
; This can be `None` (for no melee attack), one number, or a
41+
; tuple of numbers, with element 0 giving damage when the
42+
; monster is at 1 HP, element 1 at 2 HP, etc. (the last element
43+
; being implicitly repeated as required).
4444
damage-shot None
4545
; Likewise for shots.
4646
shot-range None
@@ -72,6 +72,8 @@
7272
(and
7373
(.player-has? StatusEffect.Ivis)
7474
(not (adjacent? (or mon-pos @pos) G.player.pos))
75+
; Invisibility has no effect on adjacent monsters. They can
76+
; smell your fear.
7577
(not @sees-invisible)))
7678

7779
(defmeth try-to-attack-player [[dry-run F] [shots-ignore-obstacles F] [pos None]]
@@ -376,14 +378,15 @@
376378
:score-for-damaging (property-meth []
377379
(self-sc score-for-damaging))
378380
:immune (property-meth []
381+
; Generators inherit all the immunities of the monsters they
382+
; generate, and they're always immune to poison.
379383
(setv x (self-sc immune))
380384
(+ x (if (in Poison x) #() #(Poison))))
381385
382386
:full-name (property-meth []
383-
(setv sc (self-sc))
384387
(.format "{}{} {}"
385-
(if sc.article (+ sc.article " ") "")
386-
(.replace sc.stem " " "-")
388+
(if (self-sc article) (+ (self-sc article) " ") "")
389+
(.replace (self-sc stem) " " "-")
387390
(Tile.full-name.fget @)))
388391
389392
:act (meth []
@@ -579,7 +582,7 @@
579582
:iq-ix 49
580583
:destruction-points 200
581584
582-
:immune #(MundaneArrow Fire #* undead-immunities)
585+
:immune #(MundaneArrow Fire #* undead-immunities)
583586
:resists #(MagicArrow)
584587
:damage-melee 20
585588
@@ -590,7 +593,9 @@
590593
:destruction-points 50
591594
592595
:immune #(PlayerMelee MundaneArrow Fire Poison DeathMagic)
593-
; The immunity to death magic is an addition to IQ.
596+
; The immunity to death magic is an addition compared to IQ. I
597+
; added it because they're clearly not living things. "Killing"
598+
; them with a wand of death makes no sense.
594599
:damage-melee 25
595600
:kamikaze T
596601
@@ -614,7 +619,7 @@
614619
(@wander :implicit-attack F))
615620
616621
:hook-normal-destruction (meth []
617-
"The monster can attempt a free attack, unless it killed itself by kamikaze."
622+
"The monster can immediately attempt to attack, unless it killed itself by kamikaze."
618623
(@try-to-attack-player))
619624
620625
:flavor "A giant aerial jellyfish, kept aloft by a foul-smelling and highly reactive gas. It doesn't fly so much as float about in the dungeon drafts. If disturbed, it readily explodes, and its explosions have the remarkable property of harming you and nobody else.")

0 commit comments

Comments
 (0)