From eb668959b7db7b10703f838d6a31bb8a895ea060 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Tue, 19 Dec 2023 02:15:10 -0800 Subject: [PATCH 1/6] Bull + Shaved Oni Horns --- .../Locale/en-US/nyanotrasen/markings/Oni.ftl | 3 +++ .../Mobs/Customization/Markings/Oni_horns.yml | 22 ++++++++++++++++++ .../Mobs/Customization/oni_horns.rsi/bull.png | Bin 0 -> 291 bytes .../Customization/oni_horns.rsi/meta.json | 19 +++++++++++++++ .../Customization/oni_horns.rsi/shaved.png | Bin 0 -> 232 bytes 5 files changed, 44 insertions(+) create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/bull.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/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..bfa1dda48d8 100644 --- a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl +++ b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl @@ -5,3 +5,6 @@ marking-OniHornDoubleCurvedOutwards = Double Curved Outwards marking-OniHornDoubleCurved = Double Curved marking-OniHornDoubleLeftBrokeCurved = Double Left Broke Curved marking-OniHornDoubleRightBrokeCurved = Double Right Broke Curved +# Delta-V Horns +marking-OniHornBull = Bull +marking-OniHornShaved = Shaved \ 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..9ed04fa0b8c 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,25 @@ sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_right_broke_curved + +# Delta-V Added Horns + +- type: marking + id: OniHornBull + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: false + speciesRestriction: [Oni] + sprites: + - sprite: DeltaV/Mobs/Customization/oni_horns.rsi + state: bull + +- type: marking + id: OniHornShaved + bodyPart: HeadTop + markingCategory: HeadTop + forcedColoring: false + speciesRestriction: [Oni] + sprites: + - sprite: DeltaV/Mobs/Customization/oni_horns.rsi + state: shaved diff --git a/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/bull.png b/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/bull.png new file mode 100644 index 0000000000000000000000000000000000000000..cea1e62fcf488c9e2ed70dbd1203ecd29614249a GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2Id?r>978JR zyuIVd)f6DWmeAc7Aj0yr@>ZGO_POe;2TxevIHke#`R5jmefg`6KUeIUYwrov#ULjV zdiPKDUz@Z8_AmA{c+cej$K@JoKHW&ZY!&~x_!8Sa^Ui-y+kLi3%xceC`B%c9@0;1C zMsD`HoU-?>dhX@JAAba0|Gqci{=EMt52mEf-Jd+aysp#^WH164YJb@H`g3i>{Qut= zkA;Mk7MxuoE-+hBV6yy$@bo%|9z!FRwrA`u5?f!2SpS*)oT(>wm2BNjgnovWos1Tn V&O7@iPKpMJdb;|#taD0e0ss>ya6AA2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/meta.json new file mode 100644 index 00000000000..a3bc6b5f1d5 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/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": 64 + }, + "states": [ + { + "name": "bull", + "directions": 4 + }, + { + "name": "shaved", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/shaved.png b/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/shaved.png new file mode 100644 index 0000000000000000000000000000000000000000..7baecb49af2eba52caf579239e4ed055eac5fd17 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2Ig319978JR zyuEXfv)Ms_^@8aV*7w&QU$y$4CA`Ttr=`KM`bG?|B4e|M&^_zA89znOv;Z|RFzhj2 z67oypwAJfm9cQnnSI?M#pTCXojAi?-Ou0?FG7ru9tp0cQS Date: Thu, 28 Dec 2023 01:42:34 -0800 Subject: [PATCH 2/6] Fix Kanabo Damage and Tweaked Back Sprite --- .../Entities/Objects/Weapons/Melee/blunt.yml | 5 +++++ .../Melee/kanabou.rsi/equipped-BACKPACK.png | Bin 359 -> 603 bytes .../Objects/Weapons/Melee/kanabou.rsi/meta.json | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml index ea24e249a42..da1be2a6a2f 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml @@ -15,6 +15,7 @@ damage: types: Blunt: 16 + Structural: 10 # Delta-V soundHit: path: /Audio/Nyanotrasen/Weapons/club.ogg bluntStaminaDamageFactor: 1.60 # 25.6 stamina damage @@ -26,6 +27,10 @@ damage: types: Blunt: 14 + Structural: 8 # Delta-V + soundHit: # Delta-V + path: /Audio/Nyanotrasen/Weapons/club.ogg + bluntStaminaDamageFactor: 2.60 # 25.6 stamina damage - type: Clothing sprite: Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi quickEquip: false diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi/equipped-BACKPACK.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi/equipped-BACKPACK.png index 3657a6747700189f5bf69e9532c72e11ffd82b90..ae54f8e21e87f2fa89f7b576d1042da864a42f3b 100644 GIT binary patch delta 589 zcmV-T0PQySD z0MHriasnS?4}jnV?&xW#a{|tgiURi}D58oekWvscR2!v89DjCg zFPc|do|*k6@+<&jj4@Uy6@t3X!IrZ!56!n*CkMf3&IuwZ-+y;z5KPQ&1IoBve8Avx2(|`c6b3Z79Kyr<85}F{{_c*RZ*E{lgk|4b z`oSUzA`LtbKJ&a%aFelODQUCWz+0A8ir;tzq(ab?t|36QUOWK6j0ginn9}v`l&@Pn zK*JT#=FAtx&VR<^TE#b#3PDd0wtw30Ne~<7P-_b$h_obvwOF-2^I9w=W#cid#R>+V zcl2O1t`9S>l%h!#?c(c|VEbnnMqxn8_j^^mmLRq>0M>&Ph^0JOyw+uI)*YMq-m#IS zGsSC@D56+OBMF~c_KY#c7-Nhv#u#J9xp*%?E0g=lzJGwrmm}uet(lj(axXx$^69?M zgRuX(zH0HMTVpdK{LJ$@`B}GrH=&D0?M@eGg>Kc=jqRICL^n*^q+`x;0kfZavu|CRn9|M3Ds91xEil%$00000NkvXXu0mjfd8iWs delta 343 zcmcc3@|L*e46Ew<1IHk(P?F- z`-Xh4omJse`T5_-sc36yRaaKtxpU`BQ)?G1YbYaQE(?o^v2kv0?t7NM`alzeN`m}? z8UCY#xPxtWK-q(yE{-7)t@UrG9pq{;;Bn#h<%-?#>i_>WyY9X^dS->|4d;6o&-mmB zP8OI`pY%d>x-_S=Wp&gsyZ>KVPT%hk6t|mcB4C}c+ULyrGzS5}cm7%mF;jm{epHlH zr!m7QbHhF*t@ATw3U{kKYM(B1R)4{#-S#33f7{>9I#Vcf{AGilhL6MbZZ(7d0k29t zS21m5_h#l2IeU!jjl;6f*ZbAhXx-%Rh;RAkf5ZR0{DU^3o${Z5#n?-o;b)Fwy3IP@ g?8ZV~ndf@khP=${#a>^#1oRGrr>mdKI;Vst02>3DGynhq diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi/meta.json index f8637ed691f..cfd238478e6 100644 --- a/Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi/meta.json @@ -1,7 +1,7 @@ { - "version": 1, + "version": 2, "license": "CC-BY-SA-3.0", - "copyright": "Made by Findorsal", + "copyright": "Made by Findorsal. Back-sprite tweaked by ps3moira.", "size": { "x": 32, "y": 32 From 8dbc2cc50e334c1c099643515c0e071c0420a273 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:49:04 -0800 Subject: [PATCH 3/6] Update Oni.ftl --- Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl index bfa1dda48d8..087a80f5f79 100644 --- a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl +++ b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl @@ -4,7 +4,4 @@ marking-OniHornSingleRightCurved = Single Right Curved marking-OniHornDoubleCurvedOutwards = Double Curved Outwards marking-OniHornDoubleCurved = Double Curved marking-OniHornDoubleLeftBrokeCurved = Double Left Broke Curved -marking-OniHornDoubleRightBrokeCurved = Double Right Broke Curved -# Delta-V Horns -marking-OniHornBull = Bull -marking-OniHornShaved = Shaved \ No newline at end of file +marking-OniHornDoubleRightBrokeCurved = Double Right Broke Curved \ No newline at end of file From f522cf8b81aa34ff21fc410fbfff85125650c05f Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:49:59 -0800 Subject: [PATCH 4/6] Update Oni_horns.yml --- .../Mobs/Customization/Markings/Oni_horns.yml | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) 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 9ed04fa0b8c..49b3b44f1bd 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml @@ -66,26 +66,4 @@ speciesRestriction: [Oni] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi - state: double_right_broke_curved - -# Delta-V Added Horns - -- type: marking - id: OniHornBull - bodyPart: HeadTop - markingCategory: HeadTop - forcedColoring: false - speciesRestriction: [Oni] - sprites: - - sprite: DeltaV/Mobs/Customization/oni_horns.rsi - state: bull - -- type: marking - id: OniHornShaved - bodyPart: HeadTop - markingCategory: HeadTop - forcedColoring: false - speciesRestriction: [Oni] - sprites: - - sprite: DeltaV/Mobs/Customization/oni_horns.rsi - state: shaved + state: double_right_broke_curved \ No newline at end of file From ce6165c55bd3a966a3beb3cb52d98a87282a4746 Mon Sep 17 00:00:00 2001 From: ps3moira <113228053+ps3moira@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:51:03 -0800 Subject: [PATCH 5/6] Remove Seperate PR's sprites --- .../Mobs/Customization/oni_horns.rsi/bull.png | Bin 291 -> 0 bytes .../Customization/oni_horns.rsi/meta.json | 19 ------------------ .../Customization/oni_horns.rsi/shaved.png | Bin 232 -> 0 bytes 3 files changed, 19 deletions(-) delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/bull.png delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/meta.json delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/shaved.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/bull.png b/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/bull.png deleted file mode 100644 index cea1e62fcf488c9e2ed70dbd1203ecd29614249a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2Id?r>978JR zyuIVd)f6DWmeAc7Aj0yr@>ZGO_POe;2TxevIHke#`R5jmefg`6KUeIUYwrov#ULjV zdiPKDUz@Z8_AmA{c+cej$K@JoKHW&ZY!&~x_!8Sa^Ui-y+kLi3%xceC`B%c9@0;1C zMsD`HoU-?>dhX@JAAba0|Gqci{=EMt52mEf-Jd+aysp#^WH164YJb@H`g3i>{Qut= zkA;Mk7MxuoE-+hBV6yy$@bo%|9z!FRwrA`u5?f!2SpS*)oT(>wm2BNjgnovWos1Tn V&O7@iPKpMJdb;|#taD0e0ss>ya6AA2 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/meta.json deleted file mode 100644 index a3bc6b5f1d5..00000000000 --- a/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/meta.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by ps3moira", - "size": { - "x": 32, - "y": 64 - }, - "states": [ - { - "name": "bull", - "directions": 4 - }, - { - "name": "shaved", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/shaved.png b/Resources/Textures/DeltaV/Mobs/Customization/oni_horns.rsi/shaved.png deleted file mode 100644 index 7baecb49af2eba52caf579239e4ed055eac5fd17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2Ig319978JR zyuEXfv)Ms_^@8aV*7w&QU$y$4CA`Ttr=`KM`bG?|B4e|M&^_zA89znOv;Z|RFzhj2 z67oypwAJfm9cQnnSI?M#pTCXojAi?-Ou0?FG7ru9tp0cQS Date: Tue, 9 Jan 2024 13:00:13 -0800 Subject: [PATCH 6/6] Update blunt.yml --- .../Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml index da1be2a6a2f..07e8e4ccb18 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/blunt.yml @@ -28,8 +28,6 @@ types: Blunt: 14 Structural: 8 # Delta-V - soundHit: # Delta-V - path: /Audio/Nyanotrasen/Weapons/club.ogg bluntStaminaDamageFactor: 2.60 # 25.6 stamina damage - type: Clothing sprite: Nyanotrasen/Objects/Weapons/Melee/kanabou.rsi