From a1c995fdd7640ab2dfad4eaefa15b3685aca6cef Mon Sep 17 00:00:00 2001 From: JustSome1Nearby <143346760+JustSome1Nearby@users.noreply.github.com> Date: Sun, 29 Jun 2025 15:34:27 +0300 Subject: [PATCH] Birch Grips (Craft, Sprite) (#1488) * BirchHandle * BirchHandle2 * GRAAAH JUST CALL IT BIRCH ITS ALLREADY WOOD * Delete gitlog * Delete BirchWood for just wood * Delete BirchWood2 * Update Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml --------- Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com> --- .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 10 ++++ .../Entities/Objects/ModularTools/grips.yml | 54 ++++++++++++++++++ .../Recipes/Workbench/Workbench/misc.yml | 22 +++++++ .../Grip/birch_grip.rsi/equipped-BELT.png | Bin 0 -> 288 bytes .../Grip/birch_grip.rsi/equipped-BELT2.png | Bin 0 -> 283 bytes .../ModularTools/Grip/birch_grip.rsi/icon.png | Bin 0 -> 347 bytes .../Grip/birch_grip.rsi/inhand-left.png | Bin 0 -> 347 bytes .../Grip/birch_grip.rsi/inhand-right.png | Bin 0 -> 343 bytes .../Grip/birch_grip.rsi/meta.json | 30 ++++++++++ .../birch_grip_long.rsi/equipped-NECK.png | Bin 0 -> 446 bytes .../GripLong/birch_grip_long.rsi/icon.png | Bin 0 -> 443 bytes .../birch_grip_long.rsi/inhand-left.png | Bin 0 -> 531 bytes .../birch_grip_long.rsi/inhand-right.png | Bin 0 -> 515 bytes .../GripLong/birch_grip_long.rsi/meta.json | 34 +++++++++++ .../wielded-inhand-left.png | Bin 0 -> 508 bytes .../wielded-inhand-right.png | Bin 0 -> 493 bytes 16 files changed, 150 insertions(+) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-right.png diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 37b5ef04e0..09b091d8ce 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -2789,6 +2789,10 @@ ent-CP14WoodenPlanks1 = деревянные доски .desc = Обработанное и готовое к использованию дерево. .suffix = 1 +ent-CP14BirchWoodenPlanks1 = березовые доски + .desc = Обработанное и готовое к использованию дерево. + .suffix = 1 + ent-CP14WoodenPlanks10 = { ent-CP14WoodenPlanks1 } .desc = { ent-CP14WoodenPlanks1.desc } .suffix = 10 @@ -3020,6 +3024,9 @@ ent-CP14ModularGripLong = длинная рукоять ent-CP14ModularGripWooden = деревянная рукоять .desc = { ent-CP14ModularGripShort.desc } +ent-CP14ModularGripBirch = березовая рукоять + .desc = { ent-CP14ModularGripShort.desc } + ent-CP14ModularGripLucens = люценовая рукоять .desc = { ent-CP14ModularGripShort.desc } @@ -3041,6 +3048,9 @@ ent-CP14ModularGripGuildmaster = рукоять рапиры гильдмаст ent-CP14ModularGripWoodenLong = длинная деревянная рукоять .desc = { ent-CP14ModularGripLong.desc } +ent-CP14ModularGripBirchLong = длинная березовая рукоять + .desc = { ent-CP14ModularGripLong.desc } + ent-CP14ModularGripLucensLong = длинная люценовая рукоять .desc = { ent-CP14ModularGripLong.desc } diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml index 6c30ce866f..b1bc4134a6 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml @@ -138,6 +138,33 @@ materialComposition: CP14LucensWoodenPlanks: 10 +- type: entity + parent: CP14ModularGripShort + id: CP14ModularGripBirch + name: birch grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Grip/birch_grip.rsi + layers: + - state: icon + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ModularGripWooden + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 60 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:CP14ModularDisassembleBehavior + - !type:DoActsBehavior + acts: ["Destruction"] + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 10 + - type: entity parent: CP14ModularGripShort id: CP14ModularGripIron @@ -332,6 +359,33 @@ materialComposition: CP14LucensWoodenPlanks: 20 +- type: entity + parent: CP14ModularGripLong + id: CP14ModularGripBirchLong + name: long birch grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi + layers: + - state: icon + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ModularGripWoodenLong + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 60 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:CP14ModularDisassembleBehavior + - !type:DoActsBehavior + acts: ["Destruction"] + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 20 + - type: entity parent: CP14ModularGripLong id: CP14ModularGripIronLong diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml index dd765998a5..61b9606990 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml @@ -109,6 +109,17 @@ count: 2 result: CP14ModularGripWooden +- type: CP14Recipe + id: CP14ModularGripBirchShort + tag: CP14RecipeWorkbench + category: Tools + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14BirchWoodenPlanks + count: 2 + result: CP14ModularGripBirch + - type: CP14Recipe id: CP14ModularGripWoodenLong tag: CP14RecipeWorkbench @@ -120,6 +131,17 @@ count: 4 result: CP14ModularGripWoodenLong +- type: CP14Recipe + id: CP14ModularGripBirchLong + tag: CP14RecipeWorkbench + category: Tools + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14BirchWoodenPlanks + count: 4 + result: CP14ModularGripBirchLong + - type: CP14Recipe id: CP14ModularGripLucens tag: CP14RecipeWorkbench diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..c8b343bca324da8589e68abb2cc2bce344a710b6 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jPK-BC>eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e4C@VZBlBu!&JMH)9?yuh4D)F>M{eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e4OFX1IS@-;JILEh9`p8`dj=$3{NC8zI@Hb96+c7oweO=Lw z;{GtJhKlvO7*lfOfl@%A&?;=tXNSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f-TA0 z-G$*l2rk&Wd@@jkv%n*=n1O*?7=#%aX3dcR3bL1Y`ns~eWRqn!l%99#6+cjDzNd?0 zNW|f{mkqg^9Rye}*efn*ZJppX!%Jt%oCDq-?`AqLIm3BGMDeQAssm!tIjej{HpoPqt|BujUQC4Rk7lr>mdKI;Vst0PUrCX#fBK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f52abdf5899d414e786d60448724ce0aafbda509 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jPK-BC>eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e4As^;~P}Uf#QAn&B&ZZf^N^Lg-j6JOA>}8cLsP z3_EX>z7Jj5^Y`1Y7fc|13=GU0qt1QSKYRQ4`wvemidkzSZ!h`t?y~m3M8;69eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e4l@dr)oKBSW_!9g zhE&{odrOgv$x(#u!ShGF+a%k056ww9-Sj|oPwU<6&PV~Bc@73A+-9dobf10D#@kmD zFV}Yb{QpZnEIHAnq5~SSI)z4*}Q$iB}?Lu+{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/meta.json new file mode 100644 index 0000000000..84f19afffb --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Grip/birch_grip.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..a9b7071765abbef2ba51e9da1a88e253629c5f1d GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jPK-BC>eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e4F!Z|@l9F&PT5225t_^6>0_GRZ@sh|!Dh;LPHdfPi%_-j0r|d_^;*XH89xp7q_& z;MPq0d%Alx85tM^4(mNHoc>v2Z=3jHfeVSdGwmubi^y!7Z5YCo_uW05`C_zf;*+)zxYdM#Z)HFib+gXKdjbG1hNiU3aGFO0eyu452x(e^`t8( zS<1lqr1TUigXF(Urd;}Npks1?tLypa$7^5s|1(Kw3wq6t(4z4|+%m=Eqj=6=Rgj>k LtDnm{r-UW|f*O~g literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e7a7b6a5b3422234f7c848754ee59637d2b7dc5e GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%C&rs6b?Si}mUKs7M+SzC z{oH>NS%G|oWRD45dI*UL`OvSj}Ky5HFasE6@fg!ItFh z?!xdN1Q+aGJ{c&&S>O>_%)r1c48n{Iv*t(u1=&kHeO=jKvdJ==Y8qwMbpwU|d%8G= zWZZju&6ewsfyA+o>anjbI2LH72(?d}x1jrhVik8e|5HVoy$uVSE@@s^x!^&qBiZ)m!G`r^N(0aDE6l9RXidPEWxhKaG|;U_MeK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e4IKRi`wY8zUvR?Z0g!JkHKiy|96R#I3Doqif2$Q-_KB2 z^1otB$G&$+j{yRleOSJ8(TZf6eoMr_S7#*uVLTqo(zPHM`cHD&GDk zHlX$W10Ikw5a5;O_xR7{|F22D4pL@JVcAf<@@~yeF}F1g|G1RDh3bcXyWjm^%2n*= zzYj0}Wd!~3ux|K!C|})i-o!Z}rPeK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e4+}o0LO`P#8g87jS$*1O_3=MFtw#Ufe*C8==%AASUOw{$3!}@Y zpQV2D=E;{hywSUn*A>MuQD#-}CcQ8#g=y2TXKm3FaCid6+`sP@Zizh5x@~sSh07cH zUKHp_{4TlUH8cHd#Qur-2a{IpZt^Jqf8)Q{xxc$-GlJ}eg99c@y)MLmF1@C0}L-L&LhE$MXe_m#Ap+s?9l4F0k3)r7Llor?Mg1m6946D_{_ zNx6aIbgo%(I(gAM-0e2zYP4bL37viCf@A~@Na-K6=(`@S@nHO(^;YhBM@ iiH?270E^F|`%Nc+L_A&nT-G@yGywoag~{pw literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/meta.json new file mode 100644 index 0000000000..ba9daec021 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": { + "x": 48, + "y": 48 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github) ", + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..866ac260b0df9f492277c8f9631be92de200f50a GIT binary patch literal 508 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jPK-BC>eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e4cvSt?v<5R&#%NYWoQ+KTJC1Juea|;@8pi>%O4)} zym`d`=!;oqB7!iZA#}qo9-!%OEkDlRCm)!&zT-aIy=}b$7kzFwE_vthz1L>i>)h;L zIwm{UMcJ9iJx#TLfAo0G&pDbB*Wc$aWw}(<=Gf!{IelKULE#@im_IEER5`ppY Z?H7yiwn?TvLFx}dd{0+Dmvv4FO#u4Qz-<5k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a1fa3ddc7a43e1f45fd94dc6e5fe493ac9113b52 GIT binary patch literal 493 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jPK-BC>eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e4(s!zTiCfuX01 zV@SoVw|8u_m>fkI9+)dUVF=?~dBo`hi