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

2 new Lobby image, some bugfix (#468)

Browse Source 
* +2 lobby screens

* Update goblin.yml

* workbench recipes remove nesting

* tips update

* Update sewing_table.yml
This commit is contained in:
Ed
2024-09-28 01:29:02 +03:00
committed by GitHub
parent 560c7acc52
commit dca61c009d
24 changed files with 121 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/_CP14/Datasets/tips.yml
View File

@@ -2,4 +2,4 @@
id: CP14Tips
values:
prefix: cp14-tips-
count: 12
count: 14

1
Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml
View File

@@ -94,6 +94,7 @@
species: CP14Goblin
- type: Inventory
templateId: CP14Human
speciesId: goblin
displacements:
belt:
sizeMaps:

101
Resources/Prototypes/_CP14/Entities/Objects/Specific/Blacksmith/melting_molds.yml
View File

@@ -1,101 +0,0 @@
- type: entity
id: CP14MeltingMoldBase
abstract: true
parent: BaseItem
name: melting mold
description: Wooden board for casting the metal into the required molds.
components:
- type: Item
size: Normal
- type: Sprite
sprite: _CP14/Objects/Specific/Blacksmith/melting_molds.rsi
- type: entity
id: CP14MeltingMoldBlank
parent: CP14MeltingMoldBase
name: blank melting mold
description: An empty mold for casting metal. You can cut any shape you need in it on the pattern cutting table.
components:
- type: Sprite
layers:
- state: blank
- type: entity
id: CP14MeltingMoldDaggers
parent: CP14MeltingMoldBase
name: dagger blade mold
components:
- type: Sprite
layers:
- state: blank
- state: dagger
- type: entity
id: CP14MeltingMoldNails
parent: CP14MeltingMoldBase
name: mails mold
components:
- type: Sprite
layers:
- state: blank
- state: nails
- type: entity
id: CP14MeltingMoldPickaxe
parent: CP14MeltingMoldBase
name: pickaxe head mold
components:
- type: Sprite
layers:
- state: blank
- state: pickaxe
- type: entity
id: CP14MeltingMoldShovel
parent: CP14MeltingMoldBase
name: shovel head mold
components:
- type: Sprite
layers:
- state: blank
- state: shovel
- type: entity
id: CP14MeltingMoldSickle
parent: CP14MeltingMoldBase
name: sickle blade mold
components:
- type: Sprite
layers:
- state: blank
- state: sickle
- type: entity
id: CP14MeltingMoldSword
parent: CP14MeltingMoldBase
name: sword blade mold
components:
- type: Sprite
layers:
- state: blank
- state: sword
- type: entity
id: CP14MeltingMoldThrowableSpear
parent: CP14MeltingMoldBase
name: throwable spearhead mold
components:
- type: Sprite
layers:
- state: blank
- state: throwable_spear
- type: entity
id: CP14MeltingMoldTwoHandedSword
parent: CP14MeltingMoldBase
name: two-handed sword blade mold
components:
- type: Sprite
layers:
- state: blank
- state: two_handed_sword

88
Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml
View File

@@ -4,6 +4,13 @@
id: CP14BaseWorkbench
abstract: true
components:
- type: Sprite
snapCardinals: true
sprite: _CP14/Structures/Furniture/workbench.rsi
state: filler
- type: Icon
sprite: _CP14/Structures/Furniture/workbench.rsi
state: filler
- type: ActivatableUI
key: enum.CP14WorkbenchUiKey.Key
- type: Climbable
@@ -26,11 +33,8 @@
description: Table for the production of various basic tools.
components:
- type: Sprite
snapCardinals: true
sprite: _CP14/Structures/Furniture/workbench.rsi
state: workbench
- type: Icon
sprite: _CP14/Structures/Furniture/workbench.rsi
state: workbench
- type: Damageable
damageContainer: Inorganic
@@ -71,70 +75,31 @@
graph: CP14TableWooden
node: CP14Workbench
- type: CP14Workbench
recipes:
- CP14Bucket
- CP14BaseBarrel
- CP14WoodenBeerMug
- CP14PlateWooden
- type: entity
id: CP14WorkbenchMeltingMolds
parent:
- CP14BaseWorkbench
- CP14BaseFlammable
name: sawing melting molds table
description: Specialized table that allows you to cut out molds for metal smelting.
components:
- type: Sprite
snapCardinals: true
sprite: _CP14/Structures/Furniture/workbench.rsi
state: melting_crafter
- type: Icon
sprite: _CP14/Structures/Furniture/workbench.rsi
state: melting_crafter
- type: CP14Workbench
craftSound:
collection: CP14Sawing
recipes:
- CP14MeltingMoldBlank
- CP14MeltingMoldDaggers
- CP14MeltingMoldNails
- CP14MeltingMoldPickaxe
- CP14MeltingMoldShovel
- CP14MeltingMoldSickle
- CP14MeltingMoldSword
- CP14MeltingMoldThrowableSpear
- CP14MeltingMoldTwoHandedSword
recipeTags:
- CP14RecipeWorkbench
- type: entity
id: CP14WorkbenchCooking
parent:
- CP14WorkbenchMeltingMolds
- CP14BaseWorkbench
- CP14BaseFlammable
name: cooking table
description: A table to work with food. Time to cook!
components:
- type: Sprite
snapCardinals: true
state: cooking_table
- type: Icon
state: cooking_table
- type: CP14Workbench
craftSound:
collection: CP14Sawing #TODO
recipes:
- CP14FoodDoughLarge
- CP14FoodDoughMediumFlat
- CP14FoodDoughMedium
- CP14FoodMeatLamb
- CP14SeedPumpkin
- CP14SeedWheat
- CP14SeedCucumber
recipeTags:
- CP14RecipeCooking
- type: entity
id: CP14WorkbenchSewing
parent:
- CP14WorkbenchMeltingMolds
- CP14BaseWorkbench
- CP14BaseFlammable
name: sewing table
description: A table with embroidery tools to create different clothing and materials.
@@ -142,28 +107,5 @@
- type: CP14Workbench
craftSound:
collection: CP14Sawing #TODO
recipes:
- CP14ClothingShirtCottonBlue
- CP14ClothingShirtCottonBlack
- CP14ClothingShirtCottonPurple
- CP14ClothingShirtCottonRed
- CP14ClothingShirtCottonWhite
- CP14ClothingShirtCottonYellow
- CP14ClothingShirtMercenary
- CP14ClothingShirtYellowWizard
- CP14ClothingCloakSimpleDarkBlue
- CP14ClothingCloakSimpleWhite
- CP14ClothingPantsTrouserWhite
- CP14ClothingPantsTrouserDarkBlue
- CP14ClothingDressBlack
- CP14ClothingPantsSouthernMagician
- CP14ClothingPantsMercenaryTrousers
- CP14ClothingHeadBeretRed
- CP14ClothingHeadBeretPurple
- CP14ClothingHeadBeretYellow
- CP14ClothingHeadBeretBlue
- CP14ClothingHeadBeretBlack
- CP14ClothingHeadBeretMercenary
- CP14ClothingHeadBandanaWhite
- CP14ClothingHeadBandanaYellow
- CP14ClothingHeadWreath
recipeTags:
- CP14RecipeSewing

7
Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml
View File

@@ -1,5 +1,6 @@
- type: CP14Recipe
id: CP14FoodMeatLamb
tag: CP14RecipeCooking
craftTime: 2
entities:
CP14FoodMeatLambSlice: 2
@@ -9,6 +10,7 @@
- type: CP14Recipe
id: CP14FoodDoughLarge
tag: CP14RecipeCooking
craftTime: 3
entities:
CP14FoodDoughMedium: 5
@@ -17,6 +19,7 @@
- type: CP14Recipe
id: CP14FoodDoughMedium
tag: CP14RecipeCooking
craftTime: 3
entities:
CP14FoodDoughMediumFlat: 1
@@ -25,6 +28,7 @@
- type: CP14Recipe
id: CP14FoodDoughMediumFlat
tag: CP14RecipeCooking
craftTime: 3
entities:
CP14FoodDoughMedium: 1
@@ -33,6 +37,7 @@
- type: CP14Recipe
id: CP14SeedPumpkin
tag: CP14RecipeCooking
craftTime: 1
entities:
CP14FoodPumpkinSlice: 1
@@ -40,6 +45,7 @@
- type: CP14Recipe
id: CP14SeedCucumber
tag: CP14RecipeCooking
craftTime: 1
entities:
CP14FoodCucumber: 1
@@ -47,6 +53,7 @@
- type: CP14Recipe
id: CP14SeedWheat
tag: CP14RecipeCooking
craftTime: 1
entities:
CP14Wheat: 1

62
Resources/Prototypes/_CP14/Recipes/Workbench/melds_crafter.yml
View File

@@ -1,62 +0,0 @@
- type: CP14Recipe
id: CP14MeltingMoldBlank
craftTime: 2
stacks:
CP14WoodenPlanks: 2
result: CP14MeltingMoldBlank
- type: CP14Recipe
id: CP14MeltingMoldDaggers
craftTime: 2
entities:
CP14MeltingMoldBlank: 1
result: CP14MeltingMoldDaggers
- type: CP14Recipe
id: CP14MeltingMoldNails
craftTime: 2
entities:
CP14MeltingMoldBlank: 1
result: CP14MeltingMoldNails
- type: CP14Recipe
id: CP14MeltingMoldPickaxe
craftTime: 2
entities:
CP14MeltingMoldBlank: 1
result: CP14MeltingMoldPickaxe
- type: CP14Recipe
id: CP14MeltingMoldShovel
craftTime: 2
entities:
CP14MeltingMoldBlank: 1
result: CP14MeltingMoldShovel
- type: CP14Recipe
id: CP14MeltingMoldSickle
craftTime: 2
entities:
CP14MeltingMoldBlank: 1
result: CP14MeltingMoldSickle
- type: CP14Recipe
id: CP14MeltingMoldSword
craftTime: 2
entities:
CP14MeltingMoldBlank: 1
result: CP14MeltingMoldSword
- type: CP14Recipe
id: CP14MeltingMoldThrowableSpear
craftTime: 2
entities:
CP14MeltingMoldBlank: 1
result: CP14MeltingMoldThrowableSpear
- type: CP14Recipe
id: CP14MeltingMoldTwoHandedSword
craftTime: 2
entities:
CP14MeltingMoldBlank: 1
result: CP14MeltingMoldTwoHandedSword

24
Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
View File

@@ -1,5 +1,6 @@
- type: CP14Recipe
id: CP14ClothingShirtCottonBlue
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -10,6 +11,7 @@
- type: CP14Recipe
id: CP14ClothingShirtCottonBlack
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -20,6 +22,7 @@
- type: CP14Recipe
id: CP14ClothingShirtCottonPurple
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -30,6 +33,7 @@
- type: CP14Recipe
id: CP14ClothingShirtCottonRed
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -40,6 +44,7 @@
- type: CP14Recipe
id: CP14ClothingShirtCottonWhite
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -49,6 +54,7 @@
- type: CP14Recipe
id: CP14ClothingShirtCottonYellow
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -59,6 +65,7 @@
- type: CP14Recipe
id: CP14ClothingShirtMercenary
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -70,6 +77,7 @@
- type: CP14Recipe
id: CP14ClothingShirtYellowWizard
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -82,6 +90,7 @@
- type: CP14Recipe
id: CP14ClothingCloakSimpleDarkBlue
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -92,6 +101,7 @@
- type: CP14Recipe
id: CP14ClothingCloakSimpleWhite
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -101,6 +111,7 @@
- type: CP14Recipe
id: CP14ClothingPantsTrouserWhite
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -110,6 +121,7 @@
- type: CP14Recipe
id: CP14ClothingPantsTrouserDarkBlue
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -120,6 +132,7 @@
- type: CP14Recipe
id: CP14ClothingDressBlack
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -130,6 +143,7 @@
- type: CP14Recipe
id: CP14ClothingPantsSouthernMagician
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -140,6 +154,7 @@
- type: CP14Recipe
id: CP14ClothingPantsMercenaryTrousers
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -151,6 +166,7 @@
- type: CP14Recipe
id: CP14ClothingHeadBeretRed
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -161,6 +177,7 @@
- type: CP14Recipe
id: CP14ClothingHeadBeretPurple
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -171,6 +188,7 @@
- type: CP14Recipe
id: CP14ClothingHeadBeretYellow
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -181,6 +199,7 @@
- type: CP14Recipe
id: CP14ClothingHeadBeretBlue
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -191,6 +210,7 @@
- type: CP14Recipe
id: CP14ClothingHeadBeretBlack
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -201,6 +221,7 @@
- type: CP14Recipe
id: CP14ClothingHeadBandanaWhite
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -210,6 +231,7 @@
- type: CP14Recipe
id: CP14ClothingHeadBandanaYellow
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -220,6 +242,7 @@
- type: CP14Recipe
id: CP14ClothingHeadBeretMercenary
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14String: 1
@@ -231,6 +254,7 @@
- type: CP14Recipe
id: CP14ClothingHeadWreath
tag: CP14RecipeSewing
craftTime: 2
entities:
CP14FlowersRed: 2

4
Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml
View File

@@ -1,5 +1,6 @@
- type: CP14Recipe
id: CP14Bucket
tag: CP14RecipeWorkbench
craftTime: 2
entities:
CP14Rope: 1
@@ -9,6 +10,7 @@
- type: CP14Recipe
id: CP14BaseBarrel
tag: CP14RecipeWorkbench
craftTime: 3
stacks:
CP14WoodenPlanks: 5
@@ -17,6 +19,7 @@
- type: CP14Recipe
id: CP14WoodenBeerMug
tag: CP14RecipeWorkbench
craftTime: 3
stacks:
CP14WoodenPlanks: 2
@@ -25,6 +28,7 @@
- type: CP14Recipe
id: CP14PlateWooden
tag: CP14RecipeWorkbench
craftTime: 3
stacks:
CP14WoodenPlanks: 2

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

@@ -28,6 +28,14 @@
- type: Tag
id: CP14AmbientWater
- type: Tag
id: CP14Plate
- type: Tag
id: CP14RecipeSewing
- type: Tag
id: CP14RecipeCooking
- type: Tag
id: CP14RecipeWorkbench

8
Resources/Prototypes/lobbyscreens.yml
View File

@@ -10,3 +10,11 @@
- type: lobbyBackground
id: Tiefling
background: /Textures/_CP14/LobbyScreens/tiefling.webp
- type: lobbyBackground
id: CuteCat
background: /Textures/_CP14/LobbyScreens/cutecat.webp
- type: lobbyBackground
id: GobWay
background: /Textures/_CP14/LobbyScreens/gob_way.webp