bug: devoted thrust rounding errors

python/gfx.py

@@ -399,24 +399,24 @@ def init_tiles_16x16_main():
         "bug",
         ############################################################
         "",
-        "skill_devoted_thrust_activated",
         "skill_devoted_thrust",
-        "skill_double_strike_activated",
+        "skill_devoted_thrust_activated",
         "skill_double_strike",
-        "skill_gold_to_health_activated",
+        "skill_double_strike_activated",
         "skill_gold_to_health",
-        "skill_artful_dodging_activated",
+        "skill_gold_to_health_activated",
         "skill_artful_dodging",
-        "skill_primal_rage_activated",
+        "skill_artful_dodging_activated",
         "skill_primal_rage",
-        "skill_healing_activated",
+        "skill_primal_rage_activated",
         "skill_healing",
-        "skill_vampiric_touch_activated",
+        "skill_healing_activated",
         "skill_vampiric_touch",
-        "skill_intimidating_strength_activated",
+        "skill_vampiric_touch_activated",
         "skill_intimidating_strength",
-        "skill_super_health_activated",
+        "skill_intimidating_strength_activated",
         "skill_super_health",
+        "skill_super_health_activated",
         ############################################################
         "",
         "spell_magic_missile",

python/things/skills/skill_artful_dodging0.py

@@ -17,5 +17,5 @@ def tp_init(self):
     my.tick_prio(self, my.MAP_TICK_PRIO_NORMAL)
     my.z_prio(self, my.MAP_Z_PRIO_ALWAYS_BEHIND)
     # end sort marker
-    my.tile(self, tile="skill_artful_dodging_activated")
     my.tile(self, tile="skill_artful_dodging")
+    my.tile(self, tile="skill_artful_dodging_activated")

python/things/skills/skill_devoted_thrust0.py

@@ -8,7 +8,7 @@ def tp_init(self):
     my.is_skill(self, True)
     my.is_tickable(self, True)
     my.on_tick_when_activated_do(self, "me.on_tick_when_activated()")
-    my.on_use_do(self, "me.on_use()")
+    my.on_use_skill_do(self, "me.on_use_skill()")
     my.skill_base_name(self, "skill_devoted_thrust")
     my.text_description_long2(self, "The Devoted Thrust skill directs your stamina into sheer vanquishing power.")
     my.text_description_long3(self, "Be warned that at high levels of this skill, you will become drained very quickly and may render yourself unable to move or jump, or escape a trap.")
@@ -17,5 +17,5 @@ def tp_init(self):
     my.tick_prio(self, my.MAP_TICK_PRIO_NORMAL)
     my.z_prio(self, my.MAP_Z_PRIO_ALWAYS_BEHIND)
     # end sort marker
-    my.tile(self, tile="skill_devoted_thrust_activated")
     my.tile(self, tile="skill_devoted_thrust")
+    my.tile(self, tile="skill_devoted_thrust_activated")

python/things/skills/skill_devoted_thrust1.py

@@ -11,16 +11,17 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     if not target:
         return
     my.spawn_using_items_radius_range(owner, skill, target, "skill_devoted_thrust_effect")
-    bonus = int(my.thing_stamina(owner) / 100) * 20
+    bonus = int(float(my.thing_stamina(owner) / 100.0) * 20.0)
 
     if bonus > 1:
         if my.thing_is_player(owner):
             my.thing_msg(owner, f"%%fg=yellow$You strike with a mighty thrust of {bonus} additional damage.%%fg=reset$")
         my.thing_dmg_current_incr(owner, bonus)
+        my.thing_stamina_decr(owner, bonus)
     else:
         if my.thing_is_player(owner):
             my.thing_msg(owner, "You run out of devotion.")

python/things/skills/skill_devoted_thrust2.py

@@ -11,16 +11,17 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     if not target:
         return
     my.spawn_using_items_radius_range(owner, skill, target, "skill_devoted_thrust_effect")
-    bonus = int(my.thing_stamina(owner) / 100) * 30
+    bonus = int(float(my.thing_stamina(owner) / 100.0) * 30.0)
 
     if bonus > 1:
         if my.thing_is_player(owner):
             my.thing_msg(owner, f"%%fg=yellow$You strike with a mighty thrust of {bonus} additional damage.%%fg=reset$")
         my.thing_dmg_current_incr(owner, bonus)
+        my.thing_stamina_decr(owner, bonus)
     else:
         if my.thing_is_player(owner):
             my.thing_msg(owner, "You run out of devotion.")

python/things/skills/skill_devoted_thrust3.py

@@ -11,16 +11,17 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     if not target:
         return
     my.spawn_using_items_radius_range(owner, skill, target, "skill_devoted_thrust_effect")
-    bonus = int(my.thing_stamina(owner) / 100) * 50
+    bonus = int(float(my.thing_stamina(owner) / 100.0) * 50.0)
 
     if bonus > 1:
         if my.thing_is_player(owner):
             my.thing_msg(owner, f"%%fg=yellow$You strike with a mighty thrust of {bonus} additional damage.%%fg=reset$")
         my.thing_dmg_current_incr(owner, bonus)
+        my.thing_stamina_decr(owner, bonus)
     else:
         if my.thing_is_player(owner):
             my.thing_msg(owner, "You run out of devotion.")

python/things/skills/skill_devoted_thrust4.py

@@ -11,16 +11,17 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     if not target:
         return
     my.spawn_using_items_radius_range(owner, skill, target, "skill_devoted_thrust_effect")
-    bonus = int(my.thing_stamina(owner) / 100) * 75
+    bonus = int(float(my.thing_stamina(owner) / 100.0) * 75.0)
 
     if bonus > 1:
         if my.thing_is_player(owner):
             my.thing_msg(owner, f"%%fg=yellow$You strike with a mighty thrust of {bonus} additional damage.%%fg=reset$")
         my.thing_dmg_current_incr(owner, bonus)
+        my.thing_stamina_decr(owner, bonus)
     else:
         if my.thing_is_player(owner):
             my.thing_msg(owner, "You run out of devotion.")

python/things/skills/skill_devoted_thrust5.py

@@ -11,14 +11,15 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     my.spawn_using_items_radius_range(owner, skill, target, "skill_devoted_thrust_effect")
-    bonus = int(my.thing_stamina(owner) / 100) * 90
+    bonus = int(float(my.thing_stamina(owner) / 100.0) * 90.0)
 
     if bonus > 1:
         if my.thing_is_player(owner):
             my.thing_msg(owner, f"%%fg=yellow$You strike with a mighty thrust of {bonus} additional damage.%%fg=reset$")
         my.thing_dmg_current_incr(owner, bonus)
+        my.thing_stamina_decr(owner, bonus)
     else:
         if my.thing_is_player(owner):
             my.thing_msg(owner, "You run out of devotion.")

python/things/skills/skill_double_strike0.py

@@ -9,7 +9,7 @@ def tp_init(self):
     my.is_skill(self, True)
     my.is_tickable(self, True)
     my.on_tick_when_activated_do(self, "me.on_tick_when_activated()")
-    my.on_use_do(self, "me.on_use()")
+    my.on_use_skill_do(self, "me.on_use_skill()")
     my.skill_base_name(self, "skill_double_strike")
     my.text_description_long(self, "With this skill you will develop the ability to deliver a deadly second strike. Initially the extra damage will be minimal but over time you will become a true force to be reckoned with.")
     my.text_description_short(self, "Double strike skill.")

python/things/skills/skill_double_strike1.py

@@ -11,7 +11,7 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     attack = my.thing_attack_num_get(owner)
     if attack == 0:
         return

python/things/skills/skill_double_strike2.py

@@ -11,7 +11,7 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     attack = my.thing_attack_num_get(owner)
     if attack == 0:
         return

python/things/skills/skill_double_strike3.py

@@ -11,7 +11,7 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     attack = my.thing_attack_num_get(owner)
     if attack == 0:
         return

python/things/skills/skill_double_strike4.py

@@ -11,7 +11,7 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     attack = my.thing_attack_num_get(owner)
     if attack == 0:
         return

python/things/skills/skill_double_strike5.py

@@ -11,7 +11,7 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     attack = my.thing_attack_num_get(owner)
     if attack == 0:
         return

python/things/skills/skill_gold_to_health0.py

@@ -15,5 +15,5 @@ def tp_init(self):
     my.tick_prio(self, my.MAP_TICK_PRIO_NORMAL)
     my.z_prio(self, my.MAP_Z_PRIO_ALWAYS_BEHIND)
     # end sort marker
-    my.tile(self, tile="skill_gold_to_health")
     my.tile(self, tile="skill_gold_to_health_activated")
+    my.tile(self, tile="skill_gold_to_health")

python/things/skills/skill_healing0.py

@@ -14,5 +14,5 @@ def tp_init(self):
     my.tick_prio(self, my.MAP_TICK_PRIO_NORMAL)
     my.z_prio(self, my.MAP_Z_PRIO_ALWAYS_BEHIND)
     # end sort marker
-    my.tile(self, tile="skill_healing_activated")
     my.tile(self, tile="skill_healing")
+    my.tile(self, tile="skill_healing_activated")

python/things/skills/skill_intimidating_strength0.py

@@ -14,5 +14,5 @@ def tp_init(self):
     my.tick_prio(self, my.MAP_TICK_PRIO_NORMAL)
     my.z_prio(self, my.MAP_Z_PRIO_ALWAYS_BEHIND)
     # end sort marker
-    my.tile(self, tile="skill_intimidating_strength_activated")
     my.tile(self, tile="skill_intimidating_strength")
+    my.tile(self, tile="skill_intimidating_strength_activated")

python/things/skills/skill_primal_rage0.py

@@ -9,13 +9,13 @@ def tp_init(self):
     my.is_tickable(self, True)
     my.on_tick_when_activated_do(self, "me.on_tick_when_activated()")
     my.on_tick_when_deactivated_do(self, "me.on_tick_when_deactivated()")
-    my.on_use_do(self, "me.on_use()")
+    my.on_use_skill_do(self, "me.on_use_skill()")
     my.skill_base_name(self, "skill_primal_rage")
     my.text_description_long2(self, "When raging your stamina will drain rapidly.")
     my.text_description_long(self, "Engage your primal spirit with the ability to rage when low on health. In such a state of frenzy you will gain strength, to-hit and damage bonuses.")
     my.text_description_short(self, "primal rage skill.")
     my.tick_prio(self, my.MAP_TICK_PRIO_NORMAL)
     my.z_prio(self, my.MAP_Z_PRIO_ALWAYS_BEHIND)
     # end sort marker
-    my.tile(self, tile="skill_primal_rage_activated")
     my.tile(self, tile="skill_primal_rage")
+    my.tile(self, tile="skill_primal_rage_activated")

python/things/skills/skill_primal_rage1.py

@@ -28,7 +28,7 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     my.spawn_using_items_radius_range(owner, skill, target, "skill_primal_rage_effect")
     bonus = 2
     my.thing_dmg_current_incr(owner, bonus)

python/things/skills/skill_primal_rage2.py

@@ -28,7 +28,7 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     if not target:
         return
     my.spawn_using_items_radius_range(owner, skill, target, "skill_primal_rage_effect")

python/things/skills/skill_primal_rage3.py

@@ -28,7 +28,7 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     my.spawn_using_items_radius_range(owner, skill, target, "skill_primal_rage_effect")
     bonus = 6
     my.thing_dmg_current_incr(owner, bonus)

python/things/skills/skill_primal_rage4.py

@@ -28,7 +28,7 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     my.spawn_using_items_radius_range(owner, skill, target, "skill_primal_rage_effect")
     bonus = 6
     my.thing_dmg_current_incr(owner, bonus)

python/things/skills/skill_primal_rage5.py

@@ -28,7 +28,7 @@ def on_tick_when_activated(owner, skill, x, y):
     return False  # didn't do anything
 
 
-def on_use(owner, skill, target, x, y):
+def on_use_skill(owner, skill, target, x, y):
     if not target:
         return
     my.spawn_using_items_radius_range(owner, skill, target, "skill_primal_rage_effect")

python/things/skills/skill_super_health0.py

@@ -21,5 +21,5 @@ def tp_init(self):
     my.tick_prio(self, my.MAP_TICK_PRIO_NORMAL)
     my.z_prio(self, my.MAP_Z_PRIO_ALWAYS_BEHIND)
     # end sort marker
-    my.tile(self, tile="skill_super_health_activated")
     my.tile(self, tile="skill_super_health")
+    my.tile(self, tile="skill_super_health_activated")

python/things/skills/skill_vampiric_touch0.py

@@ -75,5 +75,5 @@ def tp_init(self):
     my.tick_prio(self, my.MAP_TICK_PRIO_NORMAL)
     my.z_prio(self, my.MAP_Z_PRIO_ALWAYS_BEHIND)
     # end sort marker
-    my.tile(self, tile="skill_vampiric_touch_activated")
     my.tile(self, tile="skill_vampiric_touch")
+    my.tile(self, tile="skill_vampiric_touch_activated")

src/game_player.cpp

@@ -314,7 +314,7 @@ void Game::place_player(void)
         auto b = level->thing_new("enchantstone", point(x, y));
         t->carry(b, carry_options);
       }
-      if (0) {
+      if (1) {
         {
           for (auto sk = 0; sk < 1; sk++) {
             auto b = level->thing_new("skillstone", point(x, y));
@@ -360,6 +360,7 @@ void Game::place_player(void)
         auto d = level->thing_new("dogman", point(x + 2, y));
         d->wake("");
       }
+      level->thing_new("tentacleye", point(x + 1, y + 1));
       if (0) {
         level->thing_new("exit1", point(x - 3, y + 2));
         level->thing_new("gnome_rock", point(x + 2, y + 1));

src/my_py_tp.hpp

@@ -931,6 +931,7 @@ TP_SET_PROTO(on_tick_when_activated_do)
 TP_SET_PROTO(on_tick_when_deactivated_do)
 TP_SET_PROTO(on_unequip_do)
 TP_SET_PROTO(on_use_do)
+TP_SET_PROTO(on_use_skill_do)
 TP_SET_PROTO(on_waiting_do)
 TP_SET_PROTO(on_want_to_shoot_at_do)
 TP_SET_PROTO(on_you_are_declared_a_follower_do)

src/my_thing.hpp

@@ -978,6 +978,7 @@ typedef class Thing_
   const std::string &on_tick_when_deactivated_do(void);
   const std::string &on_unequip_do(void);
   const std::string &on_use_do(void);
+  const std::string &on_use_skill_do(void);
   const std::string &on_waiting_do(void);
   const std::string &on_want_to_shoot_at_do(void);
   const std::string &on_you_are_declared_a_follower_do(void);
@@ -2860,6 +2861,8 @@ typedef class Thing_
   void on_thrown_callback(ThingId owner_id_when_thrown);
   void on_thrown(ThingId owner_id_when_thrown);
   void on_unequip(Thingp what);
+  void on_use_skill(Thingp what);
+  void on_use_skill(Thingp what, Thingp target);
   void on_use(Thingp what);
   void on_use(Thingp what, Thingp target);
   void on_waiting(void);

src/my_thing_template.hpp

@@ -1038,6 +1038,7 @@ class Tp
   std::string _on_tick_when_deactivated_do;
   std::string _on_unequip_do;
   std::string _on_use_do;
+  std::string _on_use_skill_do;
   std::string _on_waiting_do;
   std::string _on_want_to_shoot_at_do;
   std::string _on_you_are_declared_a_follower_do;
@@ -1399,6 +1400,7 @@ class Tp
   const std::string &on_tick_when_deactivated_do(void) const;
   const std::string &on_unequip_do(void) const;
   const std::string &on_use_do(void) const;
+  const std::string &on_use_skill_do(void) const;
   const std::string &on_waiting_do(void) const;
   const std::string &on_want_to_shoot_at_do(void) const;
   const std::string &on_you_are_declared_a_follower_do(void) const;
@@ -3041,6 +3043,7 @@ class Tp
   void on_tick_when_deactivated_do_set(const std::string &v);
   void on_unequip_do_set(const std::string &v);
   void on_use_do_set(const std::string &v);
+  void on_use_skill_do_set(const std::string &v);
   void on_waiting_do_set(const std::string &v);
   void on_want_to_shoot_at_do_set(const std::string &v);
   void on_you_are_declared_a_follower_do_set(const std::string &v);

src/py_tp.cpp

@@ -1735,6 +1735,7 @@ TP_BODY_SET_STRING(on_tick_when_activated_do)
 TP_BODY_SET_STRING(on_tick_when_deactivated_do)
 TP_BODY_SET_STRING(on_unequip_do)
 TP_BODY_SET_STRING(on_use_do)
+TP_BODY_SET_STRING(on_use_skill_do)
 TP_BODY_SET_STRING(on_waiting_do)
 TP_BODY_SET_STRING(on_want_to_shoot_at_do)
 TP_BODY_SET_STRING(on_you_are_declared_a_follower_do)

src/python_methods.cpp

@@ -1992,6 +1992,7 @@ static PyMethodDef python_c_METHODS[] = {
     MY_ADD_PYTHON_TP_FUNCTION(on_tick_when_deactivated_do),
     MY_ADD_PYTHON_TP_FUNCTION(on_unequip_do),
     MY_ADD_PYTHON_TP_FUNCTION(on_use_do),
+    MY_ADD_PYTHON_TP_FUNCTION(on_use_skill_do),
     MY_ADD_PYTHON_TP_FUNCTION(on_waiting_do),
     MY_ADD_PYTHON_TP_FUNCTION(on_want_to_shoot_at_do),
     MY_ADD_PYTHON_TP_FUNCTION(on_you_are_declared_a_follower_do),

src/thing_api.cpp

@@ -4520,6 +4520,12 @@ const std::string &Thing::on_use_do(void)
   return (tp()->on_use_do());
 }
 
+const std::string &Thing::on_use_skill_do(void)
+{
+  TRACE_NO_INDENT();
+  return (tp()->on_use_skill_do());
+}
+
 const std::string &Thing::on_swing_do(void)
 {
   TRACE_NO_INDENT();