Browse Source

Update.

For P80 npcs and new def v.
Fix for #2
Mie 7 years ago
parent
commit
06b196a0c1
4 changed files with 41 additions and 117 deletions
  1. 0 5
      README.md
  2. 0 0
      lib/data/npcData.json
  3. 36 107
      lib/index.js
  4. 5 5
      manifest.json

+ 0 - 5
README.md

@@ -1,11 +1,6 @@
 # Fps Utils
   Written for tera-proxy, a free script filled with features dedicated to improve your fps, in the open world, in dungeons and in battlegrounds.
 
-## NOTE FOR CLASSIC SERVER.
-  - I've tested all it's functionality, Everything is good. If you found any bug/error/issue, please inform me, thank you. 
-  - Side note: The GUI that the module uses (welcome window) doesn't support clicking, this been said; You've to write the commands by hand, You may still however open the GUI but it will be just a visual, nothing can be clicked inside, a full list of commands can be found in [this Wiki](https://github.com/Risenio/fps-utils/wiki/Commands).
-  
-
 ## How to use.
   * Put the script folder "fps-utils" into the `mods` folder.
   * Log the game using the proxy.

File diff suppressed because it is too large
+ 0 - 0
lib/data/npcData.json


+ 36 - 107
lib/index.js

@@ -1,49 +1,11 @@
 'use strict'
 /* global __dirname */
 
-function LoadThis() { //Lets hope this won't break other modules.
-	const { protocol } = require('tera-data-parser');
-
-	protocol.messages.set('S_LOGIN', new Map().set(12, [['name', 'offset'], ['details', 'count'], ['details', 'offset'], ['shape', 'count'], ['shape', 'offset'], ['templateId', 'int32'], ['gameId', 'uint64'], ['serverId', 'uint32'], ['playerId', 'uint32'], ['actionMode', 'int32'], ['alive', 'bool'], ['status', 'int32'], ['walkSpeed', 'int32'], ['runSpeed', 'int32'], ['appearance', 'customize'], ['visible', 'bool'], ['isSecondCharacter', 'bool'], ['level', 'uint16'], ['profMineral', 'uint16'], ['profBug', 'uint16'], ['profHerb', 'uint16'], ['profEnergy', 'uint16'], ['profPet', 'uint16'], ['pkDeclareCount', 'int32'], ['pkKillCount', 'int32'], ['totalXp', 'int64'], ['levelXp', 'int64'], ['totalLevelXp', 'int64'], ['unkn1', 'int32'], ['restBonusXp', 'int32'], ['maxRestBonusXp', 'int32'], ['xpBonusPercent', 'float'], ['dropBonusPercent', 'float'], ['weapon', 'int32'], ['body', 'int32'], ['hand', 'int32'], ['feet', 'int32'], ['underwear', 'int32'], ['head', 'int32'], ['face', 'int32'], ['serverTime', 'int64'], ['isPkServer', 'bool'], ['chatBanEndTime', 'int64'], ['title', 'uint32'], ['weaponModel', 'int32'], ['bodyModel', 'int32'], ['handModel', 'int32'], ['feetModel', 'int32'], ['weaponDye', 'uint32'], ['bodyDye', 'uint32'], ['handDye', 'uint32'], ['feetDye', 'uint32'], ['unkn2', 'uint32'], ['weaponEnchant', 'uint32'], ['isWorldEventTarget', 'bool'], ['infamy', 'int32'], ['showFace', 'bool'], ['styleHead', 'uint32'], ['styleFace', 'uint32'], ['styleBack', 'uint32'], ['styleWeapon', 'uint32'], ['styleBody', 'uint32'], ['styleBodyDye', 'uint32'], ['unionId', 'uint32'], ['unionClass', 'uint32'], ['unionEchelon', 'uint32'], ['showStyle', 'bool'], ['titleCount', 'int64'], ['appearance2', 'int32'], ['scale', 'float'], ['name', 'string'], ['details', 'bytes'], ['shape', 'bytes']]))
-	protocol.messages.set('S_ABNORMALITY_BEGIN', new Map().set(3, [['target', 'uint64'], ['source', 'uint64'], ['id', 'uint32'], ['duration', 'int32'], ['unk', 'int32'], ['stacks', 'int32']]))
-	protocol.messages.set('S_CREATURE_CHANGE_HP', new Map().set(6, [['curHp', 'uint32'], ['maxHp', 'uint32'], ['diff', 'int32'], ['type', 'uint32'], ['target', 'uint64'], ['source', 'uint64'], ['crit', 'byte']]))
-	protocol.messages.set('S_USER_LOCATION', new Map().set(5, [['gameId', 'uint64'], ['loc', 'vec3'], ['w', 'angle'], ['speed', 'int16'], ['dest', 'vec3'], ['type', 'int32'], ['inShuttle', 'bool']]))
-	protocol.messages.set('S_START_USER_PROJECTILE', new Map().set(9, [['gameId', 'uint64'], ['templateId', 'int32'], ['unk1', 'int32'], ['id', 'uint64'], ['skill', 'uint32'], ['loc', 'vec3'], ['dest', 'vec3'], ['speed', 'float']]))
-	protocol.messages.set('S_SPAWN_USER', new Map().set(14, [['icons', 'count'], ['icons', 'offset'], ['name', 'offset'], ['guildName', 'offset'], ['guildRank', 'offset'], ['details', 'count'], ['details', 'offset'], ['guildTitle', 'offset'], ['guildLogo', 'offset'], ['shape', 'count'], ['shape', 'offset'], ['serverId', 'uint32'], ['playerId', 'uint32'], ['gameId', 'uint64'], ['loc', 'vec3'], ['w', 'angle'], ['relation', 'int32'], ['templateId', 'int32'], ['huntingZoneId', 'int16'], ['walkSpeed', 'int16'], ['runSpeed', 'int16'], ['actionMode', 'int16'], ['status', 'int16'], ['visible', 'bool'], ['alive', 'bool'], ['appearance', 'customize'], ['weapon', 'uint32'], ['body', 'uint32'], ['hand', 'uint32'], ['feet', 'uint32'], ['underwear', 'uint32'], ['head', 'uint32'], ['face', 'uint32'], ['spawnFx', 'int32'], ['mount', 'int32'], ['pose', 'int32'], ['title', 'int32'], ['shuttleId', 'int64'], ['guildLogoId', 'int32'], ['exarch', 'bool'], ['gm', 'bool'], ['gmInvisible', 'bool'], ['weaponModel', 'uint32'], ['bodyModel', 'uint32'], ['handModel', 'uint32'], ['feetModel', 'uint32'], ['weaponDye', 'uint32'], ['bodyDye', 'uint32'], ['handDye', 'uint32'], ['feetDye', 'uint32'], ['weaponEnchant', 'uint32'], ['isWorldEventTarget', 'bool'], ['pkEnabled', 'bool'], ['level', 'int32'], ['vehicleEx', 'uint64'], ['showFace', 'bool'], ['styleHead', 'uint32'], ['styleFace', 'uint32'], ['styleBack', 'uint32'], ['styleWeapon', 'uint32'], ['styleBody', 'uint32'], ['styleBodyDye', 'uint32'], ['partyServer', 'int32'], ['partyId', 'int32'], ['raid', 'bool'], ['unionId', 'uint32'], ['unionClass', 'uint32'], ['unionEchelon', 'uint32'], ['showStyle', 'bool'], ['titleCount', 'int64'], ['appearance2', 'int32'], ['scale', 'float'], ['icons', [['icon', 'int32']]], ['name', 'string'], ['guildName', 'string'], ['guildRank', 'string'], ['details', 'bytes'], ['guildTitle', 'string'], ['guildLogo', 'string'], ['shape', 'bytes']]))
-	protocol.messages.set('S_SPAWN_PROJECTILE', new Map().set(5, [['id', 'uint64'], ['unk1', 'uint32'], ['skill', 'uint32'], ['loc', 'vec3'], ['dest', 'vec3'], ['moving', 'bool'], ['speed', 'float'], ['gameId', 'uint64'], ['templateId', 'int32']]))
-	protocol.messages.set('S_SPAWN_NPC', new Map().set(11, [['seats', 'count'], ['seats', 'offset'], ['npcName', 'offset'], ['gameId', 'uint64'], ['target', 'uint64'], ['loc', 'vec3'], ['w', 'angle'], ['relation', 'int32'], ['templateId', 'uint32'], ['huntingZoneId', 'uint16'], ['walkSpeed', 'int16'], ['runSpeed', 'int16'], ['status', 'int16'], ['mode', 'int16'], ['hpLevel', 'int16'], ['questInfo', 'int16'], ['visible', 'bool'], ['villager', 'bool'], ['spawnType', 'int32'], ['replaceId', 'uint64'], ['spawnScript', 'uint32'], ['replaceDespawnScript', 'uint32'], ['aggressive', 'bool'], ['owner', 'uint64'], ['occupiedByPartyId', 'uint64'], ['occupiedByPlayerId', 'uint64'], ['unk1', 'uint32'], ['unk2', 'byte'], ['seats', [['id', 'uint32'], ['passengerId', 'uint64'], ['pitch', 'angle'], ['yaw', 'angle'], ['passengerMaxHp', 'int32'], ['passengerMaxMp', 'int32'], ['passengerHp', 'int32'], ['passengerMp', 'int32']]], ['npcName', 'string']]))
-	protocol.messages.set('S_SPAWN_DROPITEM', new Map().set(6, [['owners', 'count'], ['owners', 'offset'], ['gameId', 'uint64'], ['loc', 'vec3'], ['item', 'int32'], ['amount', 'int32'], ['expiry', 'int32'], ['explode', 'bool'], ['masterwork', 'bool'], ['enchant', 'int32'], ['source', 'uint64'], ['owners', [['gameId', 'uint64']]]]))
-	protocol.messages.set('S_PARTY_MEMBER_LIST', new Map().set(7, [['members', 'count'], ['members', 'offset'], ['ims', 'bool'], ['raid', 'bool'], ['unk1', 'uint32'], ['unk2', 'uint32'], ['unk3', 'uint16'], ['unk4', 'uint16'], ['leaderServerId', 'uint32'], ['leaderPlayerId', 'uint32'], ['unk5', 'uint32'], ['unk6', 'uint32'], ['unk7', 'byte'], ['unk8', 'uint32'], ['unk9', 'byte'], ['unk10', 'uint32'], ['unk11', 'byte'], ['members', [['name', 'offset'], ['serverId', 'uint32'], ['playerId', 'uint32'], ['level', 'uint32'], ['class', 'uint32'], ['online', 'bool'], ['gameId', 'uint64'], ['order', 'int32'], ['canInvite', 'byte'], ['name', 'string']]]]))
-	protocol.messages.set('S_ACTION_STAGE', new Map().set(9, [['animSeq', 'count'], ['animSeq', 'offset'], ['gameId', 'uint64'], ['loc', 'vec3'], ['w', 'angle'], ['templateId', 'int32'], ['skill', 'uint32'], ['stage', 'int32'], ['speed', 'float'], ['id', 'uint32'], ['animSeq', [['duration', 'int32'], ['xyRate', 'float'], ['zRate', 'float'], ['distance', 'float']]]]))
-	const ReactionObject12 = [['movement', 'count'], ['movement', 'offset'], ['enable', 'bool'], ['instantPush', 'bool'], ['loc', 'vec3'], ['w', 'angle'], ['skill', 'uint32'], ['stage', 'int32'], ['id', 'uint32'], ['movement', [['duration', 'int32'], ['speed', 'float'], ['unk', 'float'], ['distance', 'float']]]]
-	ReactionObject12.type = 'object';
-	protocol.messages.set('S_EACH_SKILL_RESULT', new Map().set(12, [['source', 'uint64'], ['target', 'uint64'], ['templateId', 'int32'], ['skill', 'uint32'], ['stage', 'int32'], ['targeting', 'int16'], ['area', 'int16'], ['id', 'uint32'], ['time', 'int32'], ['damage', 'int32'], ['type', 'int16'], ['noctEffect', 'int16'], ['crit', 'bool'], ['stackExplode', 'bool'], ['reaction', ReactionObject12]]))
-	//const ReactionObject13 = [['enable', 'bool'], ['push', 'bool'], ['loc', 'vec3'], ['w', 'angle'], ['skill', 'uint32'], ['stage', 'int32'], ['id', 'uint32'], ['animSeq', [['duration', 'int32'], ['xyRate', 'float'], ['zRate', 'float'], ['distance', 'float']]]]
-	//ReactionObject13.type = 'object';
-	//protocol.messages.set('S_EACH_SKILL_RESULT', new Map().set(13, [['source', 'uint64'], ['target', 'uint64'], ['templateId', 'int32'], ['skill', 'uint32'], ['targeting', 'int32'], ['area', 'int32'], ['id', 'uint32'], ['time', 'int32'], ['value', 'int32'], ['type', 'int16'], ['noctEffect', 'int16'], ['crit', 'bool'], ['stackExplode', 'bool'], ['reaction', ReactionObject13]]))
-
-	// Misc.
-	protocol.messages.set('S_JOIN_PRIVATE_CHAT', new Map().set(1, [['name', 'offset'], ['index', 'int32'], ['id', 'int32'], ['name', 'string']]))
-	protocol.messages.set('S_USER_EFFECT', new Map().set(1, [['target', 'uint64'], ['circle', 'int32'], ['operation', 'int32']]))
-	protocol.messages.set('C_PLAYER_LOCATION', new Map().set(5, [['loc', 'vec3'], ['w', 'angle'], ['dest', 'vec3'], ['type', 'int32'], ['jumpDistance', 'int16'], ['inShuttle', 'bool'], ['time', 'uint32']]))
-	protocol.messages.set('S_ACTION_END', new Map().set(5, [['gameId', 'uint64'], ['loc', 'vec3'], ['w', 'angle'], ['templateId', 'int32'], ['skill', 'uint32'], ['type', 'int32'], ['id', 'uint32']]))
-	protocol.messages.set('S_NPC_STATUS', new Map().set(2, [['gameId', 'uint64'], ['enraged', 'bool'], ['hpLevel', 'int32'], ['target', 'uint64'], ['status', 'int32']]))
-	protocol.messages.set('C_USE_ITEM', new Map().set(3, [['gameId', 'uint64'], ['id', 'int32'], ['dbid', 'uint64'], ['target', 'uint64'], ['dest', 'vec3'], ['loc', 'vec3'], ['w', 'angle'], ['unk1', 'uint32'], ['unk2', 'uint32'], ['unk3', 'uint32'], ['unk4', 'bool']]))
-	//protocol.messages.set('S_USER_EXTERNAL_CHANGE', new Map().set(7, [['gameId', 'uint64'], ['weapon', 'int32'], ['body', 'int32'], ['hand', 'int32'], ['feet', 'int32'], ['underwear', 'int32'], ['head', 'int32'], ['face', 'int32'], ['weaponModel', 'int32'], ['bodyModel', 'uint32'], ['handModel', 'uint32'], ['feetModel', 'uint32'], ['weaponDye', 'uint32'], ['bodyDye', 'uint32'], ['handDye', 'uint32'], ['feetDye', 'uint32'], ['underwearDye', 'uint32'], ['weaponEnchant', 'uint32'], ['styleHead', 'int32'], ['styleFace', 'int32'], ['styleBack', 'int32'], ['styleWeapon', 'int32'], ['styleBody', 'int32'], ['styleBodyDye', 'uint32'], ['showStyle', 'bool']]))
-	//protocol.messages.set('S_INVEN', new Map().set(16, [['items', 'count'], ['items', 'offset'], ['gameId', 'uint64'], ['gold', 'int64'], ['open', 'bool'], ['first', 'bool'], ['more', 'bool'], ['size', 'int32'], ['itemLevelInventory', 'int32'], ['itemLevel', 'int32'], ['tcat', 'int64'], ['brokerUseTcat', 'int32'], ['items', [['passivities', 'count'], ['passivities', 'offset'], ['customString', 'offset'], ['id', 'int32'], ['dbid', 'uint64'], ['ownerId', 'uint64'], ['slot', 'uint32'], ['storageType', 'int32'], ['amount', 'int32'], ['enchant', 'int32'], ['durability', 'int32'], ['soulbound', 'bool'], ['crystal1', 'int32'], ['crystal2', 'int32'], ['crystal3', 'int32'], ['crystal4', 'int32'], ['crystal5', 'int32'], ['remodel', 'int32'], ['dye', 'uint32'], ['dyeSecRemaining', 'int32'], ['dyeDate', 'int64'], ['dyeExpiryDate', 'int64'], ['masterwork', 'bool'], ['enigma', 'int32'], ['masterworkBonus', 'int32'], ['itemLevel', 'int32'], ['timesBrokered', 'int32'], ['enchantAdvantage', 'int32'], ['enchantBonus', 'int32'], ['enchantBonusMaxPlus', 'int32'], ['boundToPlayer', 'uint64'], ['passivities', [['id', 'int32']]], ['customString', 'string']]]]))
-	//const path = require('path');
-	//protocol.messages.clear();
-	//protocol.load(path.join(__dirname, 'Classic-tera-data'));
-	//for (const [k, v] of protocol.messages.entries()) protocol.maps.set(k, v);
-}
-
 module.exports = function FpsUtils(mod) {
 
 	// ~~~ * Data * ~~~ \\
 
 	const NotCP = typeof global.TeraProxy === 'undefined';
-	const Classic_NOTCP = mod.majorPatchVersion === 27 && NotCP;
-	if (Classic_NOTCP) LoadThis(); //Pinkie's Proxy classic-server capability.
 	const NpcData = require("./data/npcData.json"), SkillData = require("./data/skillString.json");
 	const 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';
 	const InvisibleNpcs = { 8: [6011], 12: [1, 2], 23: [201, 202], 34: [8000], 61: [9901], 62: [1039, 1040, 1041, 1042, 1900, 1901, 1902, 1903, 9001, 9002, 9003, 9004, 9901], 83: [9901], 207: [9901], 212: [1034], 223: [9901], 230: [9901] };
@@ -248,7 +210,6 @@ module.exports = function FpsUtils(mod) {
 				break;
 			case "help":
 				gui.parse([
-					{ text: mod.majorPatchVersion < 79 ? `<font color="${PnkC}" size="+15"><p align="right">Classic server detected, buttons doesn't work here, thanks for understanding.</p></font><br>` : '' },
 					{ text: `<font color="${PrpC}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: "fps gui" },
 					{ text: `<font size="20"><font color="${LBlC}">Command</font>            <font color="${SlvC}">Arg(s)</font>                 <font color="${CPKC}">Example</font><br>` },
 					{ text: `<font color="${HBlC}">gui ^ g</font>                      <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!fps gui</font><br>` },
@@ -279,7 +240,6 @@ module.exports = function FpsUtils(mod) {
 				break;
 			default:
 				gui.parse([
-					{ text: mod.majorPatchVersion < 79 ? `<font color="${PnkC}" size="+15"><p align="right">Classic server detected, buttons doesn't work here, thanks for understanding.</p></font><br>` : '' },
 					{ text: `<font color="${PrpC}" size="+15"><p align="right">REFRESH</p></font><br>`, command: "fps gui" },
 					{ text: `<font color="${YlwC}" size="+20">Modes:</font>` }, { text: "&#09;&#09;" },
 					{ text: `<font color="${mod.settings.Mode === 0 ? GrnC : RedC}" size="+18">[Mode 0]</font>`, command: "fps mode 0;fps gui" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
@@ -530,20 +490,19 @@ module.exports = function FpsUtils(mod) {
 		let modified = false;
 
 		if (mod.settings.ShowStyle) {
-			event.weapon = event.body = event.hand = event.feet = event.underwear = event.head = event.face = 0;
-			if (event.mount) event.mount = 16; //231; The mount 231 doesn't exist in classic server.
+			event.weapon = [10001, 10002, 10003, 10004, 10005, 10006, 10007, 10008, 80396, 55005, 82005, 58171, 59053][event.templateId % 100 - 1];
+			event.body = event.hand = event.feet = event.underwear = event.head = event.face = 0;
+			if (event.mount) event.mount = 16;
 			if (mod.settings.Hideguildlogos) event.guildLogoId = 0;
-			if (mod.majorPatchVersion >= 79) event.title = 0; //!classic
+			event.title = 0;
 			// event.weaponModel = event.bodyModel = event.handModel = event.feetModel // TODO;
 			event.weaponDye = event.bodyDye = event.handDye = event.feetDye = event.weaponEnchant = 0;
 			event.showFace = false;
 			event.styleHead = event.styleFace = event.styleBack = event.styleWeapon = event.styleBody = 0;
-			if (mod.majorPatchVersion >= 79) event.underwearDye = event.styleBackDye = event.styleHeadDye = event.styleFaceDye = 0; //!classic
+			event.underwearDye = event.styleBackDye = event.styleHeadDye = event.styleFaceDye = 0;
 			event.showStyle = false;
-			if (mod.majorPatchVersion >= 79) { //!classic
-				event.styleFootprint = event.styleHeadScale = event.styleFaceScale = event.styleBackScale = 0;
-				event.usedStyleHeadTransform = false;
-			}
+			event.styleFootprint = event.styleHeadScale = event.styleFaceScale = event.styleBackScale = 0;
+			event.usedStyleHeadTransform = false;
 			event.styleBodyDye = 0;
 			event.icons = [];
 
@@ -564,7 +523,7 @@ module.exports = function FpsUtils(mod) {
 
 		if (mod.settings.Hit_Me && (EqGid(event.source) || EqGid(event.owner))) {
 			event.templateId = 10101;
-			if (!Classic_NOTCP) event.skill.id = 10100; else event.skill = 10100 + 0x4000000;
+			event.skill.id = 10100;
 			event.time = 0;
 			event.crit = false;
 
@@ -573,29 +532,27 @@ module.exports = function FpsUtils(mod) {
 
 		if (mod.settings.Hit_Other && !EqGid(event.target) && !EqGid(event.source) && !EqGid(event.owner) && (SUsers[event.owner] || SUsers[event.source])) {
 			event.templateId = 10101;
-			if (!Classic_NOTCP) event.skill.id = 10100; else event.skill = 10100 + 0x4000000;
+			event.skill.id = 10100;
 			event.time = 0;
 			event.crit = false;
 
 			modified = true;
 		}
 
-		if (mod.settings.Hit_Damage && (EqGid(event.source) || EqGid(event.owner) || UserNPCs.includes(event.templateId) && (Classic_NOTCP ? (((((Boolean(event.skill & 0x40000000) === true) && (event.skill >> 26 & 0xf) === 1)) ? (event.skill >> 16 & 0x3ff) : 0) === 1023) : event.skill.huntingZoneId === 1023))) {
-			event.id = event.type = event.noctEffect = 0;
-			if (!Classic_NOTCP) event.reaction.skill.id = 0; else event.reaction.skill = 0;
-			if (!NotCP) event.damage = 0; else event.value = 0;
+		if (mod.settings.Hit_Damage && (EqGid(event.source) || EqGid(event.owner) || UserNPCs.includes(event.templateId) && event.skill.huntingZoneId === 1023)) {
+			event.id = event.type = event.noctEffect = event.reaction.skill.id = 0;
+			event.value = 0;
 			event.crit = event.stackExplode = false;
-			if (mod.majorPatchVersion >= 79) if (NotCP) event.blocked = false; else event.superArmor = false; //!classic
+			event.superArmor = false;
 
 			modified = true;
 		}
 
 		if (mod.settings.Hit_All) {
-			event.id = event.type = event.noctEffect = 0;
-			if (!Classic_NOTCP) event.reaction.skill.id = 0; else event.reaction.skill = 0;
-			if (!NotCP) event.damage = 0; else event.value = 0;
+			event.id = event.type = event.noctEffect = event.reaction.skill.id = 0;
+			event.value = 0;
 			event.crit = event.stackExplode = false;
-			if (mod.majorPatchVersion >= 79) if (NotCP) event.blocked = false; else event.superArmor = false; //!classic
+			event.superArmor = false;
 			event.target = 0;
 
 			modified = true;
@@ -706,7 +663,7 @@ module.exports = function FpsUtils(mod) {
 		SUsers[event.gameId].mount = event.id;
 		if (HUsers[event.gameId]) HUsers[event.gameId].mount = event.id;
 		if (mod.settings.ShowStyle) {
-			event.id = 16; //231; 
+			event.id = 16;
 			return true;
 		}
 	}
@@ -932,16 +889,7 @@ module.exports = function FpsUtils(mod) {
 
 	function sActionStage(event) {
 		if (EqGid(event.gameId) || !SUsers[event.gameId]) return;
-		if ((mod.settings.Mode >= 2) || HUsers[event.gameId] || mod.settings.ClassesData[ClassID(event.templateId)].CD_HideBlacklistedSkills) {
-			UpdateUserLoc(event);
-			return false;
-		}
-		if (Classic_NOTCP) {
-			if (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor((event.skill - 0x4000000) / 10000).toString())) {
-				UpdateUserLoc(event);
-				return false;
-			}
-		} else if (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor(event.skill.id / 10000).toString())) {
+		if ((mod.settings.Mode >= 2) || HUsers[event.gameId] || (mod.settings.HideBlacklistedSkills && mod.settings.ClassesData[ClassID(event.templateId)].CD_SkillsBlacklist.includes(Math.floor((event.skill.id / 10000).toString()))) || mod.settings.ClassesData[ClassID(event.templateId)].CD_HideBlacklistedSkills) {
 			UpdateUserLoc(event);
 			return false;
 		}
@@ -949,28 +897,22 @@ module.exports = function FpsUtils(mod) {
 
 	function sStartUserProjectile(event) {
 		if (ProjDebug) {
-			if (EqGid(event.gameId)) if (Classic_NOTCP) log('Projectile', 'Started', 'from', MyName, event.skill - 0x4000000); else log('Projectile', 'Started', 'from', MyName, event.skill.id);
-			if (SUsers[event.gameId]) if (Classic_NOTCP) log('Projectile', 'Started', 'from', SUsers[event.gameId].name, event.skill - 0x4000000); else log('Projectile', 'Started', 'from', SUsers[event.gameId].name, event.skill.id);
-		}
-		if (mod.settings.PvpTraps) {
-			if (Classic_NOTCP && TrapsIds.includes(event.skill - 0x4000000)) return;
-			else if (TrapsIds.includes(event.skill.id)) return;
+			if (EqGid(event.gameId)) log('Projectile', 'Started', 'from', MyName, event.skill.id);
+			if (SUsers[event.gameId]) log('Projectile', 'Started', 'from', SUsers[event.gameId].name, event.skill.id);
 		}
-		if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles)) { if (Classic_NOTCP && mod.settings.ProjectilesBlacklist.includes(event.skill - 0x4000000)) return false; else if (mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false; }
+		if (mod.settings.PvpTraps && TrapsIds.includes(event.skill.id)) return;
+		if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
 		if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || mod.settings.Mode >= 2 || mod.settings.HideAllProjectiles)) return false;
 	}
 
 	function sSpawnProjectile(event) {
-		if (Classic_NOTCP ? (Boolean(event.skill & 0x40000000) === true) : event.skill.npc) return;
+		if (event.skill.npc) return;
 		if (ProjDebug) {
-			if (EqGid(event.gameId)) if (Classic_NOTCP) log('Projectile', 'Spawned', 'from', MyName, event.skill - 0x4000000); else log('Projectile', 'Spawned', 'from', MyName, event.skill.id);
-			if (SUsers[event.gameId]) if (Classic_NOTCP) log('Projectile', 'Spawned', 'from', SUsers[event.gameId].name, event.skill - 0x4000000); else log('Projectile', 'Spawned', 'from', SUsers[event.gameId].name, event.skill.id);
-		}
-		if (mod.settings.PvpTraps) {
-			if (Classic_NOTCP && TrapsIds.includes(event.skill - 0x4000000)) return;
-			else if (TrapsIds.includes(event.skill.id)) return;
+			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);
 		}
-		if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles)) { if (Classic_NOTCP && mod.settings.ProjectilesBlacklist.includes(event.skill - 0x4000000)) return false; else if (mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false; }
+		if (mod.settings.PvpTraps && TrapsIds.includes(event.skill.id)) return;
+		if ((mod.settings.HideBlacklistedProjectiles || mod.settings.HideAllProjectiles) && mod.settings.ProjectilesBlacklist.includes(event.skill.id)) return false;
 		if (!EqGid(event.gameId) && SUsers[event.gameId] && (HUsers[event.gameId] || mod.settings.Mode >= 2 || mod.settings.HideAllProjectiles)) return false;
 	}
 
@@ -998,8 +940,7 @@ module.exports = function FpsUtils(mod) {
 		if (EqGid(event.source)) return;
 		if (mod.settings.HideBlacklistedDrop) {
 			for (let i in event.owners) {
-				if (mod.majorPatchVersion >= 79 && event.owners[i].playerId.toString() === MyPlayerId.toString()) return; //!classic
-				else if (mod.majorPatchVersion === 27 && event.owners[i].gameId.toString() === MyGameId.toString()) return;
+				if (event.owners[i].playerId.toString() === MyPlayerId.toString()) return;
 			}
 			if (mod.settings.DropBlacklist.includes(event.item)) return false;
 		}
@@ -1018,15 +959,6 @@ module.exports = function FpsUtils(mod) {
 	const Last_Hook = { order: 100010 }
 	const Last_Hookfn = { order: 100010, filter: { fake: null } };
 
-	if (mod.majorPatchVersion >= 79) {
-		mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
-		mod.hook('S_USER_MOVETYPE', 'raw', Last_Hook, sUserMoveType)
-		mod.hook('S_UNICAST_TRANSFORM_DATA', 5, Last_Hook, sUnicastTransformData)
-		mod.hook('S_USER_APPEARANCE_CHANGE', 1, Last_Hookfn, sUserAppearanceChange)
-		mod.hook('S_USER_EXTERNAL_CHANGE', 7, Last_Hookfn, sUserExternalChange)
-		mod.hook('S_FONT_SWAP_INFO', 'raw', sFontSwapInfo)
-	}
-
 	mod.hook('S_LOGIN', 12, sLogin)
 	mod.hook('S_LOAD_TOPO', 'raw', sLoadTopo)
 	mod.hook('S_LEAVE_PARTY', 'raw', sLeaveParty)
@@ -1050,12 +982,12 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_DESPAWN_USER', 3, Last_Hook, sDespawnUser)
 	mod.hook('S_USER_LOCATION', 5, sUserLocation)
 	mod.hook('S_USER_STATUS', 3, sUserStatus)
-	//'S_DEAD_LOCATION'
-	//'S_USER_MOVETYPE'
+	mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
+	mod.hook('S_USER_MOVETYPE', 'raw', Last_Hook, sUserMoveType)
 	mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
-	//'S_USER_APPEARANCE_CHANGE'
-	//'S_USER_EXTERNAL_CHANGE' Found it... but like 90% confirmed, need someone has everything (costume-wise and gear-wise) equiped so it can 100% confirmed so caali push it... guess that won't happen any soon.
-	//'S_UNICAST_TRANSFORM_DATA'
+	mod.hook('S_USER_APPEARANCE_CHANGE', 1, Last_Hookfn, sUserAppearanceChange)
+	mod.hook('S_USER_EXTERNAL_CHANGE', 7, Last_Hookfn, sUserExternalChange)
+	mod.hook('S_UNICAST_TRANSFORM_DATA', 5, Last_Hook, sUnicastTransformData)
 
 	mod.hook('S_SPAWN_NPC', 11, sSpawnNpc)
 	mod.hook('S_DESPAWN_NPC', 3, sDespawnNpc)
@@ -1074,9 +1006,9 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_START_USER_PROJECTILE', 9, Last_Hook, sStartUserProjectile)
 	mod.hook('S_PLAYER_CHANGE_MP', 1, sPlayerChangeMp)
 	mod.hook('S_CREATURE_CHANGE_HP', 6, sCreatureChangeHp)
-	mod.hook('S_EACH_SKILL_RESULT', NotCP ? 12 : 13, Last_Hook, sEachSkillResult)
-	mod.hook('S_SPAWN_DROPITEM', 6, sSpawnDropItem)
-	//'S_FONT_SWAP_INFO'
+	mod.hook('S_EACH_SKILL_RESULT', 13, Last_Hook, sEachSkillResult)
+	mod.hook('S_SPAWN_DROPITEM', mod.majorPatchVersion >= 80 ? 7 : 6, sSpawnDropItem)
+	mod.hook('S_FONT_SWAP_INFO', 'raw', sFontSwapInfo)
 
 	// ~~~ * Commands * ~~~ \\
 
@@ -1435,18 +1367,15 @@ module.exports = function FpsUtils(mod) {
 						mod.toServer('C_REQUEST_CONTRACT', 1, { type: 8 });
 						break;
 					case "talent": case "talents":
-						if (mod.majorPatchVersion < 79) return;	//classic
 						mod.toServer('C_REQUEST_CONTRACT', 1, { type: 77 });
 						break;
 					case "broker":
 						mod.toClient('S_NPC_MENU_SELECT', 1, { type: 28 });
 						break;
 					case "dress": case "dressingroom":
-						if (mod.majorPatchVersion < 79) return;	//classic
 						mod.toServer('C_REQUEST_CONTRACT', 1, { type: 76 });
 						break;
 					case "hat": case "hatrestyle":
-						if (mod.majorPatchVersion < 79) return;	//classic
 						mod.toServer('C_REQUEST_CONTRACT', 1, { type: 90 });
 						break;
 					case "lobby":

+ 5 - 5
manifest.json

@@ -1,9 +1,9 @@
 {
     "files": {
-        "README.md": "5265e5d92a17de8f85a3a0638258fb6623ab895f1aec59704171abfd3e12677f",
-        "lib/data/npcData.json": "d3e7b59617ef841447567d69b074aa2dd6958eabb1a231c5821ffa7165daeac6",
+        "README.md": "d460498a2503b6857f0faed356b8f06cf4108ae863d022e361f6762877966837",
+        "lib/data/npcData.json": "913aace2b007dc2c04cfcb4b96bd8fea4abbc4a149df8a901c7382797b25f23b",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "bbf1472a4513167fbd53a16a3fa85f6aa099edfe39d4e4c386a0c5059bfdf867",
+        "lib/index.js": "ad8bcc96675eb29b5b9f5b88dd11360bbe40fd7b1efd5d816edb9f20700f8f8f",
         "lib/setting_migration.js": "868abf1f54c8e91df415e19220a2046021fa67a905dcff6a799b01a83488f6a8",
         "module.json": "edcfd2361bc0f72ed7b3838f9f07ad3647738ed2564e230e7da8f7b4a08db715",
         "package.json": "f3e3cf2c845e54b6503108b6bef7f8f5bf33654f6ae1664c75bedbf7f6aa83c1"
@@ -29,7 +29,7 @@
         "S_DEAD_LOCATION": 2,
         "S_DESPAWN_NPC": 3,
         "S_DESPAWN_USER": 3,
-        "S_EACH_SKILL_RESULT": [12,13],
+        "S_EACH_SKILL_RESULT": 13,
         "S_EXIT": 3,
         "S_FEARMOVE_END": 1,
         "S_FEARMOVE_STAGE": 1,
@@ -48,7 +48,7 @@
         "S_PCBANGINVENTORY_DATALIST": 1,
         "S_PLAYER_CHANGE_MP": 1,
         "S_SHOW_AWESOMIUMWEB_SHOP": 1,
-        "S_SPAWN_DROPITEM": 6,
+        "S_SPAWN_DROPITEM": [6,7],
         "S_SPAWN_NPC": 11,
         "S_SPAWN_PROJECTILE": 5,
         "S_SPAWN_USER": 14,

Some files were not shown because too many files changed in this diff