Risenio лет назад: 7
Родитель
Сommit
0b3761b38e
2 измененных файлов с 9 добавлено и 42 удалено
  1. 8 41
      lib/index.js
  2. 1 1
      manifest.json

+ 8 - 41
lib/index.js

@@ -9,46 +9,13 @@ module.exports = function FpsUtils(mod) {
 	const PvPProjs = [30120, 30220, 30320, 90120, 90220, 90320, 90420, 90520, 90620, 90720, 90820, 90920, 100120, 100220, 100320, 100420, 100520, 120220, 120320, 120420, 120520, 120620, 120720, 120820, 120920, 150120, 150220, 150320, 150420, 150520, 150620, 150720, 170120, 170220, 170320, 170420, 170520, 170620, 170720, 170820, 170920, 230120, 230220, 230320, 250120, 250220, 250320, 250420, 250520, 250620, 250720, 250820, 250920, 251020];
 	const UserNPCs = [12345, 1100100, 1100101, 1023000, 1023001, 1023002, 1023003, 1023004, 1023005, 1023006, 1023007, 1023008, 1023009, 1023010, 1023011, 1023012, 1023013, 1023014, 1023200, 1023201, 1023202, 1023203, 1023204, 1023205, 1023206, 1023207, 1023208, 1023209, 1023210, 1023211, 1023300, 1023301, 1023302, 1023303, 1023304, 1023305, 1023306, 1023307, 1023308, 1023309, 1023310, 1023311, 1023312, 1023400, 1023401, 1023402, 1023403, 1023404, 1023405, 1024000, 1024001, 1024100, 1024200, 1024300, 2100100, 2100101, 10235001, 10235002, 10235003, 10235004, 10235005, 10235006, 10235007, 10235008, 10235009, 10235010, 10235011, 10235012, 10235013, 10235014, 10235015, 10235016, 10235017, 10235100, 10236001, 10236002, 10236003, 10236004, 10236005, 10236006, 10236007, 10236008, 10236009, 10236010, 10236011, 10236012, 10236013, 10236014, 10236015, 10236100, 10237001, 10237002, 10237003, 10237004, 10237005, 10237006, 10237007, 10237008, 10237009, 10237010, 10237011, 10237012, 10237013, 10237014, 10237015, 10237100, 10238001, 10238002, 10238003, 10238004, 10238005, 10238006, 10238007, 10238008, 10238100, 10239003, 30301001, 30301002, 30301003, 30301004, 30301005, 30302001, 30302002, 30302003, 30302004, 30302005, 30302006, 30302007, 30303001, 30303002, 30303003, 30303004, 30303005, 30303006, 30303007];
 	const SpamAchievementIds = [51, 377, 391, 466, 467, 468, 469, 470, 471, 472, 473, 476, 611, 1408, 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, 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];
-	const ImportantAbns = [
-		90440009, 90442106, 90442110, 90442111, 90442112, 90442113, 90442114, 90442400, 90442401, 90442402, 90442403, 90442404, 90442405, 90442406, 90442407, 90442408, 90442502,
-
-		78200123, // - Stunned; Cannot move.
-		78200126, // - Eye debuff.
-
-		78200130, // - pink circle?
-		78200131, // - violet circle?
-
-		// 78200142 - blue circle?
-		// 78200143 - purple effect with gathering?
-
-		// 78200148 - Delicate Green Aroma
-		// 78200149 - Sweet Violet Aroma
-
-		// 78200157 - rose flower above head
-		// 78200158 - yellow=>white flower with shaking
-		// 78200157 - yellow explosion
-
-		78200161, // - BIG dount (green effect)
-		78200162, // - BIG dount (blue effect)
-
-		//78200165 - Heavy blue-white debuff?
-
-		78200203, // - Bloody Statue's Gaze
-		78200204, // - Radiant Statue's Gaze
-		78200205, // - Cursed Statue's Gaze
-
-		78200209, // - Restraint; The three statues bind Ptakum.
-		78200234, // - Restraint; A statue binds you.
-		78200235, // - Restraint; Two statues bind you.
-		78200236, // - Restraint; Three statues bind you.
-	];
-
+	const ImportantAbns = [90440009, 90442106, 90442110, 90442111, 90442112, 90442113, 90442114, 90442400, 90442401, 90442402, 90442403, 90442404, 90442405, 90442406, 90442407, 90442408, 90442502, 78200123, 78200126, 78200130, 78200131, 78200161, 78200162, 78200203, 78200204, 78200205, 78200209, 78200234, 78200235, 78200236];
 
 	let MyGameId,
 		MyName,
 		MyPlayerId,
 		SwitchCd,
-		FirstAchUpdates,
+		AllowedAchUps,
 		LastState,
 		LastVrange,
 		ProjDebug,
@@ -641,7 +608,7 @@ module.exports = function FpsUtils(mod) {
 		MyPlayerId = event.playerId;
 		ProjDebug = false;
 		AbnDebug = false;
-		FirstAchUpdates = 2;
+		AllowedAchUps = 2;
 	}
 
 	function sLoadTopo() {
@@ -649,7 +616,7 @@ module.exports = function FpsUtils(mod) {
 		SNpcs = {};
 		HUsers = {};
 		HNpcs = {};
-		FirstAchUpdates = 1;
+		AllowedAchUps = 1;
 		if (ProjDebug) {
 			ProjDebug = false
 			Msg(`<font color="${HPkC}">Auto Disabled</font> projectile debug, to reduce the unneeded spam.`)
@@ -711,7 +678,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sUpdateAchievementProgress(event) {
-		if (FirstAchUpdates) { FirstAchUpdates--; return; }
+		if (AllowedAchUps) { AllowedAchUps--; return; }
 		for (const Achieve of event.achievements) if (SpamAchievementIds.indexOf(Achieve.id) > -1) return false;
 	}
 
@@ -824,7 +791,7 @@ module.exports = function FpsUtils(mod) {
 		SNpcs[event.gameId].spawnType = 1;
 		SNpcs[event.gameId].spawnScript = 0;
 		if (NpcBCheck(event)) return false;
-		//if (mod.settings.ShowStyle) { event.repairable = false; return true; } // {p}artially... This option is used not only for the icons above npcs heads, but it's used also for showing the whole shape of some npcs, e.g. bahaar & glsh. :\
+		//if (mod.settings.ShowStyle) { event.repairable = false; return true; } // partially... This option is not only used for the icons above npcs heads, but it's used also for showing the whole shape of some npcs, e.g. bahaar & glsh. :\
 	}
 
 	function sDespawnNpc(event) {
@@ -896,7 +863,7 @@ module.exports = function FpsUtils(mod) {
 	}
 
 	function sActionStage(event) {
-		if (EqGid(event.gameId) || !SUsers[event.gameId] || event.skill.npc) return;
+		if (EqGid(event.gameId) || !SUsers[event.gameId]) return;
 		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;
@@ -992,7 +959,7 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_USER_STATUS', 3, sUserStatus)
 	mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
 	mod.hook('S_USER_MOVETYPE', 'raw', Last_Hook, sUserMoveType)
-	mod.hook('S_PARTY_MEMBER_LIST', 7, Last_Hook, sPartyMemberList)
+	mod.hook('S_PARTY_MEMBER_LIST', 7, sPartyMemberList)
 	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)

+ 1 - 1
manifest.json

@@ -3,7 +3,7 @@
         "README.md": "d460498a2503b6857f0faed356b8f06cf4108ae863d022e361f6762877966837",
         "lib/data/npcData.json": "d3e7b59617ef841447567d69b074aa2dd6958eabb1a231c5821ffa7165daeac6",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "927087603bc33c01302beabc91f4dc10a9191fc9adb051b5811c26a8d3ddb029",
+        "lib/index.js": "5401560fd330905975229bf2ab370e73c4006083df65e5ef821fab99c4a72be2",
         "lib/setting_migration.js": "6f9169f0a607b77b4922dee0fdbaaae6dedcc181ccf2af234baf92530a50cf75",
         "module.json": "53bbd3e486323e381ea9f89fe262c23b1389a54b954fe2fd91c368791cce1b7d",
         "package.json": "b90a372cfaa137b9cf1835345248c5d6a600b4168faec199792e29d7491af7e1"