jketreno/peddlers-of-ketran
1
0
Fork 0
Code Issues 42 Activity

Fixed house rules not working

Browse Source 
Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>
This commit is contained in:
James Ketrenos 2022-07-07 16:00:21 -07:00
parent 3abc4ad2a1
commit 054849067a
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/HouseRules.js
View File

@ -24,11 +24,11 @@ const Volcano = ({ ws, rules, field, disabled }) => {
useEffect(() => {
if (field in rules) {
setGold('gold' in rules[field] ? rules[field].gold : false);
setGold('gold' in rules[field] ? rules[field].gold : true);
setNumber('number' in rules[field] ? rules[field].number : init);
let update = false;
if (!('gold' in rules[field])) {
rules[field].gold = false;
rules[field].gold = true;
update = true;
}
if (!('number' in rules[field])) {

20
server/routes/games.js
View File

@ -713,7 +713,7 @@ const adminCommands = (game, action, value, query) => {
const rules = {};
for (let key in supportedRules) {
if (game.rules[key]) {
rules[key] = game.rules[key];
rules[key] = game.rules[key];
} else {
rules[key] = { enabled: false };
}
@ -2780,7 +2780,7 @@ const getVictoryPointRule = (game) => {
}
const supportedRules = {
'victory-points': (game, session, rules) => {
'victory-points': (game, session, rule, rules) => {
if (!('points' in rules[rule])) {
return `No points specified for victory-points`;
}
@ -2794,11 +2794,11 @@ const supportedRules = {
`${rules[rule].points}`);
}
},
'roll-double-roll-again': (game, session, rules) => {
'roll-double-roll-again': (game, session, rule, rules) => {
addChatMessage(game, null,
`${getName(session)} has ${rules[rule].enabled ? 'en' : 'dis'}abled the Roll Double, Roll Again house rule.`);
},
'volcano': (game, session, rules) => {
'volcano': (game, session, rule, rules) => {
if (!rules[rule].enabled) {
addChatMessage(game, null,
`${getName(session)} has disabled the Volcano ` +
@ -2826,27 +2826,27 @@ const supportedRules = {
}
}
},
'twelve-and-two-are-synonyms': (game, session, rules) => {
'twelve-and-two-are-synonyms': (game, session, rule, rules) => {
addChatMessage(game, null,
`${getName(session)} has ${rules[rule].enabled ? 'en' : 'dis'}abled the Twelve and Two are Synonyms house rule.`);
game.rules[rule] = rules[rule];
},
'most-developed': (game, session, rules) => {
'most-developed': (game, session, rule, rules) => {
addChatMessage(game, null,
`${getName(session)} has ${rules[rule].enabled ? 'en' : 'dis'}abled the Most Developed house rule.`);
},
'port-of-call': (game, session, rules) => {
'port-of-call': (game, session, rule, rules) => {
addChatMessage(game, null,
`${getName(session)} has ${rules[rule].enabled ? 'en' : 'dis'}abled the Another Round of Port house rule.`);
},
'tiles-start-facing-down': (game, session, rules) => {
'tiles-start-facing-down': (game, session, rule, rules) => {
addChatMessage(game, null,
`${getName(session)} has ${rules[rule].enabled ? 'en' : 'dis'}abled the Tiles Start Facing Down house rule.`);
if (rules[rule].enabled) {
shuffle(game, session);
}
},
'robin-hood-robber': (game, session, rules) => {
'robin-hood-robber': (game, session, rule, rules) => {
addChatMessage(game, null,
`${getName(session)} has ${rules[rule].enabled ? 'en' : 'dis'}abled the Robin Hood Robber house rule.`);
}
@ -2863,7 +2863,7 @@ const setRules = (game, session, rules) => {
}
if (rule in supportedRules) {
const warning = supportedRules[rule](game, session, rules);
const warning = supportedRules[rule](game, session, rule, rules);
if (warning) {
return warning;
}