From 72dcef420340cac721b01810ee247da4c8a70b23 Mon Sep 17 00:00:00 2001 From: mirrorcult Date: Mon, 3 Jan 2022 02:53:09 -0700 Subject: [PATCH] Reduce locker/crate hp and resistances, add spear wielding (#6001) --- Resources/Prototypes/Damage/modifier_sets.yml | 6 +++--- .../Objects/Weapons/Melee/baseball_bat.yml | 2 +- .../Entities/Objects/Weapons/Melee/fireaxe.yml | 8 ++++---- .../Entities/Objects/Weapons/Melee/pickaxe.yml | 4 ++-- .../Entities/Objects/Weapons/Melee/spear.yml | 6 ++++++ .../Closets/Lockers/base_structurelockers.yml | 12 ++++++++++-- .../Storage/Crates/base_structurecrates.yml | 6 +++--- .../Objects/Weapons/Melee/spear.rsi/meta.json | 8 ++++++++ .../Melee/spear.rsi/wielded-inhand-left.png | Bin 0 -> 717 bytes .../Melee/spear.rsi/wielded-inhand-right.png | Bin 0 -> 669 bytes 10 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 178b3e7a6e..ae68d48f48 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -26,9 +26,9 @@ Piercing: 0.7 Shock: 1.2 flatReductions: - Blunt: 16 - Slash: 16 - Piercing: 16 + Blunt: 14 + Slash: 14 + Piercing: 14 Shock: 10 Heat: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index 31b9c54fce..96671b4f89 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -10,7 +10,7 @@ - type: MeleeWeapon damage: types: - Blunt: 15 + Blunt: 14 - type: Clothing size: 15 sprite: Objects/Weapons/Melee/baseball_bat.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 11057b854a..ac7bf1f8fc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -14,14 +14,14 @@ damage: types: # axes are kinda like sharp hammers, you know? - Blunt: 7 - Slash: 7 + Blunt: 4 + Slash: 10 - type: Wieldable - type: IncreaseDamageOnWield modifiers: flatReductions: - Blunt: -5 # negative reductions = increases - Slash: -5 + Blunt: -2 # negative reductions = increases + Slash: -8 - type: Clothing size: 20 sprite: Objects/Weapons/Melee/fireaxe.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index e0f1bbfef0..c6507d1856 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -12,8 +12,8 @@ - type: MeleeWeapon damage: types: - Piercing: 15 - Blunt: 5 + Piercing: 10 + Blunt: 4 - type: Item size: 24 sprite: Objects/Weapons/Melee/pickaxe.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 24b6120d02..7c0bc711a3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -24,6 +24,7 @@ - type: Clothing size: 24 sprite: Objects/Weapons/Melee/spear.rsi + QuickEquip: false Slots: - back - type: Construction @@ -39,6 +40,11 @@ solution: melee - type: SolutionTransfer maxTransferAmount: 5 + - type: Wieldable + - type: IncreaseDamageOnWield + modifiers: + flatReductions: + Piercing: -7 - type: MeleeWeaponAnimation id: spear diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml index d80f616c11..fa7eb140b0 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml @@ -23,7 +23,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 150 + damage: 50 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -43,4 +43,12 @@ components: - type: Damageable damageContainer: Inorganic - damageModifierSet: StrongMetallic \ No newline at end of file + damageModifierSet: StrongMetallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index f7aba28fb9..b8a74a5f73 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml @@ -45,7 +45,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 50 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -110,7 +110,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 75 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -128,4 +128,4 @@ - Paper - type: Construction graph: CrateSecure - node: cratesecure \ No newline at end of file + node: cratesecure diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json index a380e9796e..777736b486 100644 --- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json @@ -18,6 +18,14 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..93d4bdbdec317f7193492e4c2cbc4b1046beb74c GIT binary patch literal 717 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|QgN zr;B4q#hkaZ484^dMUMZsoVI1-P9^yRSA~+a#N66ebaVvr=Pyaik&L1X09oC&s zXEAf@x^CEDaP?8xHpYo-FLm9q$bZygy8Bqp9F~uJX| z^ZuXZ9k(|JYdGYxH~uv2T4b)y?zrHe{g)4m@16SlOseat65H3$>RlHsZX7?gzCxu* zK~he3MPcb@^RQj*89(f#swR|YnqH5TIsPlcmD%>P;nqmSX-b)w`Ig+xTV1s`@0ZLm zt@B~kk$?B@l0Uk*F2kq#ubqvp+pITlv<&JS-)wsSN>o6t`B2Mb6~nikb-(LEd84^l~jvu2rp%}kz}TJtE!UQsscr(Uu6!Mz6)Dn7CIsL$9_EXO+| zW#WQGp{6U(M{3-5_j5S9=Z=%7>W^6`as_Y(2~ub|1S((UemVJ+hb!yR%FQQ!v@+#5 ztdb16ctuR&d7w$9zTMGf??vWwZTsA1`%&M))H&ETE}kj0r(ACR)sw09ib6SWZa3G; zT+QOJl2txZ8v5&Sc0(+0oy=>N5~YK;VuWUj{66u0>e`6gPODe{2##klc6FbcyS$nx?XryLh+^k;tKvZxm*+ITW?qUDLn3P_2d ceQ$$!=4IW)6i0OrVESb6boFyt=akR{0EyHtKL7v# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ccf554d0b890d4bef4044d4dad90d9d66d14f331 GIT binary patch literal 669 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S%4 zr;B4q#hkaZHhL>NiX7WN_2{)%6PmY#Nw1yc^x?sdOWG{bkq4_lHBpLZ=-8>?Y{YBQ+Anc#d~)J#m&a~_wvPreq3uU2w`Yh z%%mVA%J6Un1BW}SgM}8up+H7~KCXs>EYSj?n5gnpVRqf)C#C<}ZTR**mS6UN_PYwv zGp-Hqe}6k)(9qhi%i{PT<@k%gIvf{l?3}7k@9FSx>Wz;tDg6AIeGzBb_3y{8Y3<&g z`PxThg89VRiaQej)%@PUVKZxEX^&w>-H+B~&mVsHC-?5#_8m9h#5x3BTfFg`r};j! zSu>*2pMUPMeScq6%;{^U-rG_OnML>CFTdu&`G9-pN}WHkcXZ;U`3|3y=01FZbLGLM zs<$P3Www0M_r3dV@x>cIg3mq*sI8cH)>=kMwV})8W67*a->H_2&kV9wHGewN8)9(% zY@Ea*sX0Hs{$FU{4E8Ucpa4s)ikWlR?;N9g>!SCO`;8by3f{$+T#So#zT2tazWVz4 zugg2fy!*rZvl- z%irx@>gC5XSpyQavW)ok_NZ>tW9rtgzBGA;XT$T#vRj_l8Luv{JyXqZ%vo{%*y?-D i|AbqRVz@*6gE-S~iPft%766kQ1B0ilpUXO@geCxyr7NHS literal 0 HcmV?d00001