From eb76a9ef6aefd39c808e2f2e66e35c62a2b85ef1 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 12 Dec 2024 23:00:16 +0300 Subject: [PATCH] Ed 12 12 2024 bugfixes (#668) * fix #665 * fix #664 * fix #661 * fix #666 --- .../_CP14/MapDamage/CP14MapDamageComponent.cs | 2 +- Content.Shared/CCVar/CCVars.Misc.cs | 4 +- .../_CP14/Entities/Mobs/Species/base.yml | 6 +- .../_CP14/Entities/Mobs/Species/skeleton.yml | 2 +- .../_CP14/Entities/Structures/Roof/base.yml | 1 - .../Entities/Structures/dungeon_entrance.yml | 133 +++++++++++++++--- .../Structures/Dungeon/ladders.rsi/down.png | Bin 179 -> 0 bytes .../Structures/Dungeon/ladders.rsi/marble.png | Bin 0 -> 1598 bytes .../Structures/Dungeon/ladders.rsi/meta.json | 8 +- .../ladders.rsi/{ladder.png => stone.png} | Bin .../Structures/Dungeon/ladders.rsi/top.png | Bin 182 -> 0 bytes .../Structures/Dungeon/ladders.rsi/wood.png | Bin 0 -> 1571 bytes .../Dungeon/ladders_up.rsi/marble.png | Bin 0 -> 3031 bytes .../Dungeon/ladders_up.rsi/meta.json | 10 +- .../ladders_up.rsi/{ladder.png => stone.png} | Bin .../Dungeon/ladders_up.rsi/wood.png | Bin 0 -> 2738 bytes Resources/migration.yml | 3 + 17 files changed, 135 insertions(+), 34 deletions(-) delete mode 100644 Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/down.png create mode 100644 Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/marble.png rename Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/{ladder.png => stone.png} (100%) delete mode 100644 Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/top.png create mode 100644 Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/wood.png create mode 100644 Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/marble.png rename Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/{ladder.png => stone.png} (100%) create mode 100644 Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/wood.png diff --git a/Content.Server/_CP14/MapDamage/CP14MapDamageComponent.cs b/Content.Server/_CP14/MapDamage/CP14MapDamageComponent.cs index f357319cee..26c8d2f9b9 100644 --- a/Content.Server/_CP14/MapDamage/CP14MapDamageComponent.cs +++ b/Content.Server/_CP14/MapDamage/CP14MapDamageComponent.cs @@ -15,7 +15,7 @@ public sealed partial class CP14MapDamageComponent : Component { DamageDict = new Dictionary() { - {"Asphyxiation", 10} + {"Asphyxiation", 5} } }; diff --git a/Content.Shared/CCVar/CCVars.Misc.cs b/Content.Shared/CCVar/CCVars.Misc.cs index 3d597c7427..2651bd6899 100644 --- a/Content.Shared/CCVar/CCVars.Misc.cs +++ b/Content.Shared/CCVar/CCVars.Misc.cs @@ -12,7 +12,7 @@ public sealed partial class CCVars /// Should we pre-load all of the procgen atlasses. /// public static readonly CVarDef ProcgenPreload = - CVarDef.Create("procgen.preload", true, CVar.SERVERONLY); + CVarDef.Create("procgen.preload", false, CVar.SERVERONLY); //CP14 false by default /// /// Enabled: Cloning has 70% cost and reclaimer will refuse to reclaim corpses with souls. (For LRP). @@ -84,7 +84,7 @@ public sealed partial class CCVars CVarDef.Create("entgc.maximum_time_ms", 5, CVar.SERVERONLY); public static readonly CVarDef GatewayGeneratorEnabled = - CVarDef.Create("gateway.generator_enabled", true); + CVarDef.Create("gateway.generator_enabled", false); //CP14 false by default public static readonly CVarDef TippyEntity = CVarDef.Create("tippy.entity", "Tippy", CVar.SERVER | CVar.REPLICATED); diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml index 26fdb0ce99..a5f0cdafd4 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml @@ -232,9 +232,9 @@ - type: CanMoveInAir # read: CanSwimInOcean lol - type: MovementAlwaysTouching - type: MovementSpeedModifier - weightlessAcceleration: 0.7 # Slow swimming - weightlessFriction: 3 - weightlessModifier: 0.5 + weightlessAcceleration: 0.8 # Slow swimming + weightlessFriction: 2 + weightlessModifier: 0.6 - type: CP14DamageableByMap diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml index da4cbdefe5..34d3a5ed41 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml @@ -1,6 +1,6 @@ - type: entity parent: - - BaseMobSpecies + - CP14BaseMobSpecies - MobFlammable id: CP14BaseMobSkeleton name: Mr. Skeleton diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml index 92a7e7a2ff..f6eb912950 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml @@ -9,7 +9,6 @@ components: - type: PlacementReplacement key: CP14Roof - - type: Clickable - type: Physics bodyType: Static canCollide: false diff --git a/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml b/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml index be6d640b2c..cc3c94d849 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml @@ -1,23 +1,21 @@ - type: entity - id: CP14DungeonEntrance + id: CP14LaddersDownBase name: stairway down - categories: [ HideSpawnMenu ] + abstract: true + categories: [ ForkFiltered, HideSpawnMenu ] description: The dark depths of the underworld are calling you. placement: mode: SnapgridCenter components: + - type: Sprite + drawdepth: FloorTiles + sprite: /Textures/_CP14/Structures/Dungeon/ladders.rsi - type: Transform anchored: True - type: InteractionOutline - type: Clickable - type: Physics bodyType: Static - - type: Sprite - sprite: /Textures/_CP14/Structures/Dungeon/ladders.rsi - drawdepth: FloorTiles - layers: - - state: ladder - #- state: down - type: Fixtures fixtures: portalFixture: @@ -34,18 +32,16 @@ randomTeleport: false - type: entity - parent: CP14DungeonEntrance - id: CP14DungeonExit + parent: CP14LaddersDownBase + id: CP14LaddersUpBase + abstract: true + categories: [ ForkFiltered, HideSpawnMenu ] name: stairway up - categories: [ HideSpawnMenu ] description: A way out of the dark underworld into the overworld. components: - type: Sprite sprite: /Textures/_CP14/Structures/Dungeon/ladders_up.rsi drawdepth: Mobs - layers: - - state: ladder - #- state: top - type: Fixtures fixtures: portalFixture: @@ -63,20 +59,113 @@ energy: 1 netsync: false + +# Basic stone - type: entity - parent: CP14DungeonEntrance - id: CP14DungeonEntranceAutoLink - categories: [ ForkFiltered ] + parent: CP14LaddersDownBase + id: CP14LaddersDownStone + categories: [ HideSpawnMenu ] + components: + - type: Sprite + state: stone + +- type: entity + parent: CP14LaddersUpBase + id: CP14LaddersUpStone + categories: [ HideSpawnMenu ] + components: + - type: Sprite + state: stone + + +- type: entity + parent: CP14LaddersDownStone + id: CP14LaddersDownStoneAutoLink + suffix: Stone components: - type: CP14ZLevelAutoPortal zLevelOffset: -1 # Go into deep - otherSideProto: CP14DungeonExit + otherSideProto: CP14LaddersUpStone - type: entity - parent: CP14DungeonExit - id: CP14DungeonExitAutoLink - categories: [ ForkFiltered ] + parent: CP14LaddersUpStone + id: CP14LaddersUpStoneAutoLink + suffix: Stone components: - type: CP14ZLevelAutoPortal zLevelOffset: 1 # Go onto surface - otherSideProto: CP14DungeonEntrance \ No newline at end of file + otherSideProto: CP14LaddersDownStone + + +# Wood +- type: entity + parent: CP14LaddersDownBase + id: CP14LaddersDownWood + categories: [ HideSpawnMenu ] + components: + - type: Sprite + state: wood + +- type: entity + parent: CP14LaddersUpBase + id: CP14LaddersUpWood + categories: [ HideSpawnMenu ] + components: + - type: Sprite + state: wood + + +- type: entity + parent: CP14LaddersDownWood + id: CP14LaddersDownWoodAutoLink + suffix: Wood + components: + - type: CP14ZLevelAutoPortal + zLevelOffset: -1 # Go into deep + otherSideProto: CP14LaddersUpWood + +- type: entity + parent: CP14LaddersUpWood + id: CP14LaddersUpWoodAutoLink + suffix: Wood + components: + - type: CP14ZLevelAutoPortal + zLevelOffset: 1 # Go onto surface + otherSideProto: CP14LaddersDownWood + + +# Wood +- type: entity + parent: CP14LaddersDownBase + id: CP14LaddersDownMarble + categories: [ HideSpawnMenu ] + components: + - type: Sprite + state: marble + +- type: entity + parent: CP14LaddersUpBase + id: CP14LaddersUpMarble + categories: [ HideSpawnMenu ] + components: + - type: Sprite + state: marble + + +- type: entity + parent: CP14LaddersDownMarble + id: CP14LaddersDownMarbleAutoLink + suffix: Marble + components: + - type: CP14ZLevelAutoPortal + zLevelOffset: -1 # Go into deep + otherSideProto: CP14LaddersUpMarble + +- type: entity + parent: CP14LaddersUpWood + id: CP14LaddersUpMarbleAutoLink + suffix: Marble + components: + - type: CP14ZLevelAutoPortal + zLevelOffset: 1 # Go onto surface + otherSideProto: CP14LaddersDownMarble \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/down.png b/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/down.png deleted file mode 100644 index 761c969d00d1e4426f919181ce43c373fef7b989..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}xt=bLArY;~ z2@l~HA;o#+)E@~APc#;kc?9T6PkL>zO63q^rs!p@z`mx5 a>P)Px)_(?=TRCt`_Ti;I{HxT~V?j8qRph=H|p7_xuJqe=z5=cmuT2;K1zNAn6Py3X< zRC$fms&Ap96`{})2u*+#Zngaak`4H{<4ozW_8wa(d)70Hf=c>s$H@O zwwiaW1^L9QlXJ_OV;*|T$_N3Vb8i6vP_K_7jxUmD3R)h=7n%25J+7RhULVEJzwTjb zvVq00g+dY?wKfM5snyDNK!^E6Y7|^|4CPfrQ z)%XD>11U&GqKZ;OlmSOxl_$#~Rfr>CGpbTuX-3%?N-1i3r~Zl{wV#+sDrMvNg01Ib zAY0-TIzf&!XM{Y%gj16Z%+I}>d9k~<&z4t>D2j|z)&?%KVdV2qSBB~b0I*u=rNz)? zm!L9KyHGEUwLVHzuy;E=DhY4Q550y z^cbz?9enVhV@;$8UL3u|G~?`rYUGu|(l`tucA?i;74$5!?7JXNlq1lm6Q=kFK?2m5SAsk{p09eNIr zUb5vb$9O73wHxWYfBzD23oQ7=(*4#@`c()4U}F3#P!I$`5>nE`PPE( zc}C(w>(mHR1}aaE{w^^PAp`Lke}AyeUT5SYO454?65ocxU(bkC`7*-V z$}$$`+icvi+da!|KhtXB;P8lbp+!fC1GmWN0Z#RQdv@B(sI9FmrxG`&z9k(gSVzd^ z%9^PIs*ulsDwSo5DBI=`DBnr~A`}bE)fXUp29WAijlu?aAw+3)sCXkq5CmA5Zzo1r zm~Z1&W5Ow>P(&9FUS|N8G}U8-Di|^`K9-C+7nG%S^*($eb5k@gu%Px?F4GE_6{Lh{ zu!TOG!ful6Y3-ty1dbnjS6DKF&rEGqkaU#zS$zUUi2J(URz#MIzR3(I8+W&X%_3KH zA#?%d>f{L7KrMpOm75}0+x1HvWl(8E$cKX0-G|dQDBS}tqEwIE-0lfC!6iujN&1;! zJp-gGCN~8|^|SuPh%cypp8kTXrX^^rgq0t_!G{lEL(qp2Y#gGbKc9l7`$ItxI1!WT z+gyrv9Vl;ej=SdW6IIE74j;g0Uy8HS49MGF@)WcAkz<}KoY#lz7G1~> wC<00>?}A0y^MH%4A@Kjo1WVvJZfpF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/meta.json b/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/meta.json index 25e04ab42a..5f8a665043 100644 --- a/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/meta.json @@ -8,14 +8,16 @@ }, "states": [ { - "name": "ladder", + "name": "marble", "directions": 4 }, { - "name": "top" + "name": "stone", + "directions": 4 }, { - "name": "down" + "name": "wood", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/ladder.png b/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/stone.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/ladder.png rename to Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/stone.png diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/top.png b/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/top.png deleted file mode 100644 index fbc71e51489e871920b9452f26b69590ad683780..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 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 Z{tM}MUfR%rrIr8y002ovPDHLkV1kYk+pqut literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/meta.json b/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/meta.json index 82745c39de..b09dbd16f5 100644 --- a/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/meta.json @@ -8,7 +8,15 @@ }, "states": [ { - "name": "ladder", + "name": "stone", + "directions": 4 + }, + { + "name": "wood", + "directions": 4 + }, + { + "name": "marble", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/ladder.png b/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/stone.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/ladder.png rename to Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/stone.png diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/wood.png b/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/wood.png new file mode 100644 index 0000000000000000000000000000000000000000..053d8920791c6893f8dac71177635dbf83ddb817 GIT binary patch literal 2738 zcmV;j3QhHiP)Px3ZVP6?n;ON;Gh%XFs^40$G49;!B(@Dd){i+ za&lT)OGmF?-r!Y3{p?!7=s7QdRw0y@-br0rMXnQB1#qLJ(M1Mp6;`%&tP5%jkdT-h|mnIet*Es~8SA-~hRa;tOlB^i zW%$zI#(g_?!A3o-$4DpPfmPFaJ)WWw)$r5#^{fTZSfJgo#{CRU z!_vQX+U-95^^adVgCPq=105;ntE5pn#Sg!H1_1o+&j%P!rr6)h+i-gq-rSozVXc&O ze*g0zKNeWmI6x~rFe_A1C0GTw(s7+Rr+zdbCJ|L&Uw8|60q;jpQRXYVwf7s&+eMucB4ZgeUv;ZkAuy>uNPZRYYk z2vT~ha%#)=h6yH?__>v-xJ#0 z<@->=!XtmYyMws3jb49l|4UF>4qjPOpUf{C3jlD2#5`E+$9m>xzYWo9 z)(Yt_>AOru8R4N|1;8ml+}cLm+IGI;aa=ES0}Gvc-AUi;51srnB9x{N8I2uIo`AD) zP)1kRVf2?|&OhC%v(CQeD`f~}$ePT9es9dIu$Gt9W!dHPdH!CL+lX0V{;by@BHo?# z@yWaqN*_`%ccA>D!eIp-`y+hx;piG?ysyQ8AmKcz+yszVD<5< zT=M2~f)bYDz7?x7T_HzA#&9NR6-pbITQkNM4JKI2<5nR8-w){hKOq_43!SzurvlbRgSpRB3^+EX=|lJc#Rih)x_&&rcJfoH@N3av z3!(li-}%M|K`uaeX&S77477NF^y4zbNBiF)LWglZqqCB}YBZS3gscLEfc%!Yd%U}2 z`tFP;J=9I-AwhoDPTdr&lGYgs(Zrt?kTbtucUQlg0<+mzT3i8$pG6 z)VAoaZ#Zn(Xbq=%ep~C>CtRUIg$flaRH#s)LWK$yDpaVjE_f$I)_tybRq&P3IWWPo zDTkY%3+r$=?NWQ3 zie7(K7QULr<-A8`PL4W`V*YNEVg%X3m+59UM_CKDmhjZ&@iKUg7_rL58@b8D{EXVs z84X&DSZsoPevBX=xAF+tIqoZqSpoZTJ6jy3T9Z4o$ta)ytpXu=aNEdcUKZ;hMXrA+ zyR}97pM1UwNL`%FJQoqL{C*zaDU&ihBBUR;;#26MZ?1#46m^qSks?B`KXhoc&p<0i z6v-6%IJcq5eyt)S0H*IqNJ0?;c`CittmXXI;_9JsL~@i6+bADX(jpEaMi6-ObwbhZt7oolmyR_I`;{R5*laaLA!3 z|9y46*e_4NH8~mO%i2)%zNS441^K6D_)9>`CnQE_dJ2hMF2t_t0D4WS;GRmf#c#RhwjN%9xtMg|? zlPWS#>%bj0?LsAq;kjN{Yhp$M6-3Z2rDw)o~ReC4YF`gt4qtV|a- zN~ggKD;5UT?BaVg2V|JC!_&&R(q9*U{(GDV78I&#Hvg->zST<<(^YT&Ji2DP- zVoD1>@4I_wG~PJNR>Tv0F=Cmnjr*_Fk5fNS{(aDikfsmnl_1;|=zMW}-!D{T(Bf5hnqc>n~ET~Ct;l1I-8$vA(#O&PdNI?v=RXqBMZC9lx{^3UVl z9YpfHJ)PZ`C?Yk!bNg0|;J+;&xANvTKBo*3DJ%M#MeqOgbrWg&;B+;~%^f}t?$D`k zd1Hj-<0QlF>(sZLKpbM5CP(%~{DCE`y_d3s;Z&8euCVc4kD CrystallEdge migration zone end