diff --git a/gfx/MShockXotto+/pngs_fillernormal_32x32/monster/mon_spawn_raptor/credits.txt b/gfx/MShockXotto+/pngs_fillernormal_32x32/monster/mon_spawn_raptor/credits.txt deleted file mode 100644 index c34ba5cbd8..0000000000 --- a/gfx/MShockXotto+/pngs_fillernormal_32x32/monster/mon_spawn_raptor/credits.txt +++ /dev/null @@ -1 +0,0 @@ -I-am-Erk \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_fillernormal_32x32/monster/mon_spawn_raptor/mon_spawn_raptor.json b/gfx/MShockXotto+/pngs_fillernormal_32x32/monster/mon_spawn_raptor/mon_spawn_raptor.json deleted file mode 100644 index 2944d9fd26..0000000000 --- a/gfx/MShockXotto+/pngs_fillernormal_32x32/monster/mon_spawn_raptor/mon_spawn_raptor.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "id": "mon_spawn_raptor", - "fg": "mon_spawn_raptor", - "bg": "shadow_32x32_normal" - } -] diff --git a/gfx/MShockXotto+/pngs_fillernormal_32x32/monster/mon_spawn_raptor/mon_spawn_raptor.png b/gfx/MShockXotto+/pngs_fillernormal_32x32/monster/mon_spawn_raptor/mon_spawn_raptor.png deleted file mode 100644 index 283fc22682..0000000000 Binary files a/gfx/MShockXotto+/pngs_fillernormal_32x32/monster/mon_spawn_raptor/mon_spawn_raptor.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_fillertall_32x64/monster/aberations/aberations.json b/gfx/MShockXotto+/pngs_fillertall_32x64/monster/aberations/aberations.json index 9fd9a97763..038e69e852 100644 --- a/gfx/MShockXotto+/pngs_fillertall_32x64/monster/aberations/aberations.json +++ b/gfx/MShockXotto+/pngs_fillertall_32x64/monster/aberations/aberations.json @@ -1,9 +1,4 @@ [ -{ - "id": "mon_zombie_phase_skulker", - "fg": "mon_zombie_phase_skulker", - "bg": "shadow_32x64_normal" -}, { "id": "mon_zombie_phase_shrike", "fg": "mon_zombie_phase_shrike", diff --git a/gfx/MShockXotto+/pngs_fillertall_32x64/monster/aberations/mon_zombie_phase_skulker.png b/gfx/MShockXotto+/pngs_fillertall_32x64/monster/aberations/mon_zombie_phase_skulker.png deleted file mode 100644 index fa352a367e..0000000000 Binary files a/gfx/MShockXotto+/pngs_fillertall_32x64/monster/aberations/mon_zombie_phase_skulker.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_fillertall_32x64/monster/mon_zombie_pupa/mon_zombie_crawler_pupa.png b/gfx/MShockXotto+/pngs_fillertall_32x64/monster/mon_zombie_pupa/mon_zombie_crawler_pupa.png deleted file mode 100644 index 1f09c77dfc..0000000000 Binary files a/gfx/MShockXotto+/pngs_fillertall_32x64/monster/mon_zombie_pupa/mon_zombie_crawler_pupa.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_fillertall_32x64/monster/mon_zombie_pupa/mon_zombie_pupa.json b/gfx/MShockXotto+/pngs_fillertall_32x64/monster/mon_zombie_pupa/mon_zombie_pupa.json index 20b8b5c79f..dd17dcdaad 100644 --- a/gfx/MShockXotto+/pngs_fillertall_32x64/monster/mon_zombie_pupa/mon_zombie_pupa.json +++ b/gfx/MShockXotto+/pngs_fillertall_32x64/monster/mon_zombie_pupa/mon_zombie_pupa.json @@ -1,20 +1,4 @@ [ - { - "id": [ - "mon_zombie_crawler_pupa", - "mon_zombie_crawler_pupa_decoy" - ], - "fg": "mon_zombie_crawler_pupa", - "bg": "shadow_32x64_normal" - }, - { - "id": [ - "mon_zombie_pupa", - "mon_zombie_pupa_decoy" - ], - "fg": "mon_zombie_pupa", - "bg": "shadow_32x64_normal" - }, { "id": [ "mon_zombie_pupa_shady", diff --git a/gfx/MShockXotto+/pngs_fillertall_32x64/monster/mon_zombie_pupa/mon_zombie_pupa.png b/gfx/MShockXotto+/pngs_fillertall_32x64/monster/mon_zombie_pupa/mon_zombie_pupa.png deleted file mode 100644 index 4a8fa34ae3..0000000000 Binary files a/gfx/MShockXotto+/pngs_fillertall_32x64/monster/mon_zombie_pupa/mon_zombie_pupa.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_large_64x80/monsters/mon_hulk_pupa/corpse_mon_hulk_pupa.png b/gfx/MShockXotto+/pngs_large_64x80/monsters/mon_hulk_pupa/corpse_mon_hulk_pupa.png new file mode 100644 index 0000000000..54236afa44 Binary files /dev/null and b/gfx/MShockXotto+/pngs_large_64x80/monsters/mon_hulk_pupa/corpse_mon_hulk_pupa.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_brute_pupa/credits.txt b/gfx/MShockXotto+/pngs_large_64x80/monsters/mon_hulk_pupa/credits.txt similarity index 100% rename from gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_brute_pupa/credits.txt rename to gfx/MShockXotto+/pngs_large_64x80/monsters/mon_hulk_pupa/credits.txt diff --git a/gfx/MShockXotto+/pngs_large_64x80/monsters/mon_hulk_pupa/mon_hulk_pupa.json b/gfx/MShockXotto+/pngs_large_64x80/monsters/mon_hulk_pupa/mon_hulk_pupa.json new file mode 100644 index 0000000000..552c099413 --- /dev/null +++ b/gfx/MShockXotto+/pngs_large_64x80/monsters/mon_hulk_pupa/mon_hulk_pupa.json @@ -0,0 +1,14 @@ +[ + { + "id": [ "mon_hulk_pupa", "mon_hulk_pupa_decoy" ], + "fg": [ "mon_hulk_pupa" ], + "rotates": false, + "bg": [ ] + }, + { + "id": [ "corpse_mon_hulk_pupa", "corpse_mon_hulk_pupa_decoy" ], + "fg": [ "corpse_mon_hulk_pupa" ], + "rotates": false, + "bg": [ ] + } +] diff --git a/gfx/MShockXotto+/pngs_large_64x80/monsters/mon_hulk_pupa/mon_hulk_pupa.png b/gfx/MShockXotto+/pngs_large_64x80/monsters/mon_hulk_pupa/mon_hulk_pupa.png new file mode 100644 index 0000000000..1f1d71066b Binary files /dev/null and b/gfx/MShockXotto+/pngs_large_64x80/monsters/mon_hulk_pupa/mon_hulk_pupa.png differ diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/duct_tape/credits.txt b/gfx/MShockXotto+/pngs_small_20x20/items/duct_tape/credits.txt new file mode 100644 index 0000000000..c8d6c499d1 --- /dev/null +++ b/gfx/MShockXotto+/pngs_small_20x20/items/duct_tape/credits.txt @@ -0,0 +1 @@ +Ryu \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/duct_tape/duct_tape.png b/gfx/MShockXotto+/pngs_small_20x20/items/duct_tape/duct_tape.png new file mode 100644 index 0000000000..fc0b7c5ed7 Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/duct_tape/duct_tape.png differ diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/honey_ant/credits.txt b/gfx/MShockXotto+/pngs_small_20x20/items/honey_ant/credits.txt new file mode 100644 index 0000000000..c8d6c499d1 --- /dev/null +++ b/gfx/MShockXotto+/pngs_small_20x20/items/honey_ant/credits.txt @@ -0,0 +1 @@ +Ryu \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/honey_ant/honey_ant.png b/gfx/MShockXotto+/pngs_small_20x20/items/honey_ant/honey_ant.png new file mode 100644 index 0000000000..06ff209ec0 Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/honey_ant/honey_ant.png differ diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/magic_8_ball/credits.txt b/gfx/MShockXotto+/pngs_small_20x20/items/magic_8_ball/credits.txt new file mode 100644 index 0000000000..c8d6c499d1 --- /dev/null +++ b/gfx/MShockXotto+/pngs_small_20x20/items/magic_8_ball/credits.txt @@ -0,0 +1 @@ +Ryu \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/magic_8_ball/magic_8_ball.png b/gfx/MShockXotto+/pngs_small_20x20/items/magic_8_ball/magic_8_ball.png new file mode 100644 index 0000000000..1db583d494 Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/magic_8_ball/magic_8_ball.png differ diff --git a/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_brute_pupa/credits.txt b/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_brute_pupa/credits.txt new file mode 100644 index 0000000000..9cb1544411 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_brute_pupa/credits.txt @@ -0,0 +1 @@ +Dandy \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_brute_pupa/mon_brute_pupa.json b/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_brute_pupa/mon_brute_pupa.json new file mode 100644 index 0000000000..969ca6cc86 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_brute_pupa/mon_brute_pupa.json @@ -0,0 +1,13 @@ +{ + "id": [ + "mon_brute_pupa", + "mon_brute_pupa_decoy" + ], + "fg": [ + "mon_brute_pupa" + ], + "rotates": false, + "bg": [ + + ] +} diff --git a/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_brute_pupa/mon_brute_pupa.png b/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_brute_pupa/mon_brute_pupa.png new file mode 100644 index 0000000000..ebde8fa2a2 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_brute_pupa/mon_brute_pupa.png differ diff --git a/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_spawn_raptor/credits.txt b/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_spawn_raptor/credits.txt new file mode 100644 index 0000000000..9cb1544411 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_spawn_raptor/credits.txt @@ -0,0 +1 @@ +Dandy \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_spawn_raptor/mon_spawn_raptor.png b/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_spawn_raptor/mon_spawn_raptor.png new file mode 100644 index 0000000000..6f086622f2 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tall_32x48/monster/mon_spawn_raptor/mon_spawn_raptor.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/cards_magic/cards_magic.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/cards_magic/cards_magic.png new file mode 100644 index 0000000000..cea885df9f Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/item/cards_magic/cards_magic.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/cards_magic/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/item/cards_magic/credits.txt new file mode 100644 index 0000000000..c8d6c499d1 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/item/cards_magic/credits.txt @@ -0,0 +1 @@ +Ryu \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_brute_pupa/corpse_mon_brute_pupa.json b/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_brute_pupa/corpse_mon_brute_pupa.json new file mode 100644 index 0000000000..4fd8146ef4 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_brute_pupa/corpse_mon_brute_pupa.json @@ -0,0 +1,13 @@ +{ + "id": [ + "corpse_mon_brute_pupa", + "corpse_mon_brute_pupa_decoy" + ], + "fg": [ + "corpse_mon_brute_pupa" + ], + "rotates": false, + "bg": [ + + ] +} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_brute_pupa/corpse_mon_brute_pupa.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_brute_pupa/corpse_mon_brute_pupa.png similarity index 100% rename from gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_brute_pupa/corpse_mon_brute_pupa.png rename to gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_brute_pupa/corpse_mon_brute_pupa.png diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_brute_pupa/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_brute_pupa/credits.txt new file mode 100644 index 0000000000..9cb1544411 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_brute_pupa/credits.txt @@ -0,0 +1 @@ +Dandy \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_spawn_raptor/corpse_mon_spawn_raptor.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_spawn_raptor/corpse_mon_spawn_raptor.png new file mode 100644 index 0000000000..a7d6030378 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_spawn_raptor/corpse_mon_spawn_raptor.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_spawn_raptor/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_spawn_raptor/credits.txt new file mode 100644 index 0000000000..9cb1544411 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/item/corpse/corpse_mon_spawn_raptor/credits.txt @@ -0,0 +1 @@ +Dandy \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/2525_mon_kreck_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/2525_mon_kreck_0.png deleted file mode 100644 index 6fc368a212..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/monster/2525_mon_kreck_0.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_brute_pupa/mon_brute_pupa.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_brute_pupa/mon_brute_pupa.png deleted file mode 100644 index 5ed9b0c745..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_brute_pupa/mon_brute_pupa.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_kreck/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_kreck/credits.txt new file mode 100644 index 0000000000..95db13b7b6 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_kreck/credits.txt @@ -0,0 +1 @@ +Paprika & Fris0uman \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_kreck/mon_kreck.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_kreck/mon_kreck.png new file mode 100644 index 0000000000..264ab66623 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_kreck/mon_kreck.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_kreck_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_kreck_0.json deleted file mode 100644 index 77bf7fab82..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_kreck_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": "mon_kreck", "fg": ["2525_mon_kreck_0"], "bg": ["shadow_32x32_normal"], "rotates": false} \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/corpse_mon_zombie_crawler_pupa.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/corpse_mon_zombie_crawler_pupa.png new file mode 100644 index 0000000000..1bbcafebe2 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/corpse_mon_zombie_crawler_pupa.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/credits.txt new file mode 100644 index 0000000000..9cb1544411 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/credits.txt @@ -0,0 +1 @@ +Dandy \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/mon_zombie_crawler_pupa.json b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/mon_zombie_crawler_pupa.json new file mode 100644 index 0000000000..3839859ce2 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/mon_zombie_crawler_pupa.json @@ -0,0 +1,14 @@ +[ + { + "id": [ "mon_zombie_crawler_pupa", "mon_zombie_crawler_pupa_decoy" ], + "fg": [ "mon_zombie_crawler_pupa" ], + "rotates": false, + "bg": [ ] + }, + { + "id": [ "corpse_mon_zombie_crawler_pupa", "corpse_mon_zombie_crawler_pupa_decoy" ], + "fg": [ "corpse_mon_zombie_crawler_pupa" ], + "rotates": false, + "bg": [ ] + } +] diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/mon_zombie_crawler_pupa.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/mon_zombie_crawler_pupa.png new file mode 100644 index 0000000000..7465c81e61 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_crawler_pupa/mon_zombie_crawler_pupa.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_phase_skulker/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_phase_skulker/credits.txt new file mode 100644 index 0000000000..562c72f63f --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_phase_skulker/credits.txt @@ -0,0 +1,2 @@ +karolasikora +https://www.fiverr.com/karolasikora/create-a-pixel-avatar-or-character-of-you?source=order_page_summary_gig_link_title&funnel=1309a8628f82994617afd174f60e94ed \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_phase_skulker/mon_zombie_phase_skulker.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_phase_skulker/mon_zombie_phase_skulker.png new file mode 100644 index 0000000000..463d51c493 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_phase_skulker/mon_zombie_phase_skulker.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/corpse_mon_zombie_pupa.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/corpse_mon_zombie_pupa.png new file mode 100644 index 0000000000..eb178aa857 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/corpse_mon_zombie_pupa.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/credits.txt new file mode 100644 index 0000000000..9cb1544411 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/credits.txt @@ -0,0 +1 @@ +Dandy \ No newline at end of file diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/mon_zombie_pupa.json b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/mon_zombie_pupa.json new file mode 100644 index 0000000000..c8e716df23 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/mon_zombie_pupa.json @@ -0,0 +1,14 @@ +[ + { + "id": [ "mon_zombie_pupa", "mon_zombie_pupa_decoy" ], + "fg": [ "mon_zombie_pupa" ], + "rotates": false, + "bg": [ ] + }, + { + "id": [ "corpse_mon_zombie_pupa", "corpse_mon_zombie_pupa_decoy" ], + "fg": [ "corpse_mon_zombie_pupa" ], + "rotates": false, + "bg": [ ] + } +] diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/mon_zombie_pupa.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/mon_zombie_pupa.png new file mode 100644 index 0000000000..58c1c067d7 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_zombie_pupa/mon_zombie_pupa.png differ