Просмотр исходного кода

Minor fixes.

NpcData update.
Fixed the issues where people just leave fishing mode on and then doesn't see idle animations, nor see the lfg messages.
Fixed the issue where the event.repairable doesn't get read properly when showStyle is on, therefore it doesn't remove the icons above npcs.
Risenio лет назад: 7
Родитель
Сommit
6a844c709e
3 измененных файлов с 12 добавлено и 30 удалено
  1. 0 0
      lib/data/npcData.json
  2. 9 26
      lib/index.js
  3. 3 4
      manifest.json

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
lib/data/npcData.json


+ 9 - 26
lib/index.js

@@ -384,7 +384,7 @@ module.exports = function FpsUtils(mod) {
 	function ShowSpecificNpc(hz, ti) {
 		for (let i in HNpcs) {
 			if (HNpcs[i].huntingZoneId === hz && HNpcs[i].templateId === ti) {
-				mod.toClient('S_SPAWN_NPC', mod.majorPatchVersion < 79 ? 10 : 11, HNpcs[i]);
+				mod.toClient('S_SPAWN_NPC', 11, HNpcs[i]);
 				delete HNpcs[i];
 			}
 		}
@@ -445,7 +445,7 @@ module.exports = function FpsUtils(mod) {
 			case 'own':
 				for (let v in HNpcs) {
 					if (EqGid(HNpcs[v].owner) && UserSumNPCs.includes(HNpcs[v].templateId) && HNpcs[v].huntingZoneId === 1023) {
-						mod.toClient('S_SPAWN_NPC', mod.majorPatchVersion < 79 ? 10 : 11, HNpcs[v]);
+						mod.toClient('S_SPAWN_NPC', 11, HNpcs[v]);
 						delete HNpcs[v];
 					}
 				}
@@ -453,7 +453,7 @@ module.exports = function FpsUtils(mod) {
 			case 'others':
 				for (let v in HNpcs) {
 					if (!EqGid(HNpcs[v].owner) && UserSumNPCs.includes(HNpcs[v].templateId) && HNpcs[v].huntingZoneId === 1023) {
-						mod.toClient('S_SPAWN_NPC', mod.majorPatchVersion < 79 ? 10 : 11, HNpcs[v]);
+						mod.toClient('S_SPAWN_NPC', 11, HNpcs[v]);
 						delete HNpcs[v];
 					}
 				}
@@ -462,7 +462,7 @@ module.exports = function FpsUtils(mod) {
 				for (let v in HNpcs) {
 					for (let i = 0; i < mod.settings.NpcsBlacklist.length; i++) {
 						if (HNpcs[v].huntingZoneId == mod.settings.NpcsBlacklist[i].zone && HNpcs[v].templateId == mod.settings.NpcsBlacklist[i].templateId) {
-							mod.toClient('S_SPAWN_NPC', mod.majorPatchVersion < 79 ? 10 : 11, HNpcs[v]);
+							mod.toClient('S_SPAWN_NPC', 11, HNpcs[v]);
 							delete HNpcs[v];
 						}
 					}
@@ -471,7 +471,7 @@ module.exports = function FpsUtils(mod) {
 			case 'fish':
 				for (let v in HNpcs) {
 					if (FishingNpcs[HNpcs[v].huntingZoneId] && FishingNpcs[HNpcs[v].huntingZoneId].includes(HNpcs[v].templateId)) {
-						mod.toClient('S_SPAWN_NPC', mod.majorPatchVersion < 79 ? 10 : 11, HNpcs[v]);
+						mod.toClient('S_SPAWN_NPC', 11, HNpcs[v]);
 						delete HNpcs[v];
 					}
 				}
@@ -688,11 +688,6 @@ module.exports = function FpsUtils(mod) {
 		if (mod.settings.Mode >= 2) return false;
 	}
 
-	function sSocial(event) {
-		if (!mod.settings.Fishing) return;
-		if ([1, 2, 3, 31, 32, 33].includes(event.animation)) return false;
-	}
-
 	function sSystemMessage(event) {
 		if (!mod.settings.Fishing) return;
 		const msg = mod.parseSystemMessage(event.message)
@@ -700,14 +695,6 @@ module.exports = function FpsUtils(mod) {
 		if (msg.id === 'SMT_KOREAN_RATING_TEENAGER_PROHIBITED') return false;	// You've been playing for X hours spam.
 	}
 
-	/*function sPartyMatchLink() {
-		if (mod.settings.Fishing) return false;
-	}
-
-	function sViewPartyInvite() {
-		if (mod.settings.Fishing) return false;
-	}
-
 	/*function sQuestVillagerInfo() {
 		if (mod.settings.Fishing) return false;
 	}*/
@@ -844,7 +831,6 @@ module.exports = function FpsUtils(mod) {
 		SNpcs[event.gameId].spawnScript = 0;
 		if (NpcBCheck(event)) return false;
 		if (mod.settings.ShowStyle) {
-			if (!event.repairable) return;
 			event.repairable = false;
 			return true;
 		}
@@ -995,11 +981,8 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_PCBANGINVENTORY_DATALIST', 1, sPcBangInventory)
 	mod.hook('S_LOADING_SCREEN_CONTROL_INFO', 'raw', sLoadingScreenControlInfo)
 
-	mod.hook('S_SOCIAL', 1, sSocial)
 	mod.hook('S_SYSTEM_MESSAGE', 1, sSystemMessage)
-	//mod.hook('S_PARTY_MATCH_LINK', 'raw', sPartyMatchLink) :\
-	//mod.hook('S_VIEW_PARTY_INVITE', 'raw', sViewPartyInvite) :/
-	//mod.hook('S_QUEST_VILLAGER_INFO', 'raw', sQuestVillagerInfo) Currently the opcode for this ain't public, but it will be soon™. Never™. and others went private... re. :\
+	//mod.hook('S_QUEST_VILLAGER_INFO', 'raw', sQuestVillagerInfo) Currently the opcode for this ain't public, Someday™.
 	mod.hook('S_UPDATE_ACHIEVEMENT_PROGRESS', 'raw', sUpdateAchievementProgress)
 	mod.hook('S_CURRENT_CHANNEL', 2, sCurrentChannel)
 	mod.hook('S_ITEM_CUSTOM_STRING', 2, sItemCustomString)
@@ -1017,12 +1000,12 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_USER_MOVETYPE', 'raw', sUserMoveType)
 	mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
 	mod.hook('S_USER_APPEARANCE_CHANGE', 1, { order: 9999 }, sUserAppearanceChange)
-	mod.hook('S_USER_APPEARANCE_CHANGE', 1, { order: 99999, filter: { fake: null } }, sUserAppearanceChangefn) // fix for the other script which force re-apply the whole apperance.
+	mod.hook('S_USER_APPEARANCE_CHANGE', 1, { order: 99999, filter: { fake: null } }, sUserAppearanceChangefn)
 	mod.hook('S_USER_EXTERNAL_CHANGE', 7, { order: 9999 }, sUserExternalChange)
-	mod.hook('S_USER_EXTERNAL_CHANGE', 7, { order: 99999, filter: { fake: null } }, sUserExternalChangefn) // fix for the other script which force re-apply the whole apperance.
+	mod.hook('S_USER_EXTERNAL_CHANGE', 7, { order: 99999, filter: { fake: null } }, sUserExternalChangefn)
 	mod.hook('S_UNICAST_TRANSFORM_DATA', 5, { order: 99999 }, sUnicastTransformData)
 
-	mod.hook('S_SPAWN_NPC', mod.majorPatchVersion < 79 ? 10 : 11, sSpawnNpc)
+	mod.hook('S_SPAWN_NPC', 11, sSpawnNpc)
 	mod.hook('S_DESPAWN_NPC', 3, sDespawnNpc)
 	mod.hook('S_NPC_LOCATION', 3, sNpcLocation)
 	mod.hook('S_CREATURE_ROTATE', 2, sCreatureRotate)

+ 3 - 4
manifest.json

@@ -1,9 +1,9 @@
 {
     "files": {
         "README.md": "87158ad01812602aae6b490f754ae30a14765d5369d1fa31e0fac1e0d1be63e2",
-        "lib/data/npcData.json": "737fd1ff6b53121fc2fa716bc7f1c5688a4db2353dedf9c024bb879cd0cfa5a0",
+        "lib/data/npcData.json": "d3e7b59617ef841447567d69b074aa2dd6958eabb1a231c5821ffa7165daeac6",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "204f88987b21992cb1614f98980ea5efbe478d449480528e0ba9ef757998faa0",
+        "lib/index.js": "c0a3fbae2980db447ce6bf33ff8b11a666ba0d6e1ce7e5322591923ab65bcc4e",
         "lib/setting_migration.js": "4d6163bcd97785739a1e7e9af800eb3f92dd7bca32824ae148c93fd4dbd16107",
         "module.json": "58b10fc0f18f3452d3f044a82dc44a9e3809d9ad7840be312b53d7991c991d8b",
         "package.json": "026fcecb19ecb5825e62a0409be84f5e207a24a1417de147d93d801f1e5758e4"
@@ -49,9 +49,8 @@
         "S_PCBANGINVENTORY_DATALIST": 1,
         "S_PLAYER_CHANGE_MP": 1,
         "S_SHOW_AWESOMIUMWEB_SHOP": 1,
-        "S_SOCIAL": 1,
         "S_SPAWN_DROPITEM": 6,
-        "S_SPAWN_NPC": [10,11],
+        "S_SPAWN_NPC": 11,
         "S_SPAWN_PROJECTILE": 5,
         "S_SPAWN_USER": 14,
         "S_START_ACTION_SCRIPT": 3,

Некоторые файлы не были показаны из-за большого количества измененных файлов