Browse Source

Add support of Menma's NPCs

Dmitry S 3 years ago
parent
commit
e669006268
4 changed files with 42 additions and 43 deletions
  1. 8 7
      index.js
  2. 3 10
      manifest.json
  3. 1 1
      module.json
  4. 30 25
      settings_migrator.js

+ 8 - 7
index.js

@@ -38,14 +38,15 @@ module.exports = function NpcSummoner(mod) {
 	});
 
 	mod.hook("S_SPAWN_NPC", mod.majorPatchVersion >= 101 ? 12 : 11, event => {
-		const npc = Object.values(mod.settings.npc).find(n =>
-			n.huntingZoneId === event.huntingZoneId &&
-			n.templateId === event.templateId
-		);
+		Object.entries(mod.settings.npc).forEach(([name, npc]) => {
+			if (npc.opts === undefined) return;
+			const opt = npc.opts.find(option => option.templateId === event.templateId && option.huntingZoneId === event.huntingZoneId);
 
-		if (npc) {
-			npc.gameId = parseInt(event.gameId);
-		}
+			if (opt) {
+				mod.settings.npc[name].value = opt._value;
+				mod.settings.npc[name].gameId = parseInt(event.gameId);
+			}
+		});
 	});
 
 	mod.hook("S_DIALOG", 2, event => {

+ 3 - 10
manifest.json

@@ -1,15 +1,8 @@
 {
     "files": {
         "README.md": "0f33c2024c759e629dc82331a4e5170eb3971d187718cd2463927398bdf31b53",
-        "index.js": "30f6cb173e1f97c6a0259815b7500b3216e58ebbdc20f3356f678613ed074a3b",
-        "module.json": "8e134de2ba3fddfd99eef15c49458b9033d69b94028f181d207e34b56f6a419c",
-        "settings_migrator.js": "b5e0675a2dfad88da4ce517fa2c8c66916133e7d380be9008b8268d2fe2baf00"
-    },
-    "defs": {
-        "C_REQUEST_CONTRACT": 50,
-        "S_DIALOG": 2,
-        "S_NPC_MENU_SELECT": 1,
-        "S_REQUEST_CONTRACT": 1,
-        "S_SPAWN_NPC": 11
+        "index.js": "78462f6adf8eaf10c717fa371a6be2d006cecb967ab0f07eec3abac767cec2ce",
+        "module.json": "8202f4ec7112fdceb67daa551f13203567a523119688ea6587ff554660991fc0",
+        "settings_migrator.js": "e40368571e91b05acc9ba26d359c06c70f4e552a5883d3a9334457febe503e3c"
     }
 }

+ 1 - 1
module.json

@@ -4,7 +4,7 @@
     "description": "Summon any NPC (merchant, bank, broker) from anywhere",
     "options": {
         "niceName": "NPC Summoner",
-        "settingsVersion": 3,
+        "settingsVersion": 4,
         "settingsFile": "config.json",
         "reloadable": true,
         "settingsMigrator": "settings_migrator.js"

+ 30 - 25
settings_migrator.js

@@ -26,35 +26,44 @@ const DefaultSettings = {
 		// You can use "npcsummoner" command to enable debug for get values.
 		"store": {
 			"type": 9,
-			"value": 70310,
+			"value": null,
 			"gameId": null,
-			"templateId": 2019,
-			"huntingZoneId": 183
+			"opts": [
+				{ "templateId": 2019, "huntingZoneId": 183, "_value": 70310 },
+				{ "templateId": 2022, "huntingZoneId": 58, "_value": 58001 }
+			]
 		},
 		"sstore": {
 			"type": 9,
-			"value": 250,
+			"value": null,
 			"gameId": null,
-			"templateId": 2109,
-			"huntingZoneId": 183
+			"opts": [
+				{ "templateId": 2109, "huntingZoneId": 183, "_value": 250 },
+				{ "templateId": 2010, "huntingZoneId": 58, "_value": 58002 }
+			]
 		},
 		"bel": {
 			"type": 50,
-			"value": 141,
+			"value": null,
 			"gameId": null,
-			"templateId": 2045,
-			"huntingZoneId": 183
+			"opts": [
+				{ "templateId": 2045, "huntingZoneId": 183, "_value": 141 },
+				{ "templateId": 2036, "huntingZoneId": 58, "_value": 141 }
+			]
 		},
 		"vg": {
 			"type": 49,
-			"value": 609,
+			"value": null,
 			"gameId": null,
-			"templateId": 2058,
-			"huntingZoneId": 183
+			"opts": [
+				{ "templateId": 2058, "huntingZoneId": 183, "_value": 609 },
+				{ "templateId": 2009, "huntingZoneId": 58, "_value": 609 }
+			]
 		}
 	}
 };
 
+// Settings Migrator Extended v2.1
 module.exports = function MigrateSettings(from_ver, to_ver, settings) {
 	if (from_ver === undefined) return { ...DefaultSettings, ...settings };
 	else if (from_ver === null) return DefaultSettings;
@@ -68,23 +77,19 @@ module.exports = function MigrateSettings(from_ver, to_ver, settings) {
 		}
 
 		const oldsettings = settings;
+		settings = Object.assign(DefaultSettings, {});
 
-		switch (to_ver) {
-			default:
-				settings = Object.assign(DefaultSettings, {});
-
-				for (const option in oldsettings) {
-					if (settings[option] !== undefined) {
-						settings[option] = MigrateOption(settings[option], oldsettings[option], ["gameId"]);
-					}
-				}
+		for (const option in oldsettings) {
+			if (settings[option] !== undefined) {
+				settings[option] = MigrateOption(settings[option], oldsettings[option], ["value", "gameId"]);
+			}
 		}
 
 		return settings;
 	}
 };
 
-function MigrateOption(option, oldoption, excludes) {
+function MigrateOption(option, oldoption, excludes = []) {
 	if (oldoption === undefined) {
 		oldoption = option;
 	}
@@ -93,9 +98,7 @@ function MigrateOption(option, oldoption, excludes) {
 		for (const key of Object.keys(option)) {
 			option[key] = MigrateOption(option[key], oldoption[key], excludes);
 		}
-	}
-
-	if (Object.getPrototypeOf(option) === Object.prototype) {
+	} else if (option !== null && Object.getPrototypeOf(option) === Object.prototype) {
 		for (const key of Object.keys(option)) {
 			if (excludes.includes(key)) {
 				option[key] = oldoption[key] || null;
@@ -103,6 +106,8 @@ function MigrateOption(option, oldoption, excludes) {
 				option[key] = MigrateOption(option[key], oldoption[key], excludes);
 			}
 		}
+	} else {
+		option = oldoption;
 	}
 
 	return option;