From c6c27480820493db37fda0a34c6032aad6162410 Mon Sep 17 00:00:00 2001 From: Adrian16199 Date: Thu, 28 Mar 2024 19:26:25 +0100 Subject: [PATCH 1/5] New horns for oni. --- .../Locale/en-US/nyanotrasen/markings/Oni.ftl | 13 +++++++++++- .../Mobs/Customization/Markings/Oni_horns.yml | 20 ++++++++++++++++++ .../Mobs/Customization/oni_horns.rsi/bull.png | Bin 0 -> 745 bytes .../Customization/oni_horns.rsi/meta.json | 8 +++++++ .../Customization/oni_horns.rsi/shaved.png | Bin 0 -> 656 bytes 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/bull.png create mode 100644 Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/shaved.png diff --git a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl index 7b8a14bccf3..4dc0e73ab14 100644 --- a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl +++ b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl @@ -1,7 +1,18 @@ marking-OniHornSingleCurved = Single Curved -marking-OniHornSingleLeftCurved =Single Left Curved +marking-OniHornSingleCurved-single_curved = Single Curved +marking-OniHornSingleLeftCurved = Single Left Curved +marking-OniHornSingleLeftCurved-single_left_curved = Single Left Curved marking-OniHornSingleRightCurved = Single Right Curved +marking-OniHornSingleRightCurved-single_right_curved = Single Right Curved marking-OniHornDoubleCurvedOutwards = Double Curved Outwards +marking-OniHornDoubleCurvedOutwards-double_curved_outwards = Double Curved Outwards marking-OniHornDoubleCurved = Double Curved +marking-OniHornDoubleCurved-double_curved = Double Curved marking-OniHornDoubleLeftBrokeCurved = Double Left Broke Curved +marking-OniHornDoubleLeftBrokeCurved-double_left_broke_curved = Double Left Broke Curved marking-OniHornDoubleRightBrokeCurved = Double Right Broke Curved +marking-OniHornDoubleRightBrokeCurved-double_right_broke_curved = Double Right Broke Curved +marking-OniHornShaved = Shaved +marking-OniHornShaved-shaved = Shaved +marking-OniHornBull = Bull +marking-OniHornBull-bull = Bull \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml index 39dca5ef9ab..886dd98e924 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml @@ -67,3 +67,23 @@ sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_right_broke_curved + +- type: marking + id: OniHornShaved + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: false + speciesRestriction: [Oni] + sprites: + - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi + state: shaved + +- type: marking + id: OniHornBull + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: false + speciesRestriction: [Oni] + sprites: + - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi + state: bull diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/bull.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/bull.png new file mode 100644 index 0000000000000000000000000000000000000000..4d1c5ebf86212c892788115467c4a6caef61295f GIT binary patch literal 745 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|*86aP zNZb5vUas0oRvi{87am<`(&$>sH=?7O(u zaWyUAQ0hBZr>pcaMmxkMe}^Ui`@QcUKH>eL&b{lUSx;l;)HyCT%g!!+w)KHBV^v1_ zjDo20w<~9Ms{CKKJ-cRAoNMU%|L_0qjGDG-9p65+hk|#@ybc-hPS#e9{@7Nqe4f8P z=X*|f8OeYjF)wFI*=wA;`oneOWS^eq_^(%r>@7Ywf8CSJ^_~0stkzBcZ2Nyr3b;0F z?!;TVyV<9+6eeY)Xl(Xr6bf89E#=$x{0FDaeFJTF?a9@$cywZ-c)rV(O(kc&OkK{O z3SO|N=>Od1**v`0cC{y6sCZv_zEuxOgn&@BI^vmw~2ewJ8KXvORRI?u{ z+MoMTxb9PiOMa&IU0?)o7I;J!Gca%qfiUBxyLEqn(V^(+;uum9_x6@I*C7LehKCw* zj)4MOo)_LOE_+?MNU`Ta==gS*i^Zh>)*LOXFC6{BGc*lt(*E!`nM|n z`)k8dVD%>EP52a>lk%UQys+nt{Sb3~d$MHO)){?k4sSWU{pU3sdp-C1(iOR(rkfWP ze13ZCr1(Vd+*6-a&r4kwKOA*k>iYKo%5hRBq_q+{JNGs$-KMIx&AyUDp@D%3H&McI zByY<7#AWNg-%z6F6T@xp?;4@yK;XpZ83}c!3nNFz>P2s>0WbkzLb6Mw<&;$V1SWDXg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json index 73fe4fb60c0..1106f3444b4 100644 --- a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json @@ -34,6 +34,14 @@ { "name": "double_right_broke_curved", "directions": 4 + }, + { + "name": "shaved", + "directions": 4 + }, + { + "name": "bull", + "directions": 4 } ] } diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/shaved.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/shaved.png new file mode 100644 index 0000000000000000000000000000000000000000..1afcdb7c539b46cca1cc7dce636b2a7cb9c9197a GIT binary patch literal 656 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|*86aP zNZb5vUas0oRvi{87am<`(&$>sH=?7O(u zaWyUAQ0hBZr>pcaMmxkMe}^Ui`@QcUKH>eL&b{lUSx;l;)HyCT%g!!+w)KHBV^v1_ zjDo20w<~9Ms{CKKJ-cRAoNMU%|L_0qjGDG-9p65+hk|#@ybc-hPS#e9{@7Nqe4f8P z=X*|f8OeYjF)wFI*=wA;`oneOWS^eq_^(%r>@7Ywf8CSJ^_~0stkzBcZ2Nyr3b;0F z?!;TVyV<9+6eeY)Xl(Xr6bf89E#=$x{0FDaeFJTF?a9@$cywZ-c)rV(O(kc&OkK{O z3SO|N=>Od1**v`0cC{y6sCZv_zEuxOgn&@BI^vmw~2ewJ8KXvORRI?u{ z+MoMTxb9PiOMa&IU0?)o7I;J!Gca%qfiUBxyLEqnf+sv(978JN-rm~Cd&oe5HK2JD zQ|+^bXXj)_GNraRw6G{yv&4$Kq^8UbvMEnL`fvL6UtSwI1Xc*{@Vi_kdAzh*?bVI- zJD=arkA5znEnRuO*z)V&>l;@j+b6r8tCZloy=KMcPsaZO*%+BvI0O_N8W^xM-h?UK zd;9+U)AX_hsfP{Q1tfLT1$Tw Date: Thu, 28 Mar 2024 19:28:38 +0100 Subject: [PATCH 2/5] Update meta.json --- .../Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json index 1106f3444b4..9990f2d944d 100644 --- a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Rane", + "copyright": "Made by Rane, shaved and bull made by PS3MOIRA", "size": { "x": 32, "y": 32 From 8907f6e5bef7529ec105ae49d7b1e765182ffdcb Mon Sep 17 00:00:00 2001 From: Adrian16199 Date: Thu, 28 Mar 2024 19:36:20 +0100 Subject: [PATCH 3/5] That one cursed lack of space --- Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl index 4dc0e73ab14..d23905d0d73 100644 --- a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl +++ b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl @@ -15,4 +15,4 @@ marking-OniHornDoubleRightBrokeCurved-double_right_broke_curved = Double Right B marking-OniHornShaved = Shaved marking-OniHornShaved-shaved = Shaved marking-OniHornBull = Bull -marking-OniHornBull-bull = Bull \ No newline at end of file +marking-OniHornBull-bull = Bull From bf3d4b3cf41bc455493a184f41377b059a42fa6e Mon Sep 17 00:00:00 2001 From: Adrian16199 Date: Thu, 28 Mar 2024 20:35:42 +0100 Subject: [PATCH 4/5] Do what was requested --- .../Locale/en-US/deltav/markings/Oni.ftl | 4 ++++ .../Locale/en-US/nyanotrasen/markings/Oni.ftl | 4 ---- .../Mobs/Customization/Markings/Oni_horns.yml | 19 +++++++++++++++++ .../Mobs/Customization/Markings/Oni_horns.yml | 20 ------------------ .../Customization/Oni}/oni_horns.rsi/bull.png | Bin .../Customization/Oni/oni_horns.rsi/meta.json | 19 +++++++++++++++++ .../Oni}/oni_horns.rsi/shaved.png | Bin .../Customization/oni_horns.rsi/meta.json | 8 ------- 8 files changed, 42 insertions(+), 32 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/markings/Oni.ftl create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml rename Resources/Textures/{Nyanotrasen/Mobs/Customization => DeltaV/Mobs/Customization/Oni}/oni_horns.rsi/bull.png (100%) create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/meta.json rename Resources/Textures/{Nyanotrasen/Mobs/Customization => DeltaV/Mobs/Customization/Oni}/oni_horns.rsi/shaved.png (100%) diff --git a/Resources/Locale/en-US/deltav/markings/Oni.ftl b/Resources/Locale/en-US/deltav/markings/Oni.ftl new file mode 100644 index 00000000000..0ba3315fdbb --- /dev/null +++ b/Resources/Locale/en-US/deltav/markings/Oni.ftl @@ -0,0 +1,4 @@ +marking-OniHornShaved = Shaved +marking-OniHornShaved-shaved = Shaved +marking-OniHornBull = Bull +marking-OniHornBull-bull = Bull diff --git a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl index d23905d0d73..de9389d9aa9 100644 --- a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl +++ b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl @@ -12,7 +12,3 @@ marking-OniHornDoubleLeftBrokeCurved = Double Left Broke Curved marking-OniHornDoubleLeftBrokeCurved-double_left_broke_curved = Double Left Broke Curved marking-OniHornDoubleRightBrokeCurved = Double Right Broke Curved marking-OniHornDoubleRightBrokeCurved-double_right_broke_curved = Double Right Broke Curved -marking-OniHornShaved = Shaved -marking-OniHornShaved-shaved = Shaved -marking-OniHornBull = Bull -marking-OniHornBull-bull = Bull diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml new file mode 100644 index 00000000000..fbf78c92e52 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml @@ -0,0 +1,19 @@ +- type: marking + id: OniHornShaved + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: false + speciesRestriction: [Oni] + sprites: + - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi + state: shaved + +- type: marking + id: OniHornBull + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: false + speciesRestriction: [Oni] + sprites: + - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi + state: bull diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml index 886dd98e924..39dca5ef9ab 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml @@ -67,23 +67,3 @@ sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_right_broke_curved - -- type: marking - id: OniHornShaved - bodyPart: HeadTop - markingCategory: HeadTop - forcedColoring: false - speciesRestriction: [Oni] - sprites: - - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi - state: shaved - -- type: marking - id: OniHornBull - bodyPart: HeadTop - markingCategory: HeadTop - forcedColoring: false - speciesRestriction: [Oni] - sprites: - - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi - state: bull diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/bull.png b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/bull.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/bull.png rename to Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/bull.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/meta.json new file mode 100644 index 00000000000..7d86318e7bf --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PS3MOIRA", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "shaved", + "directions": 4 + }, + { + "name": "bull", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/shaved.png b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/shaved.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/shaved.png rename to Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/shaved.png diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json index 9990f2d944d..5b02edeeaee 100644 --- a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json @@ -34,14 +34,6 @@ { "name": "double_right_broke_curved", "directions": 4 - }, - { - "name": "shaved", - "directions": 4 - }, - { - "name": "bull", - "directions": 4 } ] } From 9b874ff31c7d2a938f1ae0c4a5847d7f427f0676 Mon Sep 17 00:00:00 2001 From: Adrian16199 Date: Thu, 28 Mar 2024 20:36:28 +0100 Subject: [PATCH 5/5] Update meta.json --- .../Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json index 5b02edeeaee..73fe4fb60c0 100644 --- a/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Mobs/Customization/oni_horns.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Rane, shaved and bull made by PS3MOIRA", + "copyright": "Made by Rane", "size": { "x": 32, "y": 32