Ratstail91/SANCTUM
1
0
Fork 0
mirror of https://github.com/Ratstail91/SANCTUM.git synced 2025-11-29 18:34:28 +11:00
Code Issues Packages Projects Releases Wiki Activity

Did a bunch of refactoring

Browse Source
This commit is contained in:
Kayne Ruse
2018-11-03 17:44:21 +11:00
parent 7812ceb9d7
commit cd19546ec8
12 changed files with 82 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SERVER_City/package.json
View File

@@ -4,10 +4,10 @@
"description": "",
"main": "city.js",
"scripts": {
"start": "forever -o forever.log -e error.log start city.js",
"restart": "forever -o forever.log -e error.log restart city.js",
"stop": "forever stop city.js",
"node": "node city.js"
"start": "forever -o forever.log -e error.log start server-city.js",
"restart": "forever -o forever.log -e error.log restart server-city.js",
"stop": "forever stop server-city.js",
"node": "node server-city.js"
},
"author": "",
"license": "ISC",

11
SERVER_City/city.js → SERVER_City/server-city.js
View File

@@ -42,6 +42,7 @@ io.on("connection", async (socket) => {
console.log(socket.client.username + " disconnected");
});
socket.on("serverPing", handleServerPing);
socket.on("updateStamina", handleUpdateStamina);
socket.on("conversion", handleConversion);
socket.on("checkin", handleCheckin);
@@ -59,6 +60,11 @@ io.on("connection", async (socket) => {
server.listen(process.env.SERVER_PORT);
console.log("listening on port " + process.env.SERVER_PORT);
//respond to a ping with a pong
async function handleServerPing({ data }, fn) {
return fn("SERVER PONG!");
}
//update the playerbase's stamina on command
async function handleUpdateStamina({ userID, data }) {
let query = "UPDATE users SET stamina = stamina + 1 WHERE stamina < maxStamina;";
@@ -116,7 +122,7 @@ async function handleConversion({ data }, fn) {
}
//handle checkin, and add 1 XP
async function handleCheckin({ data }, fn) {
async function handleCheckin({ data }, fn) { //TODO: You already checked in with me today, you should check in again after X hours
//handle checkins (grant crystal bonus)
//arguments to fn: ["available", time since last checkin], randomAmount
@@ -124,7 +130,6 @@ async function handleCheckin({ data }, fn) {
let randomAmount = calcRandom.Random(4, 9);
let query = "SELECT TIME_TO_SEC(TIMEDIFF(NOW(), lastCheckin)) FROM users WHERE userID = ? LIMIT 1;";
return dbConnection.query(query, [data[0]], (err, result) => {
if (err) throw err;
@@ -150,7 +155,7 @@ async function handleWallet({ data }, fn) {
dbConnection.query(query, [data[0]], (err, result) => {
if (err) throw err;
dbLog(data[0], "wallet query", "result: " + result[0].wallet);
fn(result[0].wallet);
return fn(result[0].wallet);
});
}