From 0e88b6dc6fbc933e0acc407f0eb5fe9018164965 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 3 Dec 2024 16:21:07 +0300 Subject: [PATCH] Table fences (#626) * collision fucks * map update --- Resources/Maps/_CP14/comoss.yml | 201 ++++++++++++++---- .../Prototypes/Entities/Objects/base_item.yml | 3 +- .../_CP14/Entities/Objects/ores.yml | 2 +- .../_CP14/Entities/Structures/Fence/base.yml | 2 + .../Entities/Structures/Fence/iron_grille.yml | 53 ++--- .../Structures/Fence/iron_grille_top.yml | 50 +++++ .../Fences/iron_grille.rsi/corner.png | Bin 1793 -> 0 bytes .../Fences/iron_grille.rsi/door_closed.png | Bin 1944 -> 1698 bytes .../Fences/iron_grille.rsi/door_opened.png | Bin 2401 -> 2356 bytes .../Fences/iron_grille.rsi/meta.json | 4 - .../Fences/iron_grille.rsi/straight.png | Bin 1214 -> 974 bytes .../Fences/iron_grille_top.rsi/meta.json | 15 ++ .../Fences/iron_grille_top.rsi/straight.png | Bin 0 -> 753 bytes Resources/migration.yml | 1 + 14 files changed, 241 insertions(+), 90 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille_top.yml delete mode 100644 Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/corner.png create mode 100644 Resources/Textures/_CP14/Structures/Fences/iron_grille_top.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Structures/Fences/iron_grille_top.rsi/straight.png diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index cd26e2ceb7..61258089fb 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/Resources/Maps/_CP14/comoss.yml @@ -54242,12 +54242,6 @@ entities: rot: -1.5707963267948966 rad pos: -13.5832405,20.604366 parent: 2 - - uid: 1375 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.992306,-28.07278 - parent: 2 - uid: 1444 components: - type: Transform @@ -54378,6 +54372,12 @@ entities: rot: -1.5707963267948966 rad pos: -7.5784397,-3.351576 parent: 2 + - uid: 12883 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.322584,-28.195072 + parent: 2 - proto: CP14Cloth10 entities: - uid: 4078 @@ -55039,14 +55039,6 @@ entities: - type: Transform pos: -16.05365,-10.44961 parent: 2 -- proto: CP14FenceIronGrilleCorner - entities: - - uid: 1807 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-13.5 - parent: 2 - proto: CP14FenceIronGrilleGate entities: - uid: 1334 @@ -55279,6 +55271,95 @@ entities: rot: 3.141592653589793 rad pos: 6.5,-13.5 parent: 2 +- proto: CP14FenceIronGrilleWindowStraight + entities: + - uid: 1425 + components: + - type: Transform + pos: -8.5,16.5 + parent: 2 + - uid: 2076 + components: + - type: Transform + pos: -17.5,-4.5 + parent: 2 + - uid: 2116 + components: + - type: Transform + pos: -16.5,-4.5 + parent: 2 + - uid: 2391 + components: + - type: Transform + pos: -6.5,-16.5 + parent: 2 + - uid: 2392 + components: + - type: Transform + pos: -7.5,-16.5 + parent: 2 + - uid: 12873 + components: + - type: Transform + pos: -8.5,-16.5 + parent: 2 + - uid: 12874 + components: + - type: Transform + pos: -9.5,-16.5 + parent: 2 + - uid: 12875 + components: + - type: Transform + pos: -4.5,-32.5 + parent: 2 + - uid: 12876 + components: + - type: Transform + pos: -3.5,-32.5 + parent: 2 + - uid: 12877 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,5.5 + parent: 2 + - uid: 12878 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,4.5 + parent: 2 + - uid: 12885 + components: + - type: Transform + pos: -7.5,16.5 + parent: 2 + - uid: 12886 + components: + - type: Transform + pos: -6.5,16.5 + parent: 2 + - uid: 12887 + components: + - type: Transform + pos: -14.5,16.5 + parent: 2 + - uid: 12888 + components: + - type: Transform + pos: -15.5,16.5 + parent: 2 + - uid: 12889 + components: + - type: Transform + pos: -17.5,16.5 + parent: 2 + - uid: 12890 + components: + - type: Transform + pos: -18.5,16.5 + parent: 2 - proto: CP14FenceWoodGate entities: - uid: 934 @@ -58507,6 +58588,24 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,18.5 parent: 2 + - uid: 12880 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,-27.5 + parent: 2 + - uid: 12881 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-27.5 + parent: 2 + - uid: 12882 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,-28.5 + parent: 2 - proto: CP14TableWoodenCounter entities: - uid: 547 @@ -59649,6 +59748,13 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 1807 + components: + - type: Transform + pos: 12.5,5.5 + parent: 2 + - type: Fixtures + fixtures: {} - uid: 1962 components: - type: Transform @@ -59657,13 +59763,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 2076 - components: - - type: Transform - pos: 15.5,5.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 2147 components: - type: Transform @@ -60052,14 +60151,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 1235 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,16.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 1239 components: - type: Transform @@ -60149,7 +60240,7 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,-30.5 + pos: 12.5,3.5 parent: 2 - type: Fixtures fixtures: {} @@ -60164,15 +60255,7 @@ entities: - uid: 1361 components: - type: Transform - pos: -15.5,-27.5 - parent: 2 - - type: Fixtures - fixtures: {} - - uid: 1425 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,16.5 + pos: -9.5,15.5 parent: 2 - type: Fixtures fixtures: {} @@ -60191,13 +60274,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 2116 - components: - - type: Transform - pos: 12.5,5.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 2267 components: - type: Transform @@ -60264,6 +60340,29 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 12879 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-34.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 12884 + components: + - type: Transform + pos: -16.5,-27.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 12891 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,17.5 + parent: 2 + - type: Fixtures + fixtures: {} - proto: CP14WallmountOrdersBorder entities: - uid: 1447 @@ -76117,6 +76216,11 @@ entities: - type: Transform pos: 5.5,14.5 parent: 2 + - uid: 1375 + components: + - type: Transform + pos: -17.5,-32.5 + parent: 2 - uid: 1767 components: - type: Transform @@ -76191,6 +76295,11 @@ entities: parent: 2 - proto: CP14WoodenCabinet entities: + - uid: 1235 + components: + - type: Transform + pos: -14.5,-27.5 + parent: 2 - uid: 1363 components: - type: Transform diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml index 61837aa1eb..f34937e432 100644 --- a/Resources/Prototypes/Entities/Objects/base_item.yml +++ b/Resources/Prototypes/Entities/Objects/base_item.yml @@ -34,7 +34,8 @@ bounds: "-0.25,-0.25,0.25,0.25" density: 20 mask: - - ItemMask + #- ItemMask # CP14 swap ItemMask to Impassable only + - Impassable restitution: 0.3 # fite me friction: 0.2 - type: Sprite diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ores.yml b/Resources/Prototypes/_CP14/Entities/Objects/ores.yml index 4525f28500..79c831acd6 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ores.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ores.yml @@ -47,4 +47,4 @@ sprite: _CP14/Objects/Materials/gold_ore.rsi layers: - state: ore1 - map: ["random"] \ No newline at end of file + map: ["random"] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/base.yml index 98e9149dba..65d07f3ee3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/base.yml @@ -15,6 +15,8 @@ bodyType: Static - type: Transform anchored: true + - type: PlacementReplacement + key: walls - type: entity parent: CP14BaseFence diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml index d8377bb13c..010bdeed1e 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml @@ -41,7 +41,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.49,-0.49,0.49,-0.29" + bounds: "-0.5,-0.15,0.5,0.15" density: 1000 mask: - FullTileMask @@ -50,42 +50,6 @@ - LowImpassable - WallLayer -- type: entity - parent: - - CP14BaseFenceCorner - - CP14FenceIronGrilleBase - id: CP14FenceIronGrilleCorner - suffix: Corner - components: - - type: Icon - state: corner - - type: Sprite - state: corner - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.49,-0.49,0.49,-0.29" - density: 1000 - mask: - - TableMask - layer: - - MidImpassable - - LowImpassable - - WallLayer - fix2: - shape: - !type:PhysShapeAabb - bounds: "0.29,-0.49,0.49,0.49" - density: 1000 - mask: - - TableMask - layer: - - MidImpassable - - LowImpassable - - WallLayer - - type: entity parent: - CP14BaseFenceDoor @@ -104,4 +68,17 @@ openSound: collection: MetalScrape closeSound: - collection: MetalScrape \ No newline at end of file + collection: MetalScrape + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.15,0.5,0.15" + density: 1000 + mask: + - FullTileMask + layer: + - MidImpassable + - LowImpassable + - WallLayer \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille_top.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille_top.yml new file mode 100644 index 0000000000..29d1f759b1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille_top.yml @@ -0,0 +1,50 @@ +- type: entity + parent: + - CP14BaseFence + id: CP14FenceIronGrilleWindowBase + name: iron grille window + description: A strong barrier made of iron bars welded together. The absence of the bottom part allows you to slip objects through it. + abstract: true + components: + - type: Sprite + sprite: _CP14/Structures/Fences/iron_grille_top.rsi + - type: Icon + sprite: _CP14/Structures/Fences/iron_grille_top.rsi + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 250 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + parent: + - CP14FenceIronGrilleWindowBase + - CP14BaseFenceStraight + id: CP14FenceIronGrilleWindowStraight + suffix: Straight + components: + - type: Icon + state: straight + - type: Sprite + state: straight + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.15,0.5,0.15" + density: 1000 + mask: + - Impassable + layer: + - MidImpassable + - HighImpassable \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/corner.png b/Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/corner.png deleted file mode 100644 index 614db83b6e55cb5fc0323855e24ffaa491c87e79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1793 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 delta 1917 zcmV-@2ZH#b4VVv*FnJ#X7c5Qbj`YIKERNq`zR2E<&f6bHC*;mQFF zH~zVYG(isXH7?w^JJ~rIaN~x6q(DVj>WXOS;cA8-vbf8f<^c?o!zBN~oYor6B!mCYmsG(Jq9CN26aE0@kC8m#~y?6m@Vy>7D=zz4TF zn9mo@RzTj!FHu!tjc)-OT1BfW3~2Zm@Yaf!X%UT9fQD8vS6-y3|IHXc)+D8;b5e+A zZT5QIW>|t6y*1 zL)=XUUYj>}n>pO8ba{Aq%(MvN=s0Rd7w8=HH`W7sy>7;rr*q)d=a1tU^Z5cNCm;C2 z#|9@SA8>znn^7uxhrtzadUl>3Q^oG@Zc}COJ5LpMM|-#OFVEAAJN@wRbIrhAdjJ~V z1*GYYD}RK}c{=X*^A#Ye3jhrm1oK>1x35d*$#RyFYXhd1SMV-C&=dyzEEu&6ZLx#P zljRKa^>;|dP_mpgcU72>M)srQ2rtjmOyQ&9XywYI;b@gCXSpjw8o|2&@fO#Y6hVDn zJD2imi~@YZTbtSid_`u6ZCu%H;p0uaXj$5gvVRmsVz}Hv%!d@i3*}Pe3lzyUKL7yQ zRU$KGA~BLYFERt*!ujY$G#rh&fKO?zlcUKMXXulgSG!DP2FONRq-cyQ=hyNgGs$w6 zscbYHjj3Yu`C>z9SSyapxia$pyNZp5qj9UK3uuuR>6(@f&?7T6rO|)7d)!3Ux*m}A z3xD`ALH-2)Zk}gL>mPLwf)tq{M}}9>bzFc=lb7R~$8LHuhDfPAKUD#|kYq`@=UTcV zxqD4Q8k;1A1$cBAPx1sI!3NP`J?-NeQluM|X-`;t+@}po$qRMQgN0$tI#YLu99G&{{i(o2G6= zM~lq-{nwvCTSXg?BQs^9Ee{WmnTQRLeKM2M#c`Z=8z38*2~Asz%uwYBH`>B0Nq@(# z2S(7b6qyN4`~L2>FcIA?R|%Xl(`A{weDki%Lxs}7CPigPuANtTfYBG}G$=)8ilQyR z&+#J9WhI(WS&38ulEG3GZQ+rbq9{&NN$mjlE?14VRG|qLAQ2=o)C3=ZNEP5aGSd{q zK@gCmD|zQd@}}|*a%5&z^h8$PlYd*1e65&`ytXX&&PaU$K3em_OUu%E%hb{_K~pEs zEA;f(cBd&GJt4cED&yMxz^fVTnzRZVPbbs9JGM}pC zY5!u!dEM;z`wYV{48t%C!!QiPFbu;m48t%C!!QiPFbu;mj3R1%MsKxxeFU-9YF$Lb z(fIW2Jl)`s9-X6&Q)u76>C@!XYPGsypRKKod%2SoCx`;1_XR?|L(rHvMnb(s;#~p# zL;X(YU8@W4o2Y#K@>!H8%YT`AtxmkRfTQC`eEU?B*NwLp5DiD;%d2b5zGwRS7(n`R z2C&|L>JnqUf$He(2Z*CjE{&JVE`NO)C%yZd~R+y`DFLx1n1kC`7uD|`I! z^q&^+i${juM;}+TUr4f?;qvMlN5@fSOAXqz&ELKczJaV0Dnl5ADPY6PS4JfBtJ4~d{KJ~SZ|hA*`jlIsI3bxEr2S*=Xq&s zZl1>1E^~Xo9uQ0cS_|-v1xI~mM*X|f`EBDG$$a|*-nO&kTX!bOj}0ZbGGBwBcSDHG zU3bIvX!M6DuN&_QC~FG)!c1Y`8J?b>>XF-Bg>1q!v5N00000NkvXXu0mjf DJE)n{ diff --git a/Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/door_opened.png b/Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/door_opened.png index 0c855c91d689de1f833b6b77a6cc019e79b8f975..6403c6602f7a127d9f9fe80e6180912436cf0364 100644 GIT binary patch delta 2333 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 DKX-?( delta 2378 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 O0000&q*3R z-)U9;!r3IaO-FJv6W;|@?}ihO?G+*I)A)`~SR~O|Uh<`WvZvRgAFn;;Rhap*FfcHy zP2Sg-WVT-AwY+zjpNmQ5erFe#O1q_-Vl4Yle_pxSXYTU8jj{Fa_WO0hXa72)`{2o! zHEE32^2@$_*m0}oT4hDd)l;!6lCS*ymHs!%g0>x)mp5jLFyE z`#ho=mN`ybA>TMj?7(%0V1@f1(<D_GB;@aZp}KZn!HJ)b)*pUWb>Qz`+qduDUAyFRzFUIpuf*-0uWW=r+Y~ZxkaIA4 z&7d{6g<+vw!h97)hw%CPxji{9Y-eqW(dT6JNh;^OyJ(Vt!WZ3h+l8KJU%yv2iA5ZNjC=uR4$B?C?rIniHp+zkV|?+^2k+^Rl_QKkWZ}?Yk1P z-+0Yx7w81k8_jv?#&}C7uv9dovik4J%k`{QmrgR}e9k@bi7PCfgeFR6 zW-)oVq%FxTX|+@`zQj`6C;=3c(rr*SQue(dApoM5M;>tJ^1tDJ(@6v2MbBpDwgjNw{rJE;w_AJ|)?4lw)b7C5pRO_l|&6(^PDXVzy zM32cey#tanCmy@Sx-05{*^UETo4Ix3Cg%yy%&fF6%VHAQ{L_EYbGDURBJ-A+%J0AW zaorXcQ^qO%>!hw+w|2U{h2`eSmyxQHGY{@=*kC82tf0Z1`*r!3uA6(T zZ0fC+&7K`Ud#%Z=PnI4@%Br3&ECsc9;~tf>C^7A*vsd`Io2iWP4DZyMpBod!4{YV0 znqR&uB0=EEx`Gd}3Z@DTE=!xgF|*lo^VA8*>|tHP#xh|aW9A356LHB&2LzMW8ydRE zC`QMZKRwRYCs5wnT;3Yo9NfTqkvlkk$EVe+7Okr9+P}ToLwtj8`MN(h7I1sqZ!oD4 ze*iSS&LPX>-+l+4nE#nc&(bB&hqK(!1*XCcc?+MO>gV0fy2OM*h?8SO*&o(+ZF{pd zu@62^U+?0wCC>ih!;2fu=Qkfb&$Nc=Me*K!U$<$`XEx;C@YeU<6nSn##u)!!zR?a@ zs~ugOk`JWRe_9u6$G(P1qr7}?-KxJoX95+MxqIx~o#q_-b7Q0Snb?O5ViT1X9bTNg zdiQIP%?vBg{O1yM*H9I_!K!h3>eaiYPmj07HrULMn!g3;5+yN#N%GQ1SZ`#j)VQ*V rO%R%6KPQGou3qk;9G18+5O?^;l-yy?vLck#03`3}>gTe~DWM4f1Q!v4 diff --git a/Resources/Textures/_CP14/Structures/Fences/iron_grille_top.rsi/meta.json b/Resources/Textures/_CP14/Structures/Fences/iron_grille_top.rsi/meta.json new file mode 100644 index 0000000000..bbdd87189d --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Fences/iron_grille_top.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "by TheShuEd (github)", + "size": { + "x": 32, + "y": 96 + }, + "states": [ + { + "name": "straight", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Fences/iron_grille_top.rsi/straight.png b/Resources/Textures/_CP14/Structures/Fences/iron_grille_top.rsi/straight.png new file mode 100644 index 0000000000000000000000000000000000000000..67f4efe5d43aed1c1f51c86dcb3e89367f31cdb0 GIT binary patch literal 753 zcmeAS@N?(olHy`uVBq!ia0vp^4nTZ>gAGV-xtR*07>k44ofy`glX=O&z_i-a#WAE} z&fB{i^KUtb9RJup^{C`31|jch9*HMss5(De<^7y*?(h9&FD`9dImIh>mjYv8o6$1o zCnqE}RM)+KcXHqRbf%x@_CMZXEzcn-2sE96q2Y|rwCm>j_j*5+gzcN%-EktvZ0gyx z>P-)F%xo*ytO}oMSvIfgFHmH{^Qrbfzx+IXk7Gu>PwL+-wbe1(>u$Z1wO^_ge09D3 zy7{Zu=B@hkX1Rl+(x)G>&h$d&(OZGG;-f-*=#xfT1LZ9-P@QJZc#p<9KV(A$h^gxpPH9Bys(z|)mQa| zUAJkWt=z7T$|vk=8Lv&ZeapS&M0hOgt_c4|iJxnO9ZpwG?VlLm(P3gQaI`AUR3r4> z|0m)~O4GwnSN*(qezn{-tN5-z&F`7RR!`Lt>)!kP>dDv6tKyzT++7uSd1KYQpEv8} z!6AZ$FsPWkPjoskn6{UH|McNQaM}6S+h>a`OPVVG)y&Fy!Mlcq_e+EBGOo<;OPRa= zRl~EjS;3o6gqJ#8|67~9`9!+lm5_6FTs@4k3v3;){cd=(p6RB3)6M<{!v)NHq#yM9 zH@m%+&@poYkzd_T6!UI4k*>UC<($7^6+APTW}W)nz4CSH1*Q3#5AHJL*N9yJ8YU>y zZ0!5={r!DWTMz5Tn=P>uzuU zoqBtB?=Ho-pEu)KtI8ezO4Ypb?@iit%3P8$_P?CyY_ab>wH*5a3xQ4B3hUwEcwSc Wcj4BI{ CrystallEdge migration zone end