Skip to content

Commit

Permalink
feat: nicer coffin feat: nicer coffin gfx
Browse files Browse the repository at this point in the history
  • Loading branch information
@goblinhack
goblinhack committed Nov 18, 2023
1 parent 3025585 commit 5a1bd02
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 42 deletions.
Binary file modified data/gfx.tgz
View file
Binary file not shown.
40 changes: 20 additions & 20 deletions python/gfx.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12027,10 +12027,10 @@ def init_tiles_24x24():
"bat_greater.dead.2",
"bat_greater.dead.3",
################################################
"",
"",
"",
"coffin_mob.100",
"coffin_mob.1.100",
"coffin_mob.2.100",
"coffin_mob.3.100",
"coffin_mob.4.100",
"coffin_mob.75",
"coffin_mob.50",
"coffin_mob.25",
Expand Down Expand Up @@ -12154,14 +12154,14 @@ def init_tiles_24x24():
"mummy.dead.2",
"mummy.dead.3",
"mummy.dead.4",
"",
"",
"",
"",
"",
"",
"",
"",
"golem_cement.1",
"golem_cement.2",
"golem_cement.3",
"golem_cement.4",
"golem_cement.5",
"golem_cement.dead.1",
"golem_cement.dead.2",
"golem_cement.dead.3",
################################################
"iceman.1",
"iceman.2",
Expand All @@ -12171,14 +12171,14 @@ def init_tiles_24x24():
"iceman.6",
"iceman.7",
"iceman.8",
"golem_cement.1",
"golem_cement.2",
"golem_cement.3",
"golem_cement.4",
"golem_cement.5",
"golem_cement.dead.1",
"golem_cement.dead.2",
"golem_cement.dead.3",
"",
"",
"",
"",
"",
"",
"",
"",
################################################
"foliage.1",
"foliage.2",
Expand Down
13 changes: 11 additions & 2 deletions python/things/mobs/coffin_mob.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,19 @@ def tp_init(name, text_long_name):
my.z_prio(self, my.MAP_Z_PRIO_MOB)
# end sort marker

delay = 200
delay = 2000
my.tile(self,
ascii_fg_char="cross", ascii_fg_col_name="purple",
tile=name + ".100", is_hp_100_percent=True, delay_ms=delay)
tile=name + ".1.100", is_hp_100_percent=True, delay_ms=delay)
my.tile(self,
ascii_fg_char="cross", ascii_fg_col_name="purple",
tile=name + ".2.100", is_hp_100_percent=True, delay_ms=delay)
my.tile(self,
ascii_fg_char="cross", ascii_fg_col_name="purple",
tile=name + ".3.100", is_hp_100_percent=True, delay_ms=delay)
my.tile(self,
ascii_fg_char="cross", ascii_fg_col_name="purple",
tile=name + ".4.100", is_hp_100_percent=True, delay_ms=delay)
my.tile(self,
ascii_fg_char="cross", ascii_fg_col_name="purple",
tile=name + ".75", is_hp_75_percent=True, delay_ms=delay)
Expand Down
40 changes: 20 additions & 20 deletions src/game_player.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -958,25 +958,26 @@ void Game::place_player(void)
level->thing_new("lava", point(x + 3, y + 2));
level->thing_new("lava", point(x + 4, y + 2));
}
IF_DEBUG2
{
if (0) {
level->thing_new("mummy_necro", point(x + 2, y - 2));
level->thing_new("mummy", point(x + 2, y - 1));
if (0) {
level->thing_new("staff_blinking", point(x, y + 1));
level->thing_new("boots_teleport", point(x, y - 1));
level->thing_new("zob_mob", point(x + 2, y + 1));
}
if (0) {
level->thing_new("coffin_mob", point(x + 2, y + 1));
}
if (0) {
level->thing_new("barrel", point(x + 2, y + 1));
level->thing_new("rat_giant", point(x + 3, y + 1));
}
if (0) {
level->thing_new("staff_energy", point(x, y + 1));
}
}
if (0) {
level->thing_new("staff_blinking", point(x, y + 1));
level->thing_new("boots_teleport", point(x, y - 1));
level->thing_new("zob_mob", point(x + 2, y + 1));
}
if (0) {
level->thing_new("coffin_mob", point(x + 2, y + 1));
}
if (0) {
level->thing_new("barrel", point(x + 2, y + 1));
level->thing_new("rat_giant", point(x + 3, y + 1));
}
if (0) {
level->thing_new("staff_energy", point(x, y + 1));
}
if (1) {
// level->thing_new("murder_bunny", point(x + 2, y + 2));
// level->thing_new("jackalope", point(x + 3, y + 2));
// level->thing_new("duck2", point(x + 3, y + 2));
Expand Down Expand Up @@ -1008,7 +1009,7 @@ void Game::place_player(void)
// level->thing_new("key_golden", point(x - 1, y + 2));
// level->thing_new("key_penta", point(x, y + 12));
// level->thing_new("snake_viper", point(x, y + 2));
// level->thing_new("mummy_pack", point(x + 2, y + 12));
// level->thing_new("mummy_pack", point(x + 2, y + 1));
// level->thing_new("barrel", point(x - 2, y));
// level->thing_new("floor_red_blood1", point(x + 2, y + 1));
// level->thing_new("teleport", point(x + 2, y + 2));
Expand Down Expand Up @@ -1093,8 +1094,7 @@ void Game::place_player(void)
// level->thing_new("lava", point(x + 1, y + 7));
//
if (0) {
auto m = level->thing_new("coffin_mob", point(x, y + 4));
m->frozen_set();
level->thing_new("coffin_mob", point(x + 1, y + 1));
}
if (0) {
level->thing_new("zorb_wizard", point(x + 2, y));
Expand Down

0 comments on commit 5a1bd02

Please sign in to comment.