part of fixes

2025-05-23 14:57:20 +03:00
parent 3a9e6dc409
commit 8e7f68c062
9 changed files with 17 additions and 221 deletions
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml
@@ -1,72 +0,0 @@
- type: constructionGraph
-  id: CP14Curtains
-  start: start
-  graph:
-    - node: start
-      actions:
-        - !type:DestroyEntity {}
-      edges:
-        - to: CP14CurtainsWhite
-          steps:
-            - stackGroup: WoodenPlanks
-              amount: 1
-              doAfter: 2
-            - material: CP14Cloth
-              amount: 2
-              doAfter: 1
-
-    - node: CP14CurtainsWhite
-      entity: CP14CurtainsWhite
-      edges:
-        - to: start
-          completed:
-            - !type:SpawnPrototype
-              prototype: CP14WoodenPlanks1
-              amount: 1
-            - !type:SpawnPrototype
-              prototype: CP14Cloth1
-              amount: 2
-            - !type:DeleteEntity {}
-          steps:
-            - tool: Prying #TODO - new tool
-              doAfter: 1
-        - to: CP14CurtainsBlue
-          steps:
-            - tag: CP14DyeBlue
-              name: blue dye
-              icon:
-                sprite: _CP14/Objects/Materials/dye.rsi
-                state: powder
-              doAfter: 1
-        - to: CP14CurtainsRed
-          steps:
-            - tag: CP14DyeRed
-              name: red dye
-              icon:
-                sprite: _CP14/Objects/Materials/dye.rsi
-                state: powder
-              doAfter: 1
-              
-    - node: CP14CurtainsBlue
-      entity: CP14CurtainsBlue
-      edges:
-        - to: CP14CurtainsWhite
-          completed:
-            - !type:SpawnPrototype
-              prototype: CP14DyeBlue
-              amount: 1
-          steps:
-            - tool: Prying #TODO - new tool
-              doAfter: 1
-
-    - node: CP14CurtainsRed
-      entity: CP14CurtainsRed
-      edges:
-        - to: CP14CurtainsWhite
-          completed:
-            - !type:SpawnPrototype
-              prototype: CP14DyeRed
-              amount: 1
-          steps:
-            - tool: Prying #TODO - new tool
-              doAfter: 1
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml
@@ -27,12 +27,6 @@
            - stackGroup: WoodenPlanks
              amount: 3
              doAfter: 1
-            - tag: CP14DyeRed
-              name: red dye
-              icon:
-                sprite: _CP14/Objects/Materials/dye.rsi
-                state: powder
-              doAfter: 0.5
            - tool: CP14Hammering
              doAfter: 1
              
@@ -62,16 +56,5 @@
              amount: 5
            - material: CP14Cloth
              amount: 2
-            - tag: CP14DyeRed
-              name: red dye
-              icon:
-                sprite: _CP14/Objects/Materials/dye.rsi
-                state: powder
-            - tag: CP14Wheat
-              name: wheat bushel
-              icon:
-                sprite: _CP14/Objects/Flora/Farm/wheat.rsi
-                state: base1
-              doAfter: 4
    - node: CP14targetEffigy
      entity: CP14TargetEffigy
--- a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
@@ -147,48 +147,6 @@
  conditions:
    - !type:TileNotBlocked

- type: construction
-  crystallPunkAllowed: true
-  id: CP14CurtainsWhite
-  graph: CP14Curtains
-  startNode: start
-  targetNode: CP14CurtainsWhite
-  category: construction-category-furniture
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canRotate: true
-  canBuildInImpassable: false
-  conditions:
-    - !type:EmptyOrWindowValidInTile 
-
- type: construction
-  crystallPunkAllowed: true
-  id: CP14CurtainsBlue
-  graph: CP14Curtains
-  startNode: start
-  targetNode: CP14CurtainsBlue
-  category: construction-category-furniture
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canRotate: true
-  canBuildInImpassable: false
-  conditions:
-    - !type:EmptyOrWindowValidInTile 
-
- type: construction
-  crystallPunkAllowed: true
-  id: CP14CurtainsRed
-  graph: CP14Curtains
-  startNode: start
-  targetNode: CP14CurtainsRed
-  category: construction-category-furniture
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canRotate: true
-  canBuildInImpassable: false
-  conditions:
-    - !type:EmptyOrWindowValidInTile 
-
 - type: construction
  crystallPunkAllowed: true
  id: CP14WoodenCloset
--- a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/head_wreath.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/head_wreath.yml
@@ -1,22 +0,0 @@
- type: constructionGraph
-  id: CP14HeadWreath
-  start: start
-  graph:
-  - node: start
-    edges:
-    - to: cp14headwreath
-      steps:
-      - tag: CP14BloodFlower
-        name: blood rose
-        icon:
-          sprite: _CP14/Objects/Flora/Wild/red_rose.rsi
-          state: base1
-      - tag: CP14Dayflin
-        name: yellow dayflin
-        icon:
-          sprite: _CP14/Objects/Flora/Wild/yellow_dayflin.rsi
-          state: base1
-        doAfter: 2
-
-  - node: cp14headwreath
-    entity: CP14ClothingHeadWreath
--- a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/straw_hat.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/straw_hat.yml
@@ -1,17 +0,0 @@
- type: constructionGraph
-  id: CP14StrawHat
-  start: start
-  graph:
-  - node: start
-    edges:
-    - to: cp14headstrawhat
-      steps:
-      - tag: CP14Wheat
-        name: wheat
-        icon:
-          sprite: _CP14/Objects/Flora/Farm/wheat.rsi
-          state: base1
-        doAfter: 4
-
-  - node: cp14headstrawhat
-    entity: CP14ClothingHeadStrawHat
--- a/Resources/Prototypes/_CP14/Recipes/Crafting/clothing.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Crafting/clothing.yml
@@ -1,27 +0,0 @@
- type: construction
-  crystallPunkAllowed: true
-  name: floral wreath
-  id: cp14headwreath
-  graph: CP14HeadWreath
-  startNode: start
-  targetNode: cp14headwreath
-  category: construction-category-clothing
-  objectType: Item
-  description: A simple flower decoration. That's so sweet.
-  icon:
-    sprite: _CP14/Clothing/Head/Produced/wreath.rsi
-    state: icon
-
- type: construction
-  crystallPunkAllowed: true
-  name: straw hat
-  id: cp14headstrawhat
-  graph: CP14StrawHat
-  startNode: start
-  targetNode: cp14headstrawhat
-  category: construction-category-clothing
-  objectType: Item
-  description: Easy to make, not too bad to lose.
-  icon:
-    sprite: _CP14/Clothing/Head/Roles/General/straw_hat.rsi
-    state: icon
--- a/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml
@@ -1,41 +1,35 @@
 - type: construction
  crystallPunkAllowed: true
-  name: herbal bandage
  id: cp14herbbandage
  graph: CP14HerbBandage
  startNode: start
  targetNode: cp14herbbandage
  category: construction-category-tools
  objectType: Item
-  description: I'm surprised it can help at all.
  icon:
    sprite: _CP14/Objects/Specific/Medical/medical.rsi
    state: herbbandage

 - type: construction
  crystallPunkAllowed: true
-  name: gauze
  id: cp14gauze
  graph: CP14Gauze
  startNode: start
  targetNode: cp14gauze
  category: construction-category-tools
  objectType: Item
-  description: Last chance not to bleed out.
  icon:
    sprite: _CP14/Objects/Specific/Medical/medical.rsi
    state: bandage

 - type: construction
  crystallPunkAllowed: true
-  name: torch
  id: cp14torch
  graph: CP14Torch
  startNode: start
  targetNode: cp14torch
  category: construction-category-tools
  objectType: Item
-  description: If darkness has become a nuisance, a good method is to lighten it up.
  icon:
    sprite: _CP14/Objects/Tools/torch.rsi
    state: torch-unlit
--- a/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml
@@ -1,104 +1,104 @@
 - type: stack
  id: CP14FloorTileFoundation
-  name: foundation
+  name: cp14-tiles-foundation
  spawn: CP14FloorTileFoundation
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: foundation }
  maxCount: 30

 - type: stack
  id: CP14FloorTileMarbleBrick
-  name: marble brick
+  name: cp14-tiles-stonebricks-marble
  spawn: CP14FloorTileMarbleBrick
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble }
  maxCount: 30

 - type: stack
  id: CP14FloorTileMarbleSmallbricks
-  name: marble small brick
+  name: cp14-tiles-stonebricks-marble
  spawn: CP14FloorTileMarbleSmallbricks
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble_smallbricks }
  maxCount: 30

 - type: stack
  id: CP14FloorTileOakWoodplanks
-  name: oak woodplanks
+  name: cp14-tiles-oak-woodplanks
  spawn: CP14FloorTileOakWoodplanks
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: oak_woodplanks }
  maxCount: 30

 - type: stack
  id: CP14FloorTileOakWoodplanksBig
-  name: oak big woodplanks
+  name: cp14-tiles-oak-woodplanks-big
  spawn: CP14FloorTileOakWoodplanksBig
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: oak_woodplanks_big }
  maxCount: 30

 - type: stack
  id: CP14FloorTileOakWoodplanksCruciform
-  name: oak cruciform woodplanks
+  name: cp14-tiles-oak-woodplanks-cruciform
  spawn: CP14FloorTileOakWoodplanksCruciform
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: oak_woodplanks_cruciform }
  maxCount: 30

 - type: stack
  id: CP14FloorTileOakWoodplanksStairs
-  name: oak stairs woodplanks
+  name: cp14-tiles-oak-woodplanks-stairways
  spawn: CP14FloorTileOakWoodplanksStairs
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: oak_woodplanks_stairways }
  maxCount: 30

 - type: stack
  id: CP14FloorTileStonebricks
-  name: stonebricks
+  name: cp14-tiles-stonebricks
  spawn: CP14FloorTileStonebricks
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: stonebrick }
  maxCount: 30

 - type: stack
  id: CP14FloorTileStonebricksSmallCarved
-  name: small carved stonebricks
+  name: cp14-tiles-stonebricks-small-carved1
  spawn: CP14FloorTileStonebricksSmallCarved
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: stonebrick_small_carved }
  maxCount: 30

 - type: stack
  id: CP14FloorTileStonebricksSmallCarved2
-  name: small carved stonebricks 2
+  name: cp14-tiles-stonebricks-small-carved2
  spawn: CP14FloorTileStonebricksSmallCarved2
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: stonebrick_small_carved2 }
  maxCount: 30

 - type: stack
  id: CP14FloorTileStonebricksSquareCarved
-  name: square carved stonebricks
+  name: cp14-tiles-stonebricks-square-carved
  spawn: CP14FloorTileStonebricksSquareCarved
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: stonebrick_square_carved }
  maxCount: 30

 - type: stack
  id: CP14FloorTileBirchWoodplanks
-  name: birch woodplanks
+  name: cp14-tiles-birch-woodplanks
  spawn: CP14FloorTileOakWoodplanks
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks }
  maxCount: 30

 - type: stack
  id: CP14FloorTileBirchWoodplanksBig
-  name: birch big woodplanks
+  name: cp14-tiles-birch-woodplanks-big
  spawn: CP14FloorTileBirchWoodplanksBig
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks_big }
  maxCount: 30

 - type: stack
  id: CP14FloorTileBirchWoodplanksCruciform
-  name: birch cruciform woodplanks
+  name: cp14-tiles-birch-woodplanks-cruciform
  spawn: CP14FloorTileBirchWoodplanksCruciform
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks_cruciform }
  maxCount: 30

 - type: stack
  id: CP14FloorTileBirchWoodplanksStairs
-  name: birch stairs woodplanks
+  name: cp14-tiles-birch-woodplanks-stairways
  spawn: CP14FloorTileBirchWoodplanksStairs
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks_stairways }
  maxCount: 30
--- a/Resources/Prototypes/_CP14/Tiles/natural.yml
+++ b/Resources/Prototypes/_CP14/Tiles/natural.yml
@@ -339,7 +339,6 @@
  baseTurf: CP14FloorBase
  isSubfloor: false
  heatCapacity: 10000
-  mobFriction: 0.5
-  mobFrictionNoInput: 0.05
-  mobAcceleration: 2
+  friction: 0.05
+  mobAcceleration: 0.1
  weather: true