From 91c226d18d56f7088844dfc1a0c1161a6a1f239f Mon Sep 17 00:00:00 2001 From: Ed Date: Tue, 8 Oct 2024 22:50:02 +0300 Subject: [PATCH] Revert "anvil" This reverts commit 3ab1649992a2aad12255315ca8c8241cac182e32. --- .../Objects/Weapons/Melee/battleStaff.yml | 6 +- .../Entities/Structures/Fence/iron_grille.yml | 6 +- .../Structures/Furniture/workbenchs.yml | 32 ----- .../_CP14/Recipes/Workbench/anvil.yml | 116 ------------------ .../_CP14/Recipes/Workbench/workbench.yml | 10 +- Resources/Prototypes/_CP14/tags.yml | 6 - .../Furniture/mannequin.rsi/meta.json | 2 +- .../Furniture/workbench.rsi/anvil.png | Bin 959 -> 0 bytes .../Furniture/workbench.rsi/meta.json | 4 - 9 files changed, 8 insertions(+), 174 deletions(-) delete mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml delete mode 100644 Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/anvil.png diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml index ce771e4b96..730e6cf724 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml @@ -24,7 +24,7 @@ - type: IncreaseDamageOnWield damage: types: - Blunt: 3 + Blunt: 4 - type: MeleeWeapon angle: 100 attackRate: 1.3 @@ -33,12 +33,12 @@ wideAnimation: CP14WeaponArcSlash damage: types: - Blunt: 3 + Blunt: 4 soundHit: collection: MetalThud cPAnimationLength: 0.3 cPAnimationOffset: -1.3 - type: StaminaDamageOnHit - damage: 4 + damage: 9 - type: CP14Currency currency: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml index d8377bb13c..99df874049 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml @@ -19,9 +19,9 @@ !type:DamageTrigger damage: 250 behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak + #- !type:PlaySoundBehavior + # sound: + # collection: WoodDestroy - !type:DoActsBehavior acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index 98ca16399e..708c7db44a 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -114,35 +114,3 @@ collection: CP14Sawing #TODO recipeTags: - CP14RecipeSewing - -- type: entity - id: CP14WorkbenchAnvil - parent: - - CP14BaseWorkbench - name: anvil - description: "An ultimatum anvil that doesn't even need a hammer or red-hot ingot temperatures to forge tools. (OOC: we just haven't done it yet)" - components: - - type: Sprite - snapCardinals: true - state: anvil - - type: Icon - state: anvil - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: StructuralMetallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 250 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: CP14Workbench - craftSound: - collection: CP14Sawing #TODO - recipeTags: - - CP14RecipeAnvil \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml deleted file mode 100644 index 8ec2629b90..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml +++ /dev/null @@ -1,116 +0,0 @@ -- type: CP14Recipe - id: CP14BaseBattleHammer - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 1 - CP14IronBar: 3 - result: CP14BaseBattleHammer - -- type: CP14Recipe - id: CP14BaseDagger - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 1 - CP14IronBar: 1 - result: CP14BaseDagger - -- type: CP14Recipe - id: CP14BaseHandheldAxe - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 1 - CP14IronBar: 1 - result: CP14BaseHandheldAxe - -- type: CP14Recipe - id: CP14BaseLightHammer - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 1 - CP14IronBar: 1 - result: CP14BaseLightHammer - -- type: CP14Recipe - id: CP14BaseMace - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 1 - CP14IronBar: 2 - result: CP14BaseMace - -- type: CP14Recipe - id: CP14BaseShield - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 2 - CP14IronBar: 2 - result: CP14BaseShield - -- type: CP14Recipe - id: CP14BaseSickle - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 1 - CP14IronBar: 2 - result: CP14BaseSickle - -- type: CP14Recipe - id: CP14BaseThrowableSpear - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 2 - CP14IronBar: 1 - result: CP14BaseThrowableSpear - -- type: CP14Recipe - id: CP14BaseSword - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 1 - CP14IronBar: 3 - result: CP14BaseSword - -- type: CP14Recipe - id: CP14BaseTwoHandedSword - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 1 - CP14IronBar: 4 - result: CP14BaseTwoHandedSword - -- type: CP14Recipe - id: CP14BaseHoe - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 1 - CP14IronBar: 2 - result: CP14BaseHoe - -- type: CP14Recipe - id: CP14BasePickaxe - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 1 - CP14IronBar: 2 - result: CP14BasePickaxe - -- type: CP14Recipe - id: CP14BaseShovel - tag: CP14RecipeAnvil - craftTime: 4 - stacks: - CP14WoodenPlanks: 1 - CP14IronBar: 2 - result: CP14BaseShovel \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml index efc2b3a803..4a1725f17c 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml @@ -51,12 +51,4 @@ CP14Wheat: 2 stacks: CP14WoodenPlanks: 2 - result: CP14BaseBroom - -- type: CP14Recipe - id: CP14BaseBattleStaff - tag: CP14RecipeWorkbench - craftTime: 4 - stacks: - CP14WoodenPlanks: 3 - result: CP14BaseBattleStaff \ No newline at end of file + result: CP14BaseBroom \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 442a162530..eca6c68975 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -42,9 +42,3 @@ - type: Tag id: CP14RecipeWorkbench - -- type: Tag - id: CP14RecipeAnvil - -- type: Tag - id: CP14RecipeMeltingFurnace diff --git a/Resources/Textures/_CP14/Structures/Furniture/mannequin.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/mannequin.rsi/meta.json index 56753a2bb8..68a4eeb0cd 100644 --- a/Resources/Textures/_CP14/Structures/Furniture/mannequin.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Furniture/mannequin.rsi/meta.json @@ -9,7 +9,7 @@ "states": [ { "name": "mannequin", - "directions": 4 + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/anvil.png b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/anvil.png deleted file mode 100644 index 102a69fe65aab9a566d806be43514f5537783639..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 959 zcmV;w13>(VP)Px&c}YY;RCt{2oxN|{Fc8J*qKg+JfdDO80$7X3E``zj{Vs$q9lh8|EsZNkGFFhzWeqzMmifH86Fn3M^hVsDgyvw&+rB7T+u_b#9Y#HOI(mU3v! z*mdxM_!M+4^1X@Pb=~Oa6Z<>K&o5#lz$f&*nUIt0yP&S?R2!1}K@ypQs6$e__$3fu zgk1t_`_4xbA_iE|eGAmRJo%JSDmjux*MNHwIfPGO>Cud@BCe?GI=I!8e9%}1R8P<5 z^yi&*zeaM7WY#Wd*S66jR!`4n*S4Iup9Sn~s5OCVgncc<|3G97uwuS#x85lU!rvmg z2=Cf<)CA4qmt2e3$5NK7>gM{}c6)QpCI01nDt;_wEC(vw99SdZaNI9k2~eJN4dQD+ zplOL7GL@NYP^{KxhQaVOKMU8~^|S00000000000000000000008($^5fxC&Rym@ zuC6I2(!ngw;nj()Eqi0qB|YqlI5nmiD0u`8aP`nkRmM4N17?hz5mxvwU%zo;3gW0O z4z@ERjQ~pNzU#HI&6);6v76#G>rEdcd`wQ)KmY!92)>W#;aoz$O)`>&b1{EQG8Z4B z%{r*pLr7Ot`l>g5CX0;V*sptSl*S;S2(D4*JrjN80}Jpz1l;&pJoCnrZ8F{Pl~ z)vP0w7l+^iM_t4?eS%!#OO~;^N@=N65+|>pKfVWZAdLXZBF0%XQ;KhlyPnyu3n5Zh z(UV3%&bqIZ1>72QL5)~pR2h)EeZk?lUudfZQ)57`-VxeNASEpE&w4`SZrq_Ir|6_( z7c|XXQcC2cW(s;#U_fDt7?5NBol2>gvKwIMSWPC_SV}Y+DKY{ynNU)EV