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

+ 22 - 3
lib/player.js

@@ -1,5 +1,6 @@
 'use strict'
 '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 NOCTAN = new Set([1206, 1210, 1230, 1300, 1301, 1302, 1303, 81212, 201225]),
 	HOOK_LAST = { order: 100, filter: { fake: null } }
 	HOOK_LAST = { order: 100, filter: { fake: null } }
 
 
@@ -23,11 +24,13 @@ class SPPlayer {
 			crests: new Set(), // Crests
 			crests: new Set(), // Crests
 			epPerks: new Set(), // EP
 			epPerks: new Set(), // EP
 			skillPolishing: new Set(), // Skill Polishing (Talyphs)
 			skillPolishing: new Set(), // Skill Polishing (Talyphs)
+			skillList: new Set(), // for passive skilleffects
 
 
 			// Equipment / Inventory
 			// Equipment / Inventory
 			hasWeapon: false,
 			hasWeapon: false,
 			hasNocTan: false,
 			hasNocTan: false,
-			itemPassives: []
+			itemPassives: [],
+			itemPassivityGroups: new Set()
 		})
 		})
 	}
 	}
 
 
@@ -57,7 +60,7 @@ class SPPlayer {
 		mod.hook('S_PLAYER_STAT_UPDATE', mod.majorPatchVersion >= 93 ? 14 : 13, HOOK_LAST, event => {
 		mod.hook('S_PLAYER_STAT_UPDATE', mod.majorPatchVersion >= 93 ? 14 : 13, HOOK_LAST, event => {
 			Object.assign(this, {
 			Object.assign(this, {
 				// Newer classes use a different speed algorithm
 				// Newer classes use a different speed algorithm
-				attackSpeed: (event.attackSpeed + event.attackSpeedBonus) / (this.job >= 8 ? 100 : event.attackSpeed),
+				attackSpeed: (event.attackSpeed + event.attackSpeedBonus) / SpeedDivider[this.job],
 				stamina: event.stamina
 				stamina: event.stamina
 			})
 			})
 		})
 		})
@@ -91,6 +94,15 @@ class SPPlayer {
 					this.skillPolishing.add(sp.id)
 					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
 		// Equipment / Inventory
 		mod.game.initialize('inventory');
 		mod.game.initialize('inventory');
 		mod.game.initialize("contract");
 		mod.game.initialize("contract");
@@ -98,7 +110,14 @@ class SPPlayer {
 			this.hasWeapon = mod.game.inventory.weaponEquipped
 			this.hasWeapon = mod.game.inventory.weaponEquipped
 			this.itemPassives = mod.game.inventory.equipmentPassivities
 			this.itemPassives = mod.game.inventory.equipmentPassivities
 			//this.hasNocTan = !!mod.game.inventory.findInBagOrPockets(NOCTAN)
 			//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/debug.js": "e588440fd11eb3d7eb84b15789df92b7f15d9d560ec2f7ef8597c384e402efb7",
         "lib/index.js": "dded72ea79f9aa060722e1d904a6e842fbca80315fdbcdf6bdda8fa38f8e96fa",
         "lib/index.js": "dded72ea79f9aa060722e1d904a6e842fbca80315fdbcdf6bdda8fa38f8e96fa",
         "lib/ping.js": "72685743a006c63a839fdff8f9b448e3e31ccfda534acbd3c1396f5eb4e8e994",
         "lib/ping.js": "72685743a006c63a839fdff8f9b448e3e31ccfda534acbd3c1396f5eb4e8e994",
-        "lib/player.js": "d678b4ed766db8bce5f5e7d4beb2601e965889a41c7bb2b8e044576cef7644bb",
+        "lib/player.js": "c9f61a1ad4ec674b68623ee106e6f511651c04e720e8732b3d50554e10f11f9a",
         "lib/require.js": "d8fcd57f21ba1cea3d474688c994804b21676c6a4cb6a9dbc4ed929c79a37dac",
         "lib/require.js": "d8fcd57f21ba1cea3d474688c994804b21676c6a4cb6a9dbc4ed929c79a37dac",
         "migration.js": "b7479525dd7257af68594063227698a7ab4a752688024368ef5e740b0700a9ed",
         "migration.js": "b7479525dd7257af68594063227698a7ab4a752688024368ef5e740b0700a9ed",
         "module.json": "c54bdf116d0dad5e47d3764a1728cda6b6a6c5162f74541717b515d69928e4b8",
         "module.json": "c54bdf116d0dad5e47d3764a1728cda6b6a6c5162f74541717b515d69928e4b8",