From 902b5e1f3c9a9d2d85e9010dac0ce9ca609e6325 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 30 Nov 2022 21:43:31 -0600 Subject: [PATCH 1/4] Aspirants Fillers --- .../monster/aspirants/aspirants.json | 12 ++++++++++++ .../Xedra_Evolved/monster/aspirants/credits.txt | 3 +++ .../monster/aspirants/deep_dwarf_death_knight.png | Bin 0 -> 630 bytes .../mods/Xedra_Evolved/monster/aspirants/trog.png | Bin 0 -> 585 bytes 4 files changed, 15 insertions(+) create mode 100644 gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/aspirants.json create mode 100644 gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/credits.txt create mode 100644 gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/deep_dwarf_death_knight.png create mode 100644 gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/trog.png diff --git a/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/aspirants.json b/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/aspirants.json new file mode 100644 index 0000000000..8c6bfa1da1 --- /dev/null +++ b/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/aspirants.json @@ -0,0 +1,12 @@ +[ + { + "id": "mon_redcap_aspirant", + "fg": [ "trog" ], + "bg": [ ] + }, + { + "id": "mon_pooka_aspirant", + "fg": [ "deep_dwarf_death_knight" ], + "bg": [ ] + } +] diff --git a/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/credits.txt b/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/credits.txt new file mode 100644 index 0000000000..4ab33a1a8f --- /dev/null +++ b/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/credits.txt @@ -0,0 +1,3 @@ +chamons +https://github.com/crawl/tiles/blob/master/releases/Nov-2015/UNUSED/monsters/deep_dwarf_death_knight.png +https://github.com/crawl/tiles/blob/master/releases/Nov-2015/UNUSED/monsters/trog.png diff --git a/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/deep_dwarf_death_knight.png b/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/deep_dwarf_death_knight.png new file mode 100644 index 0000000000000000000000000000000000000000..a3e26182d0772f8d8d3d9f55d3a7cdb970728658 GIT binary patch literal 630 zcmV-+0*U>JP)}q@m6lQ1*QN0hdBcRON}wc^JNL|6WBD}`u|$L?C$`!p8@dn z(d?b~=Vn4WXtJu}Iu9M+PwR{;9;%K&i9`UB)7O}bL8fpr2} zaMqbfQoBQTSS^8dJBiu4ldJh1)_}=?37c~w*-4gm+6!O-iyrcM&x0h}$xgBW>*3;I zG6;Fdr+1Qcvs3#EL;zu|9Z)e58TL>6ZES*k`W#?qxDImC-|18h5bhpfC-T=^s*Zui z9rRgQ2QCAuN_!J9!8$+=Dy&Dq5<9E_tj7S%ybR9P0Dxu}gXU|GuSK71pPDBxPoWPA QCjbBd07*qoM6N<$g3nU`3jhEB literal 0 HcmV?d00001 diff --git a/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/trog.png b/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/trog.png new file mode 100644 index 0000000000000000000000000000000000000000..2a3d4bb7672ef8d0bea1497dc0b7555b9eec4130 GIT binary patch literal 585 zcmV-P0=E5$P)>uwA$PeoMgL zMTm{M?D`@v0d}&hwtop=COdoI7y(h)J_7(Dw-$w(sk|mI5z@@K5QyZOCVlTlt4{(y zKl2>sQ)p#$elCHkPSZR!P%8C7;QRb_*2sLJ(M|LbVDR(tcoY%UOQo6c;hZ>~PVUZ( z$VG*ODenR#Pahu`Nn_kmgpT(i_>TTrtF`)64{j<*cn4qSBS-BbVH$w_sjCK11)$AT z0^~n1Yl`>}P$*qPv^#K(T!9Q6oSuzFtpJ*sJPDCN29HZ&s;D(g6LS(0S*8wAj1(YD z6Y;LxeHH3W(R$86`Rl zo?!9>{Q~q2bO^BC0auWNh`wI}xKp!((j99+m1O*q%O}yc%tGlxlIy_pj9mxU`x=Wa zO9?O}h+w&8j%c9omw=2BCD-5z0H%ZT+JV{P8Q{RSL|59v&rc$cPTWFQM3$e3 Date: Thu, 1 Dec 2022 16:37:32 -0600 Subject: [PATCH 2/4] Move trog to tall filler file --- .../Xedra_Evolved/monster/aspirants/aspirants.json | 5 ----- .../Xedra_Evolved/monster/aspirants/credits.txt | 1 - .../monster/redcap_aspirant/credits.txt | 2 ++ .../monster/redcap_aspirant/redcap_aspirant.json | 7 +++++++ .../xedra_evolved/monster/redcap_aspirant}/trog.png | Bin 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/credits.txt create mode 100644 gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/redcap_aspirant.json rename gfx/MShockXotto+/{pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants => pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant}/trog.png (100%) diff --git a/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/aspirants.json b/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/aspirants.json index 8c6bfa1da1..af7c06bd9b 100644 --- a/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/aspirants.json +++ b/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/aspirants.json @@ -1,9 +1,4 @@ [ - { - "id": "mon_redcap_aspirant", - "fg": [ "trog" ], - "bg": [ ] - }, { "id": "mon_pooka_aspirant", "fg": [ "deep_dwarf_death_knight" ], diff --git a/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/credits.txt b/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/credits.txt index 4ab33a1a8f..dcdf45ae7d 100644 --- a/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/credits.txt +++ b/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/credits.txt @@ -1,3 +1,2 @@ chamons https://github.com/crawl/tiles/blob/master/releases/Nov-2015/UNUSED/monsters/deep_dwarf_death_knight.png -https://github.com/crawl/tiles/blob/master/releases/Nov-2015/UNUSED/monsters/trog.png diff --git a/gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/credits.txt b/gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/credits.txt new file mode 100644 index 0000000000..97c287bdeb --- /dev/null +++ b/gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/credits.txt @@ -0,0 +1,2 @@ +chamons +https://github.com/crawl/tiles/blob/master/releases/Nov-2015/UNUSED/emissaries/trog.png diff --git a/gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/redcap_aspirant.json b/gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/redcap_aspirant.json new file mode 100644 index 0000000000..716aaad366 --- /dev/null +++ b/gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/redcap_aspirant.json @@ -0,0 +1,7 @@ +[ + { + "id": "mon_redcap_aspirant", + "fg": [ "trog" ], + "bg": [ ] + } +] diff --git a/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/trog.png b/gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/trog.png similarity index 100% rename from gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/trog.png rename to gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/trog.png From 3690a701105c7382a0ba5362dd8dbb89dc43eca0 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 1 Dec 2022 16:46:24 -0600 Subject: [PATCH 3/4] Making the dream happen --- .../monster/redcap_aspirant/credits.txt | 0 .../monster/redcap_aspirant/redcap_aspirant.json | 0 .../xedra_evolved/monster/redcap_aspirant/trog.png | Bin 3 files changed, 0 insertions(+), 0 deletions(-) rename gfx/MShockXotto+/{pngs_fillertall_32x64 => pngs_dcss_32x48}/mods/xedra_evolved/monster/redcap_aspirant/credits.txt (100%) rename gfx/MShockXotto+/{pngs_fillertall_32x64 => pngs_dcss_32x48}/mods/xedra_evolved/monster/redcap_aspirant/redcap_aspirant.json (100%) rename gfx/MShockXotto+/{pngs_fillertall_32x64 => pngs_dcss_32x48}/mods/xedra_evolved/monster/redcap_aspirant/trog.png (100%) diff --git a/gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/credits.txt b/gfx/MShockXotto+/pngs_dcss_32x48/mods/xedra_evolved/monster/redcap_aspirant/credits.txt similarity index 100% rename from gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/credits.txt rename to gfx/MShockXotto+/pngs_dcss_32x48/mods/xedra_evolved/monster/redcap_aspirant/credits.txt diff --git a/gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/redcap_aspirant.json b/gfx/MShockXotto+/pngs_dcss_32x48/mods/xedra_evolved/monster/redcap_aspirant/redcap_aspirant.json similarity index 100% rename from gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/redcap_aspirant.json rename to gfx/MShockXotto+/pngs_dcss_32x48/mods/xedra_evolved/monster/redcap_aspirant/redcap_aspirant.json diff --git a/gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/trog.png b/gfx/MShockXotto+/pngs_dcss_32x48/mods/xedra_evolved/monster/redcap_aspirant/trog.png similarity index 100% rename from gfx/MShockXotto+/pngs_fillertall_32x64/mods/xedra_evolved/monster/redcap_aspirant/trog.png rename to gfx/MShockXotto+/pngs_dcss_32x48/mods/xedra_evolved/monster/redcap_aspirant/trog.png From e2ab708a5bcd44e3e1d3aa4a5d184ec4daedbcae Mon Sep 17 00:00:00 2001 From: Fris0uman Date: Mon, 5 Dec 2022 15:05:24 +0100 Subject: [PATCH 4/4] flip sprite and add shadow --- .../aspirants/deep_dwarf_death_knight.png | Bin 630 -> 1302 bytes .../monster/redcap_aspirant/trog.png | Bin 585 -> 1137 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/deep_dwarf_death_knight.png b/gfx/MShockXotto+/pngs_dcss_32x32/mods/Xedra_Evolved/monster/aspirants/deep_dwarf_death_knight.png index a3e26182d0772f8d8d3d9f55d3a7cdb970728658..dfec78cb0e1e0d53db65d18b5aef7aaee90976b1 100644 GIT binary patch delta 1294 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