Merge branch 'develop' into refactor-content

2025-12-19 15:48:04 +01:00 · 2015-10-01 21:08:00 -05:00
parent a7fe29e04e 22c69c7e2f
commit be3decf859
86 changed files with 5065 additions and 4461 deletions
--- a/common/script/src/content/quests/holiday.js
+++ b/common/script/src/content/quests/holiday.js
@@ -117,7 +117,7 @@ let holidayQuests = {
 let questDefaults = (name) => {
  return  {
    completion: t(`quest${name}Completion`),
-    canBuy: false,
+    canBuy: () => { return false; },
    category: 'pet',
  }
 };
--- a/common/script/src/content/quests/world.js
+++ b/common/script/src/content/quests/world.js
@@ -160,7 +160,7 @@ let questDefaults = (name) => {
  return {
    completion: t(`quest${name}Completion`),
    value: 0,
-    canBuy: false,
+    canBuy: () => { return false; },
    category: 'world',
  }
 };