World minor changes (#519)

* x2 weather time

* remove alchemy test and battle royale maps, add simple island map

* island map + ocean parallax

* map floor occluder sys

* undercliff test

* update sand and ocean sprite

* Revert "undercliff test"

This reverts commit c484fe630a.

* more experiments

* Revert "more experiments"

This reverts commit a7f30fd608.

* Update default.yml

* Update debug.yml

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -50,9 +50,8 @@ namespace Content.IntegrationTests.Tests
             "MeteorArena",
 
             //CrystallPunk maps
-            "AlchemyTest",
-            "BattleRoyale",
-            "ExpeditionTest",
+            "Village",
+            "Island",
             //CrystallPunk Map replacement end
         };
 

Content.Server/_CP14/WeatherControl/CP14WeatherControllerComponent.cs

@@ -13,7 +13,7 @@ public sealed partial class CP14WeatherControllerComponent : Component
     /// random time with no weather.
     /// </summary>
     [DataField]
-    public MinMax ClearDuration = new(60,600);
+    public MinMax ClearDuration = new(120,1200);
 
     [DataField]
     public HashSet<CP14WeatherData> Entries = new();

Content.Shared/Movement/Systems/SharedFloorOcclusionSystem.cs

@@ -6,11 +6,13 @@ namespace Content.Shared.Movement.Systems;
 /// <summary>
 /// Applies an occlusion shader for any relevant entities.
 /// </summary>
-public abstract class SharedFloorOcclusionSystem : EntitySystem
+public abstract partial class SharedFloorOcclusionSystem : EntitySystem //CP14 partial
 {
     public override void Initialize()
     {
         base.Initialize();
+        CP14InitializeMapOccluder(); //CP14
+
         SubscribeLocalEvent<FloorOccluderComponent, StartCollideEvent>(OnStartCollide);
         SubscribeLocalEvent<FloorOccluderComponent, EndCollideEvent>(OnEndCollide);
     }

Content.Shared/_CP14/Movement/CP14FloorOcclusionSystem.Maps.cs

@@ -0,0 +1,31 @@
+using Content.Shared.Movement.Components;
+
+namespace Content.Shared.Movement.Systems;
+
+public abstract partial class SharedFloorOcclusionSystem
+{
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    private void CP14InitializeMapOccluder()
+    {
+        SubscribeLocalEvent<FloorOcclusionComponent, EntParentChangedMessage>(OnParentChanged);
+    }
+
+    private void OnParentChanged(Entity<FloorOcclusionComponent> ent, ref EntParentChangedMessage args)
+    {
+        if (args.OldParent == null || TerminatingOrDeleted(ent))
+            return;
+
+        if (ent.Comp.Colliding.Contains(args.OldParent.Value))
+            ent.Comp.Colliding.Remove(args.OldParent.Value);
+
+        var newParent = _transform.GetParentUid(ent);
+        if (HasComp<CP14MapFloorOccluderComponent>(newParent))
+        {
+            if (!ent.Comp.Colliding.Contains(newParent))
+                ent.Comp.Colliding.Add(newParent);
+        }
+
+        Dirty(ent);
+        SetEnabled(ent);
+    }
+}

Content.Shared/_CP14/Movement/CP14MapFloorOccluderComponent.cs

@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// Applies floor occlusion to any <see cref="FloorOcclusionComponent"/> that reparent to this map entity.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CP14MapFloorOccluderComponent : Component
+{
+
+}

Resources/Maps/_CP14/tavern.yml

@@ -46,7 +46,7 @@ entities:
     - type: GridTree
     - type: MovedGrids
     - type: BecomesStation
-      id: ExpeditionTest
+      id: Village
     - type: CP14WeatherController
       entries:
       - visuals: CP14Rain

Resources/Prototypes/Entities/Markers/Spawners/jobs.yml

@@ -14,6 +14,7 @@
 - type: entity
   name: observer spawn point
   id: SpawnPointObserver
+  categories: [ ForkFiltered ]
   parent: MarkerBase
   components:
   - type: Sprite
@@ -29,6 +30,7 @@
 - type: entity
   name: latejoin spawn point
   id: SpawnPointLatejoin
+  categories: [ ForkFiltered ]
   parent: SpawnPointJobBase
   components:
   - type: Sprite

Resources/Prototypes/_CP14/Maps/Pools/default.yml

@@ -1,7 +1,7 @@
 - type: gameMapPool
   id: DefaultMapPool
   maps:
-   - ExpeditionTest
+   - Village
 
 - type: gameMapPool
   id: DeathMatchMapPool

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -14,59 +14,14 @@
             CP14Adventurer: [ -1, -1 ]
 
 - type: gameMap
-  id: AlchemyTest
-  mapName: Alchemy test
-  mapPath: /Maps/_CP14/alchemy_test.yml
-  maxRandomOffset: 0
-  randomRotation: false
-  minPlayers: 0
-  stations:
-    AlchemyTest:
-      stationProto: CP14BaseExpedition
-      components:
-        - type: CP14StationZLevels
-          defaultMapLevel: 0
-          levels:
-            1:
-              path: /Maps/_CP14/alchemy_test_layer2.yml
-        - type: StationNameSetup
-          mapNameTemplate: "Alchemy test"
-        - type: StationJobs
-          availableJobs:
-            CP14Adventurer: [ -1, -1 ]
-            CP14Alchemist: [ -1, -1 ]
-            #CP14Captain: [1, 1]
-
-- type: gameMap
-  id: BattleRoyale
-  mapName: Battle royale
-  mapPath: /Maps/_CP14/battle_royale.yml
-  maxRandomOffset: 0
-  randomRotation: false
-  minPlayers: 0
-  stations:
-    BattleRoyale:
-      stationProto: CP14BaseExpedition
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: "Battle royale"
-        - type: StationJobs
-          availableJobs:
-            CP14Adventurer: [ -1, -1 ]
-            CP14Alchemist: [ -1, -1 ]
-            #CP14Captain: [1, 1]
-        - type: StationBiome
-          biome: CP14GrassFill
-
-- type: gameMap
-  id: ExpeditionTest
+  id: Village
   mapName: Sandbox village
   mapPath: /Maps/_CP14/tavern.yml
   maxRandomOffset: 0
   randomRotation: false
   minPlayers: 0
   stations:
-    ExpeditionTest:
+    Village:
       stationProto: CP14BaseExpedition
       components:
         - type: StationNameSetup
@@ -84,4 +39,21 @@
           defaultMapLevel: 0
           levels:
             -1:
-              path: /Maps/_CP14/tavern_cave.yml
+              path: /Maps/_CP14/tavern_cave.yml
+
+- type: gameMap
+  id: Island
+  mapName: Island
+  mapPath: /Maps/_CP14/island.yml
+  maxRandomOffset: 0
+  randomRotation: false
+  minPlayers: 0
+  stations:
+    Island:
+      stationProto: CP14BaseExpedition
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: "Island"
+        - type: StationJobs
+          availableJobs:
+            CP14Adventurer: [ -1, -1 ]

Resources/Prototypes/_CP14/Maps/debug.yml

@@ -32,4 +32,4 @@
           defaultMapLevel: 0
           levels:
             -1:
-              path: /Maps/_CP14/alchemy_test_layer2.yml
+              path: /Maps/_CP14/tavern_cave.yml

Resources/Prototypes/_CP14/Parallax/ocean.yml

@@ -0,0 +1,33 @@
+- type: parallax
+  id: CP14Ocean
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/_CP14/Parallaxes/ocean.png"
+      slowness: 0.5
+      scale: "1, 1"
+      scrolling: "0, -0.05"
+      shader: ""
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/_CP14/Parallaxes/ocean_overlay2.png"
+      slowness: 0.3
+      scale: "1, 1"
+      scrolling: "-0.08, -0.08"
+      shader: ""
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/_CP14/Parallaxes/ocean_overlay.png"
+      slowness: 0.05
+      scale: "1, 1"
+      scrolling: "-0.1, -0.1"
+      shader: ""
+  layersLQ:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/_CP14/Parallaxes/ocean.png"
+      slowness: 0.5
+      scale: "1, 1"
+      scrolling: "0, -0.05"
+      shader: ""
+  layersLQUseHQ: false

Resources/Prototypes/_CP14/Tiles/natural.yml

@@ -55,14 +55,14 @@
   - 1.0
   edgeSpritePriority: 2
   edgeSprites:
-    SouthEast: /Textures/_CP14/Tiles/Sand/single_edge.png
-    NorthEast: /Textures/_CP14/Tiles/Sand/single_edge.png
-    NorthWest: /Textures/_CP14/Tiles/Sand/single_edge.png
-    SouthWest: /Textures/_CP14/Tiles/Sand/single_edge.png
-    South: /Textures/_CP14/Tiles/Sand/double_edge.png
-    East: /Textures/_CP14/Tiles/Sand/double_edge.png
-    North: /Textures/_CP14/Tiles/Sand/double_edge.png
-    West: /Textures/_CP14/Tiles/Sand/double_edge.png
+    SouthEast: /Textures/_CP14/Tiles/Sand/single_edge_SE.png
+    NorthEast: /Textures/_CP14/Tiles/Sand/single_edge_NE.png
+    NorthWest: /Textures/_CP14/Tiles/Sand/single_edge_NW.png
+    SouthWest: /Textures/_CP14/Tiles/Sand/single_edge_SW.png
+    South: /Textures/_CP14/Tiles/Sand/double_edge_S.png
+    East: /Textures/_CP14/Tiles/Sand/double_edge_E.png
+    North: /Textures/_CP14/Tiles/Sand/double_edge_N.png
+    West: /Textures/_CP14/Tiles/Sand/double_edge_W.png
   baseTurf: CP14FloorBase
   deconstructTools: [ CP14Digging ]
   itemDrop: CP14DirtEffect #TODO sand variant

Resources/Textures/_CP14/Parallaxes/attributions.yml

@@ -1,4 +1,9 @@
 - files: ["Shadows.png"]
   license: "CC-BY-SA-3.0"
   copyright: "Created by TheShuEd for CrystallPunk14"
-  source: "https://github.com/crystallpunk-14/crystall-punk-14"
+  source: "https://github.com/crystallpunk-14/crystall-punk-14"
+
+- files: ["ocean.png", "ocean_overlay.png", "ocean_overlay2.png"]
+  license: "CC0-1.0"
+  copyright: "Created by TheShuEd"
+  source: "https://github.com/space-syndicate/space-station-14/pull/1938"