Skip to content

Commit dbbc3e5

Browse files
committed
bug: carcas creeper missing sleeping animation
1 parent 3d824d7 commit dbbc3e5

File tree

8 files changed

+32
-10
lines changed

8 files changed

+32
-10
lines changed

python/things/monsters/bear_undead.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def tp_init(name, text_long_name):
120120
my.stat_luck(self, 10)
121121
my.stat_psi(self, 8)
122122
my.stat_str(self, 20)
123-
my.text_a_or_an(self, "a")
123+
my.text_a_or_an(self, "an")
124124
my.text_description_long(self, "This bear took hibernation to the extreme and became undead. Watch out for its unpleasant attack")
125125
my.text_description_short(self, "A undead bear.")
126126
my.text_hits(self, "gores")

python/things/monsters/carcas_creeper.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,14 @@ def tp_init(name, text_long_name):
167167
ascii_fg_char="c", ascii_bg_col_name="", ascii_fg_col_name="gray30",
168168
tile="carcas_creeper.dead", is_dead=True, delay_ms=delay)
169169

170+
delay = 1500
171+
my.tile(self,
172+
ascii_fg_char="c", ascii_bg_col_name="", ascii_fg_col_name="pink",
173+
tile="carcas_creeper.1", is_sleeping=True, delay_ms=delay)
174+
my.tile(self,
175+
ascii_fg_char="C", ascii_bg_col_name="", ascii_fg_col_name="pink",
176+
tile="carcas_creeper.2", is_sleeping=True, delay_ms=delay)
177+
170178
my.tp_update(self)
171179

172180

python/things/monsters/gargoyle_static.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ def tp_init(name, text_long_name):
139139
my.tile(self,
140140
ascii_fg_char="G", ascii_bg_col_name="", ascii_fg_col_name="gray70",
141141
tile="gargoyle.sleeping.2", is_sleeping=True, delay_ms=delay)
142+
142143
delay = 300
143144
my.tile(self,
144145
ascii_fg_char="G", ascii_bg_col_name="", ascii_fg_col_name="gray70",

python/things/monsters/iceman.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,14 @@ def tp_init(name, text_long_name):
176176
ascii_fg_char="I", ascii_bg_col_name="", ascii_fg_col_name="cyan",
177177
tile=name + ".8", delay_ms=delay, frame=4)
178178

179+
delay = 1500
180+
my.tile(self,
181+
ascii_fg_char="I", ascii_bg_col_name="", ascii_fg_col_name="cyan",
182+
tile=name + ".1", is_sleeping=True, delay_ms=delay)
183+
my.tile(self,
184+
ascii_fg_char="I", ascii_bg_col_name="", ascii_fg_col_name="cyan",
185+
tile=name + ".2", is_sleeping=True, delay_ms=delay)
186+
179187
my.tp_update(self)
180188

181189

python/things/monsters/spider_onyx_widow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def tp_init(name, text_long_name):
122122
my.temperature_min(self, 0)
123123
my.temperature(self, 20)
124124
my.temperature_sensitive(self, True)
125-
my.text_a_or_an(self, "a")
125+
my.text_a_or_an(self, "an")
126126
my.text_description_long2(self, "Onyx widows are roamers and are renowned for being fast moving. And poisonous. I mean the widow thing kind of gives it away...")
127127
my.text_description_long(self, "A disturbingly large spider with a shiny onyx carapace emblazoned with a red skull. Sounds friendly.")
128128
my.text_description_short(self, "A large onyx widow spider.")

python/things/monsters/tentacleye.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ def tp_init(name, text_long_name):
157157
my.tile(self,
158158
ascii_fg_char="T", ascii_bg_col_name="", ascii_fg_col_name="green",
159159
tile=name + ".6.100", delay_ms=delay)
160+
160161
my.tile(self,
161162
ascii_fg_char="t", ascii_bg_col_name="", ascii_fg_col_name="green",
162163
tile=name + ".sleeping.1", is_sleeping=True, delay_ms=delay)

python/things/monsters/yeti.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,17 @@ def tp_init(name, text_long_name):
164164
ascii_fg_char="Y", ascii_bg_col_name="", ascii_fg_col_name="white",
165165
tile=name + ".7", delay_ms=delay, frame=4)
166166
my.tile(self,
167-
ascii_fg_char="m", ascii_bg_col_name="", ascii_fg_col_name="gray30",
167+
ascii_fg_char="Y", ascii_bg_col_name="", ascii_fg_col_name="gray30",
168168
tile="yeti.dead", is_dead=True, delay_ms=delay)
169169

170+
delay = 1500
171+
my.tile(self,
172+
ascii_fg_char="Y", ascii_bg_col_name="", ascii_fg_col_name="white",
173+
tile="yeti.1", is_sleeping=True, delay_ms=delay)
174+
my.tile(self,
175+
ascii_fg_char="Y", ascii_bg_col_name="", ascii_fg_col_name="white",
176+
tile="yeti.2", is_sleeping=True, delay_ms=delay)
177+
170178
my.tp_update(self)
171179

172180

src/dungeon_test.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void dungeon_test(void)
5555
// Create the new level
5656
//
5757
TRACE_NO_INDENT();
58-
if (! game->init_level(world_at, grid_at, difficulty_depth, dungeon_walk_order_level_no)) {
58+
if (! game->init_level(world_at, grid_at, difficulty_depth, dungeon_walk_order_level_no++)) {
5959
DIE("Failed to create level");
6060
}
6161

@@ -69,7 +69,7 @@ void dungeon_test(void)
6969
//
7070
TRACE_NO_INDENT();
7171
if (! game->init_level(world_at + point3d(0, 0, 2), grid_at + point(0, 1), difficulty_depth,
72-
dungeon_walk_order_level_no)) {
72+
dungeon_walk_order_level_no++)) {
7373
DIE("Failed to create 2nd level");
7474
}
7575

@@ -78,7 +78,7 @@ void dungeon_test(void)
7878
//
7979
TRACE_NO_INDENT();
8080
if (! game->init_level(world_at + point3d(0, 0, 4), grid_at + point(0, 2), difficulty_depth,
81-
dungeon_walk_order_level_no)) {
81+
dungeon_walk_order_level_no++)) {
8282
DIE("Failed to create 2nd level");
8383
}
8484

@@ -114,23 +114,19 @@ void dungeon_test(void)
114114
TRACE_NO_INDENT();
115115
wid_display_all();
116116

117-
player->con("NEIL %s:%d", __FUNCTION__, __LINE__);
118117
if (player && player->is_waiting_to_descend_dungeon) {
119118
player->descend_dungeon(true, game->level->world_at + point3d(0, 0, 2));
120119
}
121-
player->con("NEIL %s:%d", __FUNCTION__, __LINE__);
122120
if (player && player->is_waiting_to_descend_sewer) {
123121
if (! player->descend_sewer()) {
124122
player->err("Failed to descend sewer");
125123
}
126124
}
127-
player->con("NEIL %s:%d", __FUNCTION__, __LINE__);
128125
if (player && player->is_waiting_to_ascend_sewer) {
129126
if (! player->ascend_sewer()) {
130127
player->err("Failed to ascend sewer");
131128
}
132129
}
133-
player->con("NEIL %s:%d", __FUNCTION__, __LINE__);
134130
if (player->is_waiting_to_descend_dungeon) {
135131
DIE("Player failed to descend");
136132
}

0 commit comments

Comments
 (0)