Browse Source

Patch 114.

• `sLogin` to v15.
• Spaces fixes.
Risenio 4 years ago
parent
commit
b62d27d9c4
5 changed files with 116 additions and 114 deletions
  1. 1 1
      lib/data/miscData.json
  2. 7 5
      lib/index.js
  3. 88 88
      manifest.json
  4. 18 18
      module.json
  5. 2 2
      package.json

+ 1 - 1
lib/data/miscData.json

@@ -1 +1 @@
-{"Alphabet":"ABCDEFGHIJKLMNOPQRSTUVWXYZ","PClasses":["warrior","lancer","slayer","berserker","sorcerer","archer","priest","mystic","reaper","gunner","brawler","ninja","valkyrie"],"PRoles":["dps","healer","tank","ranged"],"InvalidVoiceId":249,"InvisibleNpcs":{"8":[6011],"12":[1],"23":[201,202],"34":[8000],"61":[9901],"62":[9001,9002,9003,9004,9901],"83":[9901],"207":[9901],"223":[9901],"230":[9901],"2010":[9901],"2011":[9901],"2012":[9901],"2013":[9901],"2014":[9901],"2015":[9901]},"ImportantActionScripts":[40000,40001,40002,426002],"MountToReplaceId":16,"SpamAchIds":[6,14,15,17,18,51,377,391,466,467,468,469,470,471,472,473,476,611,1002,1003,1004,1005,1308,1309,1310,1311,1312,1313,1314,1315,1408,1420,1744,1745,1769,1770,1771,1942,1943,1952,1992,2032,2033,2036,2037,2038,2057,2062,2071,2078,2081,2082,2083,2084,2088,2089,2095,6005,9817,20605,20607,20608,28723,28724,28725,28726,28727,28728,28729,28730,28731,28732,28733,28734,28735,28736,510005,510012,510019,510026,510027,510033,510034,510035,510036,510037,510038,510039,510040,510041,520029,520030,520032,520033,520034,520035,520048,520049,520050,520051,525000,525001,525002,525003,525004,525005,525006,525007,525008,525009,525010,525011,525012,525013,525014,525015,525016,525017,525018,525019,525020,525021,525022,525023,525024,525025,5010000],"StarterWeaponIds":[10001,10002,10003,10004,10005,10006,10007,10008,80396,55005,82005,58171,59053],"HexColors":{"BnzC":"#BC8F8F","SlvC":"#9A9A9A","GldC":"#DAA520","PnkC":"#FFB7C5","HPkC":"#FF69B4","CPkC":"#ED5D92","RedC":"#FE6F5E","GrnC":"#4DE19C","LPrC":"#E0B0FF","PrpC":"#9966CC","LBlC":"#4DDCE1","BluC":"#436EEE","DBlC":"#5BC0BE","HBlC":"#08B3E5","GryC":"#778899","YlwC":"#C0B94D"}}
+{"Alphabet":"ABCDEFGHIJKLMNOPQRSTUVWXYZ","PClasses":["warrior","lancer","slayer","berserker","sorcerer","archer","priest","mystic","reaper","gunner","brawler","ninja","valkyrie"],"PRoles":["dps","healer","tank","ranged"],"InvalidVoiceId":249,"InvisibleNpcs":{"8":[6011],"12":[1],"23":[201,202],"34":[8000],"61":[9901],"62":[9001,9002,9003,9004,9901],"83":[9901],"207":[9901],"223":[9901],"230":[9901],"2010":[9901],"2011":[9901],"2012":[9901],"2013":[9901],"2014":[9901],"2015":[9901]},"ImportantActionScripts":[40000,40001,40002,426002],"MountToReplaceId":16,"SpamAchIds":[3,6,14,15,17,18,51,166,358,377,391,466,467,468,469,470,471,472,473,476,611,1002,1003,1004,1005,1308,1309,1310,1311,1312,1313,1314,1315,1408,1420,1744,1745,1769,1770,1771,1942,1943,1952,1992,2032,2033,2036,2037,2038,2057,2062,2071,2078,2081,2082,2083,2084,2088,2089,2095,6005,9817,20605,20607,20608,28723,28724,28725,28726,28727,28728,28729,28730,28731,28732,28733,28734,28735,28736,510005,510012,510019,510026,510027,510033,510034,510035,510036,510037,510038,510039,510040,510041,520029,520030,520032,520033,520034,520035,520048,520049,520050,520051,525000,525001,525002,525003,525004,525005,525006,525007,525008,525009,525010,525011,525012,525013,525014,525015,525016,525017,525018,525019,525020,525021,525022,525023,525024,525025,5010000],"StarterWeaponIds":[10001,10002,10003,10004,10005,10006,10007,10008,80396,55005,82005,58171,59053],"HexColors":{"BnzC":"#BC8F8F","SlvC":"#9A9A9A","GldC":"#DAA520","PnkC":"#FFB7C5","HPkC":"#FF69B4","CPkC":"#ED5D92","RedC":"#FE6F5E","GrnC":"#4DE19C","LPrC":"#E0B0FF","PrpC":"#9966CC","LBlC":"#4DDCE1","BluC":"#436EEE","DBlC":"#5BC0BE","HBlC":"#08B3E5","GryC":"#778899","YlwC":"#C0B94D"}}

+ 7 - 5
lib/index.js

@@ -545,6 +545,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function ActionHCheck(event, end) {
+		if (event.skill.npc) return;
 		let hidden = false;
 
 		if (EqGid(event.gameId) || !SUsers[event.gameId]) return undefined;
@@ -566,7 +567,8 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function ProjectileBCheck(event) {
-		if (typeof event.id === 'undefined') event.id = event.actionId
+		if (event.skill.npc) return;
+		if (typeof event.id === 'undefined') event.id = event.actionId;
 
 		if (typeof event.skill !== 'undefined') {
 			if (ImportantProjectiles[ClassID(event.templateId)] && ImportantProjectiles[ClassID(event.templateId)] === Math.floor(event.skill.id / 1E4) || (Cfg.PvpTraps && TrapsIds.includes(event.skill.id))) return undefined;
@@ -580,6 +582,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function ModifySkillResult(event) {
+		if (event.skill.npc) return;
 		let returnValue = undefined;
 
 		if (Cfg.Hit_Me && (EqGid(event.source) || EqGid(event.owner))) {
@@ -783,6 +786,7 @@ module.exports = function FpsUtils(mod) {
 			AllowedAchUps--;
 			return;
 		}
+		if (Cfg.Mode < 2) return;
 		for (const Achieve of event.achievements) if (SpamAchIds.indexOf(Achieve.id) !== -1 || !Achieve.requirements.length) return false;
 	}
 
@@ -1045,7 +1049,6 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sInstanceArrow(event) {
-		if (event.skill.npc) return;
 		if (ProjDebug) {
 			if (EqGid(event.gameId)) log('Projectile-Arrow', 'Spawned', 'from', MyName, event.skill.id);
 			if (SUsers[event.gameId]) log('Projectile-Arrow', 'Spawned', 'from', SUsers[event.gameId].name, event.skill.id);
@@ -1054,7 +1057,6 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sSpawnProjectile(event) {
-		if (event.skill.npc) return;
 		if (ProjDebug) {
 			if (EqGid(event.gameId)) log('Projectile', 'Spawned', 'from', MyName, event.skill.id);
 			if (SUsers[event.gameId]) log('Projectile', 'Spawned', 'from', SUsers[event.gameId].name, event.skill.id);
@@ -1165,7 +1167,7 @@ module.exports = function FpsUtils(mod) {
 
 	// ~~~ * Packet Hooks * ~~~ \\
 
-	mod.hook('S_LOGIN', 14, sLogin)
+	mod.hook('S_LOGIN', mod.majorPatchVersion < 114 ? 14 : 15, sLogin)
 	mod.hook('S_LOAD_TOPO', 'raw', sLoadTopo)
 	mod.hook('S_MOUNT_VEHICLE', 2, LastHook, sMountVehicle)
 	mod.hook('S_UNMOUNT_VEHICLE', 2, LastHook, sUnmountVehicle)
@@ -1228,7 +1230,7 @@ module.exports = function FpsUtils(mod) {
 
 	mod.hook('S_PLAYER_CHANGE_MP', 1, LastHook, sPlayerChangeMp)
 	mod.hook('S_CREATURE_CHANGE_HP', 6, LastHook, sCreatureChangeHp)
-	mod.hook('S_EACH_SKILL_RESULT', mod.majorPatchVersion < 110 ? 14 : 15, LastHook, sEachSkillResult)
+	mod.hook('S_EACH_SKILL_RESULT', 15, LastHook, sEachSkillResult)
 	mod.hook('S_ITEM_EXPLOSION_RESULT', 2, LastHook, sItemExplosionResult)
 	mod.hook('S_SPAWN_DROPITEM', 9, LastHook, sSpawnDropItem)
 	mod.hook('S_FONT_SWAP_INFO', 'raw', LastHookfn, sFontSwapInfo)

+ 88 - 88
manifest.json

@@ -1,90 +1,90 @@
 {
-    "files": {
-        "README.md": "f5c50ef82e8ba86477c3f97f92bf5e8b466b6742e84297b72d3f357f02ad26cb",
-        "lib/data/abnormalities.json": "54727de2123584eb0ff38ffca5e86601e3faf05e8dc3379c9a0fd6e5ede1ca0c",
-        "lib/data/miscData.json": "4f36b0f6c847ddde5a1a35acf944f700f3e47e39ca23e58cbf06233af67ad251",
-        "lib/data/npcData.json": "bcd1876e4266f71299a298221b2594e45bf87f143f276a62c60dd8a35b75acd7",
-        "lib/data/skillString.json": "90f7cf9e29f0c143ffe4650bebe85c097371507a23c9fd2a0ab6c877d5451e58",
-        "lib/data/userSpawns.json": "e82a593b3e5aa970542d8330dfe690049abad98691e8b90210f46cdc281b17a3",
-        "lib/index.js": "090f1cac356bc4561d1118d859b7320ab989ebc4945460ca362c80b3b2ce9051",
-        "lib/setting_migration.js": "1821fbb5ed37672bd9a8daa54f8ab392e35aa6c38b1602c560865b3bf6a7c6a2",
-        "module.json": "1acb2a7c8a79d262c90412eacb5ab0f78c1c571f9d921858e4c9a893e90d5452",
-        "package.json": "c4741e35f2f35ea93f57f4eb5ff6de4cfd551ccc49687a2a809e2edcd74a587f"
-    },
-    "defs": {
-        "C_ADMIN": 1,
-        "C_CONFIRM_UPDATE_NOTIFICATION": "raw",
-        "C_DISMISS_PARTY": 1,
-        "C_LEAVE_PARTY": 1,
-        "C_REQUEST_CONTRACT": 1,
-        "C_RESET_ALL_DUNGEON": 1,
-        "C_RETURN_TO_LOBBY": 1,
-        "C_SET_VISIBLE_RANGE": 1,
-        "S_ABNORMALITY_BEGIN": 5,
-        "S_ABNORMALITY_DAMAGE_ABSORB": 1,
-        "S_ABNORMALITY_END": 1,
-        "S_ABNORMALITY_FAIL": 2,
-        "S_ABNORMALITY_REFRESH": 2,
-        "S_ABNORMALITY_RESIST": 1,
-        "S_ABNORMALITY_SCALE_UP": 2,
-        "S_ACTION_END": 5,
-        "S_ACTION_STAGE": 9,
-        "S_ANNOUNCE_UPDATE_NOTIFICATION": 1,
-        "S_APPLY_TITLE": 3,
-        "S_CREATURE_CHANGE_HP": 6,
-        "S_CREATURE_LIFE": 3,
-        "S_CREATURE_ROTATE": 2,
-        "S_DEAD_LOCATION": 2,
-        "S_DESPAWN_DROPITEM": 4,
-        "S_DESPAWN_EVENT_SEED": 1,
-        "S_DESPAWN_NPC": 3,
-        "S_DESPAWN_PROJECTILE": 2,
-        "S_DESPAWN_USER": 3,
-        "S_EACH_SKILL_RESULT": 14,
-        "S_END_USER_PROJECTILE": 4,
-        "S_EXIT": 3,
-        "S_FEARMOVE_END": 2,
-        "S_FEARMOVE_STAGE": 2,
-        "S_FIELD_EVENT_ON_ENTER": "raw",
-        "S_FIELD_EVENT_ON_LEAVE": "raw",
-        "S_FONT_SWAP_INFO": "raw",
-        "S_GUILD_NAME": 2,
-        "S_IMAGE_DATA": "raw",
-        "S_INSTANCE_ARROW": 4,
-        "S_ITEM_CUSTOM_STRING": 2,
-        "S_ITEM_EXPLOSION_RESULT": 2,
-        "S_LEAVE_PARTY": "raw",
-        "S_LEAVE_PARTY_MEMBER": 2,
-        "S_LOADING_SCREEN_CONTROL_INFO": "raw",
-        "S_LOAD_TOPO": "raw",
-        "S_LOGIN": 14,
-        "S_MOUNT_VEHICLE": 2,
-        "S_NPC_LOCATION": 3,
-        "S_NPC_MENU_SELECT": 1,
-        "S_PARTY_MEMBER_LIST": 9,
-        "S_PLAYER_CHANGE_MP": 1,
-        "S_QUEST_BALLOON": 1,
-        "S_REQUEST_DESPAWN_SERVANT": 1,
-        "S_REQUEST_SPAWN_SERVANT": 4,
-        "S_RESULT_EVENT_SEED": 2,
-        "S_SOCIAL": 1,
-        "S_SPAWN_DROPITEM": 9,
-        "S_SPAWN_EVENT_SEED": 2,
-        "S_SPAWN_NPC": 12,
-        "S_SPAWN_PROJECTILE": 6,
-        "S_SPAWN_USER": 17,
-        "S_START_ACTION_SCRIPT": 3,
-        "S_START_COOLTIME_ITEM": 1,
-        "S_START_USER_PROJECTILE": 9,
-        "S_UNICAST_TRANSFORM_DATA": 6,
-        "S_UNMOUNT_VEHICLE": 2,
-        "S_UPDATE_ACHIEVEMENT_PROGRESS": 1,
-        "S_UPDATE_EVENT_SEED_STATE": 4,
-        "S_USER_APPEARANCE_CHANGE": 1,
-        "S_USER_CHANGE_FACE_CUSTOM": 2,
-        "S_USER_EXTERNAL_CHANGE": 7,
-        "S_USER_LOCATION": 6,
-        "S_USER_MOVETYPE": 1,
-        "S_USER_STATUS": 4
-    }
+	"files": {
+		"README.md": "f5c50ef82e8ba86477c3f97f92bf5e8b466b6742e84297b72d3f357f02ad26cb",
+		"lib/data/abnormalities.json": "54727de2123584eb0ff38ffca5e86601e3faf05e8dc3379c9a0fd6e5ede1ca0c",
+		"lib/data/miscData.json": "7d71d166aaa8bd39f40d9ddd8cbbccea6af7d8facae42b7d77046f2ea8cd143b",
+		"lib/data/npcData.json": "bcd1876e4266f71299a298221b2594e45bf87f143f276a62c60dd8a35b75acd7",
+		"lib/data/skillString.json": "90f7cf9e29f0c143ffe4650bebe85c097371507a23c9fd2a0ab6c877d5451e58",
+		"lib/data/userSpawns.json": "e82a593b3e5aa970542d8330dfe690049abad98691e8b90210f46cdc281b17a3",
+		"lib/index.js": "ee36df541ecb128665494f122b80fde74e56535843645f74cbd33b366f3ee0b8",
+		"lib/setting_migration.js": "1821fbb5ed37672bd9a8daa54f8ab392e35aa6c38b1602c560865b3bf6a7c6a2",
+		"module.json": "f6c096f624a92587583d9b0f66a21bcbaefaf9d81c684f035a3ecada3712579c",
+		"package.json": "05c87cd1ccd2c23ba209b7a58d7fe10c5ed04e52c6fbecac8c3b0f368eeb7742"
+	},
+	"defs": {
+		"C_ADMIN": 1,
+		"C_CONFIRM_UPDATE_NOTIFICATION": "raw",
+		"C_DISMISS_PARTY": 1,
+		"C_LEAVE_PARTY": 1,
+		"C_REQUEST_CONTRACT": 1,
+		"C_RESET_ALL_DUNGEON": 1,
+		"C_RETURN_TO_LOBBY": 1,
+		"C_SET_VISIBLE_RANGE": 1,
+		"S_ABNORMALITY_BEGIN": 5,
+		"S_ABNORMALITY_DAMAGE_ABSORB": 1,
+		"S_ABNORMALITY_END": 1,
+		"S_ABNORMALITY_FAIL": 2,
+		"S_ABNORMALITY_REFRESH": 2,
+		"S_ABNORMALITY_RESIST": 1,
+		"S_ABNORMALITY_SCALE_UP": 2,
+		"S_ACTION_END": 5,
+		"S_ACTION_STAGE": 9,
+		"S_ANNOUNCE_UPDATE_NOTIFICATION": 1,
+		"S_APPLY_TITLE": 3,
+		"S_CREATURE_CHANGE_HP": 6,
+		"S_CREATURE_LIFE": 3,
+		"S_CREATURE_ROTATE": 2,
+		"S_DEAD_LOCATION": 2,
+		"S_DESPAWN_DROPITEM": 4,
+		"S_DESPAWN_EVENT_SEED": 1,
+		"S_DESPAWN_NPC": 3,
+		"S_DESPAWN_PROJECTILE": 2,
+		"S_DESPAWN_USER": 3,
+		"S_EACH_SKILL_RESULT": 15,
+		"S_END_USER_PROJECTILE": 4,
+		"S_EXIT": 3,
+		"S_FEARMOVE_END": 2,
+		"S_FEARMOVE_STAGE": 2,
+		"S_FIELD_EVENT_ON_ENTER": "raw",
+		"S_FIELD_EVENT_ON_LEAVE": "raw",
+		"S_FONT_SWAP_INFO": "raw",
+		"S_GUILD_NAME": 2,
+		"S_IMAGE_DATA": "raw",
+		"S_INSTANCE_ARROW": 4,
+		"S_ITEM_CUSTOM_STRING": 2,
+		"S_ITEM_EXPLOSION_RESULT": 2,
+		"S_LEAVE_PARTY": "raw",
+		"S_LEAVE_PARTY_MEMBER": 2,
+		"S_LOADING_SCREEN_CONTROL_INFO": "raw",
+		"S_LOAD_TOPO": "raw",
+		"S_LOGIN": 14,
+		"S_MOUNT_VEHICLE": 2,
+		"S_NPC_LOCATION": 3,
+		"S_NPC_MENU_SELECT": 1,
+		"S_PARTY_MEMBER_LIST": 9,
+		"S_PLAYER_CHANGE_MP": 1,
+		"S_QUEST_BALLOON": 1,
+		"S_REQUEST_DESPAWN_SERVANT": 1,
+		"S_REQUEST_SPAWN_SERVANT": 4,
+		"S_RESULT_EVENT_SEED": 2,
+		"S_SOCIAL": 1,
+		"S_SPAWN_DROPITEM": 9,
+		"S_SPAWN_EVENT_SEED": 2,
+		"S_SPAWN_NPC": 12,
+		"S_SPAWN_PROJECTILE": 6,
+		"S_SPAWN_USER": 17,
+		"S_START_ACTION_SCRIPT": 3,
+		"S_START_COOLTIME_ITEM": 1,
+		"S_START_USER_PROJECTILE": 9,
+		"S_UNICAST_TRANSFORM_DATA": 6,
+		"S_UNMOUNT_VEHICLE": 2,
+		"S_UPDATE_ACHIEVEMENT_PROGRESS": 1,
+		"S_UPDATE_EVENT_SEED_STATE": 4,
+		"S_USER_APPEARANCE_CHANGE": 1,
+		"S_USER_CHANGE_FACE_CUSTOM": 2,
+		"S_USER_EXTERNAL_CHANGE": 7,
+		"S_USER_LOCATION": 6,
+		"S_USER_MOVETYPE": 1,
+		"S_USER_STATUS": 4
+	}
 }

+ 18 - 18
module.json

@@ -1,20 +1,20 @@
 {
-    "disableAutoUpdate": false,
-    "name": "fps-utils",
-    "author": "Risenio",
-    "homepage": "https://github.com/Risenio/fps-utils/wiki",
-    "supportUrl": "https://github.com/Risenio/fps-utils/issues",
-    "readmePath": "./README.md",
-    "description": "A free script filled with features dedicated to improve your fps.",
-    "contributors": ["Saegusae","codeagon","SerenTera","Kyoukaya","SaltyMonkey","Leyki"],
-    "conflicts": ["hide-players","fps-utils-lite","fps-manager"],
-    "version": "19",
-    "options": {
-        "cliName": "FPS",
-        "guiName": "Fps Utils",
-        "settingsVersion": 19,
-        "settingsFile": "config.json",
-        "settingsMigrator": "./lib/setting_migration.js"
-    },
-    "servers": ["https://raw.githubusercontent.com/Risenio/fps-utils/master/"]
+	"disableAutoUpdate": false,
+	"name": "fps-utils",
+	"author": "Risenio",
+	"homepage": "https://github.com/Risenio/fps-utils/wiki",
+	"supportUrl": "https://github.com/Risenio/fps-utils/issues",
+	"readmePath": "./README.md",
+	"description": "A free script filled with features dedicated to improve your fps.",
+	"contributors": ["Saegusae","codeagon","SerenTera","Kyoukaya","SaltyMonkey","Leyki"],
+	"conflicts": ["hide-players","fps-utils-lite","fps-manager"],
+	"version": "19",
+	"options": {
+		"cliName": "FPS",
+		"guiName": "Fps Utils",
+		"settingsVersion": 19,
+		"settingsFile": "config.json",
+		"settingsMigrator": "./lib/setting_migration.js"
+	},
+	"servers": ["https://raw.githubusercontent.com/Risenio/fps-utils/master/"]
 }

+ 2 - 2
package.json

@@ -4,8 +4,8 @@
 	"author": "Risenio",
 	"description": "A free script filled with features dedicated to improve your fps.",
 	"version": "19",
-    "homepage": "https://github.com/Risenio/fps-utils/wiki",
-    "supportUrl": "https://github.com/Risenio/fps-utils/issues",
+	"homepage": "https://github.com/Risenio/fps-utils/wiki",
+	"supportUrl": "https://github.com/Risenio/fps-utils/issues",
 	"keywords": ["tera", "fps", "tera-fps", "tera-proxy", "tera-toolbox", "tera-online", "fps-utils", "optimization"],
 	"contributors": ["Saegusae", "codeagon", "SerenTera", "Kyoukaya", "SaltyMonkey", "Leyki"],
 	"conflicts": ["hide-players","fps-utils-lite","fps-manager"],