Back to Ru CBT + Bugfixes (#1065)

* Update Dev.toml

* fix #1059

* fix #1061

* fix #1060

* fix #1058

Resources/ConfigPresets/_CP14/Dev.toml

@@ -1,5 +1,5 @@
 [whitelist]
-enabled = false
+enabled = true
 
 [log]
 path = "logs"
@@ -14,7 +14,7 @@ bindto = "::,0.0.0.0"
 max_connections = 100
 
 [game]
-hostname = "⚔️  CrystallEdge [RU] ⚔️ Status: Открытое тестирование"
+hostname = "⚔️  CrystallEdge [RU] ⚔️ Status: Whitelist only"
 desc = "History of the City of Sword and Magic. A social economic sandbox reinventing the Space Station 14 concept in fantasy style"
 lobbyenabled = true
 soft_max_players = 40
@@ -61,4 +61,4 @@ enable_during_round = true
 
 [cp14]
 discord_auth_enabled = true
-closet_beta_test = false
+closet_beta_test = true

Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl

@@ -1,8 +1,2 @@
 cp14-ghost-role-information-name-skeleton = Undead skeleton
-cp14-ghost-role-information-name-skeleton-sword = Undead skeleton (swordsman)
-cp14-ghost-role-information-name-skeleton-halberd = Undead skeleton (halberdier)
-cp14-ghost-role-information-name-skeleton-archer = Undead skeleton (archer)
-cp14-ghost-role-information-name-skeleton-dodger = Undead skeleton (dodger)
-cp14-ghost-role-information-name-skeleton-wizard = Undead skeleton (wizard)
-cp14-ghost-role-information-name-skeleton-bard = Undead skeleton (bard)
 cp14-ghost-role-information-description-skeleton = The spawn of necromancy, putting a living soul into dead bones. Often such souls are controlled by the necromancer, doing his bidding.

Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl

@@ -1,8 +1,2 @@
 cp14-ghost-role-information-name-skeleton = Оживленный скелет
-cp14-ghost-role-information-name-skeleton-sword = Оживленный скелет (мечник)
-cp14-ghost-role-information-name-skeleton-halberd = Оживленный скелет (алебардщик)
-cp14-ghost-role-information-name-skeleton-archer = Оживленный скелет (лучник)
-cp14-ghost-role-information-name-skeleton-dodger = Оживленный скелет (кинжал)
-cp14-ghost-role-information-name-skeleton-wizard = Оживленный скелет (маг)
-cp14-ghost-role-information-name-skeleton-bard = Оживленный скелет (бард)
 cp14-ghost-role-information-description-skeleton = Порождение некромантии, вселившее живую душу в мертвые кости. Часто такие души контролируются некромантом, исполняя его волю.

Resources/Maps/_CP14/comoss.yml

@@ -63,6 +63,11 @@ entities:
       data: {}
     - type: BecomesStation
       id: Comoss
+    - type: CP14WeatherController
+      entries:
+      - visuals: CP14Mist
+      - visuals: CP14Rain
+      - visuals: CP14Storm
     - type: LightCycle
     - type: SunShadow
     - type: SunShadowCycle

Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/base.yml

@@ -40,7 +40,6 @@
         - MobMask
         layer:
         - MobLayer
-        - ItemMask
   - type: NpcFactionMember
     factions:
     - CP14Monster

Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml

@@ -134,7 +134,7 @@
   parent: MarkerBase
   components:
   - type: GhostRole
-    name: cp14-ghost-role-information-name-skeleton-halberd
+    name: cp14-ghost-role-information-name-skeleton
     allowMovement: true
     description: cp14-ghost-role-information-description-skeleton
     rules: cp14-ghost-role-information-rules-demiplane
@@ -162,7 +162,7 @@
   - type: GhostRoleMobSpawner
     prototype: CP14MobUndeadSkeletonSword
   - type: GhostRole
-    name: cp14-ghost-role-information-name-skeleton-sword
+    name: cp14-ghost-role-information-name-skeleton
 
 - type: entity
   id: SpawnPointGhostDemiplaneSkeletonDodger
@@ -175,7 +175,7 @@
   - type: GhostRoleMobSpawner
     prototype: CP14MobUndeadSkeletonDodger
   - type: GhostRole
-    name: cp14-ghost-role-information-name-skeleton-dodger
+    name: cp14-ghost-role-information-name-skeleton
 
 - type: entity
   id: SpawnPointGhostDemiplaneSkeletonArcher
@@ -188,7 +188,7 @@
   - type: GhostRoleMobSpawner
     prototype: CP14MobUndeadSkeletonArcher
   - type: GhostRole
-    name: cp14-ghost-role-information-name-skeleton-archer
+    name: cp14-ghost-role-information-name-skeleton
 
 - type: entity
   id: SpawnPointGhostDemiplaneSkeletonWizard
@@ -201,7 +201,7 @@
   - type: GhostRoleMobSpawner
     prototype: CP14MobUndeadSkeletonWizard
   - type: GhostRole
-    name: cp14-ghost-role-information-name-skeleton-wizard
+    name: cp14-ghost-role-information-name-skeleton
 
 - type: entity
   id: SpawnPointGhostDemiplaneSkeletonBard
@@ -214,4 +214,4 @@
   - type: GhostRoleMobSpawner
     prototype: CP14MobUndeadSkeletonBard
   - type: GhostRole
-    name: cp14-ghost-role-information-name-skeleton-bard
+    name: cp14-ghost-role-information-name-skeleton

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml

@@ -15,7 +15,7 @@
     ambientLightColor: "#BFEEFFFF"
   - type: CP14CloudShadows
   - type: Biome
-    template: CP14IceOceanFill
+    template: CP14SandOceanFill
   - type: SunShadow
   - type: SunShadowCycle
   - type: Roof

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_grass_geode.yml

@@ -11,6 +11,9 @@
   - CP14DemiplaneUnderground
   - CP14DemiplaneWater
   - CP14DemiplaneAnimalsSwamp
+  components:
+  - type: Biome
+    template: CP14CavesIndestructibleFill
 
 - type: dungeonConfig
   id: CP14DemiplaneSwampGeode