diff --git a/client/src/HouseRules.js b/client/src/HouseRules.js index b18b245..e54808f 100644 --- a/client/src/HouseRules.js +++ b/client/src/HouseRules.js @@ -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])) { diff --git a/server/routes/games.js b/server/routes/games.js index 4a1189c..042f11d 100755 --- a/server/routes/games.js +++ b/server/routes/games.js @@ -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; }