From a1153843a2294154664cfcdd75b08d7d3089f845 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 26 Apr 2025 17:20:52 +0300 Subject: [PATCH] Storage durability rebalance + Fuck nails (#1225) * fix storage * bye nails * Update target.yml * f * Update migration.yml * Update migration.yml --- .../SharedEntityStorageComponent.cs | 2 +- .../en-US/_CP14/materials/materials.ftl | 1 - .../Locale/en-US/_CP14/stack/materials.ftl | 1 - .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 12 --- .../ru-RU/_CP14/materials/materials.ftl | 1 - .../Locale/ru-RU/_CP14/stack/materials.ftl | 1 - .../Prototypes/_CP14/Catalog/Fills/crates.yml | 1 - .../Clothing/Cloak/Roles/blacksmith.yml | 1 - .../Entities/Objects/Materials/simple.yml | 79 ------------------ .../Structures/Storage/Crates/base_chest.yml | 14 ---- .../Structures/Storage/Crates/chests.yml | 79 +++--------------- .../Structures/Storage/Crates/coffin.yml | 16 ++-- .../Structures/Storage/Crates/crates.yml | 53 ++---------- .../Prototypes/_CP14/Materials/simple.yml | 9 -- .../Graphs/Furniture/cabinets.yml | 5 -- .../Construction/Graphs/Furniture/closets.yml | 2 - .../Graphs/Furniture/curtains.yml | 6 -- .../Construction/Graphs/Misc/target.yml | 3 - .../Construction/Graphs/Storage/barrels.yml | 9 -- .../Construction/Graphs/Storage/chests.yml | 30 ++++--- .../Construction/Graphs/Storage/coffins.yml | 23 +++-- .../Construction/Graphs/Storage/crates.yml | 30 +++++-- .../Graphs/Structures/Doors/iron_doors.yml | 6 -- .../Recipes/Workbench/Workbench/misc.yml | 3 - .../Prototypes/_CP14/Stacks/materials.yml | 7 -- Resources/Prototypes/_CP14/tags.yml | 3 - .../Objects/Materials/nails.rsi/meta.json | 20 ----- .../Objects/Materials/nails.rsi/nail.png | Bin 315 -> 0 bytes .../Objects/Materials/nails.rsi/nail_2.png | Bin 402 -> 0 bytes .../Objects/Materials/nails.rsi/nail_3.png | Bin 491 -> 0 bytes Resources/migration.yml | 5 +- 31 files changed, 83 insertions(+), 339 deletions(-) delete mode 100644 Resources/Textures/_CP14/Objects/Materials/nails.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Objects/Materials/nails.rsi/nail.png delete mode 100644 Resources/Textures/_CP14/Objects/Materials/nails.rsi/nail_2.png delete mode 100644 Resources/Textures/_CP14/Objects/Materials/nails.rsi/nail_3.png diff --git a/Content.Shared/Storage/Components/SharedEntityStorageComponent.cs b/Content.Shared/Storage/Components/SharedEntityStorageComponent.cs index 4100449f4e..fe04d5e9ca 100644 --- a/Content.Shared/Storage/Components/SharedEntityStorageComponent.cs +++ b/Content.Shared/Storage/Components/SharedEntityStorageComponent.cs @@ -86,7 +86,7 @@ public abstract partial class SharedEntityStorageComponent : Component /// Whether or not the container is sealed and traps air inside of it /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public bool Airtight = true; + public bool Airtight = false; //CP14 false - bandaid fix: dont work with MapAtmosphere /// /// Whether or not the entitystorage is open or closed diff --git a/Resources/Locale/en-US/_CP14/materials/materials.ftl b/Resources/Locale/en-US/_CP14/materials/materials.ftl index a50d8d7177..195e227c13 100644 --- a/Resources/Locale/en-US/_CP14/materials/materials.ftl +++ b/Resources/Locale/en-US/_CP14/materials/materials.ftl @@ -3,7 +3,6 @@ cp14-material-examine = Consists of materials: cp14-material-wooden-planks = wooden planks cp14-material-dirt-block = dirt cp14-material-stone-block = stone -cp14-material-nail = nails cp14-material-cloth = cloth cp14-material-copper = copper cp14-material-iron = iron diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index 6d79da02fb..e33412b8f8 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -3,7 +3,6 @@ cp14-stack-stone-block = stone blocks cp14-stack-marble-block = marble rocks cp14-stack-wood-planks = oak planks cp14-stack-wood-planks-birch = birch planks -cp14-stack-nails = nails cp14-stack-cloth = rolls of fabric cp14-stack-flora = tufts of grass cp14-stack-compost = compost piles diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 48402982ce..56217d580f 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -2166,18 +2166,6 @@ ent-CP14LucensWoodenPlanks20 = { ent-CP14LucensWoodenPlanks1 } .desc = { ent-CP14LucensWoodenPlanks1.desc } .suffix = 20 -ent-CP14Nail1 = гвозди - .desc = Основной столярный инструмент, позволяющий делать с деревом невообразимые вещи. - .suffix = 1 - -ent-CP14Nail20 = { ent-CP14Nail1 } - .desc = { ent-CP14Nail1.desc } - .suffix = 20 - -ent-CP14Nail50 = { ent-CP14Nail1 } - .desc = { ent-CP14Nail1.desc } - .suffix = 50 - ent-CP14String = нитки .desc = Тонкая нить. Материал для починки одежды или пошива новой. diff --git a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl index 8531c12330..d2c4acdccc 100644 --- a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl @@ -3,7 +3,6 @@ cp14-material-examine = Состоит из материалов: cp14-material-wooden-planks = деревянные доски cp14-material-dirt-block = земля cp14-material-stone-block = камень -cp14-material-nail = гвозди cp14-material-cloth = ткань cp14-material-copper = медь cp14-material-iron = железо diff --git a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl index 16f7cbb2cf..c5074780fa 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -3,7 +3,6 @@ cp14-stack-stone-block = каменные блоки cp14-stack-marble-block = мраморные камни cp14-stack-wood-planks = дубовые доски cp14-stack-wood-planks-birch = березовые доски -cp14-stack-nails = гвозди cp14-stack-cloth = рулоны ткани cp14-stack-flora = пучки травы cp14-stack-compost = кучи компоста diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 4dcbb0dade..a4c7a4bad9 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -75,7 +75,6 @@ - id: CP14CrystalLampBlueEmpty - id: CP14CrystalLampOrangeEmpty - id: CP14Rope - - id: CP14Nail20 - id: CP14EnergyCrystalSmall - id: CP14d20Dice - id: CP14d6Dice diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml index b8edd982c6..3b18a1176c 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml @@ -25,4 +25,3 @@ - CP14Lighter - CP14Scissors - CP14SharpeningStone - - CP14Nail diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml index 75c4c13109..1fe3c18135 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -1,82 +1,3 @@ -- type: entity - id: CP14Nail1 - parent: BaseItem - name: nails - suffix: 1 - description: A basic carpenter's tool that allows you to do unimaginable things with wood. - categories: [ ForkFiltered ] - components: - - type: Item - size: Tiny - - type: Sprite - noRot: true - sprite: _CP14/Objects/Materials/nails.rsi - layers: - - state: nail - map: ["base"] - - type: Appearance - - type: Stack - stackType: CP14Nail - count: 1 - baseLayer: base - layerStates: - - nail - - nail_2 - - nail_3 - - type: Material - - type: PhysicalComposition # точно ли это нужно? - materialComposition: - CP14Nail: 100 - - type: Fixtures - fixtures: - slips: - shape: - !type:PhysShapeAabb - bounds: "-0.2,-0.2,0.2,0.2" - hard: false - layer: - - LowImpassable - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.2,-0.2,0.2,0.2" - density: 30 - mask: - - ItemMask - - type: CollisionWake - enabled: false - - type: StepTrigger - intersectRatio: 0.2 - - type: TriggerOnStepTrigger - - type: PreventableStepTrigger - - type: DamageUserOnTrigger - damage: - types: - Piercing: 5 - - type: Slippery - slipSound: - path: /Audio/Effects/weak_hit2.ogg - launchForwardsMultiplier: 0 - - type: Tag - tags: - - CP14Nail - -- type: entity - id: CP14Nail20 - parent: CP14Nail1 - suffix: 20 - components: - - type: Stack - count: 20 - -- type: entity - id: CP14Nail50 - parent: CP14Nail1 - suffix: 50 - components: - - type: Stack - count: 50 - - type: entity id: CP14String parent: BaseItem diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml index e2f6379861..856c2da767 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml @@ -35,20 +35,6 @@ - type: EntityStorage - type: PlaceableSurface isPlaceable: false # defaults to closed. - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - type: Appearance - type: EntityStorageVisuals stateDoorOpen: open diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml index d564edc721..c3eac68da9 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml @@ -1,52 +1,3 @@ -- type: entity - parent: - - BaseStructureDynamic - - CP14BaseFlammable - categories: [ ForkFiltered ] - id: CP14WoodenChestFrame - name: wooden chest frame - description: Base for any wooden chest - components: - - type: Icon - sprite: _CP14/Structures/Storage/Crates/chest.rsi - state: base - - type: Sprite - sprite: _CP14/Structures/Storage/Crates/chest.rsi - noRot: true - state: base - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:SpawnEntitiesBehavior - spawn: - CP14WoodenPlanks1: - min: 1 - max: 2 - - type: Construction - graph: CP14WoodenChest - node: CP14WoodenChestFrame - - type: entity parent: - CP14ChestGeneric @@ -66,34 +17,24 @@ - state: closed map: ["enum.StorageVisualLayers.Door"] - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood + damageContainer: StructuralInorganic + damageModifierSet: CP14WoodStructural - type: Destructible thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - trigger: !type:DamageTrigger - damage: 150 + damage: 50 behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - !type:SpawnEntitiesBehavior spawn: CP14WoodenPlanks1: - min: 2 - max: 3 + min: 1 + max: 2 + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: [ "Destruction" ] - type: EntityStorage closeSound: path: /Audio/Effects/woodenclosetclose.ogg diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml index 46cfee65bc..4690ca2bd7 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml @@ -18,22 +18,22 @@ sprite: _CP14/Structures/Storage/Crates/coffin.rsi state: base - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood + damageContainer: StructuralInorganic + damageModifierSet: CP14WoodStructural - type: Destructible thresholds: - trigger: !type:DamageTrigger - damage: 15 + damage: 50 behaviors: - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - !type:SpawnEntitiesBehavior spawn: CP14WoodenPlanks1: - min: 2 - max: 3 + min: 1 + max: 2 + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy - !type:DoActsBehavior acts: [ "Destruction" ] - type: Construction diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml index d4587f4a1d..88e871d185 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml @@ -5,29 +5,6 @@ categories: [ ForkFiltered ] components: - type: InteractionOutline - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:EmptyAllContainersBehaviour - - !type:SpawnEntitiesBehavior - spawn: - CP14WoodenPlanks1: - min: 1 - max: 2 - - !type:DoActsBehavior - acts: [ "Destruction" ] - type: Climbable - type: Sprite noRot: true @@ -88,26 +65,6 @@ grid: - 0,0,5,5 maxItemSize: Normal - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 70 - behaviors: - - !type:EmptyAllContainersBehaviour - - !type:SpawnEntitiesBehavior - spawn: - CP14WoodenPlanks1: - min: 1 - max: 2 - - !type:DoActsBehavior - acts: [ "Destruction" ] - type: entity id: CP14LargeWoodenCrate @@ -126,7 +83,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 75 + damage: 50 behaviors: - !type:PlaySoundBehavior sound: @@ -134,8 +91,8 @@ - !type:SpawnEntitiesBehavior spawn: CP14WoodenPlanks1: - min: 2 - max: 4 + min: 1 + max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] - type: Construction @@ -159,7 +116,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 50 + damage: 30 behaviors: - !type:PlaySoundBehavior sound: @@ -168,7 +125,7 @@ spawn: CP14WoodenPlanks1: min: 1 - max: 2 + max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - type: Construction diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml index 180c7faed6..b50a476edb 100644 --- a/Resources/Prototypes/_CP14/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Materials/simple.yml @@ -34,15 +34,6 @@ color: "#555963" price: 0 -- type: material - id: CP14Nail - stackEntity: CP14Nail1 - name: cp14-material-nail - unit: materials-unit-piece - icon: { sprite: _CP14/Objects/Materials/nails.rsi, state: nail_2 } - color: "#555963" - price: 0 - - type: material id: CP14Cloth stackEntity: CP14Cloth1 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml index e58ca892b7..10e3b1e49e 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml @@ -10,8 +10,6 @@ steps: - stackGroup: WoodenPlanks amount: 3 - - material: CP14Nail - amount: 2 - node: CP14WoodenCabinet entity: CP14WoodenCabinet @@ -27,8 +25,5 @@ steps: - material: CP14IronBar amount: 3 - - material: CP14Nail - amount: 2 - doAfter: 4 - node: CP14IronCabinet entity: CP14IronCabinet diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml index d2ef73b335..9521828bf7 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml @@ -10,7 +10,5 @@ steps: - stackGroup: WoodenPlanks amount: 4 - - material: CP14Nail - amount: 2 - node: CP14WoodenCloset entity: CP14WoodenCloset diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml index e9aef0720a..6fb47c415f 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml @@ -11,9 +11,6 @@ - stackGroup: WoodenPlanks amount: 1 doAfter: 2 - - material: CP14Nail - amount: 4 - doAfter: 1 - material: CP14Cloth amount: 2 doAfter: 1 @@ -26,9 +23,6 @@ - !type:SpawnPrototype prototype: CP14WoodenPlanks1 amount: 1 - - !type:SpawnPrototype - prototype: CP14Nail1 - amount: 4 - !type:SpawnPrototype prototype: CP14Cloth1 amount: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml index cc5d94563b..cbbb52579f 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml @@ -27,9 +27,6 @@ - stackGroup: WoodenPlanks amount: 3 doAfter: 1 - - material: CP14Nail - amount: 1 - doAfter: 1 - tag: CP14DyeRed name: red dye icon: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml index 699b9ab35d..28a9400dfd 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml @@ -11,9 +11,6 @@ - stackGroup: WoodenPlanks amount: 5 doAfter: 3 - - material: CP14Nail - amount: 2 - doAfter: 2 - node: CP14BaseBarrel entity: CP14BaseBarrel @@ -30,9 +27,6 @@ - stackGroup: WoodenPlanks amount: 5 doAfter: 3 - - material: CP14Nail - amount: 2 - doAfter: 2 - node: CP14CraneBarrel entity: CP14CraneBarrel @@ -49,8 +43,5 @@ - stackGroup: WoodenPlanks amount: 3 doAfter: 3 - - material: CP14Nail - amount: 2 - doAfter: 2 - node: CP14CraneBarrelSmall entity: CP14CraneBarrelSmall \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml index f11ba020a8..5feaac7487 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml @@ -6,25 +6,23 @@ actions: - !type:DestroyEntity {} edges: - - to: CP14WoodenChestFrame + - to: CP14WoodenChest steps: - - stackGroup: WoodenPlanks + - material: CP14WoodenPlanks amount: 2 doAfter: 2 - - node: CP14WoodenChestFrame - entity: CP14WoodenChestFrame - edges: - - to: CP14WoodenChest - steps: - - stackGroup: WoodenPlanks - amount: 2 - doAfter: 2 - - material: CP14Nail - amount: 1 - doAfter: 1 - - tool: CP14Hammering - doAfter: 2 - - node: CP14WoodenChest entity: CP14WoodenChest + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 2 + conditions: + - !type:Locked + locked: false + steps: + - tool: Prying + doAfter: 4 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml index b7a34df729..f980e2f899 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml @@ -3,17 +3,30 @@ start: start graph: - node: start + actions: + - !type:DestroyEntity {} edges: - to: CP14CrateCoffin completed: - !type:SnapToGrid steps: - - stackGroup: WoodenPlanks - amount: 3 + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 - material: CP14Cloth amount: 2 - - material: CP14Nail - amount: 1 - doAfter: 4 + doAfter: 2 - node: CP14CrateCoffin entity: CP14CrateCoffin + edges: + - to: start + steps: + - tool: Prying + doAfter: 2 + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 2 + - !type:SpawnPrototype + prototype: CP14Cloth1 + amount: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml index 611c3c4dca..bbf002b05f 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml @@ -3,33 +3,49 @@ start: start graph: - node: start + actions: + - !type:DestroyEntity {} edges: - to: CP14SmallWoodenCrate completed: - !type:SnapToGrid steps: - stackGroup: WoodenPlanks - amount: 2 - - material: CP14Nail amount: 1 - doAfter: 4 - node: CP14SmallWoodenCrate entity: CP14SmallWoodenCrate + edges: + - to: start + steps: + - tool: Prying + doAfter: 2 + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 1 - type: constructionGraph id: CP14LargeWoodenCrate start: start graph: - node: start + actions: + - !type:DestroyEntity {} edges: - to: CP14LargeWoodenCrate completed: - !type:SnapToGrid steps: - stackGroup: WoodenPlanks - amount: 4 - - material: CP14Nail amount: 2 - doAfter: 4 - node: CP14LargeWoodenCrate - entity: CP14LargeWoodenCrate + entity: CP14LargeWoodenCrate + edges: + - to: start + steps: + - tool: Prying + doAfter: 2 + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml index d854572540..ae0db8bbc5 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml @@ -35,9 +35,6 @@ doAfter: 2 - to: CP14IronDoorWindowed steps: - - material: CP14Nail - amount: 1 - doAfter: 1 - material: CP14IronBar amount: 2 doAfter: 2 @@ -68,9 +65,6 @@ doAfter: 2 - to: CP14IronDoorWindowedMirrored steps: - - material: CP14Nail - amount: 1 - doAfter: 1 - material: CP14IronBar amount: 2 doAfter: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml index 2af331093c..3260bc9185 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml @@ -20,9 +20,6 @@ - !type:StackGroupResource group: WoodenPlanks count: 2 - - !type:StackResource - stack: CP14Nail - count: 1 result: CP14WoodenBeerMug - type: CP14Recipe diff --git a/Resources/Prototypes/_CP14/Stacks/materials.yml b/Resources/Prototypes/_CP14/Stacks/materials.yml index 659eec30bc..84768d5c04 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -40,13 +40,6 @@ icon: { sprite: _CP14/Objects/Materials/wood_lucens.rsi, state: planks_2 } maxCount: 20 -- type: stack - id: CP14Nail - name: cp14-stack-nails - spawn: CP14Nail1 - icon: { sprite: _CP14/Objects/Materials/nails.rsi, state: nail_2 } - maxCount: 50 - - type: stack id: CP14Cloth name: cp14-stack-cloth diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index ca98b32f7b..30948e227f 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -124,9 +124,6 @@ - type: Tag id: CP14SharpeningStone -- type: Tag - id: CP14Nail - - type: Tag id: CP14Vial diff --git a/Resources/Textures/_CP14/Objects/Materials/nails.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/nails.rsi/meta.json deleted file mode 100644 index 47113d5453..0000000000 --- a/Resources/Textures/_CP14/Objects/Materials/nails.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github)", - "states": [ - { - "name": "nail" - }, - { - "name": "nail_2" - }, - { - "name": "nail_3" - } - ] -} diff --git a/Resources/Textures/_CP14/Objects/Materials/nails.rsi/nail.png b/Resources/Textures/_CP14/Objects/Materials/nails.rsi/nail.png deleted file mode 100644 index 116016b5c14c42158aa16d68f9315d320630cc4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmV-B0mS}^P)Px#^+`lQR9J=Wl);L^Fcd{kWxhZWgvxAPb}c`)*z?0YMN1;gtx&NC#o0ht&LVDW1j&bALt#8lX7j-qQ?R zifMo}PB^L~fbMJJZUcs&?=Q0Ds%xqj&ISP5rbbm|@8SR>*8?Z@%Xl)i^J}3D!btm{ z3p;MT158QAagtKz0JswzEIl`fLQF!b*z2!ill`~e@~Vs?1!-g^K5 N002ovPDHLkV1ivfiR1tP diff --git a/Resources/Textures/_CP14/Objects/Materials/nails.rsi/nail_2.png b/Resources/Textures/_CP14/Objects/Materials/nails.rsi/nail_2.png deleted file mode 100644 index 89928190167a76ad7633c75544fd6f279939cc2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 402 zcmV;D0d4+?P)Px$Oi4sRR9J=WlRs+1Fcii=m!81JP*CO7Sv+`cwb{NxOCbbuh0+7`CWa6w?G=)2 zY1R&%ygCsCLUILlsa%yfwq$JRAOA)@@x4z^?*n>zdVU+k^9AvI(U#tsY4fXV)>dzG z16^QjfD#JZal7zRO%O71|L`b+khS*zfWZU~`yDRH#nHK3O5*vY=IRWe>ol(uk&8(Q z1%PjNlPCrN@&2~78W{*eCI$l^lu)FT=~12MnYB`y-rn35lS(Jk(y6JGx+*gP0OQdR z8@|PCF~_MF1tAlM{SLO{B8lS4yMX2wNP+b8rB#BmW;?D}^RPx$rAb6VR9J=WRk4nOKolG<_XTV=F+pstC}@=q_yvuLG4abxjET`-06Ne1iff=n zH!&gb3wy=61QixRa}`svWZ%5mnfHJW9XfPq0c|kk+F;1vao0zi;-j%udS;jwH%zM$ zvCpOis$iHFcWnoKt%nuB0pRERpu9vt$jsvC<|19wp%MxfNBOsFF%AH(?cl^t0Kn@= z)G9Cr%Ayq&n6uPF@ zUIP3n6^0Sc>;jcgsD$SKyS4*VJcpEkc-QG<1~2g8+DFz)Q8r%75@DDY7jbN|Cu%)#-?2~y z*QqB^n0`2Z9iFYOG4iS;VcaH(GB)AvcR7rMQ&- h4NdochYlU8@C!Xx(!h*-(ux28002ovPDHLkV1i)m)e8Us diff --git a/Resources/migration.yml b/Resources/migration.yml index a41dae5e43..44d4f2b13f 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -175,7 +175,6 @@ CP14OreCopper: CP14OreCopper1 CP14OreIron: CP14OreIron1 CP14OreGold: CP14OreGold1 CP14OreMithril: CP14OreMithril1 -CP14Nail10: CP14Nail20 #2025-07-02 CP14SpawnPointBanker: CP14SpawnPointMerchant @@ -333,6 +332,10 @@ CP14BaseCrowbar: CP14ModularIronPickaxe #2025-26-04 CP14WallSkulls: CP14WallStonebrickOld +CP14WoodenChestFrame: null +CP14Nail1: null +CP14Nail20: null +CP14Nail50: null # <---> CrystallEdge migration zone end