Browse Source

GF v110.2

Dmitry Shin 5 years ago
parent
commit
b612a8673f
4 changed files with 39 additions and 8 deletions
  1. 2 1
      README.md
  2. 3 3
      manifest.json
  3. 2 2
      module.json
  4. 32 2
      settings_migrator.js

+ 2 - 1
README.md

@@ -8,7 +8,8 @@ Toolbox(/8) | Command description
 **broker** | Trade Broker
 **bank** | Bank
 **gbank** | Guild Bank
-**pbank** | Personal Storage
+**pbank** | Special Storage (Pet Bank)
+**cbank** | Wardrobe (Costume Bank)
 **store** | Merchant
 **sstore** | Specialty Store
 **vg** | Vanguard Initiative Credit Merchant

+ 3 - 3
manifest.json

@@ -1,10 +1,10 @@
 {
     "files": {
         "C_REQUEST_CONTRACT.50.def": "2247897b86830f04c7b96500055087d9cb05070ffc8e21f679b797f760f03a89",
-        "README.md": "db16f4f34206dd41089ad5239ba02a0050541796ebb47bbc0602f256785fe5e0",
+        "README.md": "8502d40e573d109405828abd748503647f60cf83e15755f6e6f548d4dfb6484f",
         "index.js": "9b4222dc7a5896f1414e2c7e69534f84bdcdb1120a8f5ab3928b8e9c375d7050",
-        "module.json": "64197ef049ca5a009ae05946d8370cdc7e03e29d98aca58e7baacdbba0530a38",
-        "settings_migrator.js": "a22ce905dd14af4bf5cf2671dbe01eba3ebdb00dec64584c1fb7d1b5636b4e15"
+        "module.json": "6d4b2c75270e1f967ff4ab7e6fdabd529a3e8fcbe63c5e9e4bda140318854b76",
+        "settings_migrator.js": "da402468235eade6a090bf1949a8fbcd1711a5af6eb1fb257ca512fe6edc7a00"
     },
     "defs": {
         "C_REQUEST_CONTRACT": 50,

+ 2 - 2
module.json

@@ -4,12 +4,12 @@
     "description": "Summon any NPC (merchant, bank, broker) from anywhere",
     "options": {
         "niceName": "NPC Summoner",
-        "settingsVersion": 1,
+        "settingsVersion": 2,
         "settingsFile": "config.json",
         "reloadable": true,
         "settingsMigrator": "settings_migrator.js"
     },
     "servers": ["https://raw.githubusercontent.com/hsdn/npc-summoner/master/"],
     "disableAutoUpdate": false,
-    "version": "10/17/2021"
+    "version": "10/20/2021"
 }

+ 32 - 2
settings_migrator.js

@@ -14,6 +14,10 @@ const DefaultSettings = {
 			"type": 26,
 			"value": 9
 		},
+		"cbank": {
+			"type": 26,
+			"value": 12
+		},
 		"store": {
 			"type": 9,
 			"value": 70310,
@@ -55,11 +59,37 @@ module.exports = function MigrateSettings(from_ver, to_ver, settings) {
 
 				for (const option in oldsettings) {
 					if (settings[option] !== undefined) {
-						settings[option] = oldsettings[option];
+						settings[option] = MigrateOption(settings[option], oldsettings[option], ["id"]);
 					}
 				}
 		}
 
 		return settings;
 	}
-};
+};
+
+function MigrateOption(option, oldoption, excludes) {
+	if (oldoption === undefined) {
+		oldoption = option;
+	}
+
+	if (Array.isArray(option)) {
+		for (const key of Object.keys(option)) {
+			option[key] = MigrateOption(option[key], oldoption[key], excludes);
+		}
+	}
+
+	if (Object.getPrototypeOf(option) === Object.prototype) {
+		option = { ...option, ...oldoption };
+
+		for (const key of Object.keys(option)) {
+			if (excludes.includes(key)) {
+				option[key] = oldoption[key] || null;
+			} else {
+				option[key] = MigrateOption(option[key], oldoption[key], excludes);
+			}
+		}
+	}
+
+	return option;
+}