From f7180f6a2dacae88d5779d4dbb65e79c788810d1 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Aug 2024 16:16:04 -0700 Subject: [PATCH 1/3] Oni Markings --- Resources/Locale/en-US/markings/oni.ftl | 18 ++++++ .../Mobs/Customization/Markings/oni_horns.yml | 53 ++++++++++++++++++ .../Oni/oni_horns.rsi/crowned.png | Bin 0 -> 197 bytes .../Customization/Oni/oni_horns.rsi/meta.json | 15 +++++ .../Oni/oni_horns48x48.rsi/meta.json | 43 ++++++++++++++ .../Oni/oni_horns48x48.rsi/tall_bull.png | Bin 0 -> 527 bytes .../oni_horns48x48.rsi/tall_bull_3tone_1.png | Bin 0 -> 362 bytes .../oni_horns48x48.rsi/tall_bull_3tone_2.png | Bin 0 -> 308 bytes .../oni_horns48x48.rsi/tall_bull_3tone_3.png | Bin 0 -> 274 bytes .../Oni/oni_horns48x48.rsi/tall_curved.png | Bin 0 -> 535 bytes .../tall_curved_3tone_1.png | Bin 0 -> 260 bytes .../tall_curved_3tone_2.png | Bin 0 -> 302 bytes .../tall_curved_3tone_3.png | Bin 0 -> 323 bytes 13 files changed, 129 insertions(+) create mode 100644 Resources/Locale/en-US/markings/oni.ftl create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml create mode 100644 Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/crowned.png create mode 100644 Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull.png create mode 100644 Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_1.png create mode 100644 Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_2.png create mode 100644 Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png create mode 100644 Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png create mode 100644 Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png create mode 100644 Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png create mode 100644 Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_3.png diff --git a/Resources/Locale/en-US/markings/oni.ftl b/Resources/Locale/en-US/markings/oni.ftl new file mode 100644 index 00000000000..bb501efc77f --- /dev/null +++ b/Resources/Locale/en-US/markings/oni.ftl @@ -0,0 +1,18 @@ +marking-OniHornTallCurved = Tall Curved +marking-OniHornTallCurved-tall_curved = Tall Curved + +marking-OniHornTallCurved3Tone = Tall Curved Three Tone +marking-OniHornTallCurved3Tone-tall_curved_3tone_1 = Bottom Third +marking-OniHornTallCurved3Tone-tall_curved_3tone_2 = Middle Third +marking-OniHornTallCurved3Tone-tall_curved_3tone_3 = Top Third + +marking-OniHornTallBull= Tall Bull +marking-OniHornTallBull-tall_bull = Tall Bull + +marking-OniHornTallBull3Tone = Tall Bull Three Tone +marking-OniHornTallBull3Tone-tall_bull_3tone_1 = Bottom Third +marking-OniHornTallBull3Tone-tall_bull_3tone_2 = Middle Third +marking-OniHornTallBull3Tone-tall_bull_3tone_3 = Top Third + +marking-OniHornCrowned = Crowned +marking-OniHornCrowned-crowned = Crowned \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml new file mode 100644 index 00000000000..63c924c98e0 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml @@ -0,0 +1,53 @@ +- type: marking + id: OniHornTallCurved + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: false + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + state: tall_curved +- type: marking + id: OniHornTallCurved3Tone + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: false + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + state: tall_curved_3tone_1 + - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + state: tall_curved_3tone_2 + - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + state: tall_curved_3tone_3 +- type: marking + id: OniHornTallBull + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: false + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + state: tall_bull +- type: marking + id: OniHornTallBull3Tone + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: false + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + state: tall_bull_3tone_1 + - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + state: tall_bull_3tone_2 + - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + state: tall_bull_3tone_3 +- type: marking + id: OniHornCrowned + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: false + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/oni/oni_horns.rsi + state: crowned diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/crowned.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/crowned.png new file mode 100644 index 0000000000000000000000000000000000000000..7341aaf74edbf3eb2de4a9911a6eeb196ced48c6 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|>OEZ?Ln`LH zy=BdJSV4s4K_&*xV) z-1~jICVTCvSASGIvvc3{?w`jGG!6*<%)A~|(qr+-43q&9=WvVfV!-Sv>+n`!(T7W zrvgrPNoxe0{4{Gz*UbC;KkD+rt!2@xyskz4yw>t{Uj0Uf8{(`PZ@%9WZcnVJv^i#> zyY=+bq-nn*t^UV9&Uw0bdZEnf&sXNX-@E?Q)+*MB?Eh6WmQLAZ=r*VL(VX9c@1{y5 zUn}l446A)ne}8rS**a59d)?gWQ}^D@yZk&+!bM$osY?HGXBU@ag(j)hf)ihV z)jDS>C|GGXzi9vc<#o^gPJg?-YWjYgxXJ%x?M;7%$1iD%*nOnOF!;XZ^U(b~dl%&U z?OSy+J}o?ZUE=valLegk6rW7e%l*1)ZryV4txIa(iS1JQzk6Htlm9z{o;J)6smcDm z_S`&qU;tu(EhSf0uk?<3ma#3;U4QcWsHd4h4L`3j+J3lau6gJoYlmT(`Oj0;`*$QB zUwKrbe$T!8R{ksR?0c|Z$LTy!waCK>(E%Ka({JyY(^$N2w>_8qN#nioS8CL!ZjF9h z^4e$e`e&{;ir3uDcU*5~Z#8-Ib9M{|Fns&UzEORd+Pl%Fy0|HZbx$Cv-~+nouLw{M+4>3`U#`@UhE&XX zd*@(oi-7>^g~BOWFF3o5bscTbsm5*0m>9tLl9UbnA6D2O~_Fetd;MczTFP@sF*YAAN`akhaXl?to zKfA@(N!yBMN<_$>xMa~MSa>esTHI6n=1?boJ?0rvrW^VZ@-~bZ$boFyt=akR{0KCY2ga7~l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png new file mode 100644 index 0000000000000000000000000000000000000000..cd427ae11790fd200924a141734818f92af5039a GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|&Um^whE&XX zd*^iT5d{HOhwQ@-UsYJ`?BjftsQ-FzpL?>Maww~V{l}CeM`hRJ-P&;X^M0L%jUpRvyk$D~S!QPPk2xI@o8B!i&J#Cy zEi<<^uD&(Wyd&`QK3jXB)kxsL{@A*VxS7c}lVx}3{7Vg;r^=d=HvenIu~@;4OIlvC zUWwX%`;WJa%+_mb_nkTZ)!tgpar)IrBm;oV2d(i{e3{K29G}mDBs^XHT-G@yGywqn Cp=_!E literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png new file mode 100644 index 0000000000000000000000000000000000000000..b32391a95e847e1b61464d9b2baca287cbb9436e GIT binary patch literal 535 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zFM7H-hE&XX zd*|T9#|i?i53gNIOP;^Rpu@3cVZ()!j21k3CNDRrm(7U1{di-GL-7Cd&8ladrx=Jw zu`u+VwwykvcxBn_D89M(EvIh^XWn~x*|f#a#Y26Uu4kJ1Fxbm8bT;3DGxihdj|5tHtxW@O{rrx^a zd)%{1vFx`Smi^ya^#A=6{oCfLJ)TPPr@c8IzRQ+$`mx35Y1!JPQ~o^*zuJB}VBfsy zbMLH^wtTQSq4I3bzvEvWR{vQ&O`&Ajou^aomv7Gf?bQ8e4`VscVFR1rdzPM6S2$Kt z&T#+ktF512BwnAx0t^-m@S!c%@88tt*}GS)|8QjDrhQND3z^!=U(1`g^_AmW8-`HP zP*K5&nX{H0_bfQKG;@~Alj3`~BI~dJ`S|*)mXiGXA`Zp5e#>XYu3NUM$ZkIS#9FOg zA^M>OyYKSt?vu0pUB7G9)-w0iHM_-MM@(CK`flsivWRJ^-|Na}GCYrwI$qen&djhc zdAfA#_9;_2`wdnUX=cSih6vvkj+x5)+1l85sVg)H8gH_^C7dY-IyT+SAp~ JWt~$(698-E^ql|z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png new file mode 100644 index 0000000000000000000000000000000000000000..560776c3896ca21e437d7dd8a1d76cd73347c2db GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|_IbKEhE&XX zd&iOQkb(efz^lLh2j@Pp+F_t_Bx5V**5=CmaIv@P8n@>Q0TpLwuidKr`r;p}|GC$? zi_Wc`vPpW=luJeD6#0|B{?S}|Ty0n3-u10~^VglUf6Mk~a_;SId!Nr-ChxHJ>r=L@ zwVUlryUGvSeHH+kgaQ_I-kV|+rTIF%O5Fd;sabL1!u!NublClParphQa|`@g{k$U{ kp078%*RpyuioQ2Hm@jNuee)Re_md!TPgg&ebxsLQ0Nq$-@c;k- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c0a0114786557f37680d5abc4d857e68bba03f57 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|UU<4VhE&XX zd&jV^*+76bAbowa_PT?z7IWS^v+p~XBf3;k=N3cZlaB7+?`j?^j5%BX-_G~))<&S) zP{0qr^Rq&tKCBa)?tDAwTgJ{!X{+;|>r9t*&{W;EZgbP0l+XkK D4#SI! literal 0 HcmV?d00001 From 026dc8da11295c78c51325f2f4bbb23006ad95f2 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Aug 2024 16:26:56 -0700 Subject: [PATCH 2/3] oops forgor about newline --- Resources/Locale/en-US/markings/oni.ftl | 2 +- .../Textures/Mobs/Customization/Oni/oni_horns.rsi/meta.json | 2 +- .../Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/markings/oni.ftl b/Resources/Locale/en-US/markings/oni.ftl index bb501efc77f..6c34f437b15 100644 --- a/Resources/Locale/en-US/markings/oni.ftl +++ b/Resources/Locale/en-US/markings/oni.ftl @@ -15,4 +15,4 @@ marking-OniHornTallBull3Tone-tall_bull_3tone_2 = Middle Third marking-OniHornTallBull3Tone-tall_bull_3tone_3 = Top Third marking-OniHornCrowned = Crowned -marking-OniHornCrowned-crowned = Crowned \ No newline at end of file +marking-OniHornCrowned-crowned = Crowned diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/meta.json b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/meta.json index 2c5805c06d7..92b16828314 100644 --- a/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi/meta.json @@ -12,4 +12,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json index a723950a5a2..bf01b0d5209 100644 --- a/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json @@ -40,4 +40,4 @@ "directions": 4 } ] -} \ No newline at end of file +} From 44de732dd562afa883afec605cd2bc769cccc467 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 13 Aug 2024 12:59:06 -0700 Subject: [PATCH 3/3] Minor Capitalization Mistake --- .../Mobs/Customization/Markings/oni_horns.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml index 63c924c98e0..b7af09b6e72 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml @@ -5,7 +5,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved - type: marking id: OniHornTallCurved3Tone @@ -14,11 +14,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved_3tone_1 - - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved_3tone_2 - - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved_3tone_3 - type: marking id: OniHornTallBull @@ -27,7 +27,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull - type: marking id: OniHornTallBull3Tone @@ -36,11 +36,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull_3tone_1 - - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull_3tone_2 - - sprite: Mobs/Customization/oni/oni_horns48x48.rsi + - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull_3tone_3 - type: marking id: OniHornCrowned @@ -49,5 +49,5 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Mobs/Customization/oni/oni_horns.rsi + - sprite: Mobs/Customization/Oni/oni_horns.rsi state: crowned