From 618c768e27dc6dcc923ce01457b6d45bc57e72cf Mon Sep 17 00:00:00 2001 From: No Elka <125199100+NoElkaTheGod@users.noreply.github.com> Date: Sat, 9 Aug 2025 12:16:49 +0300 Subject: [PATCH] Add (rebalanced) double esword to uplink (#4145) * Change stats * Add to uplink * Nerf a wee bit more * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Woops --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .../en-US/_DV/store/uplink/weaponry.ftl | 3 + .../Objects/Weapons/Melee/e_sword.yml | 42 ++++++------ .../_DV/Catalog/Uplink/weaponry.yml | 14 ++++ .../inhand-left-blade.png | Bin 0 -> 2687 bytes .../inhand-left.png | Bin 0 -> 169 bytes .../inhand-right-blade.png | Bin 0 -> 2665 bytes .../inhand-right.png | Bin 0 -> 174 bytes .../e_sword_double-inhands.rsi/meta.json | 63 ++++++++++++++++++ 8 files changed, 100 insertions(+), 22 deletions(-) create mode 100644 Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json diff --git a/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl b/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl index b941206242..5e8e70b84a 100644 --- a/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl +++ b/Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl @@ -8,3 +8,6 @@ uplink-foam-sabre-desc = A blade disguised as a toy foam sabre. Perfect for assa uplink-rigged-laser-tag-gun-name = Rigged Laser Tag Gun uplink-rigged-laser-tag-gun-desc = This laser tag gun has been tampered with to fire a much more harmful laser and can switch modes to be more covert and look like a regular laser tag gun. + +uplink-desword-name = Double-Bladed Energy Sword +uplink-desword-desc = Now with twice as much energy per sword! Not the most practical design, but at least you can swing it faster now, albeit at a cost of lower damage per hit. Good luck blocking any bullets with it. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 4798cb2a3f..9699181913 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -290,17 +290,17 @@ id: EnergySwordDouble description: Syndicate Command Interns thought that having one blade on the energy sword was not enough. This can be stored in pockets. components: - - type: ItemToggle - onUse: false # wielding events control it instead - onActivate: false # prevents the weapon from being able to be turned on when it is on the ground - soundActivate: - path: /Audio/Weapons/ebladeon.ogg - params: - volume: 3 - soundDeactivate: - path: /Audio/Weapons/ebladeoff.ogg - params: - volume: 3 + #- type: ItemToggle # DeltaV - commented out + # onUse: false # wielding events control it instead + # onActivate: false # prevents the weapon from being able to be turned on when it is on the ground + # soundActivate: + # path: /Audio/Weapons/ebladeon.ogg + # params: + # volume: 3 + # soundDeactivate: + # path: /Audio/Weapons/ebladeoff.ogg + # params: + # volume: 3 - type: ItemToggleMeleeWeapon activatedSoundOnSwing: path: /Audio/Weapons/eblademiss.ogg @@ -308,10 +308,10 @@ volume: 3 variation: 0.250 activatedDamage: - types: - Slash: 12 - Heat: 12 - Structural: 15 + types: # DeltaV - was 12 slash, 12 heat, 15 structural + Slash: 9 + Heat: 9 + Structural: 8 - type: ItemToggleActiveSound activeSound: path: /Audio/Weapons/ebladehum.ogg @@ -324,11 +324,11 @@ malus: 0.7 - type: Execution doAfterDuration: 4.0 - - type: Wieldable - wieldSound: null # esword light sound instead + #- type: Wieldable # DeltaV - commented out + # wieldSound: null # esword light sound instead - type: MeleeWeapon wideAnimationRotation: -135 - attackRate: 1.5 + attackRate: 2.0 # DeltaV - was 1.5 angle: 100 damage: types: @@ -344,12 +344,10 @@ map: [ "blade" ] - type: Item size: Small - sprite: Objects/Weapons/Melee/e_sword_double-inhands.rsi + sprite: _DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi # DeltaV - fancier inhands sprite - type: Reflect - reflectProb: .75 + reflectProb: .10 # DeltaV: Having two blades isn't really practical for reflecting shots. spread: 75 - reflects: - - Energy # DeltaV: 80% Energy Reflection but no ballistics. - type: UseDelay delay: 1 diff --git a/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml b/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml index 2b377d8c23..7fc0b6acf0 100644 --- a/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml +++ b/Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml @@ -42,3 +42,17 @@ Telecrystal: 10 categories: - UplinkWeaponry + +- type: listing + id: UplinkDesword + name: uplink-desword-name + description: uplink-desword-desc + icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword_double.rsi, state: icon } + discountCategory: veryRareDiscounts + discountDownTo: + Telecrystal: 6 + productEntity: EnergySwordDouble + cost: + Telecrystal: 9 + categories: + - UplinkWeaponry diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png b/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png new file mode 100644 index 0000000000000000000000000000000000000000..13acb99fdbc2e0727251370d572b4af0d95e7304 GIT binary patch literal 2687 zcma)8c{J307ypfAOx97hm<)O&lPz0_Fp+p{4V7h@NktKpH%&ztS$d*E*-}|TMKUuz zVjfF)lw=*UjBN}FS;i963}eju>#z5m=bY!9=l*lQ=bn4+`JQ_}pU=I?p6*UElB$vb z0LVBWcff!?4geqk3<|z(ZN$C;9V7zdga*jnh&cd|v~+f`_rCdz&9u3q`kMlDBIkfh zVzuTUo>_2xrkm;A468(THh5&66*F1PH9;2I0P_D}HhU8cpy(#spZ9%XY}w@OZoxGE6fyTx*0iG>=#9}i{X<2B~Y zTL?!+4qeC1+O2qqF68$SXuIf8p#!HmI}lk5jx`=meEy}dZT&j96iH%lg5Zq0@+vWV!j_Y2uT2{cRPHsCE4|<7EBg3dmt9rq- z(T9yr7wY1S^g5bvTFZ7qr&fLVf=c)~wqrJ?`$#m8di8Ee#dK(T)zQpT<(x%fhfXpI z{;ohNb2`IR5mrl<*@}1HDR64fm5iU3LvtfUTS$*o0?qHnsPU9A?ZdA;3IKpcqXEDN zqpM);1$I$w&&%L^eJ*RQUTU=Z@^Vbt)-Ak7$XZ0g7@N(O2BMK4-+1o-=B?dh3J+;H zC!aqHY1+L)69V1dP-B<@N9y3v1SUWVt#%_1UMnTc8e}L5A!)#;rm9pCMMED-yW^}Z*wWVe9V$4o`HCpoP zoQRm1ylYU zdSKpVADnrGFKf+d#2Vai?c0)m<1Mm5VJ#!`3ksZmjF)YMC!i9TOy;z@x_Wq2)RPN+ zS}$gz`b=#lyoJ0g76|p!V|%eUoHpZgsp-?Mrja1yC-I5pf51GmBs2e{l1CJsc>T7RzTuU@vPFKG#y&2 z*+(aWfs){UzGF6|B-5no_kykG(KZ2FpicF@ox!F=1H_VyEWXs!{Gef#8J0(x&2N!5oTyk3`=61w7{ zU>M@7v~o@7$1@bUFhzg=oq+EMF*A@-*7Q0stGKw>vF81M9AoQv8;-JX%z73$MtSZB zh5r3+$;{})L#}<+qJs>-OSDmy2gj&khr4H5bUKeS%+z3-{naZil6!+6@6_7&!l98R zx8;B8x}>3V$B2gUycRd={R4V$?`4BftbMvqo67%{56q0VmfD&Q{#t63f2m8u?2A;A z$hLrs2b$;wwgD=iqcBdUA=)j$%GIhVjVNG}!7k{|SNi!sBT z4u7UWLrrwFH&!56YnDs@V)TPD6C;`Ho}+WcRm@aTlv z3zX5)xV5N zyBnkrV>K}zwxBV3I^YgWt)+rfQ#_qLy9R8)PA3GdVKJ*5Y^%)7a zQb$K;IjSPB&et@qjGoAemng9sK7&@ zFi~sp^XE@bP_R%*Z^}Pa>|zj48007`e$GK9Vb}SBk&TUwr+AXiktQNh45_YOxE9ts zfW7i$#@CLRes40|r|)MquPexess$?~?K?3s_mxrx`{H@~txOpTF=x@O^`v}YzP*&D zcVM=bT-~BE!x1_9U^C2lK%pnpoYBqUMD59FbLfzwlqw#fS}{cJXrmRu3=#>2cfWy} zt|LFq&1@Vafp^8iHfwAQ_uzdQ2oER4m>jhV8wx>z)q=oD}$0}|@99KD<*nM$$ttPhcbu`(3LRab;ER`$?F8%(M4#o{Q%l`k=Lne)_{_q{8#*UgjT7tN2KXX4O?}RRFEG0o zM@m_*_4Z6ccUUwt%TVLXA zc3GnSro!b57JBXvVFW5c0c)l&nf#@sPyJ7s##3e#8FUWMrwpkC)?$7X@jDh9R&h=9 SW&C9U683cUb6Mw<&;$Tj79+&~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png b/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png new file mode 100644 index 0000000000000000000000000000000000000000..de9c4fcf575fc99db7d2daa51e5524e563f5f2ef GIT binary patch literal 2665 zcma);c{JN;7sr2L8cR{rY0Hq-QZ<#I)KW{@DOF2QO-hI`7+cZBQnZ+; zrPV~MA_k46%5*HL3Py>9SlZ+jOBx}TOlHpe*L&VMXTJa3=iKxBai4qc{eGUTORf&` zvMRCw0LVKz+QG#!82~_lG+2B}*i5Pw2T&~B!4@D6LB0Th>`^DXvz~E}m*^eglLKl} zD`ZNXah_5kLM0CVo0cuh%(vATXG7Ms-IWQxX)zH{fYVH?x>6M3I&R5(r|kAK#?f$( zZuTl%dc(qQ(V-~VAuH0!>P^t4l?E$H0@td-;z_nO@a;c{@K_PAlNK66&+~NB8D18Q zvR)P3dK~i*el)F<&nID~Ja_bawC=%eowEWPYRmHv(tk)%)D*UVztl1IP#wbW;&sa< zJ?@sH6xBWw{SD%K13;ONIWrhiT?2o{ z+}McYZt*en&*(M=DAA?CODB`aci&0ET@Cr;I@KQg_4OwwqnGCUcFnEYP9DwGcTe@x zD}F^L!+1#@jEv>24~F!;8i-PDOKSM1W`ei5o9)sH3(b2I7}cot`8eb~HDEBbWDRsN zVA?)t9K|er%E1w#f2_9#MD z1DUQ!<|(|Uxi_F`ozErjYCf4um$D{`Y%?eCmYI%!^ajlw-VHTYQG-ALfXn3qmWM-6 zZXJ$4mX;hjc}X(DckF7Dh>jElO*ZE@hR02Y^vd~rl6 zm|2ME+&9W{$;V*!pnA$s7McH2jvncC?EC3CIeQD7tFNdtyv~hXKFwvb!{9by0gU_J zL=N5)O7|;5g^HV{fxFfmTKE<}3(c61(R_iDxd$JjDSy6g-dkafi$t@|KF}1H zpK+@V<|ES=^C8q27^tz+ncrAjGh!VgGTNQ-@jAzUZI%Oo#l^*Fh?Kahzy{SYeZ?WL zbdg41OmtEbWoY3#o{m&2sgW6Y4-VVkG`UoDQdr>!MMI^Xj|FGf6{LqkJ~gW#F4s@4$6QIQ{^`K5$!>4f^j!9QXrI(e2XR$soa zvF^e6-@zqIy#3JTf}Z3Ph@kmNhS zl$0Ce`L1M~YCC$lmHTl5anwIB&~^98*{|r>s^JgFROMr7E%}@d#o0jJ@AY39Ua)zL zpGLYi!W=(|a(yIb4{V}eM^0K0ITCLD-Lz@-xTJlRJ~zPjJ4%jFeuub%G7!F-T!z~b zR-?eu9<`}mjVp&b=h*65-P`$42@)(WF>%W5%$dO!6T5$@ubSJ{AC3k1`&W8GO+cN^ zOAWr{#pj&g?R z+!X^cR*?r@>$p3cQQF%FTGBbSaGbx0*RJ*ADWYd{bMvV%xF!0Wsj9jU@-{(k8cFUb zt$9{HbX`)TXD&9LE&AQ#Yiwbc#gn|4Telk74THIrhoZj&7MA2?Uuk_~pSw^L=TR}@ zUUw)u)-{Vfr6+TO6dDBpFc_?)If@SHD`|rP-C&-(i5b%CH( z;Vu%1M3gQlZ!9;uli9`3MI^t-TL{mF@!X`2eDMpN_#;TN1w;;f<)*-z)Zer+tsY@{ zBpIGk@SS}SOf9`yshdx+Uv7= z+Q|>*6tgA}qzQHJ?*PPUM+?*Vdfe`cV3|RP@Oy+`%qz&TkzQ3#i}OK=VA?;;u7f+0c8sjB!UEI?{97{YQh%pW zKeP8DAk0^s1p!CY)X1)GZl{p)|G?G%O}nQ=_?=}J-h<;A%k_QsTLB3FprHD`L6_ra z+l=7Ojyl5}K8@GCZQ2CYSGCL|!0Px~nK?qdT$1N6&^%|ID(Verw1aikUX5@32xGMH zo0rw8?TEC$(28P{98q$T0Gp5bYBf>q}9x?KB=NN%6LwzuqCa5jKe~9lX+^^~Ha&pn`d7km)9?>+F6zLv3_fKsvJV z*)QmL4!C)osPQ9@5=87ei3;2gh`}TB^j#>{>{`xMqj>~b(3o1K|b|h9MKbc zw+-;FH13X zEK>z&p{yl!a-$As*cSs_BrSO5S3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..13b78ac7dc20a77791cae8196d26c7d24ac78a33 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSrJgR1Ar*7p-aW|4puod?fN#p* z>#O7Eb9E_{3oj8ku{ji|1{LUdT=M)?+V^;$&8tcI-l%fuyg5%5jTnSCqY7_GX9yGL Unzm=D?kmdKI;Vst0GbvhzW@LL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json new file mode 100644 index 0000000000..4488e17721 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Inhands by RiceMar1244. Modified by NoElkaTheGod (GitHub).", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +}