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 761c969d00..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/down.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/marble.png b/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/marble.png new file mode 100644 index 0000000000..64722701de Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/marble.png differ 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 fbc71e5148..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/top.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/wood.png b/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/wood.png new file mode 100644 index 0000000000..1525206457 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/wood.png differ diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/marble.png b/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/marble.png new file mode 100644 index 0000000000..ebde437231 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/marble.png differ 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 0000000000..053d892079 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/wood.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 07cf7ff780..7c688e008e 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -199,6 +199,9 @@ CP14FloraTreeLarge04: CP14FloraTreeGreenLarge CP14FloraTreeLarge05: CP14FloraTreeGreenLarge CP14FloraTreeLarge06: CP14FloraTreeGreenLarge +CP14DungeonEntranceAutoLink: CP14LaddersDownStoneAutoLink +CP14DungeonExitAutoLink: CP14LaddersUpStoneAutoLink + # <---> CrystallEdge migration zone end