diff --git a/combat.js b/combat.js index ab8dbcf..d109197 100644 --- a/combat.js +++ b/combat.js @@ -102,7 +102,7 @@ function grapple(attacker, weightFactor = 1) { }, requirements: [ function(attacker, defender) { return isNormal(attacker) && isNormal(defender); }, - function(attacker, defender) { return defender.flags.grapple; } + function(attacker, defender) { return defender.prefs.grapple; } ], priority: 1, weight: function(attacker, defender) { return weightFactor - weightFactor * defender.health / defender.maxHealth; } diff --git a/feast.js b/feast.js index 5a7e7ef..1451907 100644 --- a/feast.js +++ b/feast.js @@ -591,6 +591,8 @@ function saveGame() { }); save.position = currentRoom.name; + save.date = date; + save.time = time; save.deaths = deaths; @@ -613,6 +615,9 @@ function loadGame() { deaths = save.deaths; + date = save.date; + time = save.time; + clearScreen(); moveToByName(save.position, ""); }