Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

improves hitscan weapons (#248)

Browse Source 
- fixes inhand sprite visibility
- adds visible charge level
- refactor sound recourse load, now you can specify fire sound from YAML
- adds laser cannon - more powerful laser
- adds new assets for cannon
This commit is contained in:
Injazz
2019-06-02 04:16:55 +05:00
committed by Pieter-Jan Briers
parent da35a0f3c9
commit 400778eb73
32 changed files with 349 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/Objects/heavylaser.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/Objects/laser_cannon.rsi/0-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 499 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/0-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 495 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/25-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 505 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/25-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 501 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/50-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 510 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/50-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 503 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/75-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 506 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/75-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 501 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 484 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 481 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/laser_cannon.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 369 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_0.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 351 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_100.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 369 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_25.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 365 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_50.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 371 B

BIN
Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_75.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 368 B

123
Resources/Textures/Objects/laser_cannon.rsi/meta.json Normal file
View File

@@ -0,0 +1,123 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e",
"states": [
{
"name": "laser_cannon",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "laser_cannon_100",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "laser_cannon_75",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "laser_cannon_50",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "laser_cannon_25",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "laser_cannon_0",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "0-inhand-left",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "0-inhand-right",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "25-inhand-left",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "25-inhand-right",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "50-inhand-left",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "50-inhand-right",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "75-inhand-left",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "75-inhand-right",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
}
]
}

0
Resources/Textures/Objects/laser_retro.rsi/100-inhand-left.png → Resources/Textures/Objects/laser_retro.rsi/inhand-left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 451 B

After

Width:  |  Height:  |  Size: 451 B

0
Resources/Textures/Objects/laser_retro.rsi/100-inhand-right.png → Resources/Textures/Objects/laser_retro.rsi/inhand-right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 437 B

After

Width:  |  Height:  |  Size: 437 B

0
Resources/Textures/Objects/laser_retro.rsi/100.png → Resources/Textures/Objects/laser_retro.rsi/laser_retro.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 538 B

After

Width:  |  Height:  |  Size: 538 B

0
Resources/Textures/Objects/laser_retro.rsi/0.png → Resources/Textures/Objects/laser_retro.rsi/laser_retro_0.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 519 B

After

Width:  |  Height:  |  Size: 519 B

BIN
Resources/Textures/Objects/laser_retro.rsi/laser_retro_100.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 538 B

0
Resources/Textures/Objects/laser_retro.rsi/25.png → Resources/Textures/Objects/laser_retro.rsi/laser_retro_25.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 533 B

After

Width:  |  Height:  |  Size: 533 B

0
Resources/Textures/Objects/laser_retro.rsi/50.png → Resources/Textures/Objects/laser_retro.rsi/laser_retro_50.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 538 B

After

Width:  |  Height:  |  Size: 538 B

0
Resources/Textures/Objects/laser_retro.rsi/75.png → Resources/Textures/Objects/laser_retro.rsi/laser_retro_75.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 536 B

After

Width:  |  Height:  |  Size: 536 B

124
Resources/Textures/Objects/laser_retro.rsi/meta.json
View File

@@ -1 +1,123 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "0", "directions": 1, "delays": [[1.0]]}, {"name": "0-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "0-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "100", "directions": 1, "delays": [[1.0]]}, {"name": "100-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "100-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "25", "directions": 1, "delays": [[1.0]]}, {"name": "25-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "25-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "50", "directions": 1, "delays": [[1.0]]}, {"name": "50-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "50-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "75", "directions": 1, "delays": [[1.0]]}, {"name": "75-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "75-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e",
"states": [
{
"name": "laser_retro",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "laser_retro_100",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "laser_retro_75",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "laser_retro_50",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "laser_retro_25",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "laser_retro_0",
"directions": 1,
"delays": [
[1.0]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "0-inhand-left",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "0-inhand-right",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "25-inhand-left",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "25-inhand-right",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "50-inhand-left",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "50-inhand-right",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "75-inhand-left",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
},
{
"name": "75-inhand-right",
"directions": 4,
"delays": [
[1.0], [1.0], [1.0], [1.0]
]
}
]
}