feat: paralysis trap

Author: goblinhack

README.md

@@ -1,5 +1,7 @@
 <!-- Bugs                                                                                                                                         -->
 <!-- ------                                                                                                                                       -->
+<!-- player reflection off                                                                                                                        -->
+<!-- insta death from onyx widow                                                                                                                  -->
 <!-- ------                                                                                                                                       -->
 <!--                                                                                                                                              -->
 <!-- Performance                                                                                                                                  -->
@@ -196,14 +198,14 @@ Content:
 - 6 x boots
 - 5 x rings
 - 5 x keys
+- 5 x debuffs
 - 4 x gauntlets
-- 4 x debuffs
 - 4 x armor
 - 4 x amulets
+- 3 x traps
 - 3 x mobs
 - 3 x doors
 - 3 x cloaks
-- 2 x traps
 - 2 x potions
 - 1 x player
 <!-- end type marker -->

python/level_biome_dungeon.py

@@ -14,6 +14,7 @@ def on_activated(me, victim, x, y):
         my.thing_msg(victim, "%%fg=red$Surprise!%%fg=reset$")
     else:
         my.thing_msg(victim, "The pressure plate clicks...")
+    my.thing_popup(victim, "!!!")
     my.thing_dead(me, "activated")
 
 
@@ -54,7 +55,7 @@ def tp_init(name, text_long_name):
 
 
 def init():
-    tp_init(name="trap_monster", text_long_name="inconspicious floor tile")
+    tp_init(name="trap_monster", text_long_name="inconspicuous floor tile")
 
 
 init()

python/things/traps/trap_monster.py

@@ -0,0 +1,61 @@
+import my
+import tp
+
+
+def on_death(me, x, y):
+    my.thing_sound_play_channel(me, my.CHANNEL_IMPACT, "pressure_plate")
+    for it in my.level_get_all(me, x, y):
+        if my.thing_paralysis_count_incr(it, 10):
+            if my.thing_is_player(it):
+                my.thing_popup(it, "!!!")
+
+
+def on_activated(me, victim, x, y):
+    if my.thing_is_player(victim):
+        my.thing_msg(victim, "You hear a pressure plate click beneath you...")
+    else:
+        my.thing_msg(victim, "The pressure plate clicks...")
+    my.thing_dead(me, "activated")
+
+
+def tp_init(name, text_long_name):
+    self = tp.Tp(name, text_long_name)
+    # begin sort marker
+    my.gfx_ascii_shown(self, True)
+    my.is_biome_chasms(self, True)
+    my.is_biome_dungeon(self, True)
+    my.is_biome_ice(self, True)
+    my.is_biome_lava(self, True)
+    my.is_cursor_can_hover_over(self, True)
+    my.is_described_in_leftbar(self, True)
+    my.is_described_when_hovering_over(self, True)
+    my.is_interesting(self, True)
+    my.is_loggable(self, True)
+    my.is_pressure_plate(self, True)
+    my.is_trap(self, True)
+    my.noise_on_hit_and_now_dead(self, 50)
+    my.noise_on_hit_and_still_alive(self, 50)
+    my.normal_placement_rules(self, True)
+    my.on_activated_do(self, "me.on_activated()")
+    my.on_death_do(self, "me.on_death()")
+    my.text_a_or_an(self, "a")
+    my.text_description_short(self, "A strange looking floor tile.")
+    my.z_depth(self, my.MAP_DEPTH_FLOOR2)
+    my.z_prio(self, my.MAP_Z_PRIO_ALWAYS_BEHIND)
+    # end sort marker
+
+    my.tile(self,
+            ascii_fg_char="middle_dot", ascii_fg_col_name="brown", tile="trap.1")
+    my.tile(self,
+            ascii_fg_char="middle_dot", ascii_fg_col_name="brown", tile="trap.2")
+    my.tile(self,
+            ascii_fg_char="middle_dot", ascii_fg_col_name="brown", tile="trap.3")
+
+    my.tp_update(self)
+
+
+def init():
+    tp_init(name="trap_paralysis", text_long_name="inconspicuous floor tile")
+
+
+init()

python/things/traps/trap_paralysis.py

@@ -15,6 +15,7 @@ def on_activated(me, victim, x, y):
     else:
         my.thing_msg(victim, "The pressure plate clicks...")
     my.thing_dead(me, "activated")
+    my.thing_popup(victim, "!!!")
 
 
 def tp_init(name, text_long_name):
@@ -54,7 +55,7 @@ def tp_init(name, text_long_name):
 
 
 def init():
-    tp_init(name="trap_pressure_plate_gas", text_long_name="inconspicious floor tile")
+    tp_init(name="trap_pressure_plate_gas", text_long_name="inconspicuous floor tile")
 
 
 init()

python/things/traps/trap_pressure_plate_gas.py

@@ -202,6 +202,7 @@ void Game::place_player(void)
       }
 
       if (0) {
+        level->thing_new("trap_paralysis", point(x - 2, y));
         level->thing_new("wall_dungeon.1", point(x - 2, y + 2));
         level->thing_new("wall_dungeon.1", point(x - 1, y + 2));
         level->thing_new("wall_dungeon.1", point(x, y + 2));

src/game_player.cpp

@@ -727,6 +727,7 @@ PyObject *thing_noise_set(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_on_death_is_stone(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_paralysis_count_decr(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_paralysis_count_incr(PyObject *obj, PyObject *args, PyObject *keywds);
+PyObject *thing_paralysis_count(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_paralysis_count_set(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_paralysis(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_perma_death(PyObject *obj, PyObject *args, PyObject *keywds);
@@ -860,7 +861,6 @@ PyObject *thing_stat_thv_total(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_stuck_count_decr(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_stuck_count_incr(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_stuck_count(PyObject *obj, PyObject *args, PyObject *keywds);
-PyObject *thing_paralysis_count(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_stuck_count_set(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_teleport_distance_get(PyObject *obj, PyObject *args, PyObject *keywds);
 PyObject *thing_teleport_distance(PyObject *obj, PyObject *args, PyObject *keywds);

src/my_py_thing.hpp

@@ -2647,7 +2647,6 @@ typedef class Thing_
   void achieve_goals_in_death(void);
   void achieve_goals_in_life(void);
   void acid_tick(void);
-  void paralysis_tick(void);
   void add_attacker(Thingp attacker, bool is_recursing = false);
   void add_avoid(Thingp attacker);
   void add_enemy(Thingp attacker, bool is_recursing = false);
@@ -2890,6 +2889,8 @@ typedef class Thing_
   void on_you_nat_attack_success(void);
   void owner_set(Thingp owner);
   void owner_unset(void);
+  void paralysis_tick(void);
+  void paralysis_update(void);
   void path_shorten(std::vector< point > &path);
   void physical_training_tick(void);
   void place_blood(bool force = false);

src/my_thing.hpp

@@ -979,6 +979,9 @@ static PyMethodDef python_c_METHODS[] = {
     MY_ADD_PYTHON_FUNCTION(thing_noise_on_open_or_close),
     MY_ADD_PYTHON_FUNCTION(thing_noise_set),
     MY_ADD_PYTHON_FUNCTION(thing_on_death_is_stone),
+    MY_ADD_PYTHON_FUNCTION(thing_paralysis_count),
+    MY_ADD_PYTHON_FUNCTION(thing_paralysis_count_decr),
+    MY_ADD_PYTHON_FUNCTION(thing_paralysis_count_incr),
     MY_ADD_PYTHON_FUNCTION(thing_perma_death),
     MY_ADD_PYTHON_FUNCTION(thing_poisoned_amount_decr),
     MY_ADD_PYTHON_FUNCTION(thing_poisoned_amount_get),
@@ -993,12 +996,6 @@ static PyMethodDef python_c_METHODS[] = {
     MY_ADD_PYTHON_FUNCTION(thing_score),
     MY_ADD_PYTHON_FUNCTION(thing_score_decr),
     MY_ADD_PYTHON_FUNCTION(thing_score_incr),
-    MY_ADD_PYTHON_FUNCTION(thing_stuck_count),
-    MY_ADD_PYTHON_FUNCTION(thing_stuck_count_decr),
-    MY_ADD_PYTHON_FUNCTION(thing_stuck_count_incr),
-    MY_ADD_PYTHON_FUNCTION(thing_paralysis_count),
-    MY_ADD_PYTHON_FUNCTION(thing_paralysis_count_decr),
-    MY_ADD_PYTHON_FUNCTION(thing_paralysis_count_incr),
     MY_ADD_PYTHON_FUNCTION(thing_set_leader),
     MY_ADD_PYTHON_FUNCTION(thing_set_mob),
     MY_ADD_PYTHON_FUNCTION(thing_shoot_at),
@@ -1113,6 +1110,9 @@ static PyMethodDef python_c_METHODS[] = {
     MY_ADD_PYTHON_FUNCTION(thing_stat_thv_incr),
     MY_ADD_PYTHON_FUNCTION(thing_stat_thv_set),
     MY_ADD_PYTHON_FUNCTION(thing_stat_thv_total),
+    MY_ADD_PYTHON_FUNCTION(thing_stuck_count),
+    MY_ADD_PYTHON_FUNCTION(thing_stuck_count_decr),
+    MY_ADD_PYTHON_FUNCTION(thing_stuck_count_incr),
     MY_ADD_PYTHON_FUNCTION(thing_teleport),
     MY_ADD_PYTHON_FUNCTION(thing_teleport_distance),
     MY_ADD_PYTHON_FUNCTION(thing_teleport_distance_get),

src/python_methods.cpp

@@ -473,7 +473,7 @@ bool Thing::coords_get(point &blit_tl, point &blit_br, point &pre_effect_blit_tl
 
   if (is_player()) {
     tile = player_tile;
-    if (! player_tile) { DIE("no player tile"); }
+    if (! player_tile) { tile = {}; }
   }
 
   //