teralove лет назад: 7
Родитель
Сommit
408aa9f417
5 измененных файлов с 271 добавлено и 245 удалено
  1. 0 19
      config.js
  2. 22 0
      config.json
  3. 180 224
      index.js
  4. 7 2
      module.json
  5. 62 0
      settings_migrator.js

+ 0 - 19
config.js

@@ -1,19 +0,0 @@
-module.exports = {
-     Skills: {
-        6: [ // Priest
-            19, // Focus Heal
-            37  // Immersion
-        ],
-        7: [ // Mystic
-            5, // Titanic Favor
-            9  // Arun's Cleansing Touch
-        ]
-    },
-    
-    autoCast: true,     // true = skills auto lockon and cast. false = pre-lockon onto targets and casting is done manually
-    autoCleanse: true,  // enable mystic cleanse
-    autoHeal: true,     // enable healing skills
-    hpCutoff: 97,       // (healing only) ignore members that have more HP% than this
-    maxDistance: 35,    // in-game meters. can work up to 35m
-    maxVertical: 25     // (ignore targets at top of CS ladders, etc). can also be 35m
-}

+ 22 - 0
config.json

@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "data": {
+        "skills": {
+            "6": [
+                19,
+                37
+            ],
+            "7": [
+                5,
+                9
+            ]
+        },
+        "autoCast": true,
+        "autoHeal": true,
+        "autoCleanse": true,
+        "hpCutoff": 97,
+        "maxDistance": 35,
+        "lockSpeed": 5,
+        "castSpeed": 10
+    }
+}

+ 180 - 224
index.js

@@ -1,10 +1,9 @@
+'use strict'
+
 module.exports = function AutoHeal(mod) {
-    const config = require('./config.js');
     
-    let enabled = false, // gets enabled when you log in as a healer
+    let hooks = [],
         debug = false,
-        playerId = 0,
-        gameId = 0,
         playerLocation = {},
         partyMembers = [],
         job = -1,
@@ -13,269 +12,228 @@ module.exports = function AutoHeal(mod) {
     mod.command.add('autoheal', (p1)=> {
         if (p1) p1 = p1.toLowerCase();
         if (p1 == null) {
-            config.autoHeal = !config.autoHeal;
+            mod.settings.autoHeal = !mod.settings.autoHeal;
         } else if (p1 === 'off') {
-            config.autoHeal = false;
+            mod.settings.autoHeal = false;
         } else if (p1 === 'on') {
-            config.autoHeal = true;
+            mod.settings.autoHeal = true;
         } else if (p1 === 'debug') {
             debug = !debug;
             mod.command.message('Debug ' + (debug ? 'enabled' : 'disabled'));
             return;
         } else if (!isNaN(p1)) {
-            config.autoHeal = true;
-            config.hpCutoff = (p1 < 0 ? 0 : p1 > 100 ? 100 : p1);
+            mod.settings.autoHeal = true;
+            mod.settings.hpCutoff = (p1 < 0 ? 0 : p1 > 100 ? 100 : p1);
         } else {
             mod.command.message(p1 +' is an invalid argument');
             return;
         }        
-        mod.command.message('Healing ' + (config.autoHeal ? 'enabled (' + config.hpCutoff + '%)' : 'disabled'));
+        mod.command.message('Healing ' + (mod.settings.autoHeal ? 'enabled (' + mod.settings.hpCutoff + '%)' : 'disabled'));
     });
     
     mod.command.add('autocleanse', (p1) => {
         if (p1) p1 = p1.toLowerCase();
         if (p1 == null) {
-            config.autoCleanse = !config.autoCleanse;
+            mod.settings.autoCleanse = !mod.settings.autoCleanse;
         } else if (p1 === 'off') {
-            config.autoCleanse = false;
+            mod.settings.autoCleanse = false;
         } else if (p1 === 'on') {
-            config.autoCleanse = true;
+            mod.settings.autoCleanse = true;
         } else {
             mod.command.message(p1 +' is an invalid argument for cleanse command');
             return;
         }
-        mod.command.message('Cleansing ' + (config.autoCleanse ? 'enabled' : 'disabled'));
+        mod.command.message('Cleansing ' + (mod.settings.autoCleanse ? 'enabled' : 'disabled'));
     });
     
     mod.command.add('autocast', (p1)=> {
         if (p1) p1 = p1.toLowerCase();
         if (p1 == null) {
-            config.autoCast = !config.autoCast;
+            mod.settings.autoCast = !mod.settings.autoCast;
         } else if (p1 === 'off') {
-            config.autoCast = false;
+            mod.settings.autoCast = false;
         } else if (p1 === 'on') {
-            config.autoCast = true;
+            mod.settings.autoCast = true;
         } else {
             mod.command.message(p1 +' is an invalid argument for cast command');
             return;
         }        
-        mod.command.message('Casting ' + (config.autoCast ? 'enabled' : 'disabled'));
+        mod.command.message('Casting ' + (mod.settings.autoCast ? 'enabled' : 'disabled'));
     });
     
     mod.hook('S_LOGIN', 10, (event) => {
-        playerId = event.playerId;
-        gameId = event.gameId;
         job = (event.templateId - 10101) % 100;
-        enabled = (config.Skills[job]) ? true : false;
+        (mod.settings.skills[job]) ? load() : unload();
     })
        
-    mod.hook('S_PARTY_MEMBER_LIST', 7, (event) => {
-        if (!enabled) return;
-        // 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;
-                    }
-                }
-            }
-        }
-        partyMembers = event.members;
-        // remove self from targets
-        for (let i = 0; i < partyMembers.length; i++) {
-            if (partyMembers[i].gameId === (gameId)) {
-                partyMembers.splice(i, 1);
-                return;
-            }
-        }
-    })
-    
-    mod.hook('S_LEAVE_PARTY', 1, (event) => {
-        partyMembers = [];
-    })
-    
-    mod.hook('C_PLAYER_LOCATION', 5, (event) => {
-        if (!enabled) return;
-        playerLocation = event;
-    })
+	function hook() {
+		hooks.push(mod.hook(...arguments));
+	}
+	
+	function unload() {
+		if (hooks.length) {
+			for (let h of hooks)
+				mod.unhook(h);
+			hooks = [];
+		}
+	}    
     
-    mod.hook('S_SPAWN_ME', 3, (event) => {
-        playerLocation.gameId = event.gameId;
-        playerLocation.loc = event.loc;
-        playerLocation.w = event.w;
-    })
-    
-    mod.hook('S_SPAWN_USER', 13, (event) => {
-        if (!enabled) return;
-        if (partyMembers.length != 0) {
-            for (let i = 0; i < partyMembers.length; i++) {
-                if (partyMembers[i].gameId === (event.gameId)) {
-                    partyMembers[i].loc = event.loc;
-                    partyMembers[i].hpP = (event.alive ? 100 : 0);
-                    return;
+	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;
+                            }
+                        }
+                    }
                 }
-            }
-        }
-    })
-    
-    mod.hook('S_USER_LOCATION', 5, (event) => {
-        if (!enabled) return;
-        for (let i = 0; i < partyMembers.length; i++) {
-            if (partyMembers[i].gameId === (event.gameId)) {
-                partyMembers[i].loc = event.loc;
-                return;
-            }
-        }
-    })
-    
-    mod.hook('S_USER_LOCATION_IN_ACTION', 2, (event) => {
-        if (!enabled) return;
-        for (let i = 0; i < partyMembers.length; i++) {
-            if (partyMembers[i].gameId === (event.gameId)) {
-                partyMembers[i].loc = event.loc;
-                return;
-            }
-        }
-    })
-    
-    mod.hook('S_INSTANT_DASH', 3, (event) => {
-        if (!enabled) return;
-        for (let i = 0; i < partyMembers.length; i++) {
-            if (partyMembers[i].gameId === (event.gameId)) {
-                partyMembers[i].loc = event.loc;
-                return;
-            }
-        }
-    })
-    
-    mod.hook('S_PARTY_MEMBER_CHANGE_HP', 4, (event) => {
-        if (!enabled) return;
-        if (playerId == event.playerId) return;
-        for (let i = 0; i < partyMembers.length; i++) {
-            if (partyMembers[i].playerId === event.playerId) {
-                partyMembers[i].hpP = (Number(event.currentHp) / Number(event.maxHp)) * 100;
-                return;
-            }
-        }
-    })
-    
-    mod.hook('S_PARTY_MEMBER_STAT_UPDATE', 3, (event) => {
-        if (!enabled) return;
-        if (playerId == event.playerId) return;
-        for (let i = 0; i < partyMembers.length; i++) {
-            if (partyMembers[i].playerId === event.playerId) {
-                partyMembers[i].hpP = (Number(event.curHp) / Number(event.maxHp)) * 100;
-                return;
-            }
-        }
-    })
-    
-    mod.hook('S_DEAD_LOCATION', 2, (event) => {
-        if (!enabled) return;
-        for (let i = 0; i < partyMembers.length; i++) {
-            if (partyMembers[i].gameId === (event.gameId)) {
-                partyMembers[i].loc = event.loc;
-                partyMembers[i].hpP = 0;
-                return;
-            }
-        }
-    })
-    
-    mod.hook('S_LEAVE_PARTY_MEMBER', 2, (event) => {
-        if (!enabled) return;
-        for (let i = 0; i < partyMembers.length; i++) {
-            if (partyMembers[i].playerId === event.playerId) {
-                partyMembers.splice(i, 1);
-                return;
-            }
-        }
-    });
-     
-    mod.hook('S_LOGOUT_PARTY_MEMBER', 1, (event) => {
-        if (!enabled) return;
-        for (let i = 0; i < partyMembers.length; i++) {
-            if (partyMembers[i].playerId === event.playerId) {
-                partyMembers[i].online = false;
-                return;
-            }
-        }
-    });
-    
-    mod.hook('S_BAN_PARTY_MEMBER', 1, (event) => {
-        if (!enabled) return;
-        for (let i = 0; i < partyMembers.length; i++) {
-            if (partyMembers[i].playerId === event.playerId) {
-                partyMembers.splice(i, 1);
-                return;
-            }
-        }
-    });    
-    
-    mod.hook('C_START_SKILL', 7, (event) => {
-        if (!enabled) return;
-        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);
-        
-        if(config.Skills[job] && config.Skills[job].includes(skill)) {
-            if (skill != 9 && !config.autoHeal) return; // skip heal if disabled
-            if (skill == 9 && !config.autoCleanse) return; // skip cleanse if disabled
-            if (skill == 9 && partyMembers.length > 4) return; // skip cleanse if in a raid
+                partyMembers = event.members.filter(m => !mod.game.me.is(m.gameId)); // remove self from targets     
+            })
+            
+            hook('S_LEAVE_PARTY', 1, (event) => {
+                partyMembers = [];
+            })
+            
+            hook('C_PLAYER_LOCATION', 5, (event) => {
+                playerLocation = event;
+            })
             
-            let targetMembers = [];
-            let maxTargetCount = getMaxTargets(skill);
-            if (skill != 9) sortHp();
-            for (let i = 0; i < partyMembers.length; i++) {
-                if (partyMembers[i].online &&
-                    partyMembers[i].hpP != undefined &&
-                    partyMembers[i].hpP != 0 &&
-                    ((skill == 9) ? true : partyMembers[i].hpP <= config.hpCutoff) && // (cleanse) ignore max hp
-                    partyMembers[i].loc != undefined &&
-                    (partyMembers[i].loc.dist3D(playerLocation.loc) / 25) <= config.maxDistance && 
-                    (Math.abs(partyMembers[i].loc.z - playerLocation.loc.z) / 25) <= config.maxVertical)
-                    {
-                        targetMembers.push(partyMembers[i]);
-                        if (targetMembers.length == maxTargetCount) break;
+            hook('S_SPAWN_ME', 3, (event) => {
+                playerLocation.loc = event.loc;
+                playerLocation.w = event.w;
+            })
+            
+            hook('S_SPAWN_USER', 13, (event) => {
+                if (partyMembers.length != 0) {
+                    let member = partyMembers.find(m => m.gameId == event.gameId);
+                    if (member) {
+                        member.loc = event.loc;
+                        member.alive = event.alive;
+                        member.hpP = (event.alive ? 100 : 0);
                     }
-            }
+                }
+            })
+            
+            hook('S_USER_LOCATION', 5, (event) => {
+                let member = partyMembers.find(m => m.gameId === event.gameId);
+                if (member) member.loc = event.loc;
+            })
+            
+            hook('S_USER_LOCATION_IN_ACTION', 2, (event) => {
+                let member = partyMembers.find(m => m.gameId === event.gameId);
+                if (member) member.loc = event.loc;
+            })
+            
+            hook('S_INSTANT_DASH', 3, (event) => {
+                let member = partyMembers.find(m => m.gameId === event.gameId);
+                if (member) member.loc = event.loc;
+            })
             
-            if (targetMembers.length > 0) {
-                if (debug) outputDebug(event.skill);
-                for (let i = 0; i < targetMembers.length; i++) {
-                    setTimeout(() => {
-                        mod.toServer('C_CAN_LOCKON_TARGET', 3, {target: targetMembers[i].gameId, skill: event.skill.id});
-                    }, 5);
+            hook('S_PARTY_MEMBER_CHANGE_HP', 4, (event) => {
+                if (mod.game.me.playerId == event.playerId) return;
+                let member = partyMembers.find(m => m.playerId === event.playerId);
+                if (member) {
+                    member.hpP = (Number(event.currentHp) / Number(event.maxHp)) * 100;
                 }
+            })
+            
+            hook('S_PARTY_MEMBER_STAT_UPDATE', 3, (event) => {
+                if (mod.game.me.playerId == event.playerId) return;
+                let member = partyMembers.find(m => m.playerId === event.playerId);
+                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);
+                if (member) {
+                    member.loc = event.loc;
+                    member.hpP = 0;
+                    member.alive = false;
+                }                
+            })
+            
+            hook('S_LEAVE_PARTY_MEMBER', 2, (event) => {
+                partyMembers = partyMembers.filter(m => m.playerId != event.playerId);                
+            });
+             
+            hook('S_LOGOUT_PARTY_MEMBER', 1, (event) => {
+                let member = partyMembers.find(m => m.playerId === event.playerId);
+                if (member) member.online = false;                
+            });
+            
+            hook('S_BAN_PARTY_MEMBER', 1, (event) => {
+                partyMembers = partyMembers.filter(m => m.playerId != event.playerId);
+            });    
+            
+            hook('C_START_SKILL', 7, (event) => {
+                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);
                 
-                if (config.autoCast) {
-                    setTimeout(() => {
-                        mod.toServer('C_START_SKILL', 7, Object.assign({}, event, {w: playerLocation.w, skill: (event.skill.id + 10)}));
-                    }, 10);
+                if(mod.settings.skills[job] && mod.settings.skills[job].includes(skill)) {
+                    if (skill != 9 && !mod.settings.autoHeal) return; // skip heal if disabled
+                    if (skill == 9 && !mod.settings.autoCleanse) return; // skip cleanse if disabled
+                    if (skill == 9 && partyMembers.length > 4) return; // skip cleanse if in a raid
+                    
+                    let targetMembers = [];
+                    let maxTargetCount = getMaxTargets(skill);
+                    if (skill != 9) sortHp();
+                    for (let i = 0, n = partyMembers.length; i < n; i++) {
+                        if (partyMembers[i].online &&
+                            partyMembers[i].alive &&
+                            partyMembers[i].hpP != undefined &&
+                            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]);
+                                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.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.settings.castSpeed);
+                        }
+                    }
                 }
-            }
-        }
-        
-    })
+                
+            })
 
-    mod.hook('S_CREST_INFO', 2, (event) => {
-        if (!enabled) return;
-        glyphs = event.crests;
-    })
-    
-    mod.hook('S_CREST_APPLY', 2, (event) => {
-        if (!enabled) return;
-        for (let i = 0; i < glyphs.length; i++) {
-            if (glyphs[i].id == event.id) {
-                glyphs[i].enable = event.enable;
-                return;
-            }
+            hook('S_CREST_INFO', 2, (event) => {
+                glyphs = event.crests;
+            })
+            
+            hook('S_CREST_APPLY', 2, (event) => {
+                let glyph = glyphs.find(g => g.id == event.id);
+                if (glyph) glyph.enable = event.enable;                
+            })
+            
         }
-    })
+    }
     
     function getMaxTargets (skill) {
         switch(skill) {
@@ -288,12 +246,9 @@ module.exports = function AutoHeal(mod) {
     }
     
     function isGlyphEnabled(glyphId) {
-        for(let i = 0; i < glyphs.length; i++) {
-            if (glyphs[i].id == glyphId && glyphs[i].enable) {
-                return true;
-            }
-        }
-        return false;
+        let glyph = glyphs.find(g => g.id == glyphId && g.enable);
+        if (glyph) return true;
+        else return false;        
     }
     
     function sortHp() {
@@ -316,4 +271,5 @@ module.exports = function AutoHeal(mod) {
         }
         console.log(out)
     }
+    
 }

+ 7 - 2
module.json

@@ -2,9 +2,14 @@
     "disableAutoUpdate": false,
 	"name": "auto-heal",
 	"author": "teralove",
-	"description": "Skip lockons and instantly heals/cleanses party members.",
+	"description": "Auto lockon and instantly heal/cleanse party members.",
+    "version": "1/23/2019",
+    "donationUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=PXRFYB39SQP4A", 
 	"options": {
-		"niceName": "Auto-Heal"
+		"niceName": "Auto Heal",
+        "settingsVersion": 1,
+        "settingsFile": "config.json",
+        "settingsMigrator": "settings_migrator.js"    
 	},
     "servers": ["https://raw.githubusercontent.com/teralove/auto-heal/master/"],
     "supportUrl": "https://github.com/teralove/auto-heal/issues"

+ 62 - 0
settings_migrator.js

@@ -0,0 +1,62 @@
+"use strict"
+
+const DefaultSettings = {
+     "skills": {
+        "6": [ // Priest
+            19, // Focus Heal
+            37  // Immersion
+        ],
+        "7": [ // Mystic
+            5, // Titanic Favor
+            9  // Arun's Cleansing Touch
+        ]
+    },
+    
+    "autoCast": true,     // true = skills auto lockon and cast. false = pre-lockon onto targets and casting is done manually
+    "autoHeal": true,     // enable healing skills
+    "autoCleanse": true,  // enable mystic cleanse
+    "hpCutoff": 97,       // (healing only) ignore members that have more HP% than this
+    "maxDistance": 35,    // in-game meters. can work up to 35m
+    "lockSpeed": 5,       // delay for locking on targets.
+    "castSpeed": 10       // delay for casting skills. castSpeed needs to be greater than lockSpeed.
+}
+
+module.exports = function MigrateSettings(from_ver, to_ver, settings) {
+    if (from_ver === undefined) {
+        // Migrate legacy config file
+        return Object.assign(Object.assign({}, DefaultSettings), settings);
+    } else if (from_ver === null) {
+        // No config file exists, use default settings
+        return DefaultSettings;
+    } else {
+        // Migrate from older version (using the new system) to latest one
+        if (from_ver + 1 < to_ver) {
+            // Recursively upgrade in one-version steps
+            settings = MigrateSettings(from_ver, from_ver + 1, settings);
+            return MigrateSettings(from_ver + 1, to_ver, settings);
+        }
+
+        // If we reach this point it's guaranteed that from_ver === to_ver - 1, so we can implement
+        // a switch for each version step that upgrades to the next version. This enables us to
+        // upgrade from any version to the latest version without additional effort!
+        switch(to_ver)
+        {
+			// keep old settings, add new ones
+			default:
+				let oldsettings = settings
+				
+				settings = Object.assign(DefaultSettings, {});
+				
+				for(let option in oldsettings) {
+					if(settings[option]) {
+						settings[option] = oldsettings[option]
+					}
+				}
+
+				if(from_ver < to_ver) console.log('[Auto Heal] Your settings have been updated to version ' + to_ver + '. You can edit the new config file after the next relog.')
+				break;
+        }
+
+        return settings;
+    }
+}