From be454907dfef928afd519af295722a667a84f2e7 Mon Sep 17 00:00:00 2001 From: Ed Date: Mon, 11 Nov 2024 22:49:57 +0300 Subject: [PATCH 01/12] wrench --- .../Objects/Weapons/Melee/Tools/crowbar.yml | 2 +- .../Objects/Weapons/Melee/Tools/wrench.yml | 36 +++++++++++++++++++ .../Structures/Furniture/cabinets.yml | 2 ++ .../Entities/Structures/Furniture/closets.yml | 2 ++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml index 504cb05814..a81f23b001 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml @@ -1,6 +1,6 @@ - type: entity id: CP14BaseCrowbar - parent: + parent: - BaseItem - CP14BaseWeaponDestructible - CP14BaseWeaponChemical diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml new file mode 100644 index 0000000000..9f02763c81 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml @@ -0,0 +1,36 @@ +- type: entity + id: CP14BaseWrench + parent: + - BaseItem + - CP14BaseWeaponDestructible + name: wrench + description: 'A common tool for assembly and disassembly. Remember: lefty latchy, righty removey.' + components: + - type: EmitSoundOnLand + sound: + path: /Audio/Items/wrench_drop.ogg + - type: Tag + tags: + - Wrench + - type: Sprite + sprite: Objects/Tools/wrench.rsi #TODO + state: icon + - type: Item + sprite: Objects/Tools/wrench.rsi #TODO + storedSprite: + sprite: Objects/Tools/wrench.rsi #TODO + state: storage + - type: MeleeWeapon + wideAnimationRotation: 135 + attackRate: 1.5 + damage: + types: + Blunt: 2.5 + soundHit: + collection: MetalThud + - type: Tool + qualities: + - Anchoring + useSound: + path: /Audio/Items/ratchet.ogg + \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml index 8e835f10c2..a86ee997ba 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml @@ -42,6 +42,8 @@ - type: Anchorable - type: Rotatable - type: Appearance + - type: Transform + anchored: true - type: entity name: wooden cabinet diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml index 72b5c15f79..901fb561e9 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml @@ -54,6 +54,8 @@ price: 50 - type: Anchorable - type: Rotatable + - type: Transform + anchored: true - type: entity name: wooden closet From 53f49d6a68451cd206f9ffc558e77df88659e0a5 Mon Sep 17 00:00:00 2001 From: Ed Date: Mon, 11 Nov 2024 23:47:03 +0300 Subject: [PATCH 02/12] station crates --- Resources/Maps/_CP14/tavern.yml | 478 +++++++++--------- .../Prototypes/_CP14/Catalog/Fills/crates.yml | 100 ++++ .../Markers/Spawners/Random/Loot/spawners.yml | 32 +- .../Objects/Specific/Alchemy/vials.yml | 13 +- .../Entities/Structures/Furniture/barrel.yml | 12 + .../Structures/Storage/Crates/crates.yml | 207 +------- 6 files changed, 370 insertions(+), 472 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Catalog/Fills/crates.yml diff --git a/Resources/Maps/_CP14/tavern.yml b/Resources/Maps/_CP14/tavern.yml index 5b889f4317..fddd6bd0a0 100644 --- a/Resources/Maps/_CP14/tavern.yml +++ b/Resources/Maps/_CP14/tavern.yml @@ -17091,13 +17091,6 @@ entities: rot: 3.141592653589793 rad pos: 35.346577,29.640251 parent: 1 -- proto: CP14BaseLockpick - entities: - - uid: 11723 - components: - - type: Transform - pos: 33.376186,-6.5496435 - parent: 1 - proto: CP14BaseMace entities: - uid: 5305 @@ -63722,11 +63715,6 @@ entities: - type: Transform pos: -2.5,30.5 parent: 1 - - uid: 3903 - components: - - type: Transform - pos: -3.5,30.5 - parent: 1 - uid: 3955 components: - type: Transform @@ -65449,18 +65437,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,14.5 parent: 1 - - uid: 4959 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,25.5 - parent: 1 - - uid: 4960 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,26.5 - parent: 1 - uid: 4961 components: - type: Transform @@ -65527,18 +65503,6 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,12.5 parent: 1 - - uid: 4988 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,18.5 - parent: 1 - - uid: 4989 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,19.5 - parent: 1 - uid: 4995 components: - type: Transform @@ -65575,24 +65539,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,12.5 parent: 1 - - uid: 5005 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,17.5 - parent: 1 - - uid: 5006 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,18.5 - parent: 1 - - uid: 5007 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,19.5 - parent: 1 - uid: 5013 components: - type: Transform @@ -65629,24 +65575,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,17.5 parent: 1 - - uid: 5024 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,18.5 - parent: 1 - - uid: 5025 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,19.5 - parent: 1 - - uid: 5026 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,20.5 - parent: 1 - uid: 5035 components: - type: Transform @@ -65667,28 +65595,11 @@ entities: - type: Transform pos: 1.5,-1.5 parent: 1 - - uid: 5061 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,28.5 - parent: 1 - - uid: 5074 - components: - - type: Transform - pos: -3.5,29.5 - parent: 1 - uid: 5075 components: - type: Transform pos: -2.5,29.5 parent: 1 - - uid: 5080 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,27.5 - parent: 1 - uid: 5081 components: - type: Transform @@ -65982,12 +65893,6 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,14.5 parent: 1 - - uid: 5216 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,13.5 - parent: 1 - uid: 5240 components: - type: Transform @@ -66006,42 +65911,12 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,14.5 parent: 1 - - uid: 5243 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,13.5 - parent: 1 - uid: 5253 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,3.5 parent: 1 - - uid: 5268 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,15.5 - parent: 1 - - uid: 5269 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,14.5 - parent: 1 - - uid: 5273 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,10.5 - parent: 1 - - uid: 5274 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,9.5 - parent: 1 - uid: 5280 components: - type: Transform @@ -66054,18 +65929,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,24.5 parent: 1 - - uid: 5295 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,15.5 - parent: 1 - - uid: 5299 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,11.5 - parent: 1 - uid: 5300 components: - type: Transform @@ -66078,12 +65941,6 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,9.5 parent: 1 - - uid: 5302 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,8.5 - parent: 1 - uid: 5304 components: - type: Transform @@ -66116,12 +65973,6 @@ entities: - type: Transform pos: -26.5,8.5 parent: 1 - - uid: 5325 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,12.5 - parent: 1 - uid: 5326 components: - type: Transform @@ -66188,18 +66039,6 @@ entities: - type: Transform pos: -27.5,2.5 parent: 1 - - uid: 5350 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,14.5 - parent: 1 - - uid: 5351 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,13.5 - parent: 1 - uid: 5352 components: - type: Transform @@ -66264,18 +66103,6 @@ entities: - type: Transform pos: -26.5,2.5 parent: 1 - - uid: 5376 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,15.5 - parent: 1 - - uid: 5377 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,14.5 - parent: 1 - uid: 5378 components: - type: Transform @@ -66344,18 +66171,6 @@ entities: - type: Transform pos: -21.5,0.5 parent: 1 - - uid: 5402 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 12.5,16.5 - parent: 1 - - uid: 5403 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 12.5,15.5 - parent: 1 - uid: 5404 components: - type: Transform @@ -76290,11 +76105,6 @@ entities: rot: 3.141592653589793 rad pos: 2.6524718,31.612745 parent: 1 - - uid: 4108 - components: - - type: Transform - pos: 2.5399916,35.7057 - parent: 1 - uid: 4110 components: - type: Transform @@ -76580,6 +76390,14 @@ entities: canCollide: False - proto: CP14ClothingRingManaGift entities: + - uid: 11662 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.3135,17.714169 + parent: 1 + - type: CollisionWake + enabled: False - uid: 11670 components: - type: Transform @@ -76602,16 +76420,6 @@ entities: parent: 1 - type: CollisionWake enabled: False -- proto: CP14ClothingRingShadowStep - entities: - - uid: 11662 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 21.3135,17.714169 - parent: 1 - - type: CollisionWake - enabled: False - proto: CP14ClothingRingSphereOfLight entities: - uid: 8817 @@ -77772,29 +77580,25 @@ entities: parent: 1 - proto: CP14FenceWoodStraight entities: - - uid: 4092 + - uid: 5273 components: - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,30.5 + pos: 16.5,31.5 parent: 1 - - uid: 4096 + - uid: 5295 components: - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,30.5 + pos: 14.5,31.5 parent: 1 - - uid: 9253 + - uid: 5299 components: - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,30.5 + pos: 13.5,31.5 parent: 1 - - uid: 9255 + - uid: 5302 components: - type: Transform - rot: 3.141592653589793 rad - pos: 14.5,30.5 + pos: 15.5,31.5 parent: 1 - uid: 9927 components: @@ -78874,17 +78678,62 @@ entities: - 9113 - 11174 - 11175 - - uid: 13007 +- proto: CP14LargeWoodenCrateFilled + entities: + - uid: 4092 components: - type: Transform - pos: -43.5,35.5 + pos: -3.5,26.5 + parent: 1 + - uid: 4096 + components: + - type: Transform + pos: 33.5,37.5 + parent: 1 + - uid: 4959 + components: + - type: Transform + pos: 37.5,45.5 + parent: 1 + - uid: 4960 + components: + - type: Transform + pos: 24.5,47.5 + parent: 1 + - uid: 5005 + components: + - type: Transform + pos: -0.5,19.5 + parent: 1 + - uid: 5061 + components: + - type: Transform + pos: 13.5,30.5 parent: 1 -- proto: CP14LargeWoodenCrateFilled - entities: - uid: 5118 components: - type: Transform - pos: -2.4670029,0.5822526 + pos: -2.5,0.5 + parent: 1 + - uid: 5216 + components: + - type: Transform + pos: 25.5,29.5 + parent: 1 + - uid: 5269 + components: + - type: Transform + pos: -44.5,36.5 + parent: 1 + - uid: 5350 + components: + - type: Transform + pos: 0.5,35.5 + parent: 1 + - uid: 5351 + components: + - type: Transform + pos: 20.5,20.5 parent: 1 - uid: 5400 components: @@ -78894,15 +78743,30 @@ entities: parent: 1 - type: StorageFill contents: [] - - uid: 12980 + - uid: 11673 components: - type: Transform - pos: 17.5,39.5 + pos: 32.5,14.5 parent: 1 - - uid: 12987 + - uid: 11674 components: - type: Transform - pos: 25.5,29.5 + pos: 33.5,8.5 + parent: 1 + - uid: 11683 + components: + - type: Transform + pos: 22.5,-6.5 + parent: 1 + - uid: 11694 + components: + - type: Transform + pos: 17.5,1.5 + parent: 1 + - uid: 12980 + components: + - type: Transform + pos: 17.5,39.5 parent: 1 - uid: 12991 components: @@ -79647,29 +79511,18 @@ entities: - type: InsideEntityStorage - proto: CP14SmallWoodenCrate entities: - - uid: 4432 - components: - - type: Transform - pos: -2.5086696,-0.5566361 - parent: 1 - - uid: 12986 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 24.733585,29.376556 - parent: 1 - uid: 12995 components: - type: Transform pos: -10.5,21.5 parent: 1 - - uid: 13008 +- proto: CP14SmallWoodenCrateFilled + entities: + - uid: 3903 components: - type: Transform - pos: -44.5,36.5 + pos: 12.5,-8.5 parent: 1 -- proto: CP14SmallWoodenCrateFilled - entities: - uid: 3931 components: - type: Transform @@ -79678,6 +79531,156 @@ entities: parent: 1 - type: StorageFill contents: [] + - uid: 4108 + components: + - type: Transform + pos: 23.5,47.5 + parent: 1 + - uid: 4432 + components: + - type: Transform + pos: 36.5,42.5 + parent: 1 + - uid: 4988 + components: + - type: Transform + pos: -0.5,18.5 + parent: 1 + - uid: 4989 + components: + - type: Transform + pos: -1.5,19.5 + parent: 1 + - uid: 5006 + components: + - type: Transform + pos: -3.5,30.5 + parent: 1 + - uid: 5007 + components: + - type: Transform + pos: -3.5,25.5 + parent: 1 + - uid: 5024 + components: + - type: Transform + pos: 2.5,35.5 + parent: 1 + - uid: 5025 + components: + - type: Transform + pos: 14.5,30.5 + parent: 1 + - uid: 5026 + components: + - type: Transform + pos: 13.5,35.5 + parent: 1 + - uid: 5074 + components: + - type: Transform + pos: 16.5,30.5 + parent: 1 + - uid: 5080 + components: + - type: Transform + pos: -43.5,35.5 + parent: 1 + - uid: 5243 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 5268 + components: + - type: Transform + pos: 24.5,29.5 + parent: 1 + - uid: 5274 + components: + - type: Transform + pos: -42.5,28.5 + parent: 1 + - uid: 5325 + components: + - type: Transform + pos: 16.5,43.5 + parent: 1 + - uid: 5376 + components: + - type: Transform + pos: 20.5,21.5 + parent: 1 + - uid: 5377 + components: + - type: Transform + pos: 14.5,14.5 + parent: 1 + - uid: 5402 + components: + - type: Transform + pos: 24.5,17.5 + parent: 1 + - uid: 5403 + components: + - type: Transform + pos: 32.5,13.5 + parent: 1 + - uid: 9253 + components: + - type: Transform + pos: 33.5,14.5 + parent: 1 + - uid: 9255 + components: + - type: Transform + pos: 36.5,10.5 + parent: 1 + - uid: 11672 + components: + - type: Transform + pos: 32.5,10.5 + parent: 1 + - uid: 11675 + components: + - type: Transform + pos: 37.5,8.5 + parent: 1 + - uid: 11682 + components: + - type: Transform + pos: 37.5,12.5 + parent: 1 + - uid: 11684 + components: + - type: Transform + pos: 22.5,-5.5 + parent: 1 + - uid: 11685 + components: + - type: Transform + pos: -57.5,1.5 + parent: 1 + - uid: 11686 + components: + - type: Transform + pos: 16.5,41.5 + parent: 1 + - uid: 11693 + components: + - type: Transform + pos: 17.5,-0.5 + parent: 1 + - uid: 11695 + components: + - type: Transform + pos: -46.5,33.5 + parent: 1 + - uid: 11696 + components: + - type: Transform + pos: 12.5,2.5 + parent: 1 - uid: 12981 components: - type: Transform @@ -86730,10 +86733,11 @@ entities: - type: Transform pos: 18.5,17.5 parent: 1 + - type: Physics + bodyType: Static - uid: 11943 components: - type: Transform - anchored: True pos: 24.5,39.5 parent: 1 - type: Physics diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml new file mode 100644 index 0000000000..fc8674ccd9 --- /dev/null +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -0,0 +1,100 @@ +- type: entity + id: CP14SmallWoodenCrateFilled + parent: + - CP14SmallWoodenCrate + suffix: Filled, Tools and Fluff + components: + - type: EntityTableContainerFill + containers: + storagebase: !type:NestedSelector + tableId: CP14StationCrateLootTools + rolls: !type:RangeNumberSelector + range: 1, 5 + +- type: entity + id: CP14LargeWoodenCrateFilled + suffix: Filled, Tools and Fluff + parent: + - CP14LargeWoodenCrate + components: + - type: EntityTableContainerFill + containers: + storagebase: !type:NestedSelector + tableId: CP14StationCrateLoot + +- type: entityTable + id: CP14StationCrateLoot + table: !type:AllSelector + children: + # Tools + - !type:NestedSelector + tableId: CP14StationCrateLootTools + rolls: !type:RangeNumberSelector + range: 1, 5 + # Fluff + - !type:NestedSelector + tableId: CP14StationCrateLootFluff + prob: 0.33 + rolls: !type:RangeNumberSelector + range: 0, 2 + +- type: entityTable + id: CP14StationCrateLootTools + table: !type:GroupSelector + children: + - !type:GroupSelector + children: + - id: CP14Scissors + - id: CP14CrystalLampBlueEmpty + - id: CP14CrystalLampOrangeEmpty + - id: CP14Bucket + - id: CP14Rope + - id: CP14Nail10 + - id: CP14EnergyCrystalSmall + - id: CP14BaseSharpeningStone + - !type:NestedSelector + tableId: CP14RandomVials + +- type: entityTable + id: CP14StationCrateLootFluff + table: !type:GroupSelector + children: + - !type:GroupSelector + children: + - id: CP14ClothingCloakFurcapeBlack + - id: CP14ClothingCloakFurcapeBlue + - id: CP14ClothingCloakSimpleWhite + - id: CP14ClothingCloakSimpleDarkBlue + - id: CP14ClothingCloakRitualAttireLeather + - id: CP14ClothingHeadBeretMercenary + - id: CP14ClothingPantsMercenaryTrousers + - id: CP14ClothingPantsSouthernMagician + - id: CP14ClothingShirtMercenary + - id: CP14ClothingShirtYellowWizard + + +- type: entityTable + id: CP14RandomVials + table: !type:GroupSelector + children: + - id: CP14VialSmall + - id: CP14VialTiny + - id: CP14GreenVial + - id: CP14BlueVial + - id: CP14RedBottle + #Common + - !type:GroupSelector + weight: 0.5 + children: + - id: CP14VialSmallDayflin + - id: CP14VialSmallBlueAmanita + - id: CP14VialSmallWildSage + - id: CP14VialSmallGroundQuartz + - id: CP14VialSmallAgaricMushroom + - id: CP14VialSmallBloodFlowerSap + #Rare + - !type:GroupSelector + weight: 0.15 + children: + - id: CP14VialTinyLumiMushroom + - id: CP14VialTinyChromiumSlime \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/spawners.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/spawners.yml index f54b4debbe..d26bf85eac 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/spawners.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/spawners.yml @@ -46,11 +46,7 @@ - id: CP14SpellScrollEarthWall - id: CP14SpellScrollFlashLight - id: CP14EnergyCrystalSmall - - id: CP14Bucket - - id: CP14CrystalLampBlueEmpty - - id: CP14Scissors - id: CP14BaseSharpeningStone - - id: CP14Rope - id: CP14GlassShard - id: CP14Paper # Rare @@ -67,10 +63,10 @@ - id: CP14VialTinyChromiumSlime - id: CP14VialTinyLumiMushroom - id: CP14SilverCoin5 - - id: CP14Nail10 - id: CP14BaseLockpick - id: CP14EnergyCrystalMedium - id: CP14DemiplanKey + weight: 2 - !type:AllSelector children: - id: CP14Crossbolt @@ -90,29 +86,9 @@ - id: CP14ClothingRingSphereOfLight - id: CP14ClothingRingFlashLight - id: CP14SpellScrollResurrection - - !type:GroupSelector - children: - - id: CP14ClothingCloakArmoredRed - - id: CP14ClothingCloakBlacksmithArpon - - id: CP14ClothingCloakMaidArpon - - id: CP14ClothingCloakBrassArmor - - id: CP14ClothingCloakCuirass - - id: CP14ClothingCloakInfantryCuirass - - id: CP14ClothingCloakCuirassLoincloth - - id: CP14ClothingCloakCuirassLeg - - id: CP14ClothingHeadCapellina - - !type:GroupSelector - children: - - id: CP14ClothingCloakFurcapeBlack - - id: CP14ClothingCloakFurcapeBlue - - id: CP14ClothingCloakSimpleWhite - - id: CP14ClothingCloakSimpleDarkBlue - - id: CP14ClothingCloakRitualAttireLeather - - id: CP14ClothingHeadBeretMercenary - - id: CP14ClothingPantsMercenaryTrousers - - id: CP14ClothingPantsSouthernMagician - - id: CP14ClothingShirtMercenary - - id: CP14ClothingShirtYellowWizard + # Rare standard village crates loot + - !type:NestedSelector + tableId: CP14StationCrateLoot - type: entityTable id: CP14TableBureaucracy diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml index 449c4b9b7e..1581be7de5 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml @@ -142,7 +142,6 @@ maxFillLevels: 5 fillBaseName: liq- - # Filled small - type: entity @@ -205,6 +204,18 @@ - ReagentId: CP14BlueAmanita Quantity: 10 +- type: entity + id: CP14VialSmallDayflin + parent: CP14VialSmall + suffix: Dayflin + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14YellowDayflinPulp + Quantity: 10 + # Filled tiny - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml index d0598f0861..c1b1a03615 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml @@ -227,3 +227,15 @@ reagents: - ReagentId: CP14LumiMushroom Quantity: 300 + +- type: entity + id: CP14BarrelDayflin + parent: CP14BaseBarrel + suffix: Dayflin + components: + - type: SolutionContainerManager + solutions: + barrel: + reagents: + - ReagentId: CP14YellowDayflinPulp + Quantity: 300 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml index a335459ce5..2471bcbfc4 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml @@ -167,209 +167,4 @@ min: 1 max: 4 - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity - abstract: true - id: BRFilledTemp - components: - - type: StorageFill - contents: - - id: CP14Crossbolt - prob: 0.2 - onGroup: Weapon - - id: CP14Crossbolt - prob: 0.2 - onGroup: Weapon - - id: CP14Crossbolt - prob: 0.2 - onGroup: Weapon - - id: CP14BaseSharpeningStone - prob: 0.2 - onGroup: Weapon - - id: CP14BaseSharpeningStone - prob: 0.2 - onGroup: Weapon - - id: CP14BaseBattleStaff - prob: 0.2 - onGroup: Weapon - - id: CP14BaseDagger - prob: 0.2 - onGroup: Weapon - - id: CP14BaseHandheldAxe - prob: 0.2 - onGroup: Weapon - - id: CP14BaseLightHammer - prob: 0.2 - onGroup: Weapon - - id: CP14BaseMace - prob: 0.2 - onGroup: Weapon - - id: CP14BaseSickle - prob: 0.2 - onGroup: Weapon - - id: CP14BaseThrowableSpear - prob: 0.2 - onGroup: Weapon - - id: CP14BaseLightCrossbow - prob: 0.2 - onGroup: Weapon - - id: CP14BaseShovel - prob: 0.2 - onGroup: Weapon2 - - id: CP14BaseHoe - prob: 0.2 - onGroup: Weapon2 - - id: CP14BasePickaxe - prob: 0.2 - onGroup: Weapon2 - - id: CP14ClothingRingIceDagger - prob: 0.2 - onGroup: Weapon2 - - id: CP14ClothingRingIceShards - prob: 0.2 - onGroup: Weapon2 - - id: CP14ClothingRingFlameCreation - prob: 0.2 - onGroup: Weapon2 - - id: CP14ClothingRingFireball - prob: 0.2 - onGroup: Weapon2 - - id: CP14ClothingRingCureWounds - prob: 0.2 - onGroup: Weapon2 - - id: CP14ClothingRingShadowStep - prob: 0.2 - onGroup: Weapon2 - - id: CP14ClothingRingShadowGrab - prob: 0.2 - onGroup: Weapon2 - - id: CP14AuraScanner - prob: 0.2 - onGroup: Weapon2 - - id: CP14CopperCoin1 - prob: 0.2 - onGroup: Currency - - id: CP14CopperCoin5 - prob: 0.2 - onGroup: Currency - - id: CP14CopperCoin - prob: 0.2 - onGroup: Currency - - id: CP14SilverCoin1 - prob: 0.2 - onGroup: Currency - - id: CP14SilverCoin5 - prob: 0.2 - onGroup: Currency - - id: CP14DirtBlock10 - prob: 0.2 - onGroup: Material - - id: CP14StoneBlock10 - prob: 0.2 - onGroup: Material - - id: CP14WoodLog - prob: 0.2 - onGroup: Material - - id: CP14WoodenPlanks10 - prob: 0.2 - onGroup: Material - - id: CP14Nail1 - prob: 0.2 - onGroup: Material - - id: CP14Nail10 - prob: 0.2 - onGroup: Material - - id: CP14BloodFlower - prob: 0.2 - onGroup: Material - - id: CP14AgaricMushroom - prob: 0.2 - onGroup: Material - - id: CP14ChromiumSlime - prob: 0.2 - onGroup: Material - - id: CP14WildSage - prob: 0.2 - onGroup: Material - - id: CP14QuartzShard - prob: 0.2 - onGroup: Material - - id: CP14LumiMushroom - prob: 0.2 - onGroup: Material - - id: CP14Pestle - prob: 0.2 - onGroup: Material - - id: CP14Mortar - prob: 0.2 - onGroup: Material - - id: CP14Dropper - prob: 0.2 - onGroup: Material - - id: CP14VialSmallBloodFlowerSap - prob: 0.2 - onGroup: Material - - id: CP14VialSmallAgaricMushroom - prob: 0.2 - onGroup: Material - - id: CP14VialSmallGroundQuartz - prob: 0.2 - onGroup: Material - - id: CP14VialSmallWildSage - prob: 0.2 - onGroup: Material - - id: CP14VialSmallChromiumSlime - prob: 0.2 - onGroup: Material - - id: CP14VialSmallLumiMushroom - prob: 0.2 - onGroup: Material - - id: CP14EnergyCrystalMedium - prob: 0.2 - onGroup: Material - - id: CP14EnergyCrystalSmall - prob: 0.2 - onGroup: Material - - id: CP14DyeRed - prob: 0.2 - onGroup: Material - - id: CP14DyeYellow - prob: 0.2 - onGroup: Material - - id: CP14DyeBlue - prob: 0.2 - onGroup: Material - - id: CP14DyeGreen - prob: 0.2 - onGroup: Material - - id: CP14DyePurple - prob: 0.2 - onGroup: Material - - id: CP14DyeBlack - prob: 0.2 - onGroup: Material - - id: CP14String - prob: 0.2 - onGroup: Material - - id: CP14Cloth10 - prob: 0.2 - onGroup: Material - - id: CP14Scissors - prob: 0.2 - onGroup: Material - - -- type: entity - id: CP14SmallWoodenCrateFilled - parent: - - CP14SmallWoodenCrate - #- BRFilledTemp - suffix: Filled, Battleroyale - -- type: entity - id: CP14LargeWoodenCrateFilled - suffix: Filled, Battleroyale - parent: - - CP14LargeWoodenCrate - #- BRFilledTemp \ No newline at end of file + acts: [ "Destruction" ] \ No newline at end of file From 47c9b77408698411458db459c9fb70469d5d287d Mon Sep 17 00:00:00 2001 From: Ed Date: Mon, 11 Nov 2024 23:49:36 +0300 Subject: [PATCH 03/12] bottles --- Resources/Prototypes/_CP14/Catalog/Fills/crates.yml | 4 ++-- .../_CP14/Entities/Objects/Consumable/Drinks/bottles.yml | 4 ++-- Resources/migration.yml | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index fc8674ccd9..88f5ff8338 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -79,8 +79,8 @@ children: - id: CP14VialSmall - id: CP14VialTiny - - id: CP14GreenVial - - id: CP14BlueVial + - id: CP14GreenBottle + - id: CP14BlueBottle - id: CP14RedBottle #Common - !type:GroupSelector diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml index cffdbfd4a7..72e67a3393 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml @@ -38,7 +38,7 @@ - type: entity name: Blue vial parent: CP14GreenBottle - id: CP14BlueVial + id: CP14BlueBottle description: A blue vial perfect for drinking whiskey. components: - type: Sprite @@ -54,7 +54,7 @@ - type: entity name: Green vial parent: CP14GreenBottle - id: CP14GreenVial + id: CP14GreenBottle description: Just a little green vial. components: - type: Sprite diff --git a/Resources/migration.yml b/Resources/migration.yml index 8add4309e4..9472ef2362 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -128,6 +128,10 @@ CP14ClothingRingIceFloor: CP14ClothingRingManaGift CP14ClothingRingCureWounds: CP14MagicHealingStaff CP14ClothingRingShadowStep: CP14ClothingRingManaGift +#2024-11-11 +CP14BlueVial: CP14BlueBottle +CP14GreenVial: CP14GreenBottle + # <---> CrystallPunk migration zone end From 5285e435be2f76342dd811b144f1b0173fb0ea65 Mon Sep 17 00:00:00 2001 From: Ed Date: Mon, 11 Nov 2024 23:55:52 +0300 Subject: [PATCH 04/12] barrel openable --- .../Entities/Structures/Furniture/barrel.yml | 32 +++++++++++++----- .../Furniture/barrel.rsi/barrel.png | Bin 1025 -> 363 bytes 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml index c1b1a03615..24cd0d3d84 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml @@ -10,6 +10,29 @@ placement: mode: PlaceFree components: + - type: Openable + sound: + collection: bottleOpenSounds + closeable: true + closeSound: + collection: bottleCloseSounds + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {visible: false} + False: {visible: true} + - type: Sprite + drawdepth: Mobs + sprite: _CP14/Structures/Furniture/barrel.rsi + noRot: true + layers: + - state: barrel_open + - state: liq1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - state: barrel + map: ["enum.OpenableVisuals.Layer"] - type: Transform noRot: true - type: InteractionOutline @@ -65,15 +88,6 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: Appearance - - type: Sprite - drawdepth: Mobs - sprite: _CP14/Structures/Furniture/barrel.rsi - noRot: true - layers: - - state: barrel_open - - state: liq1 - map: ["enum.SolutionContainerLayers.Fill"] - visible: false - type: SolutionContainerManager solutions: barrel: diff --git a/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/barrel.png b/Resources/Textures/_CP14/Structures/Furniture/barrel.rsi/barrel.png index 38401aa411aa5ee24aa2b3619f6a72942d66fed6..1397f23b322ce1a3a20fcc39a5c28074b5c261fc 100644 GIT binary patch delta 324 zcmV-K0lWTz2O4L#JMDSeB{}lEN|-vn7$Xdg>xoXf*|!3GF@{-K0n$QFx_=g*Pc1^%ZsVbA6S_8m zQ^)613#e~tFaeS0Rf`)NVQ8{?39rtiL`dI&KRE~B!ZO-eGfubpw_IUpZT?^aeik{z zSAoL{`21|Y;s=B+U*DykOv(jul8gc;s5G(7tt!E) zAR$$pdfDr$mwtl%M7^NB<_lD+)K(>zY7te-?n*cX3RFZ%YQ>K0ylAtBFoToWj??S@ zPw~t%&-0rZ&wm{Fzw4)Q2duB=y1%Zk1ojt-2F1URBIk`9=zlF-C>ofy3xJ+b05EMA zJ)z)@i2@QEr}&GPpU@KuX?+r1jkBCosMVViAgxbQC>j6)q&o^?B*0+td`4qlQ`!Gq z10Z*E4gjmwC3ka<`B{g9Q;R~;hy*bawfN5~bLeV(6t7fnaauyGujaZx1mIOVISatN zrph+)yJk6kv46T6m+_+%2yiEr>Z2Yk5+pC6kZHR^`9=Z^O1x}C?Ezp%=ilU(iIXxG zz`xoe03S*hJb!WztJTGH+SDv(sA#R;lzsc3YnVmcvQK#cK6d_oU*=G28i!Jd$AwJ%5I+*(~rC0OP#O^C$NJc=7U6 zUqRDpW7;mJ?aCN2bD77gjt4MdU6Ot9fTR7A+)LxU%t__Ch@V~^oU)u$n3?LOKDzu) zb}h}vw};~a0F;a`WY@N^|JjpmrqjkaFU#kXipz2`_$5oNZBa751onplI2VVMfb8uJ zs=z|^&wrtqq~@QZy6}+HLT?hzh5zhF0_X_^^9thGv)_PCR)KeWZ+u~@3lG_Ox+$M` zcmD`24k5SUom8r;Clquw&T-j7UAim#vMXtR+1MN!^KS1AfLwCt;*eW6Gysmv7Jr?c z4b_Wu8|n##-1JwDF27^iE@$-;yH`cBD`^>bwtxRxUd#E6#z8&!-G~IBtMR@)&Sx}U zAG*C$(dhwve0x1hU5#VfF8Pcm$0W5F6{|BoK+n1SZPp8AItocG#>`ZVMze$I_|LkR z?`)_&)Co}xpLGo0Vb?V01~%1 zWPe+uIlPyCA1U5AF<#`03?SrnvB4!5g$BW{--mXn3yuVste1eEow`epXf!+MYCLrB zO{Yzx*}+|UL~3oTFOQ!>zgWdrjJkC9$_aZCPS|L6s8}6&3Ra)~-WTJwVLua!1fVAr zOxxxD3LS82n<9`TX5W=hbk63qn3krGvumly41Rx+pQem}1-sjxnH1CaX z+`6H0T(*GVr5B2H7l Date: Mon, 11 Nov 2024 23:58:48 +0300 Subject: [PATCH 05/12] Update crates.yml --- Resources/Prototypes/_CP14/Catalog/Fills/crates.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 88f5ff8338..987fae9450 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -45,9 +45,14 @@ - !type:GroupSelector children: - id: CP14Scissors + - id: CP14BaseCrowbar + - id: CP14BaseWrench + - id: CP14BaseShovel + - id: CP14BaseMop + - id: CP14BaseBroom + - id: CP14BasePickaxe - id: CP14CrystalLampBlueEmpty - id: CP14CrystalLampOrangeEmpty - - id: CP14Bucket - id: CP14Rope - id: CP14Nail10 - id: CP14EnergyCrystalSmall From 1d5d10fa58f4e40e52a16a90ff64ede1ec096042 Mon Sep 17 00:00:00 2001 From: Ed Date: Tue, 12 Nov 2024 00:00:46 +0300 Subject: [PATCH 06/12] mop fix --- .../_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml index 3d2228f3d8..a2c2a54682 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml @@ -7,7 +7,10 @@ description: Mop for cleaning floors from various unpleasant liquids components: - type: Item - size: Large + size: Normal + storedRotation: 0 + shape: + - 0,0,0,2 sprite: _CP14/Objects/Tools/mop.rsi - type: Sprite sprite: _CP14/Objects/Tools/mop.rsi @@ -30,7 +33,7 @@ - type: SolutionContainerManager solutions: absorbed: - maxVol: 100 + maxVol: 50 - type: entity id: CP14BaseBroom From e1492fcf743f9c9cff1213050d632fb189f64f51 Mon Sep 17 00:00:00 2001 From: Ed Date: Tue, 12 Nov 2024 00:01:26 +0300 Subject: [PATCH 07/12] broom fix --- .../_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml index a2c2a54682..3dcefe6687 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml @@ -44,7 +44,10 @@ description: Sweeps up dried footprints and other stains from the floor components: - type: Item - size: Large + size: Normal + storedRotation: 0 + shape: + - 0,0,0,2 sprite: _CP14/Objects/Tools/broom.rsi - type: Sprite sprite: _CP14/Objects/Tools/broom.rsi From c14b48f73ae14d3c10a2b37524ede4c5a8656a2c Mon Sep 17 00:00:00 2001 From: Ed Date: Tue, 12 Nov 2024 00:03:55 +0300 Subject: [PATCH 08/12] crossbolt size fix --- .../Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml | 2 ++ .../_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml index 9eb030183d..6233a28559 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml @@ -6,6 +6,8 @@ components: - type: Item size: Tiny + shape: + - 0,0,0,0 - type: Tag tags: - CP14CrossbowBolt diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml index ce62f54f3d..b3c6a36184 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml @@ -11,7 +11,7 @@ - state: unwielded map: [ base ] - type: Item - size: Small + size: Normal - type: Clothing equipDelay: 0.45 unequipDelay: 0.45 From 2c686568436c66cce174515674e4f17363c07b9b Mon Sep 17 00:00:00 2001 From: Ed Date: Tue, 12 Nov 2024 00:11:56 +0300 Subject: [PATCH 09/12] bottles fix --- Resources/Prototypes/_CP14/Catalog/Fills/crates.yml | 2 ++ .../Entities/Objects/Consumable/Drinks/bottles.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 987fae9450..e4f0d59a78 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -85,7 +85,9 @@ - id: CP14VialSmall - id: CP14VialTiny - id: CP14GreenBottle + - id: CP14GreenBottle2 - id: CP14BlueBottle + - id: CP14OrangeBottle - id: CP14RedBottle #Common - !type:GroupSelector diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml index 72e67a3393..c403c99b05 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/bottles.yml @@ -1,6 +1,6 @@ #Base for future bottles - type: entity - name: Green Bottle + name: green Bottle parent: CP14BaseVialFragile id: CP14GreenBottle suffix: Empty @@ -36,7 +36,7 @@ fillBaseName: fill- - type: entity - name: Blue vial + name: blue bottle parent: CP14GreenBottle id: CP14BlueBottle description: A blue vial perfect for drinking whiskey. @@ -52,9 +52,9 @@ fillBaseName: fill- - type: entity - name: Green vial + name: green bottle parent: CP14GreenBottle - id: CP14GreenBottle + id: CP14GreenBottle2 description: Just a little green vial. components: - type: Sprite @@ -65,7 +65,7 @@ maxVol: 15 - type: entity - name: Orange bottle + name: orange bottle parent: CP14GreenBottle id: CP14OrangeBottle description: Just a orange bottle. @@ -74,7 +74,7 @@ sprite: _CP14/Objects/Consumable/Drinks/orange_bottle.rsi - type: entity - name: Red Bottle + name: red Bottle parent: CP14GreenBottle id: CP14RedBottle description: A red bottle perfect for drinking wine. From e45c74d1204c3d4faa60ffb07af7613ddce63add Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:19:14 +0300 Subject: [PATCH 10/12] Update closets.yml --- .../Prototypes/_CP14/Entities/Structures/Furniture/closets.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml index 901fb561e9..ff1af14f70 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml @@ -23,6 +23,7 @@ collection: MetalThud - type: InteractionOutline - type: Physics + bodyType: Static - type: Fixtures fixtures: fix1: From 93260157866b195b562612d9b9ddd228960b446c Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:24:04 +0300 Subject: [PATCH 11/12] Update anvil.yml --- Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml index dc518f8ea9..788fc5693a 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml @@ -87,6 +87,14 @@ CP14IronBar: 2 result: CP14BaseCrowbar +- type: CP14Recipe + id: CP14BaseWrench + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14IronBar: 2 + result: CP14BaseWrench + - type: CP14Recipe id: CP14BaseTwoHandedSword tag: CP14RecipeAnvil From d70397d2c281440eddeff1c491a335ae3d7cff3d Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 12 Nov 2024 12:22:47 +0300 Subject: [PATCH 12/12] Update crates.yml --- .../_CP14/Entities/Structures/Storage/Crates/crates.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml index 2471bcbfc4..7d89a31698 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml @@ -44,7 +44,7 @@ False: { state: icon } - type: Storage grid: - - 0,0,6,6 + - 0,0,7,7 maxItemSize: Large storageOpenSound: /Audio/Effects/closetopen.ogg storageCloseSound: /Audio/Effects/closetclose.ogg @@ -62,7 +62,7 @@ shape: !type:PhysShapeAabb bounds: "-0.4,-0.4,0.4,0.4" - density: 155 + density: 255 mask: - MachineMask layer: @@ -79,14 +79,14 @@ shape: !type:PhysShapeAabb bounds: "-0.3,-0.3,0.3,0.3" - density: 95 + density: 135 mask: - MachineMask layer: - WallLayer - type: Storage grid: - - 0,0,4,4 + - 0,0,5,5 maxItemSize: Normal - type: Destructible thresholds: