Skip to content

Commit 6e7ee5e

Browse files
PazazPazaz
committed
feat: Default to included Client2, mapview applet page
1 parent 6e94647 commit 6e7ee5e

18 files changed

+239
-16
lines changed

‎public/bz2.wasm

11.5 KB
Binary file not shown.

‎public/js/9f86b5397894e28b5ae2.wasm

58.5 KB
Binary file not shown.

‎public/js/client.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/mapview.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/runetek.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lostcity/web/routes/client.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ export default function (f: any, opts: any, next: any) {
118118
return res.redirect(302, '/detail');
119119
}
120120

121-
if (req.query.method == 0) {
122-
return res.view('webclient', {
121+
if (req.query.method == 0 || req.query.method == 4) {
122+
return res.view('client/webclient', {
123123
world,
124124
detail: req.query.detail,
125125
method: req.query.method
126126
});
127127
} else if (req.query.method == 1 || req.query.method == 2) {
128-
return res.view('javaclient', {
128+
return res.view('client/javaclient', {
129129
world,
130130
detail: req.query.detail,
131131
method: req.query.method
@@ -153,14 +153,14 @@ export default function (f: any, opts: any, next: any) {
153153
return;
154154
}
155155

156-
if (req.query.method == 0) {
157-
return res.view('webclient-inner', {
156+
if (req.query.method == 0 || req.query.method == 4) {
157+
return res.view('client/webclient-inner', {
158158
world,
159159
detail: req.query.detail,
160160
method: req.query.method
161161
});
162162
} else if (req.query.method == 1 || req.query.method == 2) {
163-
return res.view('javaclient-inner', {
163+
return res.view('client/javaclient-inner', {
164164
world,
165165
detail: req.query.detail,
166166
method: req.query.method

‎src/lostcity/web/routes/website.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ export default function (f, opts, next) {
5454

5555
if (req.query.method == 3) {
5656
return res.redirect('/downloads');
57-
} else if (req.query.method == 4) {
58-
return res.redirect('https://2004scape.github.io/Client2/');
5957
}
6058

6159
return res.view('serverlist', {
@@ -106,7 +104,7 @@ export default function (f, opts, next) {
106104
});
107105

108106
f.get('/worldmap', async (req, res) => {
109-
return res.view('worldmap');
107+
return res.view('worldmap/applet');
110108
});
111109

112110
f.get('/downloads', async (req, res) => {

‎view/_partial/disclaimer.ejs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
This is a fan-made project and is not affiliated with <a href="https://www.jagex.com/">Jagex Ltd.</a><br>
2-
We have not been endorsed by, authorized by, or officially communicated with <a href="https://www.jagex.com/">Jagex Ltd.</a> on our efforts here.<br>
2+
We have not been endorsed by, authorized by, or communicated<br>with <a href="https://www.jagex.com/">Jagex Ltd.</a> on our efforts here.<br>
33

44
<ul style="text-align: left">
55
<li>The assets within belong wholly to Jagex. The names and trademarks within are a representation of their time.</li>

‎view/client/client2.ejs

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
5+
<title>RuneScape 2</title>
6+
<link rel="icon" type="image/x-icon" href="favicon.ico">
7+
8+
<meta charset="utf-8">
9+
<meta name="viewport" content="width=device-width, initial-scale=1">
10+
11+
<style>
12+
body {
13+
margin: 0;
14+
padding: 0;
15+
color: #fff;
16+
background-color: #000;
17+
}
18+
19+
canvas {
20+
display: block;
21+
margin: 0 auto;
22+
23+
touch-action: none;
24+
-webkit-touch-callout: none;
25+
-webkit-user-select: none;
26+
-khtml-user-select: none;
27+
-moz-user-select: none;
28+
-ms-user-select: none;
29+
user-select: none;
30+
outline: none;
31+
-webkit-tap-highlight-color: rgba(255, 255, 255, 0);
32+
z-index: -1;
33+
}
34+
</style>
35+
36+
<script defer="defer" src="/js/runetek.js"></script>
37+
<script defer="defer" src="/js/client.js"></script>
38+
</head>
39+
40+
<body>
41+
<canvas id="canvas" width="789" height="532"></canvas>
42+
</body>
43+
44+
</html>

‎view/javaclient-inner.ejs ‎view/client/javaclient-inner.ejs

File renamed without changes.

‎view/javaclient.ejs ‎view/client/javaclient.ejs

File renamed without changes.

‎view/webclient-inner.ejs ‎view/client/teavm.ejs

File renamed without changes.

‎view/client/webclient-inner.ejs

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<% if (method == 4) { %>
2+
<%- include('./teavm.ejs'); %>
3+
<% } else {%>
4+
<%- include('./client2.ejs'); %>
5+
<% } %>

‎view/webclient.ejs ‎view/client/webclient.ejs

File renamed without changes.

‎view/detail.ejs

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
<td align=center>
4848
<span style="font-size:11px" color="white">Select a method to play</span><br>
4949
<select name='method' id='method' style="background-color: #B1977E;">
50-
<option value='0'> Modern Web Client (Recommended)</option>
51-
<option value='4'> Modern Web Client (Experimental)</option>
52-
<option value='1'> Legacy Web Client</option>
53-
<option value='2'> Legacy Web Client Unsigned</option>
54-
<option value='3'> Desktop Client</option>
50+
<option value='0'> Modern Web</option>
51+
<option value='4'> Modern Web (TeaVM)</option>
52+
<option value='1'> Legacy Web (Java plugin)</option>
53+
<option value='2'> Legacy Web Unsigned</option>
54+
<option value='3'> Standalone</option>
5555
</select>
5656
</td>
5757
</tr>

‎view/index.ejs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ It is not representative of today's RuneScape and does not involve any of their
2323

2424
<%- include('./_partial/disclaimer.ejs'); %>
2525

26-
<a href="/title">Please click here to continue, acknowledging you understand the above statements.</a><br>
26+
<a href="/title">Click here if you understand the above statements.</a><br>
2727

2828
<%- include('./_components/stones-content-end.ejs'); %>
2929
<%- include('./_components/stones-border-bottom.ejs'); %>

‎view/worldmap/applet.ejs

+173
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
<html>
2+
3+
<head>
4+
<META HTTP-EQUIV="Expires" CONTENT="0">
5+
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
6+
<META HTTP-EQUIV="Cache-Control" CONTENT="no-cache">
7+
<meta name="MSSmartTagsPreventParsing" content="TRUE">
8+
<title>Jagex Software</title>
9+
<STYLE>
10+
BODY,
11+
TD,
12+
P {
13+
font-family: Arial, Helvetica, sans-serif;
14+
font-size: 13px;
15+
}
16+
17+
.b {
18+
border-style: outset;
19+
border-width: 3pt;
20+
border-color: #373737
21+
}
22+
23+
.b2 {
24+
border-style: outset;
25+
border-width: 3pt;
26+
border-color: #570700
27+
}
28+
29+
.e {
30+
border: 2px solid #382418
31+
}
32+
33+
.c {
34+
text-decoration: none
35+
}
36+
37+
A.c:hover {
38+
text-decoration: underline
39+
}
40+
41+
.white {
42+
text-decoration: none;
43+
color: #FFFFFF;
44+
}
45+
46+
.red {
47+
text-decoration: none;
48+
color: #E10505;
49+
}
50+
51+
.lblue {
52+
text-decoration: none;
53+
color: #9DB8C3;
54+
}
55+
56+
.dblue {
57+
text-decoration: none;
58+
color: #0D6083;
59+
}
60+
61+
.yellow {
62+
text-decoration: none;
63+
color: #FFE139;
64+
}
65+
66+
.green {
67+
text-decoration: none;
68+
color: #04A800;
69+
}
70+
71+
.purple {
72+
text-decoration: none;
73+
color: #C503FD;
74+
}
75+
76+
.pink {
77+
text-decoration: none;
78+
color: #FAA8AA;
79+
}
80+
81+
A.c:hover {
82+
text-decoration: underline
83+
}
84+
85+
A.white:hover {
86+
text-decoration: underline
87+
}
88+
89+
A.red:hover {
90+
text-decoration: underline
91+
}
92+
93+
A.lblue:hover {
94+
text-decoration: underline
95+
}
96+
97+
A.dblue:hover {
98+
text-decoration: underline
99+
}
100+
101+
A.yellow:hover {
102+
text-decoration: underline
103+
}
104+
105+
A.green:hover {
106+
text-decoration: underline
107+
}
108+
109+
A.purple:hover {
110+
text-decoration: underline
111+
}
112+
113+
A.pink:hover {
114+
text-decoration: underline
115+
}
116+
</STYLE>
117+
<script defer="defer" src="/js/runetek.js"></script>
118+
<script defer="defer" src="/js/mapview.js"></script>
119+
</head>
120+
121+
<body bgcolor=black text="white" link=#90c040 alink=#90c040 vlink=#90c040 style="margin:0">
122+
<table width=100% height=100% cellpadding=0 cellspacing=0>
123+
<tr>
124+
<td valign=middle>
125+
<center>
126+
<center>
127+
<table width=250 bgcolor=black cellpadding=4>
128+
<tr>
129+
<td class=e>
130+
<center>
131+
<b>Map of the RuneScape World</b><br>
132+
<a href="/" class=c>Main Menu</a>
133+
</center>
134+
</td>
135+
</tr>
136+
</table>
137+
</center>
138+
<p>
139+
<canvas id="canvas" width="635" height="503"></canvas>
140+
<p>
141+
<center>
142+
<table width=500 bgcolor=black cellpadding=4 border=0>
143+
<tr>
144+
<td class=e>
145+
<b>Using the Main Map</b><br>
146+
Click and drag the left mouse button on the main map to move the map around. Click on the different
147+
percentage buttons at the bottom of the applet to zoom in and out.
148+
<p>
149+
<b>Using the Overview Map</b><br>
150+
Click on the "Overview" button to bring up the overview map. The red shaded area indicated what
151+
the area the main map is showing. Left click on the overview map to move the main map around
152+
quickly.
153+
<p>
154+
<b>Using the Key</b><br>
155+
Click on the "Key" button to bring up the key. There are two pages in the key, clicking on the
156+
"Prev page" or "Next page" buttons will allow you to navigate them. Clicking on any item in the
157+
key will locate all icons on the map of that type (they will flash yellow for a while).
158+
</td>
159+
</tr>
160+
</table><br>
161+
</center>
162+
<div align="center" style="font-family:Arial,Helvetica,sans-serif; font-size:11px;">
163+
This webpage and its contents is copyright 2004 Jagex Ltd<br>
164+
To use our service you must agree to our <a href="terms/terms.html" class=c>Terms+Conditions</a> + <a
165+
href="privacy/privacy.html" class=c>Privacy policy</a>
166+
</div>
167+
</center>
168+
</td>
169+
</tr>
170+
</table>
171+
</body>
172+
173+
</html>

‎view/worldmap.ejs ‎view/worldmap/static.ejs

File renamed without changes.

0 commit comments

Comments
 (0)