juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Storage durability rebalance + Fuck nails (#1225)

Browse Source 
* fix storage

* bye nails

* Update target.yml

* f

* Update migration.yml

* Update migration.yml
This commit is contained in:
Ed
2025-04-26 17:20:52 +03:00
committed by GitHub
parent cff9dc6fcf
commit a1153843a2
31 changed files with 83 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Storage/Components/SharedEntityStorageComponent.cs
View File

@@ -86,7 +86,7 @@ public abstract partial class SharedEntityStorageComponent : Component
/// Whether or not the container is sealed and traps air inside of it
/// </summary>
[DataField, ViewVariables(VVAccess.ReadWrite)]
public bool Airtight = true;
public bool Airtight = false; //CP14 false - bandaid fix: dont work with MapAtmosphere
/// <summary>
/// Whether or not the entitystorage is open or closed

1
Resources/Locale/en-US/_CP14/materials/materials.ftl
View File

@@ -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

1
Resources/Locale/en-US/_CP14/stack/materials.ftl
View File

@@ -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

12
Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
View File

@@ -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 = Тонкая нить. Материал для починки одежды или пошива новой.

1
Resources/Locale/ru-RU/_CP14/materials/materials.ftl
View File

@@ -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 = железо

1
Resources/Locale/ru-RU/_CP14/stack/materials.ftl
View File

@@ -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 = кучи компоста

1
Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
View File

@@ -75,7 +75,6 @@
- id: CP14CrystalLampBlueEmpty
- id: CP14CrystalLampOrangeEmpty
- id: CP14Rope
- id: CP14Nail20
- id: CP14EnergyCrystalSmall
- id: CP14d20Dice
- id: CP14d6Dice

1
Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml
View File

@@ -25,4 +25,3 @@
- CP14Lighter
- CP14Scissors
- CP14SharpeningStone
- CP14Nail

79
Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml
View File

@@ -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

14
Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml
View File

@@ -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

79
Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml
View File

@@ -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

16
Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml
View File

@@ -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

53
Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml
View File

@@ -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

9
Resources/Prototypes/_CP14/Materials/simple.yml
View File

@@ -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

5
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml
View File

@@ -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

2
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml
View File

@@ -10,7 +10,5 @@
steps:
- stackGroup: WoodenPlanks
amount: 4
- material: CP14Nail
amount: 2
- node: CP14WoodenCloset
entity: CP14WoodenCloset

6
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml
View File

@@ -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

3
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml
View File

@@ -27,9 +27,6 @@
- stackGroup: WoodenPlanks
amount: 3
doAfter: 1
- material: CP14Nail
amount: 1
doAfter: 1
- tag: CP14DyeRed
name: red dye
icon:

9
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml
View File

@@ -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

30
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml
View File

@@ -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

23
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml
View File

@@ -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

30
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml
View File

@@ -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

6
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml
View File

@@ -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

3
Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml
View File

@@ -20,9 +20,6 @@
- !type:StackGroupResource
group: WoodenPlanks
count: 2
- !type:StackResource
stack: CP14Nail
count: 1
result: CP14WoodenBeerMug
- type: CP14Recipe

7
Resources/Prototypes/_CP14/Stacks/materials.yml
View File

@@ -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

3
Resources/Prototypes/_CP14/tags.yml
View File

@@ -124,9 +124,6 @@
- type: Tag
id: CP14SharpeningStone
- type: Tag
id: CP14Nail
- type: Tag
id: CP14Vial

20
Resources/Textures/_CP14/Objects/Materials/nails.rsi/meta.json
View File

@@ -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"
}
]
}

BIN
Resources/Textures/_CP14/Objects/Materials/nails.rsi/nail.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 315 B

BIN
Resources/Textures/_CP14/Objects/Materials/nails.rsi/nail_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 402 B

BIN
Resources/Textures/_CP14/Objects/Materials/nails.rsi/nail_3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 491 B

5
Resources/migration.yml
View File

@@ -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