some tweaks

2024-08-04 16:51:26 +03:00
parent aeb3b17c50
commit d5094b2f8c
7 changed files with 27 additions and 100 deletions
--- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl
+++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl
@@ -12,4 +12,6 @@ cp14-loadout-basic-shoes = Shoes
 # Org

 cp14-loadout-captain-cloak = Captain's cloak
-cp14-loadout-captain-head = Captain's head
+cp14-loadout-captain-head = Captain's head
+
+cp14-loadout-guard-commander-cloak = Guard commander's cloak
--- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl
+++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl
@@ -11,4 +11,7 @@ cp14-loadout-basic-shoes = Обувь

 # Org

-cp14-loadout-captain-cloak = Капитанская накидка
+cp14-loadout-captain-cloak = Капитанская накидка
+cp14-loadout-captain-head = Капитанская шляпа
+
+cp14-loadout-guard-commander-cloak = Накидка командира стражи
--- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml
@@ -220,99 +220,6 @@
      - id: CP14SilverCoin5
        prob: 0.2
        onGroup: Currency
-      - id: CP14ClothingCloakArmoredRed
-        prob: 0.3
-        onGroup: Cloth
-      - id: CP14ClothingCloakBlacksmithArpon
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingCloakFurcapeBlack
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingCloakFurcapeBlue
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingCloakSimpleWhite
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingCloakSimpleDarkBlue
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingEyesMonocle
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingEyesGlasses
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingEyesAlchemyGlasses
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingEyesAlchemyMonocle
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingEyesThaumaturgyGlasses
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingGlovesGirdles
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingHeadMetalHeadband
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingHeadTriangularHat
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingHeadTriangularHatGolden
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingHeadRedBeret
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingHeadPurpleBeret
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingHeadYellowBeret
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingHeadBlueBeret
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingHeadBlackBeret
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingPantsTrouserWhite
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingPantsTrouserDarkBlue
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingPantsAristocratic
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingPantsLoincloth
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingShirtCottonBlue
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingShirtCottonBlack
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingShirtCottonPurple
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingShirtCottonRed
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingShirtCottonWhite
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingShirtCottonYellow
-        prob: 0.2
-        onGroup: Cloth
-      - id: CP14ClothingShirtSteampunk
-        prob: 0.2
-        onGroup: Cloth
      - id: CP14DirtBlock10
        prob: 0.2
        onGroup: Material
@@ -388,7 +295,7 @@
  id: CP14SmallWoodenCrateFilled
  parent: 
  - CP14SmallWoodenCrate
-  #- BRFilledTemp
+  - BRFilledTemp
  suffix: Filled, Battleroyale

 - type: entity
@@ -396,4 +303,4 @@
  suffix: Filled, Battleroyale
  parent: 
  - CP14LargeWoodenCrate
-  #- BRFilledTemp
+  - BRFilledTemp
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guard_commander.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guard_commander.yml
@@ -0,0 +1,10 @@
+
+# Cloak
+- type: loadout
+  id: CP14ClothingCloakArmoredRed
+  equipment: CP14ClothingCloakArmoredRed
+
+- type: startingGear
+  id: CP14ClothingCloakArmoredRed
+  equipment:
+    cloak: CP14ClothingCloakArmoredRed
--- a/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml
@@ -90,3 +90,9 @@
  name: cp14-loadout-captain-cloak
  loadouts:
  - CP14ClothingCloakCaptainJacket
+
+- type: loadoutGroup
+  id: CP14GuardCommanderCloak
+  name: cp14-loadout-guard-commander-cloak
+  loadouts:
+  - CP14ClothingCloakArmoredRed
--- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
@@ -52,7 +52,7 @@
  - CP14BasicHead
  - CP14BasicEyes
  - CP14BasicMask
-  - CP14CaptainCloak
+  - CP14GuardCommanderCloak
  - CP14BasicGloves
  - CP14BasicShirt
  - CP14BasicPants
--- a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml
+++ b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml
@@ -169,7 +169,7 @@
      entities:
        - CP14GatherableWildSage
    - !type:BiomeEntityLayer # Mobs and aura
-      threshold: 0.7
+      threshold: 0.8
      noise:
        seed: 8
        noiseType: OpenSimplex2
@@ -183,7 +183,6 @@
      allowedTiles:
        - CP14FloorGrass
      entities:
-        - CP14ConstrainedSpawnerXeno
        - CP14AuraNodeBase

 # Подбиомы лугов