From: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Date: Thu, 21 Dec 2023 06:32:11 +0000 (-0500) Subject: Resprites energy sword and double energy sword (#22797) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=5ee01ce90020628edfea298182cb1aabb91713cf;p=space-station-14.git Resprites energy sword and double energy sword (#22797) * Removes old inhand visuals from e_sword.rsi and its meta.json * Adds new visuals with a longer blade for the e sword * Makes e sword use its new sprites and modifies other energy weapons prototypes to keep using their own inhands * Makes the toy sword use the old less scary e sword sprites (and gives it BaseItem parent because I thought I broke something when i couldnt pick it up) * Removes old desword sprites and modifies meta.json * Temporarily removes esword blade sprites * Adds back esword sprites after modifying them to flash instead of shimmer * Adds new desword inhand sprites and modifies meta.json and entity prototype to use them * Moves desword sprites back to its own folder from inhands_64x after a supposed prefix conflict * Removes blade inhands * Adds back blade inhands * Moves all inhand sprites to their own inhand folders related to the items. Removes inhands_64x folder --- diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 450fc4dfe7..d6d79edcef 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -853,7 +853,7 @@ colorOptions: - DodgerBlue - type: Sprite - sprite: Objects/Weapons/Melee/e_sword.rsi + sprite: Objects/Fun/toy_sword.rsi layers: - state: e_sword - state: e_sword_blade @@ -863,7 +863,7 @@ map: [ "blade" ] - type: Item size: Small - sprite: Objects/Weapons/Melee/e_sword.rsi + sprite: Objects/Fun/toy_sword.rsi - type: UseDelay delay: 1.0 - type: PointLight diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 5b06f09946..b2b7bfd20c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -31,7 +31,7 @@ Blunt: 4.5 - type: Item size: Small - sprite: Objects/Weapons/Melee/e_sword.rsi + sprite: Objects/Weapons/Melee/e_sword-inhands.rsi - type: UseDelay delay: 1.0 - type: PointLight @@ -165,6 +165,15 @@ - type: Item size: Small sprite: Objects/Weapons/Melee/e_cutlass.rsi + - type: ToggleableLightVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + right: + - state: inhand-right-blade + shader: unshaded - type: entity name: Double Bladed Energy Sword @@ -201,10 +210,19 @@ map: [ "blade" ] - type: Item size: Small - sprite: Objects/Weapons/Melee/e_sword_double.rsi + sprite: Objects/Weapons/Melee/e_sword_double-inhands.rsi - type: Reflect enabled: true reflectProb: .75 spread: 75 - type: UseDelay delay: 1 + - type: ToggleableLightVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + right: + - state: inhand-right-blade + shader: unshaded diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png new file mode 100644 index 0000000000..c231db05b3 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png differ diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png new file mode 100644 index 0000000000..28e0ec67a8 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png differ diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png new file mode 100644 index 0000000000..535d9de84e Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left-blade.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-left-blade.png rename to Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left-blade.png diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-left.png rename to Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right-blade.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-right-blade.png rename to Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right-blade.png diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-right.png rename to Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json new file mode 100644 index 0000000000..2026e221b7 --- /dev/null +++ b/Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json @@ -0,0 +1,78 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "e_sword" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "e_sword_blade", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "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-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left-blade.png new file mode 100644 index 0000000000..a0e957d35d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000..f9a6e3404b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right-blade.png new file mode 100644 index 0000000000..a536ccffbe Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000..13b78ac7dc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/meta.json new file mode 100644 index 0000000000..c5ff7a52d2 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Inhands by RiceMar1244.", + "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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json index 58c2a67aac..602e032963 100644 --- a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json @@ -12,14 +12,6 @@ }, { "name": "e_sword" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 }, { "name": "e_sword_blade", @@ -29,50 +21,6 @@ 0.1 ] ] - }, - { - "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-blade", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ] - ] } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png new file mode 100644 index 0000000000..c5403860e5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000..5c1b0e20fb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png new file mode 100644 index 0000000000..e8ad57084e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000..3e354dd6fe Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json new file mode 100644 index 0000000000..a28cd72138 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json @@ -0,0 +1,71 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation and modified by RiceMar1244", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "wielded-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": "wielded-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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..a442878e76 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..a1b6f2b852 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png index dfd3bb9ace..5601092c2e 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png index 9c19655cd4..31aecac1d2 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left-blade.png deleted file mode 100644 index 96d2136fce..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left-blade.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left.png deleted file mode 100644 index 2f06869cd1..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right-blade.png deleted file mode 100644 index 18b785e11c..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right-blade.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right.png deleted file mode 100644 index ebaeb95b41..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json index d7ae4a0ad3..9e17f6e51a 100644 --- a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json @@ -6,81 +6,21 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "e_sword_double" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - }, - { - "name": "e_sword_double_blade", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - }, - { - "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-blade", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ] - ] - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "e_sword_double" + }, + { + "name": "e_sword_double_blade", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-left.png deleted file mode 100644 index 0160cafd5d..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-right.png deleted file mode 100644 index 727fa419de..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-right.png and /dev/null differ