From 27becd89868568190f0e036e59a08ea48636112f Mon Sep 17 00:00:00 2001 From: HerCoyote23 <131214189+HerCoyote23@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:37:12 -0700 Subject: [PATCH] Security Melee Weapon, the Truncheon (#17666) * Added Combat Baton * Add to secfab * reduce damage to 15 * Renamed to Truncheon, set damage to 17 again. * Added T2 research, up dmg to 18 cause it'll be rarer. * Make recipe dynamic --- .../Locale/en-US/research/technologies.ftl | 1 + .../Entities/Objects/Weapons/security.yml | 26 ++++++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Recipes/Lathes/security.yml | 8 ++++++ Resources/Prototypes/Research/arsenal.yml | 14 +++++++++- .../Melee/truncheon.rsi/equipped-BELT.png | Bin 0 -> 245 bytes .../Weapons/Melee/truncheon.rsi/icon.png | Bin 0 -> 357 bytes .../Melee/truncheon.rsi/inhand-left.png | Bin 0 -> 367 bytes .../Melee/truncheon.rsi/inhand-right.png | Bin 0 -> 367 bytes .../Weapons/Melee/truncheon.rsi/meta.json | 26 ++++++++++++++++++ 10 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/meta.json diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 9f8bbf84ba..24a9809199 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -37,6 +37,7 @@ research-technology-nonlethal-ammunition = Nonlethal Ammunition research-technology-optimized-ballistics = Optimized Ballistics research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry research-technology-wave-particle-harnessing = Wave Particle Harnessing +research-technology-advanced-riot-control = Advanced Riot Control research-technology-handheld-electrical-propulsion = Handheld Electrical Propulsion research-technology-basic-robotics = Basic Robotics diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 2ac431b873..cca60eac6a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -57,6 +57,32 @@ intensitySlope: 1.5 maxIntensity: 200 +- type: entity + name: truncheon + parent: BaseItem + id: Truncheon + description: A rigid, steel-studded baton, meant to harm. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/truncheon.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Blunt: 18 + - type: Item + size: 30 + - type: Clothing + sprite: Objects\Weapons\Melee\truncheon.rsi + quickEquip: false + slots: + - Belt + - type: DisarmMalus + malus: 0.225 + - type: Appearance + - type: StaticPrice + price: 100 + - type: entity name: flash parent: BaseItem diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index fba103c5cd..86057f2e01 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -455,6 +455,7 @@ - SignalTrigger - VoiceTrigger - TimerTrigger + - Truncheon - FlashPayload - ExplosivePayload - WeaponLaserCarbine diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 8814fb1336..d995a7701e 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -20,6 +20,14 @@ Steel: 300 Plastic: 300 +- type: latheRecipe + id: Truncheon + result: Truncheon + completetime: 2 + materials: + Steel: 300 + Plastic: 300 + - type: latheRecipe id: WeaponLaserCarbine result: WeaponLaserCarbine diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 64f8dc3401..1b5d739213 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -1,4 +1,4 @@ -# Tier 1 +# Tier 1 - type: technology id: SalvageWeapons @@ -130,6 +130,18 @@ recipeUnlocks: - WeaponXrayCannon +- type: technology + id: AdvancedRiotControl + name: research-technology-advanced-riot-control + icon: + sprite: Objects/Weapons/Melee/truncheon.rsi + state: icon + discipline: Arsenal + tier: 2 + cost: 8000 + recipeUnlocks: + - Truncheon + # Tier 3 - type: technology diff --git a/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..5426912bf998f4b77924b6bfa41c820169b64c65 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!7fi1$B>G+x3>;*9#Ifr4e<27mvijen=5B^ z!Y1s{F?#Q4@WgDszg{vUQ0;?-QLp#(S6s3(YRI0u{w{Aser4u?&TT9P$2|Ui{{3q2 z`D?d)B;9yq54&@`4z`n;uot9>f#E}N@m)_3?Y4T^1KZwyuus`Pc>$xfR6z;DK_fHm i*A=`TcNiLMy?!zrQT3YY*z(W}q{q|M&t;ucLK6TlDpxuH literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3de91ca2940bbd714a6b1a738d63db06d2d7a18f GIT binary patch literal 357 zcmV-r0h<1aP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0QyNpK~z{r?UbPo zgD@0D-=>xs!~|kEl1UOQLGUO18h?bs3?vhX2@F{>(e09wAeKRC`^YkmDTVZ%cbih$ z_zSWu6Ta^YjPeyPkf&)XqA22RV4NIs$8mUfVVs;*{wcZq#KV?+OU{-Y{Cx7A9F>7Q zj$bj2dJlB$gy&Pu&d6Fc(ys9c~IhftR zAcxo_vl5KuL;AX|wbO&iA~xmVYa!cmFnI=S%E4s8_b=DqZqK8j=6W;UfD-QIZ2YcQ zx(D3DsXrHT%F7@&-GI^#*g&~~=5d!#D`4Xgt_;x&D>mE$tH&_P00000NkvXXu0mjf Dk3p6# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1a6205030fc77c5c3c86e5d199a4ca95937c8ab0 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4J@86jv*CsZ*OfBY&PI&O;lIj!0c_nw$4)^ConLiA2v9$Eq8J3JB@X}%PME>mc85i zSYmoAXYKvy6#v4z*DbjJ@~3XgoYgPsCmSx38lpdS*3JCm@}-*>cdvW>XxF-h>s}l9 z27lTd!uU&e)he#fHoMnd?2Y^9p|;)Yf{mC~w^;u2_9wI0(?6by5S;p8uSXp_*jk{E z8Mj>jzDi$VYWV+#>iULnKkj{HU81$AUg3LP{kxwrxx07oG@e!+H+}E-_}@%HE1C3e z+ZSxnSGXF+IsLW#g+*_^h@{)|hr6oUd=vzlIH~mmgZQ_lh4)=QGJ-7dboFyt=akR{ E01@MnVgLXD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/truncheon.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..06897312dd14778b27c97378a04d6195e4044ae4 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4J@86jv*CsZ*LvsZ8qR(P28@$f!W)D>Cu^~ zR} zTAF*P_eua(~2XYuSzrto(SEvxO*y{@UfGt=5Q@AsahlP?xNx2YD=s0P^y1P%$W zwClb<_|9dy`ok>#5014vuFCyk3p}Uw=GDRc2i5zX&(2M`U;k!B?ft)ZfB#?2zQ0lH z!IsTj_o_ZU*<31VPs&Kl<