heroku deploy and added moving pawns
This commit is contained in:
+51
-3
@@ -1,5 +1,6 @@
|
||||
var express = require('express');
|
||||
var router = express.Router();
|
||||
const RoomModel = require('../schemas/room');
|
||||
|
||||
function setNextPlayer(req, res){
|
||||
RoomModel.findOne({_id: req.session.roomId}, function (err, doc){
|
||||
@@ -20,11 +21,58 @@ function setNextPlayer(req, res){
|
||||
}
|
||||
|
||||
router.get('/roll', function (req, res){
|
||||
res.send({number: Math.ceil(Math.random() * 6)});
|
||||
const rolledNumber = Math.ceil(Math.random() * 6);
|
||||
req.session.rolledNumber = rolledNumber;
|
||||
res.send({number: rolledNumber});
|
||||
});
|
||||
|
||||
router.post('/move', function (req, res){
|
||||
|
||||
router.post('/move', async function (req, res){
|
||||
const rolledNumber = req.session.rolledNumber;
|
||||
req.session.rolledNumber = null;
|
||||
const room = await RoomModel.findOne({_id: req.session.roomId});
|
||||
console.log(room);
|
||||
const indexOfMovedPawn = room.pawns.findIndex( pawn => pawn._id === req.body.pawnId);
|
||||
let { position } = room.pawns[indexOfMovedPawn];
|
||||
switch (req.session.color){
|
||||
case 'red':
|
||||
if(position >= 0 && position <= 3){
|
||||
position = 4;
|
||||
}else if(position > 15 && position + rolledNumber <= 66){
|
||||
position = position + rolledNumber;
|
||||
}else{
|
||||
position = 67 + (position + rolledNumber - 66);
|
||||
}
|
||||
break;
|
||||
case 'blue':
|
||||
if(position >= 4 && position <= 7){
|
||||
position = 55;
|
||||
}else if(position+rolledNumber>55 || position+rolledNumber <= 53){
|
||||
position = position + rolledNumber;
|
||||
}else{
|
||||
position = 71 + (position + rolledNumber - 53);
|
||||
}
|
||||
break;
|
||||
case 'green':
|
||||
if(pawn.position >= 8 && pawn.position <= 11){
|
||||
position = 42;
|
||||
}else if(position + rolledNumber > 42 || position+rolledNumber <= 40){
|
||||
position = position + rolledNumber;
|
||||
}else{
|
||||
position = 76 - (position + rolledNumber - 40)
|
||||
}
|
||||
break;
|
||||
case 'yellow':
|
||||
if(pawn.position >= 12 && pawn.position <= 15){
|
||||
return 29;
|
||||
}else if(position + rolledNumber > 29 || position+rolledNumber <= 27){
|
||||
position = position + rolledNumber;
|
||||
}else{
|
||||
position = 82 + (position + rolledNumber - 27)
|
||||
}
|
||||
break;
|
||||
}
|
||||
RoomModel.findOneAndUpdate({_id: req.session.roomId, 'pawnw._id': req.body.pawnId}, room);
|
||||
res.send("Correctly Moved!");
|
||||
});
|
||||
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ router.post('/ready', function (req, res){
|
||||
|
||||
//deleting user in case he left before game started
|
||||
router.post('/exit', function(req,res){
|
||||
changeReadyState(req,res, true)
|
||||
// changeReadyState(req,res, true)
|
||||
});
|
||||
|
||||
//return session data
|
||||
|
||||
+5
-1
@@ -26,7 +26,7 @@ const mongoose = require("mongoose");
|
||||
mongoose.set('useFindAndModify', false);
|
||||
const CONNECTION_URI = require("./credentials.js").MONGODB_URL;
|
||||
|
||||
mongoose.connect(CONNECTION_URI, {
|
||||
mongoose.connect(process.env.MONGODB_URL || CONNECTION_URI, {
|
||||
useNewUrlParser: true,
|
||||
useUnifiedTopology: true
|
||||
})
|
||||
@@ -51,6 +51,10 @@ app.use(session({
|
||||
secure: false,},
|
||||
}));
|
||||
|
||||
if (process.env.NODE_ENV === 'production') {
|
||||
app.use(express.static('../build'))
|
||||
}
|
||||
|
||||
//ROUTES CONFIG
|
||||
const roomRoutes = require("./routes/room");
|
||||
const playerRoutes = require("./routes/player");
|
||||
|
||||
Reference in New Issue
Block a user