tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shitty combat mode & animations. (#367)

Browse Source 
* Combat mode UI & targeting zones.

* Fix inventory hud positioning.

* Crappy attack animations.

* Import TG combat sounds

* More work on arcs.

* Implement hit sounds.

* Lunging, hit effects, some more stuff.
This commit is contained in:
Pieter-Jan Briers
2019-09-26 22:32:32 +02:00
committed by GitHub
parent ac55ccf46e
commit 02d509fc5f
47 changed files with 1231 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Resources/Textures/UserInterface/target-doll-high.svg Normal file
View File

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="6.1054072mm"
height="5.5663342mm"
viewBox="0 0 6.1054072 5.5663342"
version="1.1"
id="svg3494"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="target-doll-high.svg">
<defs
id="defs3488" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4"
inkscape:cx="-27.670735"
inkscape:cy="-44.325776"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:window-width="1920"
inkscape:window-height="1043"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1" />
<metadata
id="metadata3491">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-24.917534,-38.704927)">
<ellipse
inkscape:label="Head"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.35841459"
ry="2.7831671"
rx="3.0527036"
cy="41.488094"
cx="27.970238"
id="Oval"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
Resources/Textures/UserInterface/target-doll-high.svg.96dpi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 427 B

73
Resources/Textures/UserInterface/target-doll-low.svg Normal file
View File

@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="32"
height="54.584877"
viewBox="0 0 8.4666669 14.442248"
version="1.1"
id="svg2285"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="target-doll-low.svg"
inkscape:export-filename="/home/pj/Projects/space-station-14/Resources/Textures/UserInterface/target-doll-low.svg.96dpi.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
id="defs2279" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.919596"
inkscape:cx="10.248134"
inkscape:cy="37.492927"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:window-width="1920"
inkscape:window-height="1043"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata2282">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-129.69328,-72.06459)">
<path
sodipodi:nodetypes="ccssccssccc"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.35841459"
inkscape:connector-curvature="0"
id="Combined-Shape"
d="m 138.02997,72.06459 0.007,12.860185 c 0,0.932522 -0.80549,1.571841 -1.59705,1.581941 -0.8089,0.01032 -1.60425,-0.628996 -1.60425,-1.581941 V 73.365601 h -1.56762 v 11.559174 c 0,0.8692 -0.79482,1.581941 -1.77407,1.581941 -0.97993,0 -1.67772,-0.712741 -1.67772,-1.581941 l 0.0103,-12.860185 z"
inkscape:label="Legs" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Resources/Textures/UserInterface/target-doll-low.svg.96dpi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 420 B

72
Resources/Textures/UserInterface/target-doll-middle.svg Normal file
View File

@@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="14.761317mm"
height="12.411281mm"
viewBox="0 0 14.761317 12.411281"
version="1.1"
id="svg2871"
sodipodi:docname="target-doll-middle.svg"
inkscape:version="0.92.4 5da689c313, 2019-01-14">
<defs
id="defs2865" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.959798"
inkscape:cx="12.344179"
inkscape:cy="40.151172"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:window-width="506"
inkscape:window-height="416"
inkscape:window-x="737"
inkscape:window-y="125"
inkscape:window-maximized="0" />
<metadata
id="metadata2868">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-10.762198,-63.252693)">
<g
transform="matrix(0.35841461,0,0,0.35841461,2.5098095,57.743415)"
style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
id="g2227"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<path
style="fill:#ffffff;fill-opacity:1"
d="m 25.617188,18.316406 c -3.668766,-0.05227 -7.262714,0.181254 -9.824219,0.681641 -2.551079,0.498351 -1.047616,0.156792 -2.542969,0.511719 -2.314857,0.549439 -3.5665384,0.789355 -4.8964844,5.476562 -1.144246,4.032732 -2.0775479,11.023827 -3.2949218,23.515625 -0.541004,4.214675 5.5660002,4.497851 6.0878902,0.478516 0.812159,-6.314445 1.251033,-14.240793 3.007813,-20.582031 l 0.01953,24.539062 c 7.628906,0 15.257813,0 22.886719,0 h 0.002 l 0.01758,-24.539062 c 1.75678,6.341238 2.197607,14.267586 3.009766,20.582031 0.52189,4.019335 6.626941,3.736159 6.085937,-0.478516 C 44.958455,36.010155 44.027106,29.01906 42.88286,24.986328 41.552915,20.299121 40.29928,20.059205 37.984423,19.509766 36.48907,19.154839 37.994483,19.496396 35.443407,18.998047 32.881902,18.49766 29.286001,18.264136 25.617236,18.316406 Z"
transform="translate(18,-2.937978)"
id="path308"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssscccccccccssscc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
Resources/Textures/UserInterface/target-doll-middle.svg.96dpi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1021 B

116
Resources/Textures/UserInterface/target-doll.svg Normal file
View File

@@ -0,0 +1,116 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="55.790806"
height="128"
viewBox="0 0 14.761317 33.866665"
version="1.1"
id="svg1561"
sodipodi:docname="target-doll.svg"
inkscape:version="0.92.4 5da689c313, 2019-01-14">
<defs
id="defs1555">
<inkscape:path-effect
center_point="43.625,24.812736"
end_point="43.625,52.938449"
start_point="43.625,-3.3129772"
effect="mirror_symmetry"
id="path-effect2208"
is_visible="true"
mode="free"
discard_orig_path="false"
fuse_paths="false"
oposite_fuse="false" />
<inkscape:path-effect
effect="mirror_symmetry"
start_point="44,-2.937978"
end_point="44,92.800469"
center_point="44,44.931246"
id="path-effect2206"
is_visible="true"
mode="vertical"
discard_orig_path="false"
fuse_paths="false"
oposite_fuse="false" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.8284271"
inkscape:cx="-11.723079"
inkscape:cy="59.646363"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:window-width="1920"
inkscape:window-height="1043"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata1558">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-66.160433,-111.91867)">
<g
style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
id="Target-Doll"
transform="matrix(0.35841461,0,0,0.35841461,57.908044,112.67527)">
<ellipse
inkscape:label="Head"
style="fill:#ffffff;fill-opacity:1"
ry="7.7652173"
rx="8.5172415"
cy="5.6542549"
cx="43.7285"
id="Oval" />
<path
sodipodi:nodetypes="ccssccssccc"
style="fill:#ffffff;fill-opacity:1"
inkscape:connector-curvature="0"
id="Combined-Shape"
d="m 55.060955,52.084422 0.01936,35.880749 c 0,2.601799 -2.24735,4.385539 -4.455865,4.41372 -2.25688,0.0288 -4.475973,-1.754942 -4.475973,-4.41372 V 55.714329 h -4.373759 v 32.250842 c 0,2.425126 -2.2176,4.41372 -4.949759,4.41372 -2.73408,0 -4.680959,-1.988594 -4.680959,-4.41372 l 0.02877,-35.880749 z"
inkscape:label="Legs" />
<g
id="g2227">
<path
style="fill:#ffffff;fill-opacity:1"
d="m 25.617188,18.316406 c -3.668766,-0.05227 -7.262714,0.181254 -9.824219,0.681641 -2.551079,0.498351 -1.047616,0.156792 -2.542969,0.511719 -2.314857,0.549439 -3.5665384,0.789355 -4.8964844,5.476562 -1.144246,4.032732 -2.0775479,11.023827 -3.2949218,23.515625 -0.541004,4.214675 5.5660002,4.497851 6.0878902,0.478516 0.812159,-6.314445 1.251033,-14.240793 3.007813,-20.582031 l 0.01953,24.539062 c 7.628906,0 15.257813,0 22.886719,0 h 0.002 l 0.01758,-24.539062 c 1.75678,6.341238 2.197607,14.267586 3.009766,20.582031 0.52189,4.019335 6.626941,3.736159 6.085937,-0.478516 C 44.958455,36.010155 44.027106,29.01906 42.88286,24.986328 41.552915,20.299121 40.29928,20.059205 37.984423,19.509766 36.48907,19.154839 37.994483,19.496396 35.443407,18.998047 32.881902,18.49766 29.286001,18.264136 25.617236,18.316406 Z"
transform="translate(18,-2.937978)"
id="path308"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssscccccccccssscc" />
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB