Dmitry S лет назад: 4
Родитель
Сommit
5e1fd031b1
2 измененных файлов с 6 добавлено и 24 удалено
  1. 5 23
      lib/player.js
  2. 1 1
      manifest.json

+ 5 - 23
lib/player.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const SpeedDivider = [120, 100, 110, 90, 110, 120, 105, 105, 100, 100, 100, 100, 100];
-const NOCTAN = new Set([1206, 1210, 1230, 1300, 1301, 1302, 1303, 81212, 201225]),
+const SPEED_DIVIDER = [120, 100, 110, 90, 110, 120, 105, 105, 100, 100, 100, 100, 100],
+	NOCTAN = new Set([1206, 1210, 1230, 1300, 1301, 1302, 1303, 81212, 201225]),
 	HOOK_LAST = { order: 100, filter: { fake: null } }
 
 class SPPlayer {
@@ -24,13 +24,11 @@ class SPPlayer {
 			crests: new Set(), // Crests
 			epPerks: new Set(), // EP
 			skillPolishing: new Set(), // Skill Polishing (Talyphs)
-			skillList: new Set(), // for passive skilleffects
 
 			// Equipment / Inventory
 			hasWeapon: false,
 			hasNocTan: false,
-			itemPassives: [],
-			itemPassivityGroups: new Set()
+			itemPassives: []
 		})
 	}
 
@@ -60,7 +58,7 @@ class SPPlayer {
 		mod.hook('S_PLAYER_STAT_UPDATE', mod.majorPatchVersion >= 93 ? 14 : 13, HOOK_LAST, event => {
 			Object.assign(this, {
 				// Newer classes use a different speed algorithm
-				attackSpeed: (event.attackSpeed + event.attackSpeedBonus) / SpeedDivider[this.job],
+				attackSpeed: (event.attackSpeed + event.attackSpeedBonus) / SPEED_DIVIDER[this.job],
 				stamina: event.stamina
 			})
 		})
@@ -94,15 +92,6 @@ class SPPlayer {
 					this.skillPolishing.add(sp.id)
 		})
 
-		// Skill List
-		mod.hook('S_SKILL_LIST', 2, event => {
-			this.skillList = new Set()
-
-			// Passive Skills
-			for (let skill of event.skills)
-				if (!skill.active) this.skillList.add(skill.id)
-		})
-
 		// Equipment / Inventory
 		mod.game.initialize('inventory');
 		mod.game.initialize("contract");
@@ -110,14 +99,7 @@ class SPPlayer {
 			this.hasWeapon = mod.game.inventory.weaponEquipped
 			this.itemPassives = mod.game.inventory.equipmentPassivities
 			//this.hasNocTan = !!mod.game.inventory.findInBagOrPockets(NOCTAN)
-
-			this.itemPassivityGroups.clear()
-			const equipmentSlots = mod.game.inventory.equipment.slots
-			for(let slot in equipmentSlots)
-				for (let stat of equipmentSlots[slot].equipmentStats)
-					for (let group of stat.passivityGroups)
-						this.itemPassivityGroups.add(group.id)
-		});
+		})
 	}
 }
 

+ 1 - 1
manifest.json

@@ -21,7 +21,7 @@
         "lib/debug.js": "e588440fd11eb3d7eb84b15789df92b7f15d9d560ec2f7ef8597c384e402efb7",
         "lib/index.js": "dded72ea79f9aa060722e1d904a6e842fbca80315fdbcdf6bdda8fa38f8e96fa",
         "lib/ping.js": "72685743a006c63a839fdff8f9b448e3e31ccfda534acbd3c1396f5eb4e8e994",
-        "lib/player.js": "c9f61a1ad4ec674b68623ee106e6f511651c04e720e8732b3d50554e10f11f9a",
+        "lib/player.js": "db9829c7495f98f7fe0811c9c10fe5dfad36626d44d883dbb535cb148abb9c7b",
         "lib/require.js": "d8fcd57f21ba1cea3d474688c994804b21676c6a4cb6a9dbc4ed929c79a37dac",
         "migration.js": "b7479525dd7257af68594063227698a7ab4a752688024368ef5e740b0700a9ed",
         "module.json": "c54bdf116d0dad5e47d3764a1728cda6b6a6c5162f74541717b515d69928e4b8",