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

Merge pull request #1777 from KittyCat432/Deconstruction

Browse Source 
Various changes again
This commit is contained in:
Kit
2025-09-15 10:45:42 -04:00
committed by GitHub
parent ac07ecf199
commit d0322972ad
26 changed files with 348 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/_CP14/Entities/Objects/Tools/screwdriver.yml
View File

@@ -25,7 +25,7 @@
attackRate: 1
damage:
types:
Piercing: 4
Piercing: 2
soundHit:
path: "/Audio/Weapons/bladeslice.ogg"
- type: Tool

2
Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml
View File

@@ -23,7 +23,7 @@
attackRate: 1.5
damage:
types:
Blunt: 6
Blunt: 2
soundHit:
collection: MetalThud
- type: Tool

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

@@ -3,6 +3,8 @@
start: start
graph:
- node: start
actions:
- !type:DestroyEntity {}
edges:
- to: CP14WoodenCabinet
completed:
@@ -13,12 +15,23 @@
doAfter: 2
- node: CP14WoodenCabinet
entity: CP14WoodenCabinet
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 3
- type: constructionGraph
id: CP14IronCabinet
start: start
graph:
- node: start
actions:
- !type:DestroyEntity {}
edges:
- to: CP14IronCabinet
completed:
@@ -26,6 +39,17 @@
steps:
- material: CP14IronBar
amount: 3
doAfter: 2
doAfter: 4
- node: CP14IronCabinet
entity: CP14IronCabinet
edges:
- to: start
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 4
completed:
- !type:SpawnPrototype
prototype: CP14IronBar1
amount: 3

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

@@ -3,6 +3,8 @@
start: start
graph:
- node: start
actions:
- !type:DestroyEntity {}
edges:
- to: CP14WoodenCloset
completed:
@@ -10,5 +12,15 @@
steps:
- stackGroup: WoodenPlanks
amount: 4
doAfter: 2
- node: CP14WoodenCloset
entity: CP14WoodenCloset
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 4

17
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/furnace.yml
View File

@@ -3,6 +3,8 @@
start: start
graph:
- node: start
actions:
- !type:DestroyEntity {}
edges:
- to: CP14Furnace
completed:
@@ -10,6 +12,17 @@
steps:
- material: CP14IronBar
amount: 3
doAfter: 2
doAfter: 4
- node: CP14Furnace
entity: CP14Furnace
entity: CP14Furnace
edges:
- to: start
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 4
completed:
- !type:SpawnPrototype
prototype: CP14IronBar1
amount: 3

9
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/orders_border.yml
View File

@@ -14,3 +14,12 @@
- node: CP14OrderBoard
entity: CP14OrderBoard
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 3

54
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml
View File

@@ -18,8 +18,26 @@
doAfter: 2
- node: CP14ChairWooden
entity: CP14ChairWooden
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 2
- node: CP14ChairWoodenBirch
entity: CP14ChairWoodenBirch
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14BirchWoodenPlanks1
amount: 2
- type: constructionGraph
id: CP14BenchWood
@@ -41,8 +59,26 @@
doAfter: 2
- node: CP14BenchWood
entity: CP14BenchWood
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 3
- node: CP14BenchWoodBirch
entity: CP14BenchWoodBirch
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14BirchWoodenPlanks1
amount: 3
- type: constructionGraph
id: CP14Stool
@@ -64,5 +100,23 @@
doAfter: 1
- node: CP14StoolWooden
entity: CP14StoolWooden
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 2
- node: CP14StoolBirch
entity: CP14StoolBirch
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14BirchWoodenPlanks1
amount: 2

54
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml
View File

@@ -127,6 +127,15 @@
doAfter: 2
- node: CP14TableWoodenRound
entity: CP14TableWoodenRound
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 3
- type: constructionGraph
id: CP14TableWoodenBirchRound
@@ -143,6 +152,15 @@
doAfter: 2
- node: CP14TableWoodenBirchRound
entity: CP14TableWoodenBirchRound
edges:
- to: start
steps:
- tool: Prying
doAfter: 3
completed:
- !type:SpawnPrototype
prototype: CP14BirchWoodenPlanks1
amount: 3
- type: constructionGraph
id: CP14Workbench
@@ -159,6 +177,15 @@
doAfter: 2
- node: CP14Workbench
entity: CP14Workbench
edges:
- to: start
steps:
- tool: Prying
doAfter: 5
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 3
- type: constructionGraph
id: CP14WorkbenchCooking
@@ -175,6 +202,15 @@
doAfter: 2
- node: CP14WorkbenchCooking
entity: CP14WorkbenchCooking
edges:
- to: start
steps:
- tool: Prying
doAfter: 5
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 3
- type: constructionGraph
id: CP14WorkbenchSewing
@@ -191,6 +227,15 @@
doAfter: 2
- node: CP14WorkbenchSewing
entity: CP14WorkbenchSewing
edges:
- to: start
steps:
- tool: Prying
doAfter: 5
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 3
- type: constructionGraph
id: CP14WorkbenchLeather
@@ -207,3 +252,12 @@
doAfter: 2
- node: CP14WorkbenchLeather
entity: CP14WorkbenchLeather
edges:
- to: start
steps:
- tool: Prying
doAfter: 5
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 3

9
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/pallets.yml
View File

@@ -13,3 +13,12 @@
doAfter: 2
- node: CP14WoodenPallet
entity: CP14WoodenPallet
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 2

9
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/tombs.yml
View File

@@ -13,3 +13,12 @@
doAfter: 2
- node: CP14BaseTombstone
entity: CP14BaseTombstone
edges:
- to: start
steps:
- tool: CP14Hammering
doAfter: 10
completed:
- !type:SpawnPrototype
prototype: CP14StoneBlock1
amount: 5

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

@@ -13,6 +13,15 @@
doAfter: 3
- node: CP14BaseBarrel
entity: CP14BaseBarrel
edges:
- to: start
steps:
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 3
- type: constructionGraph
id: CP14CraneBarrel
@@ -29,6 +38,17 @@
doAfter: 3
- node: CP14CraneBarrel
entity: CP14CraneBarrel
edges:
- to: start
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 5
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 5
- type: constructionGraph
id: CP14CraneBarrelSmall
@@ -45,4 +65,14 @@
doAfter: 3
- node: CP14CraneBarrelSmall
entity: CP14CraneBarrelSmall
edges:
- to: start
steps:
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 3

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

@@ -23,12 +23,17 @@
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 2
- !type:SpawnPrototype
prototype: CP14IronBar1
amount: 1
conditions:
- !type:Locked
locked: false
steps:
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 4
doAfter: 3
- type: constructionGraph
id: CP14GoldChest
@@ -58,9 +63,17 @@
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 2
- !type:SpawnPrototype
prototype: CP14IronBar1
amount: 1
- !type:SpawnPrototype
prototype: CP14GoldBar1
amount: 1
conditions:
- !type:Locked
locked: false
steps:
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 4
doAfter: 5

11
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Furniture/lighting.yml
View File

@@ -54,3 +54,14 @@
- node: CP14WallmountLampEmpty
entity: CP14WallmountLampEmpty
edges:
- to: start
steps:
- tool: Screwing
doAfter: 4
- tool: Prying
doAfter: 2
completed:
- !type:SpawnPrototype
prototype: CP14CopperBar1
amount: 3

22
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/shelfs.yml
View File

@@ -13,6 +13,17 @@
doAfter: 2
- node: CP14WallmountBarShelfA
entity: CP14WallmountBarShelfA
edges:
- to: start
steps:
- tool: Screwing
doAfter: 0.5
- tool: Prying
doAfter: 1
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 2
- type: constructionGraph
id: CP14WallmountBarShelfB
@@ -29,3 +40,14 @@
doAfter: 2
- node: CP14WallmountBarShelfB
entity: CP14WallmountBarShelfB
edges:
- to: start
steps:
- tool: Screwing
doAfter: 0.5
- tool: Prying
doAfter: 1
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 2

10
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick.yml
View File

@@ -11,7 +11,7 @@
steps:
- material: CP14Stone
amount: 2
doAfter: 2
doAfter: 5
- node: CP14WallFrameStoneBrick
entity: CP14WallFrameStonebrick
@@ -24,12 +24,12 @@
- !type:DeleteEntity {}
steps:
- tool: Prying
doAfter: 2
doAfter: 4
- to: CP14WallStoneBrick
steps:
- material: CP14Stone
amount: 2
doAfter: 2
doAfter: 5
- node: CP14WallStoneBrick
entity: CP14WallStonebrick
@@ -38,6 +38,10 @@
steps:
- tool: CP14Hammering
doAfter: 2
- tool: Prying
doAfter: 4
- tool: CP14Hammering
doAfter: 6
completed:
- !type:SpawnPrototype
prototype: CP14StoneBlock1

10
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick_marble.yml
View File

@@ -11,7 +11,7 @@
steps:
- material: CP14MarbleStone
amount: 2
doAfter: 2
doAfter: 5
- node: CP14WallFrameMarbleBrick
entity: CP14WallFrameMarblebrick
@@ -24,12 +24,12 @@
- !type:DeleteEntity {}
steps:
- tool: Prying
doAfter: 2
doAfter: 4
- to: CP14WallMarbleBrick
steps:
- material: CP14MarbleStone
amount: 2
doAfter: 2
doAfter: 5
- node: CP14WallMarbleBrick
entity: CP14WallMarbleBrick
@@ -38,6 +38,10 @@
steps:
- tool: CP14Hammering
doAfter: 2
- tool: Prying
doAfter: 4
- tool: CP14Hammering
doAfter: 6
completed:
- !type:SpawnPrototype
prototype: CP14MarbleBlock1

2
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden.yml
View File

@@ -37,7 +37,7 @@
- to: CP14WallFrameWooden
steps:
- tool: CP14Hammering
doAfter: 2
doAfter: 4
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1

2
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_birch.yml
View File

@@ -42,7 +42,7 @@
- to: CP14WallFrameWoodenBirch
steps:
- tool: CP14Hammering
doAfter: 2
doAfter: 4
completed:
- !type:SpawnPrototype
prototype: CP14BirchWoodenPlanks1

10
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_palisade.yml
View File

@@ -13,3 +13,13 @@
doAfter: 2
- node: CP14WallWoodenPalisade
entity: CP14WallWoodenPalisade
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: CP14WoodenPlanks1
amount: 4
- !type:DeleteEntity {}
steps:
- tool: Prying
doAfter: 6

4
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_spruce.yml
View File

@@ -42,11 +42,11 @@
- to: CP14WallFrameWoodenSpruce
steps:
- tool: CP14Hammering
doAfter: 2
doAfter: 4
completed:
- !type:SpawnPrototype
prototype: CP14SpruceWoodenPlanks1
amount: 2
#- node: WindowWooden
# entity: CP14WindowWooden
# entity: CP14WindowWooden

3
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_stonebrick.yml
View File

@@ -11,7 +11,7 @@
steps:
- material: CP14Stone
amount: 2
doAfter: 2
doAfter: 5
- node: CP14WindowFrameStoneBrick
entity: CP14WindowFrameStoneBrick
@@ -56,4 +56,3 @@
- !type:SpawnPrototype
prototype: CP14GlassShard
amount: 1

1
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_stonebrick_marble.yml
View File

@@ -56,4 +56,3 @@
- !type:SpawnPrototype
prototype: CP14GlassShard
amount: 1

1
Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_wooden.yml
View File

@@ -105,4 +105,3 @@
- !type:SpawnPrototype
prototype: CP14GlassShard
amount: 1

1
Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
View File

@@ -141,7 +141,6 @@
canRotate: true
conditions:
- !type:TileNotBlocked
- !type:CP14WallRequired
- type: construction
crystallPunkAllowed: true

32
Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml
View File

@@ -22,6 +22,26 @@
service: !type:CP14BuyItemsService
product: CP14CrystalShardQuartz
- type: cp14TradingPosition
id: CP14Screwdriver
faction: DwarfMining
uiPosition: 3
icon:
sprite: _CP14/Objects/Tools/screwdriver.rsi
state: screwdriver
service: !type:CP14BuyItemsService
product: CP14Screwdriver
- type: cp14TradingPosition
id: CP14BaseWrench
faction: DwarfMining
uiPosition: 4
icon:
sprite: _CP14/Objects/Tools/wrench.rsi
state: icon
service: !type:CP14BuyItemsService
product: CP14BaseWrench
- type: cp14TradingPosition
id: CP14BaseSharpeningStone
faction: DwarfMining
@@ -45,6 +65,18 @@
service: !type:CP14BuyItemsService
product: CP14OreIron5
- type: cp14TradingPosition #TODO: replace with copper pickaxe when those get added
id: CP14WeaponPickaxeIron
faction: DwarfMining
reputationLevel: 1
uiPosition: 4
icon:
sprite: _CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi
state: icon
service: !type:CP14BuyItemsService
product: CP14WeaponPickaxeIron
count: 1
- type: cp14TradingPosition
id: CP14Lighter
faction: DwarfMining

46
Resources/Prototypes/_CP14/Trading/BuyPositions/helmir_child.yml
View File

@@ -11,21 +11,10 @@
product: CP14WeaponHammerIron
count: 1
- type: cp14TradingPosition
id: CP14WeaponPickaxeIronHelmir
faction: HelmirChild
uiPosition: 1
icon:
sprite: _CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi
state: icon
service: !type:CP14BuyItemsService
product: CP14WeaponPickaxeIron
count: 1
- type: cp14TradingPosition
id: CP14WeaponShovelIron
faction: HelmirChild
uiPosition: 2
uiPosition: 1
icon:
sprite: _CP14/Objects/Weapons/Melee/Shovel/iron.rsi
state: icon
@@ -36,7 +25,7 @@
- type: cp14TradingPosition
id: CP14WeaponDaggerIron
faction: HelmirChild
uiPosition: 4
uiPosition: 3
icon:
sprite: _CP14/Objects/Weapons/Melee/Dagger/iron.rsi
state: icon
@@ -47,7 +36,7 @@
- type: cp14TradingPosition
id: CP14WeaponShieldWooden
faction: HelmirChild
uiPosition: 5
uiPosition: 4
icon:
sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi
state: icon
@@ -58,7 +47,7 @@
- type: cp14TradingPosition
id: CP14WeaponShieldBuckler
faction: HelmirChild
uiPosition: 6
uiPosition: 5
icon:
sprite: _CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi
state: icon
@@ -69,7 +58,7 @@
- type: cp14TradingPosition
id: CP14WeaponSkimitarIron
faction: HelmirChild
uiPosition: 7
uiPosition: 6
icon:
sprite: _CP14/Objects/Weapons/Melee/Skimitar/iron.rsi
state: icon
@@ -80,7 +69,7 @@
- type: cp14TradingPosition
id: CP14WeaponSpearIron
faction: HelmirChild
uiPosition: 8
uiPosition: 7
icon:
sprite: _CP14/Objects/Weapons/Melee/Spear/iron.rsi
state: icon
@@ -91,7 +80,7 @@
- type: cp14TradingPosition
id: CP14WeaponSwordIron
faction: HelmirChild
uiPosition: 9
uiPosition: 8
icon:
sprite: _CP14/Objects/Weapons/Melee/Sword/iron.rsi
state: icon
@@ -102,7 +91,7 @@
- type: cp14TradingPosition
id: CP14WeaponTowerShieldWooden
faction: HelmirChild
uiPosition: 10
uiPosition: 9
icon:
sprite: _CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi
state: icon
@@ -113,7 +102,7 @@
- type: cp14TradingPosition
id: CP14WeaponTwoHandedSwordIron
faction: HelmirChild
uiPosition: 11
uiPosition: 10
icon:
sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi
state: icon
@@ -124,7 +113,7 @@
- type: cp14TradingPosition
id: CP14WeaponWarAxeIron
faction: HelmirChild
uiPosition: 12
uiPosition: 11
icon:
sprite: _CP14/Objects/Weapons/Melee/WarAxe/iron.rsi
state: icon
@@ -135,7 +124,7 @@
- type: cp14TradingPosition
id: CP14WeaponWarHammerIron
faction: HelmirChild
uiPosition: 13
uiPosition: 12
icon:
sprite: _CP14/Objects/Weapons/Melee/WarHammer/iron.rsi
state: icon
@@ -146,7 +135,7 @@
- type: cp14TradingPosition
id: CP14Arrow
faction: HelmirChild
uiPosition: 14
uiPosition: 13
icon:
sprite: _CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi
state: rod
@@ -157,7 +146,7 @@
- type: cp14TradingPosition
id: CP14BowCombat
faction: HelmirChild
uiPosition: 15
uiPosition: 14
icon:
sprite: _CP14/Objects/Weapons/Ranged/bow.rsi
state: unwielded
@@ -169,7 +158,8 @@
- type: cp14TradingPosition
id: CP14ClothingOuterClothingChainmail
faction: HelmirChild
uiPosition: 16
reputationLevel: 1
uiPosition: 3
priceMarkup: 3
icon:
sprite: _CP14/Clothing/OuterClothing/chainmail.rsi
@@ -181,7 +171,8 @@
- type: cp14TradingPosition
id: CP14ClothingOuterClothingCuirass
faction: HelmirChild
uiPosition: 17
reputationLevel: 1
uiPosition: 4
priceMarkup: 3
icon:
sprite: _CP14/Clothing/OuterClothing/cuirass.rsi
@@ -193,7 +184,8 @@
- type: cp14TradingPosition
id: CP14ClothingOuterClothingInfantryCuirass
faction: HelmirChild
uiPosition: 18
reputationLevel: 1
uiPosition: 5
priceMarkup: 3
icon:
sprite: _CP14/Clothing/OuterClothing/infantry_cuirass.rsi