Skip to content

Commit ba22083

Browse files
goblinhackgoblinhack
committed
bug: various skill fixes
1 parent c17618f commit ba22083

22 files changed

+88
-33
lines changed

‎python/things/skills/skill_artful_dodging0.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
def tp_init(self):
55
# begin sort marker
66
my.gfx_ascii_shown(self, True)
7-
my.is_auto_activated(self, True)
7+
my.is_always_activated(self, True)
88
my.is_loggable(self, True)
99
my.is_skill(self, True)
1010
my.is_tickable(self, True)
1111
my.on_tick_when_activated_do(self, "me.on_tick_when_activated()")
1212
my.skill_base_name(self, "skill_artful_dodging")
13-
my.skill_base_name(self, "skill_devoted_thrust")
1413
my.text_description_long2(self, "As part of your training you will receive enhanced dexterity and defensive bonuses and the ability to recover stamina more quickly.")
1514
my.text_description_long(self, "This skill allows you to artfully dodge blows that rains down upon you with cat-like reflexes.")
1615
my.text_description_short(self, "Artful dodging skill.")

‎python/things/skills/skill_healing1.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77

88
def on_tick_when_activated(owner, skill, x, y):
9-
my.topcon("owner {} {}".format(my.thing_name_get(owner), my.thing_health(owner)))
10-
my.topcon("skill {} {}".format(my.thing_name_get(skill), my.thing_health(skill)))
9+
# my.topcon("owner {} {}".format(my.thing_name_get(owner), my.thing_health(owner)))
10+
# my.topcon("skill {} {}".format(my.thing_name_get(skill), my.thing_health(skill)))
1111

1212
if not owner:
1313
return False # did nothing

‎python/things/skills/skill_intimidating_strength0.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
def tp_init(self):
55
# begin sort marker
66
my.gfx_ascii_shown(self, True)
7-
my.is_auto_activated(self, True)
7+
my.is_always_activated(self, True)
88
my.is_loggable(self, True)
99
my.is_skill(self, True)
1010
my.is_tickable(self, True)

‎python/things/skills/skill_primal_rage0.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
def tp_init(self):
55
# begin sort marker
66
my.gfx_ascii_shown(self, True)
7+
my.is_auto_activated(self, True)
78
my.is_loggable(self, True)
89
my.is_skill(self, True)
910
my.is_tickable(self, True)

‎python/things/skills/skill_super_health0.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
def tp_init(self):
55
# begin sort marker
66
my.gfx_ascii_shown(self, True)
7-
my.is_auto_activated(self, True)
7+
my.is_always_activated(self, True)
88
my.is_loggable(self, True)
99
my.is_skill(self, True)
1010
my.is_tickable(self, True)

‎python/things/skills/skill_vampiric_touch0.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33

44
def do_vampiric_touch(me, owner, hitter, real_hitter, x, y, damage, damage_reduction_percent):
5-
# my.con("me {} {:X}".format(my.thing_name_get(me), me))
6-
# my.con("owner {} {:X}".format(my.thing_name_get(owner), owner))
7-
# my.con("hitter {} {:X}".format(my.thing_name_get(hitter), hitter))
8-
# my.con("rhitter {} {:X}".format(my.thing_name_get(real_hitter), real_hitter))
5+
# my.topcon("me {} {:X}".format(my.thing_name_get(me), me))
6+
# my.topcon("owner {} {:X}".format(my.thing_name_get(owner), owner))
7+
# my.topcon("hitter {} {:X}".format(my.thing_name_get(hitter), hitter))
8+
# my.topcon("rhitter {} {:X}".format(my.thing_name_get(real_hitter), real_hitter))
99

1010
if real_hitter == me:
1111
return damage

‎src/game_player.cpp‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ void Game::place_player(void)
151151
auto w = level->thing_new("skill_primal_rage1", point(x, y));
152152
t->skill_add(w);
153153
}
154+
if (0) {
155+
auto w = level->thing_new("skill_intimidating_strength1", point(x, y));
156+
t->skill_add(w);
157+
}
154158
if (0) {
155159
auto w = level->thing_new("skill_devoted_thrust1", point(x, y));
156160
t->skill_add(w);
@@ -159,6 +163,27 @@ void Game::place_player(void)
159163
auto w = level->thing_new("skill_double_strike1", point(x, y));
160164
t->skill_add(w);
161165
}
166+
if (0) {
167+
auto w = level->thing_new("skill_super_health5", point(x, y));
168+
t->skill_add(w);
169+
}
170+
if (0) {
171+
auto w = level->thing_new("skill_vampiric_touch5", point(x, y));
172+
t->skill_add(w);
173+
}
174+
if (0) {
175+
auto w = level->thing_new("skill_healing1", point(x, y));
176+
t->skill_add(w);
177+
}
178+
if (0) {
179+
auto w = level->thing_new("skill_artful_dodging1", point(x, y));
180+
t->skill_add(w);
181+
}
182+
if (0) {
183+
level->thing_new("gold6", point(x + 1, y));
184+
auto w = level->thing_new("skill_gold_to_health1", point(x, y));
185+
t->skill_add(w);
186+
}
162187

163188
if (0) {
164189
level->thing_new("wall_dungeon.1", point(x - 2, y + 2));
@@ -184,11 +209,6 @@ void Game::place_player(void)
184209
level->thing_new("dry_grass", point(x + 3, y + 1));
185210
}
186211

187-
if (0) {
188-
level->thing_new("gold6", point(x + 1, y));
189-
auto w = level->thing_new("skill_gold_to_health", point(x, y));
190-
t->skill_add(w);
191-
}
192212
if (0) {
193213
auto w = level->thing_new("amulet_endurance", point(x, y - 2));
194214
t->carry(w, carry_options);

‎src/my_py_thing.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ PyObject *thing_is_aerodynamic(PyObject *obj, PyObject *args, PyObject *keywds);
210210
PyObject *thing_is_air_breather(PyObject *obj, PyObject *args, PyObject *keywds);
211211
PyObject *thing_is_alive_monst(PyObject *obj, PyObject *args, PyObject *keywds);
212212
PyObject *thing_is_alive_on_end_of_anim(PyObject *obj, PyObject *args, PyObject *keywds);
213+
PyObject *thing_is_always_activated(PyObject *obj, PyObject *args, PyObject *keywds);
213214
PyObject *thing_is_always_hit(PyObject *obj, PyObject *args, PyObject *keywds);
214215
PyObject *thing_is_always_submerged_in_water(PyObject *obj, PyObject *args, PyObject *keywds);
215216
PyObject *thing_is_amulet(PyObject *obj, PyObject *args, PyObject *keywds);
@@ -566,7 +567,6 @@ PyObject *thing_is_unused_flag123(PyObject *obj, PyObject *args, PyObject *keywd
566567
PyObject *thing_is_unused_flag124(PyObject *obj, PyObject *args, PyObject *keywds);
567568
PyObject *thing_is_unused_flag125(PyObject *obj, PyObject *args, PyObject *keywds);
568569
PyObject *thing_is_unused_flag126(PyObject *obj, PyObject *args, PyObject *keywds);
569-
PyObject *thing_is_unused_flag127(PyObject *obj, PyObject *args, PyObject *keywds);
570570
PyObject *thing_is_unused_flag12(PyObject *obj, PyObject *args, PyObject *keywds);
571571
PyObject *thing_is_unused_flag13(PyObject *obj, PyObject *args, PyObject *keywds);
572572
PyObject *thing_is_unused_flag142(PyObject *obj, PyObject *args, PyObject *keywds);

‎src/my_py_tp.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ TP_SET_PROTO(is_aerodynamic)
304304
TP_SET_PROTO(is_air_breather)
305305
TP_SET_PROTO(is_alive_on_end_of_anim)
306306
TP_SET_PROTO(is_allied_with)
307+
TP_SET_PROTO(is_always_activated)
307308
TP_SET_PROTO(is_always_hit)
308309
TP_SET_PROTO(is_always_submerged_in_water)
309310
TP_SET_PROTO(is_amulet)
@@ -655,7 +656,6 @@ TP_SET_PROTO(is_unused_flag123)
655656
TP_SET_PROTO(is_unused_flag124)
656657
TP_SET_PROTO(is_unused_flag125)
657658
TP_SET_PROTO(is_unused_flag126)
658-
TP_SET_PROTO(is_unused_flag127)
659659
TP_SET_PROTO(is_unused_flag13)
660660
TP_SET_PROTO(is_unused_flag14)
661661
TP_SET_PROTO(is_unused_flag142)

‎src/my_thing.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1411,6 +1411,7 @@ typedef class Thing_
14111411
int is_air_breather(void);
14121412
int is_alive_monst(void);
14131413
int is_alive_on_end_of_anim(void);
1414+
int is_always_activated(void);
14141415
int is_always_hit(void);
14151416
int is_always_submerged_in_water(void);
14161417
int is_amulet(void);
@@ -1782,7 +1783,6 @@ typedef class Thing_
17821783
int is_unused_flag124(void);
17831784
int is_unused_flag125(void);
17841785
int is_unused_flag126(void);
1785-
int is_unused_flag127(void);
17861786
int is_unused_flag12(void);
17871787
int is_unused_flag13(void);
17881788
int is_unused_flag142(void);

0 commit comments

Comments
 (0)