Browse Source

2.0 update

teralove 8 years ago
parent
commit
ac7a16732e
3 changed files with 229 additions and 411 deletions
  1. 46 12
      README.MD
  2. 0 31
      format.js
  3. 183 368
      index.js

+ 46 - 12
README.MD

@@ -1,16 +1,50 @@
-# Auto Lockon
+# auto-heal
+tera-proxy module that skips lockons and automatically heals and cleanses party members.
 
 
-- Instantly Focus Heal and cleanse party members without needing to lockon.
+## Dependency
+- `Command` module
 
 
-## Commands:
-* **!autolockon**    - Toggles on/off
+## Usage
+### `autoheal`
+- Toggle on/off
+- Default is on
+### `autocleanse`
+- Toggle on/off
+- Default is on
 
 
-## [Issues](https://github.com/teralove/auto-lockon/issues)
-* incompatible with skill-prediction
-* ghosting, does not compensate for lag. Try different values.
-* Heal targetting is unreliable in raids (I recommend disabling module). No cleanse targetting in raids. Works better in parties only.
+## Info
+- **Skills affected**:
+-- Priest
+--- Focus Heal
+-- Mystic
+--- Titanic Favor
+--- Arun's Cleansing Touch
+- Heal will auto-lockon and immediately heal up to 4 party members with the lowest HP.
+- Mystic's cleanse works only in parties of 5 members or less. Disabled in raids!
+- Skills work up to 35m. You can remove the distance glyph and spend the points elsewhere.
 
 
-## Notes
-* Focus Heal(Priest and Mystic), will auto-lockon and immediately heal 4 party members with the lowest HP. Works up to 35m. Can remove the distance glyph and spend the points elsewhere.
-* Mystic Cleanse, will auto-cleanse everyone in a party. Also works up to 35m. Disabled while in raid because there were some problems prioritizing abnormalities and ignoring uncleansable debuffs. 
-* Still buggy.
+## Changelog
+<details>
+
+    2.01
+    - Renamed module from auto-lockon to auto-heal
+    2.00
+    - Rewrote module
+    - Fixed bug: Casting skills would rotate the player towards north.
+    - Fixed bug: Locking and casting onto dead targets
+    - Added Command dependency
+    - Added autocleanse command
+    - Removed slash support
+    1.20
+    - Added heal skills for or lvl characters. You can use it even if u have lowlvl char.
+    - 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>
+
+---

+ 0 - 31
format.js

@@ -1,31 +0,0 @@
-const entities = {
-  amp: '&',
-  lt: '<',
-  gt: '>',
-  quot: '"',
-  apos: "'",
-};
-
-const reversedEscapeChars = {};
-for (let k in entities) reversedEscapeChars[entities[k]] = k;
-
-module.exports = {
-  stripTags: s => s.replace(/<\/?[^<>]*>/gi, ''),
-
-  escapeHTML: s => s.replace(/[&<>"']/g, m => `&${reversedEscapeChars[m]};`),
-
-  decodeHTMLEntities: s => s
-    .replace(/&#(\d+);?/g, (_, code) => String.fromCharCode(code))
-    .replace(/&#[xX]([A-Fa-f0-9]+);?/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
-    .replace(/&([^;\W]+;?)/g, (m, e) => {
-      const target = entities[e.replace(/;$/, '')];
-      switch (typeof target) {
-        case 'number':
-          return String.fromCharCode(target);
-        case 'string':
-          return target;
-        default:
-          return m;
-      }
-    }),
-};

+ 183 - 368
index.js

@@ -1,370 +1,185 @@
-// vers 0.0.3b
-
-const format = require('./format.js');
-
-Skills = [
-	67298964, // priest heal I
-	67299064, // priest heal II
-	67299164, // priest heal III
-	67299264, // priest heal IV
-	67299364, // priest heal V
-	67299464, // priest heal VI
-	67299564, // priest heal VII
-	67299664, // priest heal VIII
-	67299764, // priest heal IX
-
-	67158964, // mystic heal I
-	67159064, // mystic heal II
-	67159164, // mystic heal III
-	67159264, // mystic heal IV
-	67159364, // mystic heal V
-	67159464, // mystic heal VI
-	67159564, // mystic heal VII
-	67159664, // mystic heal VIII
-	67159764, // mystic heal IX
-	67159864, // mystic heal X
-	67198964 // mystic cleanse
-];
-
-    // lockOn : auto cast
-LockOnCast = {
-	67298964: 67298974, // priest focus heal I
-	67299064: 67299074, // priest focus heal II
-	67299164: 67299174, // priest focus heal III
-	67299264: 67299274, // priest focus heal IV
-	67299364: 67299374, // priest focus heal V
-	67299464: 67299474, // priest focus heal VI
-	67299564: 67299574, // priest focus heal VII
-	67299664: 67299674, // priest focus heal VIII
-	67299764: 67299774, // priest focus heal IX
-
-	67158964: 67158974, // mystic focus heal I
-	//67159064: 67159074, // mystic focus heal II
-	//67159164: 67159174, // mystic focus heal III
-	//67159264: 67159274, // mystic focus heal IV
-	//67159364: 67159374, // mystic focus heal V
-	//67159464: 67159474, // mystic focus heal VI
-	//67159564: 67159574, // mystic focus heal VII
-	//67159664: 67159674, // mystic focus heal VIII
-	//67159764: 67159774, // mystic focus heal IX
-	//67159864: 67159874, // mystic focus heal X
-	67198964: 67198974  // mystic cleanse
-};
-
-
-module.exports = function AutoLockon(dispatch) {
-
-	const MAXIMUM_DISTANCE = 900;  //~35 meters, ignore members further than this
-	const MAXIMUM_HP = 0.97;       //(healing) ignore members that have more HP% than this
-
-	let enabled = false,
-	userId;
-
-	let playerLocation = {x: 0, y: 0, z: 0};
-	let locations = [];
-
-	let partyMemberList = [];
-	let partyMemberStats = [];
-	let playerBuffs = [];
-
-	dispatch.hook('S_LOGIN', 2, (event) => {
-		userId = event.playerId;
-		let job = event.model % 100;
-		(job != 7 && job != 8) ? enabled = false : enabled = true;
-	})
-
-	dispatch.hook('S_LEAVE_PARTY', 1, (event) => {
-		if (!enabled) return;
-
-		//playerLocation = {x: 0, y: 0, z: 0};
-		locations = [];
-		partyMemberList = [];
-		partyMemberStats = [];
-		playerBuffs = [];
-	})
-
-	dispatch.hook('C_PLAYER_LOCATION', 1, (event) => {
-		if (!enabled) return;
-
-		playerLocation.x = event.x1;
-		playerLocation.y = event.y1;
-		playerLocation.z = event.z1;
-	})
-
-	dispatch.hook('S_USER_LOCATION', 1, (event) => {
-		if (!enabled) return;
-
-		if (!partyMemberList || !partyMemberList.members) return;
-
-		let playerIsInParty = false;
-		for (let i in partyMemberList.members) {
-			if (partyMemberList.members[i].cid - event.target == 0) {
-				playerIsInParty = true;
-			}
-		}
-		if (!playerIsInParty) return;
-
-		for (let i in locations) {
-			if (locations[i].target - event.target == 0) {
-				locations[i].x = event.x1;
-				locations[i].y = event.y1;
-				locations[i].z = event.z1;
-				return;
-			}
-		}
-
-		locations.push({
-			target: event.target,
-			x: event.x1,
-			y: event.y1,
-			z: event.z1
-		});
-	})
-
-	dispatch.hook('S_PARTY_MEMBER_CHANGE_HP', 3, (event) => {
-
-		if (!enabled || event.playerId == userId) return;
-
-		for (let i in partyMemberStats) {
-			if (partyMemberStats[i].playerId == event.playerId) {
-				partyMemberStats[i].percHp = (event.currentHp / event.maxHp);
-				return;
-			}
-		}
-
-		partyMemberStats.push({
-			cid: getPlayerCid(event.playerId),
-			playerId: event.playerId,
-			percHp: (event.currentHp / event.maxHp)
-		});
-
-	})
-
-
-	dispatch.hook('C_START_SKILL', 1, (event) => {
-		if (!enabled) return;
-
-		if (Skills.includes(event.skill)) {
-
-			let targetMembers;
-			if (event.skill == 67198964 || event.skill == 67198974) {
-				targetMembers = getMembersToCleanse();
-			} else {
-				targetMembers = getMembersToHeal();
-
-			}
-
-			if (targetMembers && targetMembers.length > 0) {
-				for (let i in targetMembers) {
-					setTimeout(() => {
-						dispatch.toServer('C_CAN_LOCKON_TARGET', 1, {
-							target: targetMembers[i].cid,
-							unk: 0,
-							skill: event.skill
-						})
-					}, 5);
-
-					setTimeout(() => {
-						dispatch.toClient('S_CAN_LOCKON_TARGET', 1, {
-							target: targetMembers[i].cid,
-							unk: 0,
-							skill: event.skill,
-							ok: 1
-						})
-					}, 60);
-				}
-
-				setTimeout(() => {
-					let newEvent = event;
-					newEvent.skill = LockOnCast[event.skill];
-					if (newEvent.skill) {
-						dispatch.toServer('C_START_SKILL', 1, newEvent);
-					}
-				}, 120);
-
-			}
-		}
-	})
-
-
-	dispatch.hook('S_PARTY_MEMBER_LIST', 5, (event) => {
-
-		if (!enabled) return;
-		locations = [];
-		partyMemberList = event;
-		partyMemberStats = [];
-		playerBuffs = [];
+// OP Required
+// - S_LOGIN
+// - S_SPAWN_ME
+// - S_PARTY_MEMBER_LIST
+// - S_LEAVE_PARTY
+// - C_PLAYER_LOCATION
+// - S_SPAWN_USER
+// - S_USER_LOCATION
+// - S_PARTY_MEMBER_CHANGE_HP
+// - C_START_SKILL
+const Command = require('command');
+
+module.exports = function AutoHeal(dispatch) {
+    
+    const Skills = {
+        6: [ // Priest
+            19 // Focus Heal
+        ],
+        7: [ // Mystic
+            5, // Titanic Favor
+            9  // Arun's Cleansing Touch
+        ]
+    };
+    
+    const MaxDistance = 900;  //~35 meters
+    const MaxHp = 0.97;       //(healing) ignore members that have more HP% than this
+    
+    let enabled = true,
+        autoCleanse = true,
+        playerId = 0,
+        playerLocation = null,
+        partyMembers = [],
+        job;
+        
+    const command = Command(dispatch);
+    
+    command.add('autoheal', ()=> {
+        enabled = !enabled;
+        command.message('(auto-heal) ' + (enabled ? 'enabled' : 'disabled'));
+    });
+    
+    command.add('autocleanse', ()=> {
+        autoCleanse = !autoCleanse;
+        command.message('(auto-heal) Cleansing ' + (enabled ? 'enabled' : 'disabled'));
+    });
+    
+    dispatch.hook('S_LOGIN', 9, (event) => {
+        playerId = event.playerId;
+        job = (event.templateId - 10101) % 100;
+        (job == 6 || job == 7) ? enabled = true : enabled = false; 
     })
     })
-
-	function getMembersToCleanse()
-	{
-		let result = [];
-		if (!partyMemberList) {
-			return result;
-		}
-
-		if (partyMemberList.members) {
-			if (partyMemberList.members.length > 5) { //in a raid
-			}
-			else // not in a raid
-			{
-				for (let i in partyMemberList.members) {
-					if (partyMemberList.members[i].playerId != userId) {
-						if (getDistanceFromMe(partyMemberList.members[i].cid) > MAXIMUM_DISTANCE) continue;
-						if (isPlayerDead(partyMemberList.members[i].cid)) continue;
-
-						// TODO: Check if player has abnormality?
-
-						result.push({cid: partyMemberList.members[i].cid});
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	function getMembersToHeal() {
-		let result = [];
-		// get list of players that need heals and can be healed
-		for (let i in partyMemberStats) {
-			if (getDistanceFromMe(partyMemberStats[i].cid) >= MAXIMUM_DISTANCE)  // too far away
-				continue;
-            if (partyMemberStats[i].percHp > MAXIMUM_HP || partyMemberStats[i].percHp == 0)
-                continue;
-
-			result.push(partyMemberStats[i]);
-		}
-		// if in a raid, make sure only 4 maximum is locked on
-		if (partyMemberStats.length > 4) {
-			// trim out the strongest ones
-			while (result.length > 4) {
-				let highestHp = 0;
-				let foundIndex = -1;
-				for (let i in result) {
-					if (highestHp <= result[i].percHp) { // remove healthiest player
-						highestHp = result[i].percHp;
-						foundIndex = i;
-					}
-					result.splice(foundIndex, 1);
-				}
-			}
-		}
-		return result;
-	}
-
-	function trimFarAwayPlayers(arr) {
-		for(let i = 0; i < arr.length; i++) {
-			if (getDistanceFromMe(arr[i].cid) >= MAXIMUM_DISTANCE) {
-				arr.splice(i, 1);
-				break;
-			}
-		}
-		return arr;
-	}
-
-	function trimFullHealthAndDeadPlayers(arr) {
-		for(let i = 0; i < arr.length; i++) {
-			if (arr[i].percHp > MAXIMUM_HP || arr[i].percHp == 0) {
-				arr.splice(i, 1);
-				break;
-			}
-		}
-		return arr;
-	}
-
-	function trimDeadPlayers(arr) {
-		for(let i = 0; i < arr.length; i++) {
-			if (arr[i].percHp == 0) {
-				arr.splice(i, 1);
-				break;
-			}
-		}
-		return arr;
-	}
-
-	function isPlayerDead(cid) {
-		for(let i = 0; i < partyMemberStats.length; i++) {
-			if (partyMemberStats[i].cid - cid == 0) {
-				if (partyMemberStats[i].percHp == 0) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	function getDistanceFromMe(target) {
-
-		let result = 999999;
-		let difference = {x: 0, y: 0, z: 0};
-
-		let targetLocation;
-		for (let i in locations) {
-			if (locations[i].target - target == 0) {
-				targetLocation = locations[i];
-			}
-		}
-
-		if (playerLocation && targetLocation) {
-			difference.x = playerLocation.x - targetLocation.x;
-			difference.y = playerLocation.y - targetLocation.y;
-			difference.z = playerLocation.z - targetLocation.z;
-
-			result = Math.sqrt(
-				Math.pow(difference.x, 2) +
-				Math.pow(difference.y, 2) +
-				Math.pow(difference.z, 2));
-
-		}
-		return result;
-	}
-
-
-	function getPlayerCid(playerId) {
-		let result;
-		for(let i in partyMemberList.members) {
-			if (partyMemberList.members[i].playerId == playerId)
-				return partyMemberList.members[i].cid;
-		}
-		return result;
-	}
-
-    const chatHook = event => {
-		let command = format.stripTags(event.message).split(' ');
-
-		if (['!autolockon'].includes(command[0].toLowerCase())) {
-			toggleModule();
-			return false;
-		}
-	}
-	dispatch.hook('C_CHAT', 1, chatHook)
-	dispatch.hook('C_WHISPER', 1, chatHook)
-
-	// slash support
-	try {
-		const Slash = require('slash')
-		const slash = new Slash(dispatch)
-		slash.on('autolockon', args => toggleModule())
-	} catch (e) {
-		// do nothing because slash is optional
-	}
-
-	function toggleModule() {
-		enabled = !enabled;
-		systemMessage((enabled ? 'enabled' : 'disabled'));
-	}
-
-	function systemMessage(msg) {
-		dispatch.toClient('S_CHAT', 1, {
-			channel: 1,//24,
-			authorID: 0,
-			unk1: 0,
-			gm: 0,
-			unk2: 0,
-			authorName: '',
-			message: ' (auto-lockon) ' + msg
-		});
-	}
-
+        
+    dispatch.hook('S_SPAWN_ME', 2, (event) => {
+        playerLocation = event.loc;
+    })
+    
+    dispatch.hook('S_PARTY_MEMBER_LIST', 6, (event) => {
+        partyMembers = event.members;
+        for (let i = 0; i < partyMembers.length; i++) {
+            if (partyMembers[i].playerId == playerId) {
+                partyMembers.splice(i, 1);
+                return;
+            }
+        }
+    })
+    
+    dispatch.hook('S_LEAVE_PARTY', 1, (event) => {
+        partyMembers = [];
+    })
+    
+    dispatch.hook('C_PLAYER_LOCATION', 3, (event) => {
+        playerLocation = event.loc;
+    })
+    
+    dispatch.hook('S_USER_LOCATION', 3, (event) => {
+        if (partyMembers.length != 0) {
+            for (let i = 0; i < partyMembers.length; i++) {
+                if (partyMembers[i].gameId.equals(event.gameId)) {
+                    partyMembers[i].loc = event.loc;
+                    return;
+                }
+            }
+        }
+    })
+    
+    dispatch.hook('S_SPAWN_USER', 13, (event) => {
+        if (partyMembers.length != 0) {
+            for (let i = 0; i < partyMembers.length; i++) {
+                if (partyMembers[i].gameId.equals(event.gameId)) {
+                    partyMembers[i].loc = event.loc;
+                    partyMembers[i].hpP = (event.alive ? 1 : 0);
+                    return;
+                }
+            }
+        }
+    })
+    
+    dispatch.hook('S_PARTY_MEMBER_CHANGE_HP', 3, (event) => {
+        if (playerId == event.playerId) return;
+        
+        for (let i = 0; i < partyMembers.length; i++) {
+            if (partyMembers[i].playerId == event.playerId) {
+                partyMembers[i].hpP = event.currentHp / event.maxHp;
+                return;
+            }
+        }
+    })
+    
+    dispatch.hook('C_START_SKILL', 4, (event) => {
+        if (!enabled) return;
+        if (partyMembers.length == 0) return; // be in a party
+        if ((event.skill - 0x4000000) / 10 & 1 != 0) return; // is casting (opposed to locking on)
+            
+        let skill = Math.floor((event.skill - 0x4000000) / 10000);
+        if(Skills[job] && Skills[job].includes(skill)) {
+            
+            let targetMembers = [];
+            if (job == 7 && skill == 9 && autoCleanse) {
+                targetMembers = getMembersToCleanse();
+            } else {
+                targetMembers = getMembersToHeal();
+            }
+            
+            if (targetMembers.length > 0) {
+                for (let i = 0; i < targetMembers.length; i++) {
+                    setTimeout(() => {
+                        dispatch.toServer('C_CAN_LOCKON_TARGET', 1, {target: targetMembers[i].gameId, skill: event.skill});
+                    }, 5);
+                    setTimeout(() => {
+                        dispatch.toClient('S_CAN_LOCKON_TARGET', 1, {target: targetMembers[i].gameId, skill: event.skill, ok: true})
+                    }, 60);
+                }
+                
+                setTimeout(() => {
+                    dispatch.toServer('C_START_SKILL', 4, Object.assign({}, event, {skill: (event.skill + 10)}));
+                }, 120);
+            }
+        }
+    })
+    
+    function getMembersToCleanse() {
+        let result = [];
+        
+        if (partyMembers.length > 4) { 
+            // in a raid
+        } else { 
+            // not in a raid
+            for (let i = 0; i < partyMembers.length; i++) {
+                if (partyMembers[i].online &&
+                    partyMembers[i].hpP != undefined &&
+                    partyMembers[i].hpP > 0 &&
+                    partyMembers[i].loc != undefined &&
+                    partyMembers[i].loc.dist3D(playerLocation) < MaxDistance) {
+                        result.push(partyMembers[i]);
+                    }
+            }
+        }
+        return result;
+    }
+    
+    function sortHp() {
+        partyMembers.sort(function (a, b) {
+            return parseFloat(a.hpP) - parseFloat(b.hpP);
+        });
+    }
+    
+    function getMembersToHeal() {
+        let result = [];
+        
+        sortHp();
+        for (let i = 0; i < partyMembers.length; i++) {
+            if (partyMembers[i].online &&
+                partyMembers[i].hpP != undefined &&
+                partyMembers[i].hpP > 0 && 
+                partyMembers[i].hpP < MaxHp && 
+                partyMembers[i].loc != undefined &&
+                partyMembers[i].loc.dist3D(playerLocation) < MaxDistance) {
+                    result.push(partyMembers[i]);
+                    if (result.length == 4) break;
+                }
+        }
+        return result;
+    }
+    
 }
 }