bug: monst damage needs to take account of num of attacks and speed

goblinhack · Jul 8, 2023 · 4e27357 · 4e27357
1 parent e9501b2
commit 4e27357
Show file tree

Hide file tree

Showing 84 changed files with 337 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -193,7 +193,7 @@ Content:
 - Multiple skill trees
 - Looking for feedback
 <!-- begin type marker -->
-- 106 x monsters
+- 108 x monsters
 - 52 x food
 - 20 x treasure
 - 13 x weapons

diff --git a/data/gfx.tgz b/data/gfx.tgz
diff --git a/python/gfx.py b/python/gfx.py
@@ -2565,18 +2565,19 @@ def init_tiles_16x16_main():
         "duck3.5",
         "duck3.6",
         "duck3.dead",
+        "jackalope.1",
+        "jackalope.2",
+        "jackalope.3",
+        "jackalope.4",
+        "jackalope.5",
+        "jackalope.6",
+        "jackalope.7",
+        "jackalope.dead",
         "",
         "",
         "",
         "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
+        ############################################################
     ]
 
     my.tile_load_arr_sprites(

diff --git a/python/things/monsters/bat_greater.py b/python/things/monsters/bat_greater.py
@@ -99,6 +99,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 200)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 10)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_hit_and_still_alive_do(self, "me.on_hit_and_still_alive()")

diff --git a/python/things/monsters/bat_lesser.py b/python/things/monsters/bat_lesser.py
@@ -98,6 +98,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 300)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 5)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_hit_and_still_alive_do(self, "me.on_hit_and_still_alive()")

diff --git a/python/things/monsters/bat_minion.py b/python/things/monsters/bat_minion.py
@@ -98,6 +98,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 200)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 5)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_hit_and_still_alive_do(self, "me.on_hit_and_still_alive()")

diff --git a/python/things/monsters/bear_undead.py b/python/things/monsters/bear_undead.py
@@ -103,6 +103,7 @@ def tp_init(name, text_long_name):
     my.is_undead(self, True)
     my.move_speed(self, 60)
     my.noise_decibels_hearing(self, 1)
+    my.noise_on_moving(self, 35)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_hit_and_still_alive_do(self, "me.on_hit_and_still_alive()")

diff --git a/python/things/monsters/bearowl.py b/python/things/monsters/bearowl.py
@@ -97,6 +97,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 120)
     my.noise_decibels_hearing(self, 1)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_hit_and_still_alive_do(self, "me.on_hit_and_still_alive()")

diff --git a/python/things/monsters/belcher.py b/python/things/monsters/belcher.py
@@ -87,6 +87,7 @@ def tp_init(name, text_long_name, text_short_name):
     my.light_dist(self, 2)
     my.move_speed(self, 100)
     my.noise_decibels_hearing(self, 50)
+    my.noise_on_moving(self, 5)
     my.normal_placement_rules(self, True)
     my.nutrition_dice(self, "1d4")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/blinkcat.py b/python/things/monsters/blinkcat.py
@@ -109,6 +109,7 @@ def tp_init(name, text_long_name):
     my.jump_distance(self, 3)
     my.move_speed(self, 150)
     my.noise_decibels_hearing(self, 10)
+    my.noise_on_moving(self, 5)
     my.normal_placement_rules(self, True)
     my.nutrition_dice(self, "-10")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/bloodbug.py b/python/things/monsters/bloodbug.py
@@ -97,6 +97,7 @@ def tp_init(name, text_long_name):
     my.jump_distance(self, 2)
     my.move_speed(self, 25)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.on_born_do(self, "me.on_born()")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/carcas_creeper.py b/python/things/monsters/carcas_creeper.py
@@ -111,6 +111,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 50)
     my.noise_decibels_hearing(self, 10)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.nutrition_dice(self, "-30")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/centipede.py b/python/things/monsters/centipede.py
@@ -113,6 +113,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 75)
     my.noise_decibels_hearing(self, 10)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.nutrition_dice(self, "-30")
     my.on_born_do(self, "me.on_born()")

diff --git a/python/things/monsters/cleaner.py b/python/things/monsters/cleaner.py
@@ -138,6 +138,7 @@ def tp_init(name, text_long_name, text_short_name):
     my.light_dist(self, 2)
     my.move_speed(self, 50)
     my.noise_decibels_hearing(self, 50)
+    my.noise_on_moving(self, 15)
     my.normal_placement_rules(self, True)
     my.nutrition_dice(self, "1d4")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/crab_sewer.py b/python/things/monsters/crab_sewer.py
@@ -120,6 +120,7 @@ def tp_init(name, text_long_name):
     my.jump_distance(self, 2)
     my.move_speed(self, 50)
     my.noise_decibels_hearing(self, 50)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.nutrition_dice(self, "1d6")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/cthulite.py b/python/things/monsters/cthulite.py
@@ -126,6 +126,7 @@ def tp_init(name, text_long_name):
     my.light_dist(self, 2)
     my.move_speed(self, 50)
     my.noise_decibels_hearing(self, 50)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.on_born_do(self, "me.on_born()")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/death_hornet.py b/python/things/monsters/death_hornet.py
@@ -107,6 +107,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 250)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.on_born_do(self, "me.on_born()")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/demon_fire.py b/python/things/monsters/demon_fire.py
@@ -132,6 +132,7 @@ def tp_init(name, text_long_name):
     my.light_dist(self, 2)
     my.move_speed(self, 150)
     my.noise_decibels_hearing(self, 50)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_hit_and_still_alive_do(self, "me.on_hit_and_still_alive()")

diff --git a/python/things/monsters/dogman.py b/python/things/monsters/dogman.py
@@ -130,6 +130,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 100)
     my.noise_decibels_hearing(self, 10)
+    my.noise_on_moving(self, 50)
     my.normal_placement_rules(self, True)
     my.nutrition_dice(self, "1d4")
     my.on_born_do(self, "me.on_born()")

diff --git a/python/things/monsters/duck1.py b/python/things/monsters/duck1.py
@@ -54,8 +54,8 @@ def tp_init(name, text_long_name):
     my.gfx_ascii_fade_with_dist(self, True)
     my.gfx_ascii_shown(self, True)
     my.gfx_pixelart_animated_can_hflip(self, True)
-    my.gfx_pixelart_bounce_on_move(self, True)
     my.gfx_pixelart_animated(self, True)
+    my.gfx_pixelart_bounce_on_move(self, True)
     my.gfx_pixelart_health_bar_shown(self, True)
     my.gfx_pixelart_oversized_and_on_floor(self, True)
     my.gfx_pixelart_reflection(self, True)
@@ -88,6 +88,7 @@ def tp_init(name, text_long_name):
     my.is_described_when_hovering_over(self, True)
     my.is_duck(self, True)
     my.is_eater_of_meat(self, True)
+    my.is_eater_of_plants(self, True)
     my.is_hittable(self, True)
     my.is_immune_to_water(self, True)
     my.is_interesting(self, True)
@@ -107,6 +108,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 50)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 15)
     my.normal_placement_rules(self, True)
     my.on_born_do(self, "me.on_born()")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/duck2.py b/python/things/monsters/duck2.py
@@ -52,12 +52,12 @@ def tp_init(name, text_long_name):
     my.dmg_nat_att_type(self, "webbed")
     my.environ_hates_fire(self, 100)
     my.environ_likes_shallow_water(self, True)
-    my.gfx_pixelart_animated_can_hflip(self, True)
-    my.gfx_pixelart_bounce_on_move(self, True)
     my.gfx_anim_use(self, "attack_red")
     my.gfx_ascii_fade_with_dist(self, True)
     my.gfx_ascii_shown(self, True)
+    my.gfx_pixelart_animated_can_hflip(self, True)
     my.gfx_pixelart_animated(self, True)
+    my.gfx_pixelart_bounce_on_move(self, True)
     my.gfx_pixelart_health_bar_shown(self, True)
     my.gfx_pixelart_oversized_and_on_floor(self, True)
     my.gfx_pixelart_reflection(self, True)
@@ -109,6 +109,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 125)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 15)
     my.normal_placement_rules(self, True)
     my.on_born_do(self, "me.on_born()")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/duck3.py b/python/things/monsters/duck3.py
@@ -52,12 +52,12 @@ def tp_init(name, text_long_name):
     my.dmg_nat_att_type(self, "metal wing")
     my.environ_hates_fire(self, 100)
     my.environ_likes_shallow_water(self, True)
-    my.gfx_pixelart_animated_can_hflip(self, True)
-    my.gfx_pixelart_bounce_on_move(self, True)
     my.gfx_anim_use(self, "attack_red")
     my.gfx_ascii_fade_with_dist(self, True)
     my.gfx_ascii_shown(self, True)
+    my.gfx_pixelart_animated_can_hflip(self, True)
     my.gfx_pixelart_animated(self, True)
+    my.gfx_pixelart_bounce_on_move(self, True)
     my.gfx_pixelart_health_bar_shown(self, True)
     my.gfx_pixelart_oversized_and_on_floor(self, True)
     my.gfx_pixelart_reflection(self, True)
@@ -109,6 +109,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 100)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 15)
     my.normal_placement_rules(self, True)
     my.on_born_do(self, "me.on_born()")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/eel.py b/python/things/monsters/eel.py
@@ -93,6 +93,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 50)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 5)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_hit_and_still_alive_do(self, "me.on_hit_and_still_alive()")

diff --git a/python/things/monsters/electric_eel.py b/python/things/monsters/electric_eel.py
@@ -107,6 +107,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 50)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 5)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_hit_and_still_alive_do(self, "me.on_hit_and_still_alive()")

diff --git a/python/things/monsters/ettin.py b/python/things/monsters/ettin.py
@@ -99,6 +99,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 50)
     my.noise_decibels_hearing(self, 50)
+    my.noise_on_moving(self, 45)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_hit_and_still_alive_do(self, "me.on_hit_and_still_alive()")

diff --git a/python/things/monsters/flameskull.py b/python/things/monsters/flameskull.py
@@ -109,6 +109,7 @@ def tp_init(name, text_long_name):
     my.light_dist(self, 2)
     my.move_speed(self, 200)
     my.noise_decibels_hearing(self, 50)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_hit_and_still_alive_do(self, "me.on_hit_and_still_alive()")

diff --git a/python/things/monsters/fleshbee.py b/python/things/monsters/fleshbee.py
@@ -102,6 +102,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 50)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.on_born_do(self, "me.on_born()")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/gargoyle_baby.py b/python/things/monsters/gargoyle_baby.py
@@ -99,6 +99,7 @@ def tp_init(name, text_long_name):
     my.is_very_heavy(self, True)
     my.move_speed(self, 100)
     my.noise_decibels_hearing(self, 50)
+    my.noise_on_moving(self, 5)
     my.normal_placement_rules(self, True)
     my.on_awake_do(self, "me.on_awake()")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/gargoyle_moving.py b/python/things/monsters/gargoyle_moving.py
@@ -83,6 +83,7 @@ def tp_init(name, text_long_name):
     my.jump_distance(self, 2)
     my.move_speed(self, 200)
     my.noise_decibels_hearing(self, 60)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_hit_and_still_alive_do(self, "me.on_hit_and_still_alive()")

diff --git a/python/things/monsters/gargoyle_static.py b/python/things/monsters/gargoyle_static.py
@@ -103,6 +103,7 @@ def tp_init(name, text_long_name):
     my.is_very_heavy(self, True)
     my.move_speed(self, 100)
     my.noise_decibels_hearing(self, 50)
+    my.noise_on_moving(self, 0)
     my.normal_placement_rules(self, True)
     my.on_awake_do(self, "me.on_awake()")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/ghost.py b/python/things/monsters/ghost.py
@@ -74,6 +74,7 @@ def tp_init(name, text_long_name):
     my.light_dist(self, 2)
     my.move_speed(self, 200)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 1)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_you_nat_attack_attempt_do(self, "me.on_you_nat_attack_attempt()")

diff --git a/python/things/monsters/ghost_minion.py b/python/things/monsters/ghost_minion.py
@@ -76,6 +76,7 @@ def tp_init(name, text_long_name):
     my.light_dist(self, 2)
     my.move_speed(self, 200)
     my.noise_decibels_hearing(self, 0)
+    my.noise_on_moving(self, 1)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_you_nat_attack_attempt_do(self, "me.on_you_nat_attack_attempt()")

diff --git a/python/things/monsters/gloat.py b/python/things/monsters/gloat.py
@@ -92,6 +92,7 @@ def tp_init(name, text_long_name, text_short_name):
     my.light_dist(self, 2)
     my.move_speed(self, 25)
     my.noise_decibels_hearing(self, 50)
+    my.noise_on_moving(self, 5)
     my.normal_placement_rules(self, True)
     my.on_death_do(self, "me.on_death()")
     my.on_you_are_on_fire_do(self, "me.on_fire()")

diff --git a/python/things/monsters/goat_battle.py b/python/things/monsters/goat_battle.py
@@ -114,6 +114,7 @@ def tp_init(name, text_long_name):
     my.jump_distance(self, 2)
     my.move_speed(self, 150)
     my.noise_decibels_hearing(self, 10)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.nutrition_dice(self, "1d6")
     my.on_born_do(self, "me.on_born()")

diff --git a/python/things/monsters/goat_demon.py b/python/things/monsters/goat_demon.py
@@ -125,6 +125,7 @@ def tp_init(name, text_long_name):
     my.jump_distance(self, 2)
     my.move_speed(self, 150)
     my.noise_decibels_hearing(self, 10)
+    my.noise_on_moving(self, 25)
     my.normal_placement_rules(self, True)
     my.nutrition_dice(self, "1d6")
     my.on_born_do(self, "me.on_born()")

diff --git a/python/things/monsters/goldfish.py b/python/things/monsters/goldfish.py
@@ -97,6 +97,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 50)
     my.noise_decibels_hearing(self, 50)
+    my.noise_on_moving(self, 5)
     my.normal_placement_rules(self, True)
     my.on_born_do(self, "me.on_born()")
     my.on_death_do(self, "me.on_death()")

diff --git a/python/things/monsters/iceman.py b/python/things/monsters/iceman.py
@@ -116,6 +116,7 @@ def tp_init(name, text_long_name):
     my.is_tickable(self, True)
     my.move_speed(self, 50)
     my.noise_decibels_hearing(self, 5)
+    my.noise_on_moving(self, 5)
     my.normal_placement_rules(self, True)
     my.on_born_do(self, "me.on_born()")
     my.on_death_do(self, "me.on_death()")