diff --git a/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeParrySystem.cs b/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeParrySystem.cs index ad57b04d73..684dad3452 100644 --- a/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeParrySystem.cs +++ b/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeParrySystem.cs @@ -24,10 +24,10 @@ public sealed class CP14MeleeParrySystem : EntitySystem base.Initialize(); SubscribeLocalEvent(OnMeleeHit); - SubscribeLocalEvent(OnMeleeParriableHitAttmpt); + SubscribeLocalEvent(OnMeleeParriableHitAttempt); } - private void OnMeleeParriableHitAttmpt(Entity ent, ref AttemptMeleeEvent args) + private void OnMeleeParriableHitAttempt(Entity ent, ref AttemptMeleeEvent args) { ent.Comp.LastMeleeHit = _timing.CurTime; } @@ -57,7 +57,8 @@ public sealed class CP14MeleeParrySystem : EntitySystem _hands.TryDrop(target, parriedWeapon); _throwing.TryThrow(parriedWeapon, _random.NextAngle().ToWorldVec(), ent.Comp.ParryPower, target); - _popup.PopupPredicted( Loc.GetString("cp14-successful-parry"), args.User, args.User); - _audio.PlayPredicted(meleeParriable.ParrySound, parriedWeapon, args.User); + _popup.PopupEntity( Loc.GetString("cp14-successful-parry"), args.User, args.User); + _popup.PopupEntity( Loc.GetString("cp14-successful-parry"), args.HitEntities[0], args.HitEntities[0]); + _audio.PlayPvs(meleeParriable.ParrySound, parriedWeapon); } } diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml index e6d566ceb6..158b9bd2bb 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml @@ -68,9 +68,6 @@ - type: Icon sprite: _CP14/Structures/Furniture/Tables/wood.rsi state: frame - - type: Construction - graph: CP14TableWooden - node: CP14TableWoodenFrame - type: entity parent: CP14WoodenTableBase @@ -102,4 +99,21 @@ state: round - type: Icon sprite: _CP14/Structures/Furniture/Tables/wood.rsi - state: round \ No newline at end of file + state: round + - type: Construction + graph: CP14TableWoodenRound + node: CP14TableWoodenRound + +- type: entity + parent: CP14TableWooden + id: CP14TableWoodenCounter + name: wooden counter + components: + - type: Sprite + sprite: _CP14/Structures/Furniture/Tables/wood_counter.rsi + - type: Icon + sprite: _CP14/Structures/Furniture/Tables/wood_counter.rsi + state: full + - type: Construction + graph: CP14TableWoodenCounter + node: CP14TableWoodenCounter \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index d297a776b9..19b4e4e0fa 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -73,7 +73,7 @@ sprite: _CP14/Effects/fire.rsi normalState: full - type: Construction - graph: CP14TableWooden + graph: CP14Workbench node: CP14Workbench - type: CP14Workbench recipeTags: @@ -91,6 +91,9 @@ state: cooking_table - type: Icon state: cooking_table + - type: Construction + graph: CP14WorkbenchCooking + node: CP14WorkbenchCooking - type: CP14Workbench craftSound: collection: CP14Sawing #TODO @@ -109,6 +112,9 @@ state: sewing_table - type: Icon state: sewing_table + - type: Construction + graph: CP14WorkbenchSewing + node: CP14WorkbenchSewing - type: CP14Workbench craftSound: collection: CP14Sawing #TODO diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index cfc7419e51..78870edd94 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -83,13 +83,19 @@ name: cp14-loadout-general-mask minLimit: 0 loadouts: - - CP14Sinner + - CP14ClothingMaskSinner + - CP14ClothingMaskSteelMask - type: loadout - id: CP14Sinner + id: CP14ClothingMaskSinner equipment: mask: CP14ClothingMaskSinner +- type: loadout + id: CP14ClothingMaskSteelMask + equipment: + mask: CP14ClothingMaskSteelMask + # Head - type: loadoutGroup @@ -285,9 +291,9 @@ maxLimit: 2 loadouts: - CP14ClothingRingCureWounds - - CP14ClothingRingFlameCreation - - CP14ClothingRingIceDagger - - CP14FoodCucumber + - CP14PenFeather + - CP14Paper + - CP14CopperCoin10 - type: loadout id: CP14ClothingRingCureWounds @@ -296,19 +302,19 @@ - CP14ClothingRingCureWounds - type: loadout - id: CP14ClothingRingFlameCreation + id: CP14PenFeather storage: back: - - CP14ClothingRingFlameCreation + - CP14PenFeather - type: loadout - id: CP14ClothingRingIceDagger + id: CP14Paper storage: back: - - CP14ClothingRingIceDagger + - CP14Paper - type: loadout - id: CP14FoodCucumber + id: CP14CopperCoin10 storage: back: - - CP14FoodCucumber \ No newline at end of file + - CP14CopperCoin \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml index 5f3e6ee579..1fcc6b8f18 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml @@ -6,48 +6,90 @@ actions: - !type:DestroyEntity {} edges: - - to: CP14TableWoodenFrame + - to: CP14TableWooden steps: - material: CP14WoodenPlanks amount: 2 doAfter: 2 - - - node: CP14TableWoodenFrame - entity: CP14TableWoodenFrame - edges: - - to: start - completed: - - !type:SpawnPrototype - prototype: CP14WoodenPlanks1 - amount: 2 - - !type:DeleteEntity {} - steps: - - tool: Screwing #TODO - new tool - doAfter: 1 - - to: CP14TableWooden - steps: - - tool: CP14Hammering - doAfter: 1 - - to: CP14Workbench - steps: - - material: CP14Nail - amount: 1 - doAfter: 1 - - tool: CP14Hammering - doAfter: 1 - - node: CP14TableWooden entity: CP14TableWooden + +- type: constructionGraph + id: CP14TableWoodenRound + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} edges: - - to: CP14TableWoodenFrame + - to: CP14TableWoodenRound steps: - - tool: Screwing #TODO - new tool - doAfter: 1 + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14TableWoodenRound + entity: CP14TableWoodenRound + +- type: constructionGraph + id: CP14TableWoodenCounter + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14TableWoodenCounter + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14TableWoodenCounter + entity: CP14TableWoodenCounter +- type: constructionGraph + id: CP14Workbench + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14Workbench + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 - node: CP14Workbench entity: CP14Workbench + +- type: constructionGraph + id: CP14WorkbenchCooking + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} edges: - - to: CP14TableWoodenFrame + - to: CP14WorkbenchCooking steps: - - tool: Screwing #TODO - new tool - doAfter: 1 \ No newline at end of file + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14WorkbenchCooking + entity: CP14WorkbenchCooking + +- type: constructionGraph + id: CP14WorkbenchSewing + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14WorkbenchSewing + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14WorkbenchSewing + entity: CP14WorkbenchSewing \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml index 2a64674984..e56c67a528 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml @@ -34,6 +34,42 @@ conditions: - !type:TileNotBlocked +- type: construction + crystallPunkAllowed: true + name: Wooden table (round) + description: A simple table made of boards. + id: CP14TableWoodenRound + graph: CP14TableWoodenRound + startNode: start + targetNode: CP14TableWoodenRound + category: construction-category-furniture + icon: + sprite: _CP14/Structures/Furniture/Tables/wood.rsi + state: round + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Wooden counter + description: A simple table made of boards. + id: CP14TableWoodenCounter + graph: CP14TableWoodenCounter + startNode: start + targetNode: CP14TableWoodenCounter + category: construction-category-furniture + icon: + sprite: _CP14/Structures/Furniture/Tables/wood_counter.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction crystallPunkAllowed: true name: Bonfire @@ -95,7 +131,7 @@ name: Workbench description: Table for the production of various basic tools. id: CP14Workbench - graph: CP14TableWooden + graph: CP14Workbench startNode: start targetNode: CP14Workbench category: construction-category-furniture @@ -108,6 +144,42 @@ conditions: - !type:TileNotBlocked +- type: construction + crystallPunkAllowed: true + name: Cooking table + description: A table to work with food. Time to cook! + id: CP14WorkbenchCooking + graph: CP14WorkbenchCooking + startNode: start + targetNode: CP14WorkbenchCooking + category: construction-category-furniture + icon: + sprite: _CP14/Structures/Furniture/workbench.rsi + state: cooking_table + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Sewing table + description: A table with embroidery tools to create different clothing and materials. + id: CP14WorkbenchSewing + graph: CP14WorkbenchSewing + startNode: start + targetNode: CP14WorkbenchSewing + category: construction-category-furniture + icon: + sprite: _CP14/Structures/Furniture/workbench.rsi + state: sewing_table + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction crystallPunkAllowed: true id: CP14Mannequin diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/full.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/full.png new file mode 100644 index 0000000000..fb62dd7933 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/meta.json new file mode 100644 index 0000000000..9db09ac085 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "state0", + "directions": 4 + }, + { + "name": "state1", + "directions": 4 + }, + { + "name": "state2", + "directions": 4 + }, + { + "name": "state3", + "directions": 4 + }, + { + "name": "state4", + "directions": 4 + }, + { + "name": "state5", + "directions": 4 + }, + { + "name": "state6", + "directions": 4 + }, + { + "name": "state7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state0.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state0.png new file mode 100644 index 0000000000..bc8249478b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state0.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state1.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state1.png new file mode 100644 index 0000000000..92bd4994d1 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state1.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state2.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state2.png new file mode 100644 index 0000000000..bc8249478b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state2.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state3.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state3.png new file mode 100644 index 0000000000..8eb118bb5c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state3.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state4.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state4.png new file mode 100644 index 0000000000..a365cbdc75 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state4.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state5.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state5.png new file mode 100644 index 0000000000..8dbfedf17e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state5.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state6.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state6.png new file mode 100644 index 0000000000..5ccb16b4ae Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state6.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state7.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state7.png new file mode 100644 index 0000000000..6b1827695c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state7.png differ