Skip to content

Commit 10f14c6

Browse files
AnEmortalKidAnEmortalKid
committed
ship showdown 2955
1 parent 1d42ccf commit 10f14c6

File tree

19 files changed

+85
-2564
lines changed

19 files changed

+85
-2564
lines changed

‎showdown/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<html>
2-
<meta http-equiv="refresh" content="0; url=../starcitizen/ship-showdown-2954/index.html" />
2+
<meta http-equiv="refresh" content="0; url=../starcitizen/ship-showdown-2955/index.html" />
33
</html>

‎starcitizen/ship-showdown-2955/400i.png‎

-1.71 KB
Binary file not shown.

‎starcitizen/ship-showdown-2955/600i_explorer.png‎

-2.19 KB
Binary file not shown.

‎starcitizen/ship-showdown-2955/85x.png‎

2.01 KB
Loading

‎starcitizen/ship-showdown-2955/890_jump.png‎

-1.89 KB
Binary file not shown.

‎starcitizen/ship-showdown-2955/arrow.png‎

-2.33 KB
Binary file not shown.

‎starcitizen/ship-showdown-2955/asgard.png‎

2.5 KB
Loading

‎starcitizen/ship-showdown-2955/bracket_cleanup.svg‎

Lines changed: 26 additions & 2510 deletions
Loading

‎starcitizen/ship-showdown-2955/index.html‎

Lines changed: 58 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,43 @@
55
</head>
66
<script text="javascript">
77
var ships = [
8-
"C1 Spirit",
9-
"Mercury",
10-
"STV",
8+
"Raft",
9+
"Asgard",
1110
"Ursa Medivac",
12-
"890 Jump",
13-
"600i Explorer",
14-
"Terrapin",
15-
"Gladiator",
16-
"Fury LX",
11+
"MTC",
1712
"M50",
18-
"Reclaimer",
13+
"Razor",
14+
"Gladiator",
15+
"85x",
16+
"Zeus MK II ES",
17+
"Corsair",
1918
"Vulture",
20-
"Syulen",
21-
"Defender",
22-
"F8C Lightning",
23-
"F7C Hornet MK II",
19+
"Mole",
20+
"Prowler Utility",
21+
"Talon",
22+
"Polaris",
23+
"Starlancer TAC",
2424
];
2525
</script>
2626
<!-- draw function uses these to source the image data -->
2727
<div id="imgs-holder" hidden>
2828
<img id="img-template" src="template_big.png">
29-
<img id="img-0" src="c1spirit.png">
30-
<img id="img-1" src="mercury.png">
31-
<img id="img-2" src="stv.png">
32-
<img id="img-3" src="ursa_medivac.png">
33-
<img id="img-4" src="890_jump.png">
34-
<img id="img-5" src="600i_explorer.png">
35-
<img id="img-6" src="terrapin.png">
36-
<img id="img-7" src="gladiator.png">
37-
<img id="img-8" src="fury_lx.png">
38-
<img id="img-9" src="m50.png">
39-
<img id="img-10" src="reclaimer.png">
40-
<img id="img-11" src="vulture.png">
41-
<img id="img-12" src="syulen.png">
42-
<img id="img-13" src="defender.png">
43-
<img id="img-14" src="f8c.png">
44-
<img id="img-15" src="f7c.png">
29+
<img id="img-0" src="raft.png">
30+
<img id="img-1" src="asgard.png">
31+
<img id="img-2" src="ursa_medivac.png">
32+
<img id="img-3" src="mtc.png">
33+
<img id="img-4" src="m50.png">
34+
<img id="img-5" src="razor.png">
35+
<img id="img-6" src="gladiator.png">
36+
<img id="img-7" src="85x.png">
37+
<img id="img-8" src="zeus_mk2_es.png">
38+
<img id="img-9" src="corsair.png">
39+
<img id="img-10" src="vulture.png">
40+
<img id="img-11" src="mole.png">
41+
<img id="img-12" src="prowler_utility.png">
42+
<img id="img-13" src="talon.png">
43+
<img id="img-14" src="polaris.png">
44+
<img id="img-15" src="starlancer_tack.png">
4545
</div>
4646
<script text="javascript">
4747
function layout_round1() {
@@ -567,22 +567,30 @@ <h2 class="rsi-yellow rsi-header-text rsi-grey-header-bg">
567567
// so we can probably compute these based on start and end
568568
// like (r0.y + r1.y ) / 2 = s0.y
569569
var coordinates = {
570-
r0: { x: 366, y: 144 },
571-
r1: { x: 366, y: 336 },
572-
r2: { x: 366, y: 528 },
573-
r3: { x: 366, y: 720 },
574-
r4: { x: 366, y: 912 },
575-
r5: { x: 366, y: 1104 },
576-
r6: { x: 366, y: 1296 },
577-
r7: { x: 366, y: 1488 },
578-
s0: { x: 648, y: 240 },
579-
s1: { x: 648, y: 624 },
580-
s2: { x: 644, y: 1008 },
581-
s3: { x: 648, y: 1392 },
582-
f0: { x: 918, y: 432 },
583-
f1: { x: 918, y: 1200 },
584-
w0: { x: 1194, y: 816 }
585-
}
570+
r0: { x: 360, y: 164 },
571+
r1: { x: 360, y: 334 },
572+
r2: { x: 360, y: 500 },
573+
r3: { x: 360, y: 670 },
574+
r4: { x: 360, y: 838 },
575+
r5: { x: 360, y: 1004 },
576+
r6: { x: 360, y: 1174 },
577+
r7: { x: 360, y: 1340 },
578+
s0: { x: 628, y: 260 },
579+
s1: { x: 628, y: 644 },
580+
s2: { x: 628, y: 1028 },
581+
s3: { x: 628, y: 1412 },
582+
583+
f0: { x: 892, y: 416 },
584+
f1: { x: 892, y: 1090 },
585+
586+
w0: { x: 1160, y: 754 }
587+
};
588+
// compute so its easier
589+
coordinates.s0.y = (coordinates.r0.y + coordinates.r1.y) / 2;
590+
coordinates.s1.y = (coordinates.r2.y + coordinates.r3.y) / 2;
591+
coordinates.s2.y = (coordinates.r4.y + coordinates.r5.y) / 2;
592+
coordinates.s3.y = (coordinates.r6.y + coordinates.r7.y) / 2;
593+
586594

587595
const canvas = document.createElement("canvas");
588596
canvas.id = "canvas";
@@ -621,15 +629,12 @@ <h2 class="rsi-yellow rsi-header-text rsi-grey-header-bg">
621629

622630
drawResult(ctx, 'r5-m0', coordinates.w0);
623631

624-
ctx.font = "18px sans-serif";
625-
ctx.fillStyle = "white";
626-
ctx.fillText("Generate yours at", 1190, 1560);
627-
ctx.fillText("anemortalkid.github.io/showdown", 1190, 1580);
628-
629-
630-
ctx.font = "28px sans-serif";
632+
ctx.font = "16px sans-serif";
631633
ctx.fillStyle = "white";
632-
ctx.fillText("C1 SPIRIT", coordinates.r0.x+40, coordinates.r0.y+40);
634+
const bottomCoordX = coordinates.w0.x-10;
635+
const bottomCoordY = 1400;
636+
ctx.fillText("Generate yours at", bottomCoordX, bottomCoordY);
637+
ctx.fillText("anemortalkid.github.io/showdown", bottomCoordX, bottomCoordY+20);
633638
}
634639
</script>
635640

‎starcitizen/ship-showdown-2955/mole.png‎

1.33 KB
Loading

0 commit comments

Comments
 (0)