From 3a3a5fbaf4c19ca44366f1c7e450bddfa8cb9f08 Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Sat, 7 Sep 2024 07:48:40 +0200 Subject: [PATCH] makes the maple wing marking have a primary and a secondary color (#31691) bogos binted --- Resources/Locale/en-US/markings/moth.ftl | 3 ++- .../Mobs/Customization/Markings/moth.yml | 4 +++- .../Customization/Moth/moth_wings.rsi/maple.png | Bin 735 -> 0 bytes .../Moth/moth_wings.rsi/maple_primary.png | Bin 0 -> 1003 bytes .../Moth/moth_wings.rsi/maple_secondary.png | Bin 0 -> 1013 bytes .../Customization/Moth/moth_wings.rsi/meta.json | 6 +++++- 6 files changed, 10 insertions(+), 3 deletions(-) delete mode 100644 Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple.png create mode 100644 Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_primary.png create mode 100644 Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_secondary.png diff --git a/Resources/Locale/en-US/markings/moth.ftl b/Resources/Locale/en-US/markings/moth.ftl index 8e38df14e0..e4c7fa5730 100644 --- a/Resources/Locale/en-US/markings/moth.ftl +++ b/Resources/Locale/en-US/markings/moth.ftl @@ -94,7 +94,8 @@ marking-MothWingsJungle = Wings (Jungle) marking-MothWingsLadybug-ladybug = Wing marking-MothWingsLadybug = Wings (Ladybug) -marking-MothWingsMaple-maple = Wing +marking-MothWingsMaple-maple_primary = Primary +marking-MothWingsMaple-maple_secondary = Secondary marking-MothWingsMaple = Wings (Maple) marking-MothWingsMoffra-moffra_primary = Primary diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml index c1d5df2463..ee4c4f67fb 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml @@ -285,7 +285,9 @@ speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: maple + state: maple_primary + - sprite: Mobs/Customization/Moth/moth_wings.rsi + state: maple_secondary - type: marking id: MothWingsMoffra diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple.png b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple.png deleted file mode 100644 index ae6ae6a83f5ac0fd9af062b6eb325ed075d9aae5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 735 zcmV<50wDc~P)ci2C!2)j? zV!&I5VmNi_5R9cR#V}bNQZ-Sde!7A=;{!WGrEcv>{_`A<&+pxt9{~Sy%Z1Yortq=; zy%dB+QmB6gAgCqW2+LwfFldP2fk<>H;zK5XD!M zjhG5KV7~JsoZXtKd90h`z76I&I=gcf-VMG~UyPBK^t@l6q6ohAiGPYZNr?N-;Sf%ge<*JQMW*jjnIepn^G9rX!VRc+70E zb=o>%F#`(1XUi*ua?DV9qts&t3{#1O3S?-^GIw*$#SH4K@C4)m5Co=%nLn~^CFUHI z_M@9a9!i*xe62OcyvQUUd&Y=Mw!y#*D0gT_+tTd0A2WDy(~S3^sb%s1_9uBbnjQZNm@$qS+LJF1n&G#S~lbUvIYNKcsYeu`2gkbiNxgApX zPm-55bl=_<3}hxDI18mduDtIl>j)2hD=m2FLmYzYdVX3!Ry!7Ujfs~QEXTfz=Opzf zX~7w?@yu1W$X#sUK zl_d-=v7oA*c9zg}oSWgV R(t`j1002ovPDHLkV1n=mU;+RD diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_primary.png b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_primary.png new file mode 100644 index 0000000000000000000000000000000000000000..1b470642fa23ff06b4a25d8e828014bb3fa5c1b2 GIT binary patch literal 1003 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1As|HK~#8N?V8I@ z>o62W!=1K_X@`}{ukg`)03Xn4kr+b9ErJ=BWqC)ZZXR~pypWd^Ik6q@-+n=)FhwsUctMBnY?aO^7|TnVf8;g zK7PKwzFZ1J=sOURA#`5CgNXlvPUw8nq4Z1Sgu#V>Vbtlg4z7LCu#C}p2%}&uJ4QuO zFxu#k4Wq9G(Pwoc>1S|CyuQ8`_xJZM?FGE+Pp_hDJ2Ce$1^j6(ZSB-Xz}wrKn`i#A z6WmWbU66j04ZGdWpIxGRJLzj~fjk&HlD58xy;p?y(h<_IopAM69n}}%eU{1yz-x!Y z!JRYDXoNI|us-dijzXya@bKW$?RI#I9#zO4_oJzxEdiwLmZ!h3iVl(u2(YZM`N6q@umn~f`HrY&GeP&1a8}-uAF9)vhE5Xjg?#((J#*Y)khIHeicBlSl3R7^2^hH2Q2cN$gj= zST2|4cX?hr-AT`Al-KKZX#?;d0bYBL$K&m7VKV`5a{xx@T%?9y7tpX^gYslw+r~>W zRv_%89K+7bt#)ymkWN)cv5kBP?W`ke4Pago_Jn#ETI|Tayu7%uGIZShN$Un^z0zTAPktt#0pN)% zOc5gWRVRbBO}5&UKKZI=R7LN1toXeerC- z=BmE<;*zMJ!8v|d#O9cV`@#W)3h&hX1ugcI_LQ-GiJAseUF5EXK1Ka{MODgVGJk`j Z_zyy2-V+XnPelL#002ovPDHLkV1iL?^zHxv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_secondary.png b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..4101bc37a3beddec3a08ba11b0b5d2e741cd049a GIT binary patch literal 1013 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1ByvRK~#8N?V7)8 zIzbS}FTWy!Bm@KtD@pBpKygh z#RTD31Yo<}X7BIs+4c2xHknKcouiz3?6B98d;oZxy5SW&yt`r(V!zfjR(H{ZG)^X^^+S*=*d~mHQ$nrye`G*JObz0JGWb@bU4H z&FAyd2U3q6_IXh)r0)aIg`#dC=?`K@nI;QV0l2xj$=dDq(dY}*V~71YXf~V9A;0}r ztL4h28*t?}<$nA89pzPA<=0AhtB;S5mG)Y@7zTsEq1){`$K)k^etu^Ce*cO9+}_^0 zGO1s$*V%YHR%tk^&`Th}5GTXmx!KFpk7ln3ryPX^9 zxz^F4iriwca1A^>JXG4p*v5jRvK9!(00zL9mzU^qpfm%-ndj%{?CtH%l?f8{F#6bG z5AyeQp$*m;oleI&A8O$@<(*nGm**qjz_A zZprJvX&lCR=6==zG3^&t7Bwskhr^=}^p~EoLVU{FXLVPU<^;iC_-NbzQYdfGZ&;R; zn*Jr}Ct^fMYzAGb{VxS!|A`$`d`@}RPq%LvhG7_nVHk#C`~^<>_mCY~HW}D#sIwz` z4(e)&-W6uor_pG*4F?+jY0!WcG-;2-eWC)u1_L`RM4P?2R6q-w&=zijRG|(44`$<0 z&fnw|HU-dvCbXe3CJ5>P@L-}W4ISH@yfkP)i@X>#qE(A30J2L<18gv+3fd$HXwHjE zsSJQWu+V@6A~nQu{{_|lLWC)X^pgHA*A%lrH2GT5UUh=3?!!crQI@{8TCI{91Asw~ zsgQ33$pp?5$_{YOLRDlhNgXZfSs)~ZMUYTOOLPE8w^LSJ-wm2#7eS!zCmeOtw}^Il zI-3HrP-7-wtkQm;P?-TZ&Y3%B{wYp>A!tM^nl;}iR0d$VT)Kx6UH_OmRnUl5G^4$W zqiN!w(KDyYhY3tK-#*2h2;%_LGXW6I;)DA80PxS~xu))Th#v^?LH&II$Y_ew@LL=Y jk=cr1fPEiegk;%&9W~eoC%;5o00000NkvXXu0mjfD(ByN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json index b2a9e559ed..148dfd6672 100644 --- a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json @@ -64,7 +64,11 @@ "directions": 4 }, { - "name": "maple", + "name": "maple_primary", + "directions": 4 + }, + { + "name": "maple_secondary", "directions": 4 }, { -- 2.51.2