Matsubaa/adventureland
1
0
Fork 0
mirror of https://github.com/gooba42/adventureland.git synced 2026-10-24 05:31:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix 3shot/5shot infinite range

Browse Source
This commit is contained in:
Kent Rasmussen
2024-02-15 07:35:32 +09:00
parent c71e8387a2
commit aa73b6f8cf
1 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node/server.js
+26 -30
View File
@@ -8268,7 +8268,7 @@ function init_io() {
} }
// Range check // Range check
if (target && (gSkill.range || gSkill.use_range)) { const isTargetTooFar = (target) => {
let range = gSkill.range || player.range; let range = gSkill.range || player.range;
if (gSkill.range_multiplier) { if (gSkill.range_multiplier) {
range *= gSkill.range_multiplier; range *= gSkill.range_multiplier;
@@ -8283,12 +8283,19 @@ function init_io() {
const dist = distance(player, target); const dist = distance(player, target);
if (dist > range + player.xrange) { if (dist > range + player.xrange) {
return fail_response("too_far", data.name, { dist: dist, id: target.id }); return true;
} }
if (dist > range) { if (dist > range) {
// xrange was used, reduce it by however much we used // xrange was used, reduce it by however much we used
player.xrange -= dist - range; player.xrange -= dist - range;
} }
return false;
};
if (target && (gSkill.range || gSkill.use_range)) {
if (isTargetTooFar(target)) {
fail_response("too_far", data.name, { dist: dist, id: target.id });
return;
}
} }
// Consume item check // Consume item check
@@ -8671,40 +8678,33 @@ function init_io() {
xy_emit(player, "ui", { type: data.name }); xy_emit(player, "ui", { type: data.name });
} else if (data.name == "3shot" || data.name == "5shot") { } else if (data.name == "3shot" || data.name == "5shot") {
player.halt = true; player.halt = true;
var times = 0; const targeted = {};
var hit = {}; let c_resolve = null;
var reftarget = null;
var targets = 3;
var attack = null;
var c_resolve = null;
if (data.name == "5shot") {
targets = 5;
}
//console.log(data.ids); //console.log(data.ids);
if (is_array(data.ids)) { if (is_array(data.ids)) {
data.ids.forEach(function (id) { // Only look at the first Xshot targets in the array if more are provided
if (times >= targets) { for (const id of data.ids.slice(0, data.name === "5shot" ? 5 : 3)) {
return; if (targeted[id]) {
// Already targeted this monster
continue;
} }
times += 1; targeted[id] = true;
var target = instances[player.in].monsters[id]; target = instances[player.in].monsters[id];
if (!target) { if (!target) {
target = instances[player.in].players[id]; target = instances[player.in].players[id];
} }
if (!target || is_invinc(target) || target.name == player.name) { if (!target || is_invinc(target) || target.name == player.name) {
attack = { failed: true, place: data.name, reason: "no_target" }; continue;
return;
} }
if (hit[id]) { if (isTargetTooFar(target)) {
return; continue;
} }
hit[id] = true; const attack = commence_attack(player, target, data.name);
attack = commence_attack(player, target, data.name);
if (!attack || !attack.projectile) { if (!attack || !attack.projectile) {
return; continue;
} }
if (!c_resolve) { if (!c_resolve) {
reftarget = target; consume_mp(player, gSkill.mp, target);
c_resolve = attack; c_resolve = attack;
attack.pids = [attack.pid]; attack.pids = [attack.pid];
attack.targets = [attack.target]; attack.targets = [attack.target];
@@ -8712,16 +8712,12 @@ function init_io() {
c_resolve.pids.push(attack.pid); c_resolve.pids.push(attack.pid);
c_resolve.targets.push(attack.target); c_resolve.targets.push(attack.target);
} }
// if(times==1 && attack==null) times=40; }
});
} }
consume_mp(player, gSkill.mp, reftarget);
player.halt = false; player.halt = false;
player.to_resend = "u+cid"; player.to_resend = "u+cid";
if (!c_resolve) { if (!c_resolve) {
if (attack) { reject = { failed: true, place: data.name, reason: "no_target" };
reject = attack;
}
disappearing_text(player.socket, player, "NO HITS"); disappearing_text(player.socket, player, "NO HITS");
} else { } else {
resolve = c_resolve; resolve = c_resolve;