Browse Source

GF v106.2

Dmitry Shin 5 years ago
parent
commit
173baa4e50
7 changed files with 354 additions and 372 deletions
  1. 3 0
      .gitignore
  2. 7 7
      README.MD
  3. 0 22
      config.json
  4. 267 281
      index.js
  5. 24 7
      manifest.json
  6. 4 5
      module.json
  7. 49 50
      settings_migrator.js

+ 3 - 0
.gitignore

@@ -0,0 +1,3 @@
+.eslintrc.json
+manifest-generator.bat
+manifest-generator.js

+ 7 - 7
README.MD

@@ -14,20 +14,20 @@ Skip lockons and instantly heals/cleanses party members.
 | Mystic - Arun's Cleansing Touch |
 
 ## Usage
-### `autoheal [on/off]`
+### `autoheal`
 - 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` [on/off]`
+### `autoheal cleanse`
 - Enables/disables auto-cleansing
 - Default is on
-### `autocast [on/off]`
+### `autoheal cast`
 - Enables/disables auto-casting
 - Default is on
+### `autoheal debug`
+- Enables/disables debug
+- Default is off
 
 ## 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)
 
----
+---

+ 0 - 22
config.json

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

+ 267 - 281
index.js

@@ -1,283 +1,269 @@
-'use strict'
+"use strict";
 
 module.exports = function AutoHeal(mod) {
-    
-    let hooks = [],
-        debug = false,
-        playerLocation = {},
-        partyMembers = [],
-        job = -1,
-        glyphs = null;
-    
-    mod.command.add('autoheal', (p1)=> {
-        if (p1) p1 = p1.toLowerCase();
-        if (p1 == null) {
-            mod.settings.autoHeal = !mod.settings.autoHeal;
-        } else if (p1 === 'off') {
-            mod.settings.autoHeal = false;
-        } else if (p1 === 'on') {
-            mod.settings.autoHeal = true;
-        } else if (p1 === 'debug') {
-            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);
-        } else {
-            mod.command.message(p1 +' is an invalid argument');
-            return;
-        }        
-        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) {
-            mod.settings.autoCleanse = !mod.settings.autoCleanse;
-        } else if (p1 === 'off') {
-            mod.settings.autoCleanse = false;
-        } else if (p1 === 'on') {
-            mod.settings.autoCleanse = true;
-        } else {
-            mod.command.message(p1 +' is an invalid argument for cleanse command');
-            return;
-        }
-        mod.command.message('Cleansing ' + (mod.settings.autoCleanse ? 'enabled' : 'disabled'));
-    });
-    
-    mod.command.add('autocast', (p1)=> {
-        if (p1) p1 = p1.toLowerCase();
-        if (p1 == null) {
-            mod.settings.autoCast = !mod.settings.autoCast;
-        } else if (p1 === 'off') {
-            mod.settings.autoCast = false;
-        } else if (p1 === 'on') {
-            mod.settings.autoCast = true;
-        } else {
-            mod.command.message(p1 +' is an invalid argument for cast command');
-            return;
-        }        
-        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();
-    })
-       
-    function hook() {
-        hooks.push(mod.hook(...arguments));
-    }
-    
-    function unload() {
-        if (hooks.length) {
-            for (let h of hooks)
-                mod.unhook(h);
-            hooks = [];
-        }
-    }
-    
-    function load() {
-        if (!hooks.length) {
-            
-            hook('S_PARTY_MEMBER_LIST', 8, (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;
-                            if (copyMember.loc) partyMembers[i].loc = copyMember.loc;
-                        }
-                    }
-                }
-            })
-            
-            hook('S_LEAVE_PARTY', 1, (event) => {
-                partyMembers = [];
-            })
-            
-            hook('C_PLAYER_LOCATION', 5, (event) => {
-                playerLocation = event;
-            })
-            
-            hook('S_SPAWN_ME', 3, (event) => {
-                playerLocation.loc = event.loc;
-                playerLocation.w = event.w;
-            })
-            
-            hook('S_SPAWN_USER', 17, (event) => {
-                if (partyMembers.length != 0) {
-                    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);
-                    }
-                }
-            })
-            
-            hook('S_USER_LOCATION', 6, (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;
-            })
-            
-            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.gameId === event.gameId));
-                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;
-                }
-                let skill = Math.floor(event.skill.id / 10000);
-                
-                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.send('C_CAN_LOCKON_TARGET', 3, {target: targetMembers[i].gameId, skill: event.skill.id});
-                            }, mod.settings.lockSpeed);
-                        }
-                        
-                        if (mod.settings.autoCast) {
-                            setTimeout(() => {
-                                mod.send('C_START_SKILL', 7, Object.assign({}, event, {w: playerLocation.w, skill: (event.skill.id + 10)}));
-                            }, mod.settings.castSpeed);
-                        }
-                    }
-                }
-                
-            })
-
-            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) {
-            case 19: return isGlyphEnabled(28003) ? 4 : 2;
-            case 37: return 1;
-            case 5: return isGlyphEnabled(27000) ? 4 : 2;
-            case 9: return (isGlyphEnabled(27063) || isGlyphEnabled(27003)) ? 5 : 3;
-        }
-        return 1;
-    }
-    
-    function isGlyphEnabled(glyphId) {
-        let glyph = glyphs.find(g => g.id == glyphId && g.enable);
-        if (glyph) return true;
-        else return false;        
-    }
-    
-    function sortHp() {
-        partyMembers.sort(function (a, b) {
-            return parseFloat(a.hpP) - parseFloat(b.hpP);
-        });
-    }
-        
-    function outputDebug(skill) {
-        let out = '\nAutoheal Debug... Skill: ' + skill.id + '\tpartyMemebers.length: ' + partyMembers.length;
-        for (let i = 0; i < partyMembers.length; i++) {
-            out += '\n' + i + '\t';
-            let name = partyMembers[i].name;
-            name += ' '.repeat(21-name.length);
-            let hp = '\tHP: ' + parseFloat(partyMembers[i].hpP).toFixed(2);
-            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 online = '\tOnline: ' + partyMembers[i].online;
-            let alive = '\tAlive: ' + partyMembers[i].alive;
-            let pid = '\tpid: ' + partyMembers[i].playerId + '  gid: ' + partyMembers[i].gameId  ;
-            out += name + hp + dist + online + alive + pid;
-        }
-        console.log(out)
-    }
-    
-}
+	let hooks = [];
+	let debug = false;
+	let playerLocation = null;
+	let job = null;
+	let glyphs = null;
+	let partyMembers = [];
+
+	mod.command.add("autoheal", {
+		"debug": () => {
+			debug = !debug;
+			mod.command.message(`Debug ${ debug ? "enabled" : "disabled"}`);
+		},
+		"cleanse": () => {
+			mod.settings.autoCleanse = !mod.settings.autoCleanse;
+			mod.command.message(`Cleansing ${mod.settings.autoCleanse ? "enabled" : "disabled"}`);
+		},
+		"cast": () => {
+			mod.settings.autoCast = !mod.settings.autoCast;
+			mod.command.message(`Casting ${mod.settings.autoCast ? "enabled" : "disabled"}`);
+		},
+		"$none": () => {
+			mod.settings.autoHeal = !mod.settings.autoHeal;
+			mod.command.message(`Healing ${mod.settings.autoHeal ? `enabled (${mod.settings.hpCutoff}%)` : "disabled"}`);
+		}
+	});
+
+	mod.game.on("enter_game", () => {
+		job = (mod.game.me.templateId - 10101) % 100;
+		(mod.settings.skills[job]) ? load() : unload();
+	});
+
+	function hook() {
+		hooks.push(mod.hook(...arguments));
+	}
+
+	function unload() {
+		hooks.forEach(h => mod.unhook(h));
+		hooks = [];
+	}
+
+	function load() {
+		if (!hooks.length) {
+			hook("S_PARTY_MEMBER_LIST", 9, event => {
+				const copyMembers = partyMembers;
+				partyMembers = event.members.filter(m => m.playerId !== mod.game.me.playerId);
+
+				if (copyMembers) {
+					partyMembers.forEach(partyMember => {
+						if (partyMember.debuffs === undefined) partyMember.debuffs = [];
+
+						const copyMember = copyMembers.find(m => m.playerId === partyMember.playerId);
+
+						if (copyMember) {
+							partyMember.gameId = copyMember.gameId;
+
+							if (copyMember.loc) {
+								partyMember.loc = copyMember.loc;
+							}
+						}
+					});
+				}
+			});
+
+			hook("S_LEAVE_PARTY", 1, () => {
+				partyMembers = [];
+			});
+
+			hook("C_PLAYER_LOCATION", 5, event => {
+				playerLocation = event;
+			});
+
+			hook("S_SPAWN_ME", 3, event => {
+				playerLocation = event;
+			});
+
+			hook("S_SPAWN_USER", 17, event => {
+				if (partyMembers.length != 0) {
+					const 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;
+					}
+				}
+			});
+
+			hook("S_USER_LOCATION", 6, event => {
+				const member = partyMembers.find(m => m.gameId === event.gameId);
+
+				if (member) {
+					member.loc = event.loc;
+				}
+			});
+
+			hook("S_USER_LOCATION_IN_ACTION", 2, event => {
+				const member = partyMembers.find(m => m.gameId === event.gameId);
+
+				if (member) {
+					member.loc = event.loc;
+				}
+			});
+
+			hook("S_INSTANT_DASH", 3, event => {
+				const member = partyMembers.find(m => m.gameId === event.gameId);
+
+				if (member) {
+					member.loc = event.loc;
+				}
+			});
+
+			hook("S_PARTY_MEMBER_CHANGE_HP", 4, event => {
+				if (mod.game.me.playerId == event.playerId) return;
+
+				const 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;
+
+				const 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 => {
+				const 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 => {
+				partyMembers = partyMembers.filter(m => m.playerId !== event.playerId);
+			});
+
+			hook("S_LOGOUT_PARTY_MEMBER", 1, event => {
+				const 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;
+
+				if (event.skill.id / 10 & 1 !== 0) {
+					playerLocation.w = event.w;
+				}
+
+				const skill = Math.floor(event.skill.id / 10000);
+
+				if (mod.settings.skills[job] && mod.settings.skills[job].includes(skill)) {
+					if (skill !== 9 && !mod.settings.autoHeal) return;
+					if (skill === 9 && !mod.settings.autoCleanse) return;
+					if (skill === 9 && partyMembers.length > 4) return;
+
+					const targetMembers = [];
+					const maxTargetCount = getMaxTargets(skill);
+
+					if (skill != 9) sortHp();
+					partyMembers.forEach(partyMember => {
+						if (partyMember.online && partyMember.alive &&
+							partyMember.hpP !== undefined &&
+							partyMember.hpP !== 0 &&
+							(skill === 9 ? true : partyMember.hpP <= mod.settings.hpCutoff) &&
+							partyMember.loc != undefined &&
+							(partyMember.loc.dist3D(playerLocation.loc) / 25) <= mod.settings.maxDistance) {
+							targetMembers.push(partyMember);
+							if (targetMembers.length === maxTargetCount) return;
+						}
+					});
+
+					if (targetMembers.length > 0) {
+						if (debug) {
+							outputDebug(event.skill);
+						}
+
+						const lockSpeed = Array.isArray(mod.settings.lockSpeed) ?
+							Math.random() * (mod.settings.lockSpeed[1] - mod.settings.lockSpeed[0]) + mod.settings.lockSpeed[0] : mod.settings.lockSpeed;
+
+						const castSpeed = Array.isArray(mod.settings.castSpeed) ?
+							Math.random() * (mod.settings.castSpeed[1] - mod.settings.castSpeed[0]) + mod.settings.castSpeed[0] : mod.settings.castSpeed;
+
+						targetMembers.forEach(targetMember =>
+							setTimeout(() => mod.send("C_CAN_LOCKON_TARGET", 3, { target: targetMember.gameId, skill: event.skill.id }), lockSpeed)
+						);
+
+						if (mod.settings.autoCast) {
+							setTimeout(() => mod.send("C_START_SKILL", 7, { ...event, w: playerLocation.w, skill: (event.skill.id + 10) }), castSpeed);
+						}
+					}
+				}
+			});
+
+			hook("S_CREST_INFO", 2, event => {
+				glyphs = event.crests;
+			});
+
+			hook("S_CREST_APPLY", 2, event => {
+				const glyph = glyphs.find(g => g.id === event.id);
+
+				if (glyph) {
+					glyph.enable = event.enable;
+				}
+			});
+		}
+	}
+
+	function getMaxTargets(skill) {
+		switch (skill) {
+			case 19:
+				return isGlyphEnabled(28003) ? 4 : 2;
+			case 37:
+				return 1;
+			case 5:
+				return isGlyphEnabled(27000) ? 4 : 2;
+			case 9:
+				return (isGlyphEnabled(27063) || isGlyphEnabled(27003)) ? 5 : 3;
+		}
+
+		return 1;
+	}
+
+	function isGlyphEnabled(glyphId) {
+		return !!glyphs.find(g => g.id === glyphId && g.enable);
+	}
+
+	function sortHp() {
+		partyMembers.sort((a, b) => parseFloat(a.hpP) - parseFloat(b.hpP));
+	}
+
+	function outputDebug(skill) {
+		let out = `\nAutoheal Debug... Skill: ${skill.id}\tpartyMemebers.length: ${partyMembers.length}`;
+
+		partyMembers.forEach((partyMember, i) => {
+			out += `\n${++i}\t`;
+			out += partyMember.name + " ".repeat(21 - partyMember.name.length);
+			out += `\tHP: ${parseFloat(partyMember.hpP).toFixed(2)}`;
+			out += partyMember.loc ? `\tDist: ${(partyMember.loc.dist3D(playerLocation.loc) / 25).toFixed(2)}` : "\tundefined";
+			// out += `\tVert: ${(Math.abs(partyMember.loc.z - playerLocation.loc.z) / 25).toFixed(2)}`;
+			out += `\tOnline: ${partyMember.online}`;
+			out += `\tAlive: ${partyMember.alive}`;
+			// out += `\tDebuffs: ${partyMember.debuffs}`;
+			out += `\tpid: ${partyMember.playerId}  gid: ${partyMember.gameId}`;
+		});
+
+		console.log(out);
+	}
+};

+ 24 - 7
manifest.json

@@ -1,11 +1,28 @@
 {
     "files": {
-        "config.json": {
-			"overwrite": false,
-			"hash": "587bd6b05d5f53bca6abc0a10a71b5f19fb33512a144b619a0bf469cf7b5d66c"
-		},
-        "index.js": "fe1c7d737522bd8512abbbe66cc50561ac53e29f2835e7b283c0cf1c5d04a234",
-        "module.json": "992ccca15a09437b74caded28d2f6af8fea5c533b2153ab22995e32cea13203b",
-        "settings_migrator.js": "d179ced619b903e02b5591ad25a4070351b777165f028bd274d60567d9a1bd5b"
+        "README.md": "19f7fe960e0178a1b0cfef5d0c0db2bc693af58daf66ada0c356ee9a1ee91b29",
+        "index.js": "90614e5dcbba52e43128a2d0176850c1cd30a237f68d2f857d989b119305ac85",
+        "module.json": "9661f0af57bd514d105427e9a454598f590ad9e1c068aa68b08ca302033742e7",
+        "settings_migrator.js": "f8728d2ae31140b22e6d61d530b4e66809ab4eebb53f1ec7c72793f2c26be934"
+    },
+    "defs": {
+        "C_CAN_LOCKON_TARGET": 3,
+        "C_PLAYER_LOCATION": 5,
+        "C_START_SKILL": 7,
+        "S_BAN_PARTY_MEMBER": 1,
+        "S_CREST_APPLY": 2,
+        "S_CREST_INFO": 2,
+        "S_DEAD_LOCATION": 2,
+        "S_INSTANT_DASH": 3,
+        "S_LEAVE_PARTY": 1,
+        "S_LEAVE_PARTY_MEMBER": 2,
+        "S_LOGOUT_PARTY_MEMBER": 1,
+        "S_PARTY_MEMBER_CHANGE_HP": 4,
+        "S_PARTY_MEMBER_LIST": 9,
+        "S_PARTY_MEMBER_STAT_UPDATE": 3,
+        "S_SPAWN_ME": 3,
+        "S_SPAWN_USER": 17,
+        "S_USER_LOCATION": 6,
+        "S_USER_LOCATION_IN_ACTION": 2
     }
 }

+ 4 - 5
module.json

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

+ 49 - 50
settings_migrator.js

@@ -1,62 +1,61 @@
-"use strict"
+"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": 27,    // in-game meters. can work up to 35m
-    "lockSpeed": 45,       // delay for locking on targets.
-    "castSpeed": 150       // delay for casting skills. castSpeed needs to be greater than lockSpeed.
-}
+	"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
+	"onlyDebuff": true, // cleanse only players with debuffs (uses debuffData.json file)
+	"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. Possible to specify two values as array to select at random.
+	"castSpeed": 10 // delay for casting skills. castSpeed needs to be greater than lockSpeed. Possible to specify two values as array to select at random.
+};
 
 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 (from_ver === undefined) {
+		// Migrate legacy config file
+		return { ...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);
+		}
+
+		const oldsettings = settings;
+		settings = Object.assign(DefaultSettings, {});
 
-        // 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)
-        {
+		// 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]
+				for (const 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.')
+				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;
-    }
-}
+		return settings;
+	}
+};