Skip to content
This repository was archived by the owner on Apr 16, 2025. It is now read-only.

Commit 186b254

Browse files
TGRHavocTGRHavoc
committed
feat: add player tracking
Users can now track players on the server.. Stalkers!
1 parent 47be19a commit 186b254

File tree

8 files changed

+108
-95
lines changed

8 files changed

+108
-95
lines changed

‎index.php‎

Lines changed: 7 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<link type="text/css" rel="stylesheet" href="style/bootstrap.css">
3434
<link type="text/css" rel="stylesheet" href="style/style.css">
3535
36-
<script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
36+
<script src="js/jquery-3.2.1.min.js"></script>
3737
<script type="text/javascript" src="js/app.min.js"></script>
3838
3939
<!-- Change the key below -->
@@ -50,29 +50,21 @@
5050
// Set relative icon directory
5151
var _MAP_iconURL = "images/icons/";
5252
53-
// Set if to show Atlas map (WARNING: REQUIRES ATLAS MAP TILE DIRECTORY)
54-
// Set "true" to show map
55-
// Set "false" to not show map
53+
// Set if to show Atlas map (WARNING: REQUIRES "atlas" TILE DIRECTORY)
5654
var _MAP_atlasMap = true;
5755
58-
// Set if to show Satellite map (WARNING: REQUIRES SATELLITE MAP TILE DIRECTORY)
59-
// Set "true" to show map
60-
// Set "false" to not show map
56+
// Set if to show Satellite map (WARNING: REQUIRES "satellite" TILE DIRECTORY)
6157
var _MAP_satelliteMap = true;
6258
63-
// Set if to show Road map (WARNING: REQUIRES ROAD MAP TILE DIRECTORY)
64-
// Set "true" to show map
65-
// Set "false" to not show map
59+
// Set if to show Road map (WARNING: REQUIRES "road" TILE DIRECTORY)
6660
var _MAP_roadMap = true;
6761
68-
// Set if to show UV Invert map (WARNING: REQUIRES UV INVERT MAP TILE DIRECTORY)
69-
// Set "true" to show map
70-
// Set "false" to not show map
62+
// Set if to show UV Invert map (WARNING: REQUIRES "uv-invert" TILE DIRECTORY)
7163
var _MAP_UVInvMap = false;
7264
7365
// Set to the IP of the GTA server running "live_map" and change the port to the
7466
// number that is in the "server.lua" file
75-
var _SETTINGS_socketUrl = "ws://localhost:30121"
67+
var _SETTINGS_socketUrl = "wss://identityrp.co.uk:30121"
7668
7769
</script>
7870
@@ -168,77 +160,5 @@ function startMarkers(){
168160
</div>
169161
</body>
170162
171-
<script>
172-
var _invervalId;
173-
var _isLive = false;
174-
var _blips = [];
175-
var _blipCount = 0;
176-
var _showBlips = true;
177-
var _isConnected = false;
178-
var _trackPlayer = null;
179-
180-
function toggleBlips(){
181-
console.log("showing local blips");
182-
if (_showBlips){
183-
_blips.forEach(function(blip){
184-
var desc = blip.description == undefined ? "" : blip.description;
185-
var obj = new MarkerObject(blip.name, new Coordinates(blip.x, blip.y, blip.z), MarkerTypes[blip.type], desc, "", "");
186-
createMarker(false, false, obj, "");
187-
});
188-
}else{
189-
clearAllMarkers();
190-
}
191-
}
192-
193-
$(document).ready(function(){
194-
globalInit();
195-
connect();
196-
197-
$("#refreshBlips").click(function(e){
198-
e.preventDefault();
199-
webSocket.send("getBlips");
200-
});
201-
202-
$("#showBlips").click(function(e){
203-
e.preventDefault();
204-
205-
_showBlips = !_showBlips;
206-
207-
//webSocket.send("getBlips");
208-
toggleBlips();
209-
210-
$("#blips_enabled").removeClass("label-success").removeClass("label-danger")
211-
.addClass( _showBlips ? "label-success" : "label-danger")
212-
.text(_showBlips ? "on" : "off")
213-
});
214-
215-
$("#reconnect").click(function(e){
216-
e.preventDefault();
217-
218-
$("#connection").removeClass("label-success").removeClass("label-danger").addClass("label-warning").text("reconnecting");
219-
connect();
220-
});
221-
222-
$("#toggleLive").click(function(e){
223-
e.preventDefault();
224-
if(!_isConnected){
225-
// Not connected
226-
return;
227-
}
228-
229-
_isLive = !_isLive;
230-
231-
$("#live_enabled").removeClass("label-success").removeClass("label-danger")
232-
.addClass( _isLive ? "label-success" : "label-danger")
233-
.text(_isLive ? "on" : "off");
234-
235-
if (_isLive){
236-
_invervalId = setInterval(function(){ webSocket.send("getLocations"); }, 250);
237-
}else{
238-
clearInterval(_invervalId);
239-
}
240-
241-
});
242-
});
243-
</script>
163+
<script src="js/controls.min.js"></script>
244164
</html>

‎js/controls.min.js‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/jquery-3.2.1.min.js‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/markers.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/socket.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/src/controls.js‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
var _invervalId; //
2+
var _isLive = false;
3+
var _blips = [];
4+
var _blipCount = 0;
5+
var _showBlips = true;
6+
var _isConnected = false;
7+
var _trackPlayer = null;
8+
9+
function toggleBlips(){
10+
console.log("showing local blips");
11+
if (_showBlips){
12+
_blips.forEach(function(blip){
13+
var desc = blip.description == undefined ? "" : blip.description;
14+
var obj = new MarkerObject(blip.name, new Coordinates(blip.x, blip.y, blip.z), MarkerTypes[blip.type], desc, "", "");
15+
createMarker(false, false, obj, "");
16+
});
17+
}else{
18+
clearAllMarkers();
19+
}
20+
}
21+
22+
$(document).ready(function(){
23+
globalInit();
24+
connect();
25+
26+
$("#playerSelect").on("change", function(){
27+
if (this.value == ""){
28+
_trackPlayer = null;
29+
return;
30+
}
31+
32+
map.setZoom(7);// zoom in!
33+
_trackPlayer = this.value;
34+
});
35+
36+
$("#refreshBlips").click(function(e){
37+
e.preventDefault();
38+
webSocket.send("getBlips");
39+
});
40+
41+
$("#showBlips").click(function(e){
42+
e.preventDefault();
43+
44+
_showBlips = !_showBlips;
45+
46+
//webSocket.send("getBlips");
47+
toggleBlips();
48+
49+
$("#blips_enabled").removeClass("label-success").removeClass("label-danger")
50+
.addClass( _showBlips ? "label-success" : "label-danger")
51+
.text(_showBlips ? "on" : "off")
52+
});
53+
54+
$("#reconnect").click(function(e){
55+
e.preventDefault();
56+
57+
$("#connection").removeClass("label-success").removeClass("label-danger").addClass("label-warning").text("reconnecting");
58+
connect();
59+
});
60+
61+
$("#toggleLive").click(function(e){
62+
e.preventDefault();
63+
if(!_isConnected){
64+
// Not connected
65+
return;
66+
}
67+
68+
_isLive = !_isLive;
69+
70+
$("#live_enabled").removeClass("label-success").removeClass("label-danger")
71+
.addClass( _isLive ? "label-success" : "label-danger")
72+
.text(_isLive ? "on" : "off");
73+
74+
if (_isLive){
75+
_invervalId = setInterval(function(){ webSocket.send("getLocations"); }, 250);
76+
}else{
77+
clearInterval(_invervalId);
78+
}
79+
80+
});
81+
});

‎js/src/markers.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// divide by 2 since we want to make make like 32x32 images
2-
var customImageWidth = 64 / 2; // sheetWidth / 16
3-
var customImageHeight = 64 / 2; // sheetHeight / 16
1+
// divide by 2 since we want to make icons 32x32 images
2+
var customImageWidth = 64 / 2; // 64 = sheetWidth / 16
3+
var customImageHeight = 64 / 2; // 64 = sheetHeight / 16
44

55
var MarkerTypes = {
66
none: {

‎js/src/socket.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ function onError(e){
8787
else
8888
reason = "Unknown reason (Server is probably down)";
8989

90-
$("#socket_error").text(reason);
91-
90+
//$("#socket_error").text(reason);
91+
console.log("Socket error: " + reason);
9292
if (_isLive){
9393
clearInterval(_invervalId);
9494
}
@@ -156,6 +156,10 @@ function doPlayerUpdate(players){
156156
}));
157157
}
158158

159+
if (_trackPlayer != null && _trackPlayer == plr.id){
160+
map.panTo(convertToMapGMAP(plr.x, plr.y));
161+
}
162+
159163
if (plr.id in localCache){
160164

161165
//console.log(JSON.stringify(plr));

0 commit comments

Comments
 (0)