teralove 6 years ago
parent
commit
ffe8795d10
3 changed files with 41 additions and 104 deletions
  1. 3 71
      README.MD
  2. 37 32
      index.js
  3. 1 1
      module.json

+ 3 - 71
README.MD

@@ -14,88 +14,20 @@ Skip lockons and instantly heals/cleanses party members.
 | Mystic - Arun's Cleansing Touch |
 
 ## Usage
-### `autoheal`
-- Toggle on/off
-- Default is on
 ### `autoheal [on/off]`
 - Enables/disables auto-heals
+- Default is on
 ### `autoheal [HP]`
 - Set cutoff for healing. ('autoheal 50' = ignore members with >50% HP. Set to 100 to always heal)
 - Default cutoff is 97%
-### `autocleanse`
-- Toggle on/off
-- Default is on
-### `autocleanse [on/off]`
+### `autocleanse` [on/off]`
 - Enables/disables auto-cleansing
-### `autocast`
-- Toggle on/off
 - Default is on
 ### `autocast [on/off]`
 - Enables/disables auto-casting
+- Default is on
 
 ## Issues
 - Skills can ghost if proxy is also using Skill-Prediction (You see animation but nothing happens). Workaround is to disable the skills in SP. [Click here to see how](https://i.imgur.com/bS4VkbX.png)
 
-## Changelog
-<details>
-
-    1.65
-    - Next Gen update
-    1.64
-    - BigInt fix
-    1.63
-    - Update for patch version 74.03
-    - Removed redundant text in command messages 
-    1.62
-    - Updated S_PARTY_MEMBER_CHANGE_HP hook version to 4
-    1.61
-    - Fix: Misspelled config.js in manifest
-    1.60
-    - New: autocast command and feature
-    - New: Configs stored in separate file
-    - New: Debug command
-    1.52
-    - Fix: Lockons ignoring berserkers with negative health
-    - Fix: Locking onto kicked party members
-    1.51
-    - New: Added support for Caali auto-update.
-    1.50
-    - New: autoheal and autocleanse commands toggle only their respectable behaviours. 
-    - New: autoheal command has argument to set HP cutoff.
-    - New: autoheal command has argument to toggle on/off explicitly ('autoheal on/off')
-    - New: autocleanse command has argument to toggle on/off explicitly ('autocleanse on/off')
-    - New: Vertical distance check.
-    - Fixed: Locking onto players that left the party.
-    - Fixed: Mod would only start working on players when they had moved.
-    - Fixed: Mod would briefly stop working when a dead party member resses.
-    - Fixed: Mod would briefly stop working after toggling via command toggle.
-    1.42
-    - Added S_USER_LOCATION_IN_ACTION hook.
-    1.41
-    - Updated protocol versions.
-    - Set max distance to 32m
-    1.40
-    - Faster response
-    - Added: Priest's Immersion skill.
-    - Added: Glyphs affect number of lockon targets.
-    - Fixed bug: Casting skills would reset player rotation
-    - Reduced max distance to 30m
-    1.30
-    - Code update and aesthetics
-    - Fixed bug: Locking and casting onto dead targets
-    - Added Command dependency
-    - Added autocleanse command
-    - Removed slash support
-    1.20
-    - Added heal skills for low level characters.
-    - Fix hp choosing bug, now targets with full hp will not receive heal.
-    1.12
-    - Added mystic's focus heal X
-    1.11
-    - Code aesthetics
-    1.10
-    - Disabled raid cleanse
-
-</details>
-
 ---

+ 37 - 32
index.js

@@ -21,6 +21,9 @@ module.exports = function AutoHeal(mod) {
             debug = !debug;
             mod.command.message('Debug ' + (debug ? 'enabled' : 'disabled'));
             return;
+        } else if (p1 === 'test') {
+			outputDebug(0);
+            return;
         } else if (!isNaN(p1)) {
             mod.settings.autoHeal = true;
             mod.settings.hpCutoff = (p1 < 0 ? 0 : p1 > 100 ? 100 : p1);
@@ -60,7 +63,7 @@ module.exports = function AutoHeal(mod) {
         }        
         mod.command.message('Casting ' + (mod.settings.autoCast ? 'enabled' : 'disabled'));
     });
-    
+        
     mod.game.on('enter_game', () => { 
         job = (mod.game.me.templateId - 10101) % 100;
         (mod.settings.skills[job]) ? load() : unload();
@@ -76,25 +79,24 @@ module.exports = function AutoHeal(mod) {
 				mod.unhook(h);
 			hooks = [];
 		}
-	}    
+	}
     
 	function load() {
 		if (!hooks.length) {
             
-            hook('S_PARTY_MEMBER_LIST', 7, (event) => {
-                // refresh locations of existing party members.
-                for (let i = 0; i < event.members.length; i++) {
-                    for (let j = 0; j < partyMembers.length; j++) {
-                        if (partyMembers[j]) {
-                            if (event.members[i].gameId === (partyMembers[j].gameId)) {
-                                event.members[i].loc = partyMembers[j].loc;
-                                event.members[i].hpP = partyMembers[j].hpP;
-                                event.members[i].alive = partyMembers[j].alive;
-                            }
-                        }
-                    }
-                }
-                partyMembers = event.members.filter(m => !mod.game.me.is(m.gameId)); // remove self from targets     
+            hook('S_PARTY_MEMBER_LIST', 7, (event) => {				
+				const copy = partyMembers;			
+            	partyMembers = event.members.filter(m => m.playerId != mod.game.me.playerId); // remove self from targets
+				
+				// restore missing gameIds. sometimes gameIds are 0 since 64-bit patch
+				if (copy) {
+					for(let i = 0; i < partyMembers.length; i++) {
+						const copyMember = copy.find(m => m.playerId == partyMembers[i].playerId);
+						if (copyMember) {
+							partyMembers[i].gameId = copyMember.gameId;
+						}
+					}
+				}
             })
             
             hook('S_LEAVE_PARTY', 1, (event) => {
@@ -112,8 +114,9 @@ module.exports = function AutoHeal(mod) {
             
             hook('S_SPAWN_USER', 15, (event) => {
                 if (partyMembers.length != 0) {
-                    let member = partyMembers.find(m => m.gameId == event.gameId);
+                    let member = partyMembers.find(m => m.playerId === event.playerId);
                     if (member) {
+						member.gameId = event.gameId;
                         member.loc = event.loc;
                         member.alive = event.alive;
                         member.hpP = (event.alive ? 100 : 0);
@@ -121,7 +124,7 @@ module.exports = function AutoHeal(mod) {
                 }
             })
             
-            hook('S_USER_LOCATION', 5, (event) => {
+            hook('S_USER_LOCATION', 5, (event) => {     
                 let member = partyMembers.find(m => m.gameId === event.gameId);
                 if (member) member.loc = event.loc;
             })
@@ -150,16 +153,16 @@ module.exports = function AutoHeal(mod) {
                 if (member) {
                     member.hpP = (Number(event.curHp) / Number(event.maxHp)) * 100;    
                     member.alive = event.alive;
-                }                    
+                }
             })
             
             hook('S_DEAD_LOCATION', 2, (event) => {
-                let member = partyMembers.find(m => m.playerId === event.playerId);
+                let member = partyMembers.find(m => (m.gameId === event.gameId));
                 if (member) {
                     member.loc = event.loc;
                     member.hpP = 0;
                     member.alive = false;
-                }                
+                }
             })
             
             hook('S_LEAVE_PARTY_MEMBER', 2, (event) => {
@@ -179,7 +182,6 @@ module.exports = function AutoHeal(mod) {
                 if (partyMembers.length == 0) return; // be in a party
                 if (event.skill.id / 10 & 1 != 0) { // is casting (opposed to locking on)
                     playerLocation.w = event.w;
-                    return; 
                 }
                 let skill = Math.floor(event.skill.id / 10000);
                 
@@ -190,6 +192,7 @@ module.exports = function AutoHeal(mod) {
                     
                     let targetMembers = [];
                     let maxTargetCount = getMaxTargets(skill);
+					
                     if (skill != 9) sortHp();
                     for (let i = 0, n = partyMembers.length; i < n; i++) {
                         if (partyMembers[i].online &&
@@ -198,24 +201,24 @@ module.exports = function AutoHeal(mod) {
                             partyMembers[i].hpP != 0 &&
                             ((skill == 9) ? true : partyMembers[i].hpP <= mod.settings.hpCutoff) && // (cleanse) ignore max hp
                             partyMembers[i].loc != undefined &&
-                            (partyMembers[i].loc.dist3D(playerLocation.loc) / 25) <= mod.settings.maxDistance)
-                            {
-                                targetMembers.push(partyMembers[i]);
+                            (partyMembers[i].loc.dist3D(playerLocation.loc) / 25) <= mod.settings.maxDistance) {
+								targetMembers.push(partyMembers[i]);
                                 if (targetMembers.length == maxTargetCount) break;
                             }
                     }
-                    
+
                     if (targetMembers.length > 0) {
                         if (debug) outputDebug(event.skill);
+                        
                         for (let i = 0, n = targetMembers.length; i < n; i++) {
                             setTimeout(() => {
-                                mod.toServer('C_CAN_LOCKON_TARGET', 3, {target: targetMembers[i].gameId, skill: event.skill.id});
+                                mod.send('C_CAN_LOCKON_TARGET', 3, {target: targetMembers[i].gameId, skill: event.skill.id});
                             }, mod.settings.lockSpeed);
                         }
                         
                         if (mod.settings.autoCast) {
                             setTimeout(() => {
-                                mod.toServer('C_START_SKILL', 7, Object.assign({}, event, {w: playerLocation.w, skill: (event.skill.id + 10)}));
+                                mod.send('C_START_SKILL', 7, Object.assign({}, event, {w: playerLocation.w, skill: (event.skill.id + 10)}));
                             }, mod.settings.castSpeed);
                         }
                     }
@@ -231,9 +234,10 @@ module.exports = function AutoHeal(mod) {
                 let glyph = glyphs.find(g => g.id == event.id);
                 if (glyph) glyph.enable = event.enable;                
             })
-            
+			
         }
     }
+
     
     function getMaxTargets (skill) {
         switch(skill) {
@@ -264,12 +268,13 @@ module.exports = function AutoHeal(mod) {
             let name = partyMembers[i].name;
             name += ' '.repeat(21-name.length);
             let hp = '\tHP: ' + parseFloat(partyMembers[i].hpP).toFixed(2);
-            let dist = 'undefined';
+            let dist = '\tundefined';
             if (partyMembers[i].loc) dist = '\tDist: ' + (partyMembers[i].loc.dist3D(playerLocation.loc) / 25).toFixed(2);
-            let vert = '\tVert: ' + (Math.abs(partyMembers[i].loc.z - playerLocation.loc.z) / 25).toFixed(2);
+           // let vert = '\tVert: ' + (Math.abs(partyMembers[i].loc.z - playerLocation.loc.z) / 25).toFixed(2);
             let online = '\tOnline: ' + partyMembers[i].online;
             let alive = '\tAlive: ' + partyMembers[i].alive;
-            out += name + hp + dist + vert + online + alive;
+            let pid = '\tpid: ' + partyMembers[i].playerId + '  gid: ' + partyMembers[i].gameId  ;
+            out += name + hp + dist + online + alive + pid;
         }
         console.log(out)
     }

+ 1 - 1
module.json

@@ -3,7 +3,7 @@
 	"name": "auto-heal",
 	"author": "teralove",
 	"description": "Auto lockon and instantly heal/cleanse party members.",
-    "version": "9/16/2019",
+    "version": "97.03",
     "donationUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=PXRFYB39SQP4A", 
 	"options": {
 		"niceName": "Auto Heal",