From: keronshb <54602815+keronshb@users.noreply.github.com> Date: Mon, 3 Feb 2025 21:22:21 +0000 (-0500) Subject: DSword Replacement - the Hypereutactic Blade (#32414) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3d6188c92188e3e7f32b622bc291ab6ae61d33a5;p=space-station-14.git DSword Replacement - the Hypereutactic Blade (#32414) * hypereutactic textures * adds hypereutactic blade * adjusts attack speed and damage * adjust attack speed and adds movement modifier * Adds structural damage * Readjusts the attack rate to be 0.8 * Adds Hypereutactic blade to the upliink * Adds use delay and structural damage, fixes disappearing wielded sprite * Changes wideAngleAnimation to 180 and range to 2.5 * Adds copyright. Changes range to 2.0 * Required wield * Changes reflect chance to 100% * Comments for future todos * Description update * Removes duplicate mapping * removes from uplink * Reorder and remove indents --- diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 59cecca312..907e47a126 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -17,6 +17,9 @@ uplink-esword-desc = A very dangerous energy sword that can reflect shots. Can b uplink-esword-double-name = Double Bladed Energy Sword uplink-esword-double-desc = A much more expensive counter part to the normal energy sword: with a much higher reflection chance, larger attack angle, higher structural damage, and faster swing. Makes a lot of noise when used or turned on. +uplink-hypereutactic-blade-name = Hypereutactic Blade +uplink-hypereutactic-blade-desc = A gigantic energy sword with power that matches its looks. Requires two hands. Slow and unwieldy, yet pretty adept at reflecting. Previously made infamous by an operative wearing a joy mask. You wouldn't want to see this coming at you down the hall! + uplink-edagger-name = Energy Dagger uplink-edagger-desc = A small energy blade conveniently disguised in the form of a pen. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 2e576e6a50..4be577e0fe 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -59,7 +59,7 @@ color: white netsync: false - type: Appearance - - type: ToggleableLightVisuals + - type: ToggleableLightVisuals # Add support for multiple layers spriteLayer: blade inhandVisuals: left: @@ -330,6 +330,60 @@ reflectProb: .75 spread: 75 +# Item will look weird in handslot. Will need to adjust handstorage visuals in a future PR +- type: entity + parent: EnergySwordDouble + id: HyperEutacticBlade + name: hypereutactic-blade + description: A supermassive weapon envisioned to cleave the very fabric of space and time itself in twain, the hypereutactic blade dynamically flash-forges a hypereutactic crystaline nanostructure capable of passing through most known forms of matter like a hot knife through butter. + components: + - type: MeleeWeapon + wideAnimationRotation: 180 + attackRate: 0.8 #0.7 and below is too slow + angle: 100 + range: 2.0 + damage: + types: + Blunt: 4.5 + - type: ItemToggleMeleeWeapon + activatedSoundOnSwing: + path: /Audio/Weapons/eblademiss.ogg + params: + volume: -3 + variation: 0.250 + activatedDamage: + types: + Slash: 20 + Heat: 20 + Structural: 20 + - type: MeleeRequiresWield + - type: HeldSpeedModifier #slowdown is what balances this compared to a dsword + walkModifier: 0.6 + sprintModifier: 0.6 + - type: UseDelay + delay: 1.5 + - type: Sprite + sprite: Objects/Weapons/Melee/hypereutactic_blade.rsi + layers: + - state: hypereutactic + - state: hypereutactic_blade + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "blade" ] + - state: hypereutactic_gem + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "gem" ] + - type: Item + size: Small + sprite: Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi + - type: Reflect + reflectProb: 1.0 + spread: 75 + +# Borgs - type: entity suffix: One-Handed, For Borgs parent: EnergySwordDouble diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/hypereutactic.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/hypereutactic.png new file mode 100644 index 0000000000..2c52d5a778 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/hypereutactic.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/hypereutactic_blade.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/hypereutactic_blade.png new file mode 100644 index 0000000000..a398c85f40 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/hypereutactic_blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/hypereutactic_gem.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/hypereutactic_gem.png new file mode 100644 index 0000000000..8bacb55813 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/hypereutactic_gem.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/icon.png new file mode 100644 index 0000000000..a7a3d5056c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/meta.json new file mode 100644 index 0000000000..2b857bccb3 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Toriate. Taken from Citadel Station at https://github.com/Citadel-Station-13/Citadel-Station-13", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "hypereutactic" + }, + { + "name": "hypereutactic_gem" + }, + { + "name": "hypereutactic_blade" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/hypereutactic_right_reference.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/hypereutactic_right_reference.png new file mode 100644 index 0000000000..a67797d86c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/hypereutactic_right_reference.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-left-blade.png new file mode 100644 index 0000000000..e697fb18e5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-left-gem.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-left-gem.png new file mode 100644 index 0000000000..f89343a785 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-left-gem.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-left.png new file mode 100644 index 0000000000..9d05f2cce9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-right-blade.png new file mode 100644 index 0000000000..da9f049f21 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-right-gem.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-right-gem.png new file mode 100644 index 0000000000..044a0810b0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-right-gem.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-right.png new file mode 100644 index 0000000000..d8c4eff9c2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/meta.json new file mode 100644 index 0000000000..1f4d5ca6c2 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/meta.json @@ -0,0 +1,83 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Toriate. Taken from Citadel Station at https://github.com/Citadel-Station-13/Citadel-Station-13", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-right-gem", + "directions": 4 + }, + { + "name": "hypereutactic_right_reference", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-left-gem", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..9d05f2cce9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..d8c4eff9c2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hypereutactic_blade_inhands.rsi/wielded-inhand-right.png differ