From 31e1589665ab2ac3c83c4f721a965a9ccfb57b35 Mon Sep 17 00:00:00 2001 From: FuchsiaThePhoenix Date: Thu, 12 Dec 2024 23:00:14 +0300 Subject: [PATCH 1/4] Add double mattress --- .../Structures/Furniture/mattress_double.yml | 79 ++++++++++++++++++ .../double_mattress.rsi/mattress_double.png | Bin 0 -> 1449 bytes .../mattress_double_down.png | Bin 0 -> 1095 bytes .../mattress_double_up.png | Bin 0 -> 548 bytes .../Furniture/double_mattress.rsi/meta.json | 20 +++++ 5 files changed, 99 insertions(+) create mode 100644 Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/mattress_double.yml create mode 100644 Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/mattress_double.png create mode 100644 Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/mattress_double_down.png create mode 100644 Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/mattress_double_up.png create mode 100644 Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/meta.json diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/mattress_double.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/mattress_double.yml new file mode 100644 index 00000000000..926e6e63639 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/mattress_double.yml @@ -0,0 +1,79 @@ +# UP SIDE: + +- type: entity + name: mattress double up + id: LPPMattressDoubleUp + parent: BaseStructure + description: Better to sleep on the floor than this, I think. + components: + - type: HealOnBuckle + damage: + types: + Poison: -0.5 + Blunt: -0.2 + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.55" + density: 190 + mask: + - TableMask + - type: Sprite + sprite: _LostParadise/Structures/Furniture/double_mattress.rsi + state: mattress_double_up + noRot: true + - type: Strap + position: Down + rotation: -90 + buckleOffset: "0,0.20" + - type: Construction + graph: LPPMattressDouble + node: LPPMattressDoubleUp + - type: PlaceableSurface + placeCentered: true + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 1 + max: 2 + - type: Transform + anchored: true + noRot: true + - type: Anchorable + - type: Pullable + + +# DOWN SIDE: + +- type: entity + parent: LPPMattressDoubleUp + id: LPPMattressDoubleDown + name: mattress double down + description: Better to sleep on the floor than this, I think. + components: + - type: Construction + graph: LPPMattressDouble + node: LPPMattressDoubleDown + - type: Sprite + state: mattress_double_down + - type: Damageable + damageModifierSet: Inflatable + - type: Strap + position: Down + rotation: -90 + buckleOffset: "0,-0.2" \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/mattress_double.png b/Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/mattress_double.png new file mode 100644 index 0000000000000000000000000000000000000000..b27997f527bfc36ae5c5b7ee417e16871c4e3b21 GIT binary patch literal 1449 zcmV;a1y=frP)Px)V@X6oR9J<@m&Qp^BxXK@g<3JB(*kNJ81%=fNOY>CP2`5VW69$+x`!Q zcZD|rQXmMr%RkX=(~SWyl0{IUXbVHF>pBVS$W~>^dQswQ-ZOV@7oQ;r9p{Qd*^T_wHq+u!ARb$}1={zl%u^)8L(Nwm%V?SoKoANFwwC*j;)A_?KKWS4J9j@)aso9cCGidkyh`qrL?MCK zpNM0>hu_&H4m|)gt3>FzsM;V&;C4Zr#5#>fO`k!GHdhW2anaarJcoS})g0 z%XQ2`>0JNq`}bJB{flo;!0R2da^*Szf!8DSPt;L0gWYHUw5xP}EQ9HA)Wz5uRFSqaC%g0u+MkZ2r*4JhVoWV1+&UVVE z+ROztW@onGbn;OdrIhHp#?s}VVwD$A%_6EyOMzjRXkNTV*xRR2tl)PKkRm}hEK0Sdu@$CCM4?nA z%Thp+!~t+}z3_XjR}-+E5_YMM-)kWijY6qP;B~QzH5ARDvHUuUW{hot6e%bQg>nOl ziVy-tGbxm6D4ID?ED4#LUzwbpkv$!{TyIV%U^^wOLMfL{@At4vb)<+f?IK|q(rdk-vamW9 z*zX>oY6gY5c~sp-Q3lt&<2V3G)?0xv7PeZ z8=&fW@=?o@K?R7&pQympMwBH%K8}MP%}YPYu}C5^k)WFvsxl?auun*t%|;-LJ+jy% z@;YpP^AGx+eH6o?+PuWkU;mcRE0pUPwnH4a=P%%#OUS6{0GVE++u8=8Tx-&A?~$b; zKX~h;bE&Gv(tAHY!J2`pnM8gM-JT%*FuB_~0KhCYCKAXMFlra+wzk=Nx|WkUZ7;t1 z3vsW@;o1WLDvLivw;bH|4kGO3>iOOMJbCBf1)5WvuE4R4u6X_Hhi4|Q{`hSG8rN^+ zWmvm#8IcJN_cl>R&cg1-W6~tTsVvHyT*B4LBU`KVheOm7ND`6Ju>Wf0mCGfM5Ue zeK}tnZ%;00000NkvXXu0mjf D1;fFU literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/mattress_double_down.png b/Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/mattress_double_down.png new file mode 100644 index 0000000000000000000000000000000000000000..46f022cc8fa3c716d0aed2f87ca2fbb2051ad59d GIT binary patch literal 1095 zcmV-N1i1T&P)Px(0ZBwbR9J=Wl}m3MRTRg6cOLf4WE{WJI8|F{DJqW&@le$T6ey1mfY|a4Sg~b| z_yT+fw!jiquwa7#RVh`)L!oJ+CLvAYIQDqnGk1oCok^y)Q&_Rde|7)9=kdSi%sGZr zoZ=LxIK?UcX9$2VKKnR-=k2$scb+LO0(XFE*Gs%=SoD6qL-Unak!eE3umBkDZ(-Kj zXcc3ouW8qLc=rcdm#=f{)-68y^m75A{1>%~rn7MEdcpHNBhPaxRs%)Vr~2fXEY5~I znQr2jTqXcS{-DGUk;#-O7>-E>xh(lUZhxFFzVYU40a4%qAXFXS>Ed)Zd9=D*@WAbj zb4rr%&{jhz8cFC9j_(1|I4lw?x8|>=wS$B^N5D-5~G=ROgxqRi}OK zIfSa0T9C^Wgutw|$x)C}BGd||-9)IBQN@yw`GxZ{1!#wdDDc=>zgJwuQAnj~FzgD< z`XXr(W7_qi1)6Rk)RB7bM0KLe)nt7!H8?MDmh=JkO~woGUK+`#aRz z9fS~so`di7P*siknG4v>C1g74aWL!=xCa=9h1EDSvjw$Q=VSqfWm7fnqIBBO!LVE8 zGNxk85r!d7cZ2$w3#GvRU=KyrG3OUhGy@?7KoJKZi9E72LeZ)d0w%^#s5)Xi)8g1{ zt9scv^!oVyT@0%>T0n|cBtMQU8BKtU{HYZ%nP@Lnyp>yfwg3BZ#lL=a-iXu)3 zGu{(;4^v{au7^(db;F_tVdXomp$48y0ck&VE4b%@#I>29Rk@ z2Hh`?{Kcz( z-kmVM@WSf=v|qbcjA8TaWn?DV-+72Q_ANYG|BW<>uo~w`j{PA)`CBLn*#3K?IQRCt zSo24Gb9IIDm#+X2crJnG(pns?)ef|asu(`elsxi9) z>uV3FYUPXjD=R#E;Ffsw^|xHTc>~vV@m!bA(n!Ge))uXHo2p>|7W=y^Y&Wj3eS3Lo zto5}A#aRG+^uc@iLbJRoJwIU1GNPx$-bqA3R9J=WlTB+AQ51%s+?mWIGfCSd)}|(fLJ5N4Cc1U!qTqj#?xY(*LBw7E zOrd-CMMPIp!C>0jv?QjPkIdI~5jsuUNf^4Yn|W6Eojd2e?>%z|?wQ=xV(-&i`M*qe z-n@@}Re*Q9ujTg37u438@k^J3bIL0Z61C?#^v^o@_5c85rOxtd14U5*aNLk$L5XXp zb??s^dmlr&v-=?z2dEeUzIB0PEyqRv*u}9f6SZd#u?MGkt_6UimvF5SLYbI2qrVVd z_qwU4QPYeJ!0vbH{rVbfqg>_T#$y1^kBIs;RZpy%c}^@L}(_S?-NDg modRTJWMpJyWMpLAJO2QR&#+ES;H&%q0000 Date: Thu, 12 Dec 2024 23:04:24 +0300 Subject: [PATCH 2/4] Update meta.json --- .../Structures/Furniture/double_mattress.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/meta.json b/Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/meta.json index d65a17c90f7..20d7c846049 100644 --- a/Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Draw by Skilets: https://github.com/Skilets", + "copyright": "Draw by Fuchsia: https://github.com/FuchsiaThePhoenix", "size": { "x": 32, "y": 32 From af24ca67972e57360e324291ada1023dd3a8f2b2 Mon Sep 17 00:00:00 2001 From: FuchsiaThePhoenix Date: Thu, 12 Dec 2024 23:48:51 +0300 Subject: [PATCH 3/4] Add translation --- .../entities/structures/furniture/mattress_double.ftl | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Resources/Locale/ru-RU/_LostParadise/prototypes/entities/structures/furniture/mattress_double.ftl diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/structures/furniture/mattress_double.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/structures/furniture/mattress_double.ftl new file mode 100644 index 00000000000..f43891568c1 --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/structures/furniture/mattress_double.ftl @@ -0,0 +1,4 @@ +ent-LPPMattressDoubleUp = Двойной матрас + .desc = Лучше спать на полу, чем так, я думаю. +ent-LPPMattressDoubleDown = Двойной матрас + .desc = Лучше спать на полу, чем так, я думаю. \ No newline at end of file From 50a95ec37e1c57d5473706977d09e73ce6414d15 Mon Sep 17 00:00:00 2001 From: FuchsiaThePhoenix Date: Mon, 16 Dec 2024 18:50:09 +0300 Subject: [PATCH 4/4] Update mattress_double.yml --- .../Entities/Structures/Furniture/mattress_double.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/mattress_double.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/mattress_double.yml index 926e6e63639..09e71b4efac 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/mattress_double.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/mattress_double.yml @@ -30,9 +30,6 @@ position: Down rotation: -90 buckleOffset: "0,0.20" - - type: Construction - graph: LPPMattressDouble - node: LPPMattressDoubleUp - type: PlaceableSurface placeCentered: true - type: Damageable @@ -66,9 +63,6 @@ name: mattress double down description: Better to sleep on the floor than this, I think. components: - - type: Construction - graph: LPPMattressDouble - node: LPPMattressDoubleDown - type: Sprite state: mattress_double_down - type: Damageable