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
RiceMar1244
GitHub
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
BIN
Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png
Normal file
|
After Width: | Height: | Size: 193 B |
BIN
Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png
Normal file
|
After Width: | Height: | Size: 826 B |
BIN
Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 335 B |
|
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 314 B After Width: | Height: | Size: 314 B |
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 318 B After Width: | Height: | Size: 318 B |
78
Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json
Normal file
@@ -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
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 169 B |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 174 B |
@@ -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
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -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
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 366 B |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 376 B |
@@ -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
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 675 B |
|
After Width: | Height: | Size: 671 B |
|
Before Width: | Height: | Size: 149 B After Width: | Height: | Size: 160 B |
|
Before Width: | Height: | Size: 813 B After Width: | Height: | Size: 431 B |
|
Before Width: | Height: | Size: 694 B |
|
Before Width: | Height: | Size: 313 B |
|
Before Width: | Height: | Size: 722 B |
|
Before Width: | Height: | Size: 330 B |
@@ -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
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 330 B |
|
Before Width: | Height: | Size: 318 B |