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 0000000000..13acb99fdb Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000..f9a6e3404b Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png differ 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 0000000000..de9c4fcf57 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png differ 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 0000000000..13b78ac7dc Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png differ 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 + ] + ] + } + ] +}