Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mercenary #1448

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Mercenary #1448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
77a7a6e
Add Mercenary Library
MikeKGilmore Apr 11, 2019
5396d39
Remove code irrelevant to Mercenary library
MikeKGilmore Apr 12, 2019
4c3ae08
Change Pather.pathTo call to Pather.moveTo
MikeKGilmore Apr 14, 2019
0b0c789
Fix code style issues in Mercenary.js
MikeKGilmore Apr 14, 2019
a5d76ff
Improve behavior when determining whether a merc is needed
MikeKGilmore Apr 14, 2019
bd78d83
Merge branch 'master' into Mercenary
MikeKGilmore Apr 15, 2019
8caf6c7
Fix bug in getMerc(), change me.getMerc to this.getMerc()
MikeKGilmore Apr 16, 2019
924df4f
[Mercenary] Correct behavior of hasMerc()
MikeKGilmore May 2, 2019
69a7474
Implement fixes/changes requested in PR
MikeKGilmore May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions d2bs/kolbot/default.dbj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ include("common/Precast.js");
include("common/Prototypes.js");
include("common/Runewords.js");
include("common/Storage.js");
include("common/Mercenary.js");
include("common/Town.js");

function main() {
Expand Down
2 changes: 1 addition & 1 deletion d2bs/kolbot/libs/GameAction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ var GameAction = {

if (this.LogMerc) {
for (i = 0; i < 3; i += 1) {
merc = me.getMerc();
merc = Mercenary.getMerc();

if (merc) {
break;
Expand Down
2 changes: 1 addition & 1 deletion d2bs/kolbot/libs/MuleLogger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ var MuleLogger = {

if (this.LogMerc) {
for (i = 0; i < 3; i += 1) {
merc = me.getMerc();
merc = Mercenary.getMerc();

if (merc) {
break;
Expand Down
2 changes: 1 addition & 1 deletion d2bs/kolbot/libs/common/Attack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ var Attack = {
var i, merc, item;

for (i = 0; i < 3; i += 1) {
merc = me.getMerc();
merc = Mercenary.getMerc();

if (merc) {
break;
Expand Down
6 changes: 3 additions & 3 deletions d2bs/kolbot/libs/common/Attacks/Amazon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var ClassAttack = {
doAttack: function (unit, preattack) {
var needRepair = Town.needRepair();

if ((Config.MercWatch && Town.needMerc()) || needRepair.length > 0) {
if ((Config.MercWatch && Mercenary.needMerc()) || needRepair.length > 0) {
Town.visitTown(!!needRepair.length);
}

Expand Down Expand Up @@ -74,7 +74,7 @@ var ClassAttack = {

if (result === 2 && Config.TeleStomp && Attack.checkResist(unit, "physical") && !!me.getMerc()) {
while (Attack.checkMonster(unit)) {
if (Town.needMerc()) {
if (Mercenary.needMerc()) {
if (Config.MercWatch && mercRevive++ < 1) {
Town.visitTown();
} else {
Expand Down Expand Up @@ -213,4 +213,4 @@ var ClassAttack = {

return 1;
}
};
};
4 changes: 2 additions & 2 deletions d2bs/kolbot/libs/common/Attacks/Assassin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var ClassAttack = {
trapRange: 20,

doAttack: function (unit, preattack) {
if (Config.MercWatch && Town.needMerc()) {
if (Config.MercWatch && Mercenary.needMerc()) {
Town.visitTown();
}

Expand Down Expand Up @@ -98,7 +98,7 @@ var ClassAttack = {

if (result === 2 && Config.TeleStomp && Attack.checkResist(unit, "physical") && !!me.getMerc()) {
while (Attack.checkMonster(unit)) {
if (Town.needMerc()) {
if (Mercenary.needMerc()) {
if (Config.MercWatch && mercRevive++ < 1) {
Town.visitTown();
} else {
Expand Down
2 changes: 1 addition & 1 deletion d2bs/kolbot/libs/common/Attacks/Barbarian.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var ClassAttack = {
doAttack: function (unit, preattack) {
var needRepair = Town.needRepair();

if ((Config.MercWatch && Town.needMerc()) || needRepair.length > 0) {
if ((Config.MercWatch && Mercenary.needMerc()) || needRepair.length > 0) {
Town.visitTown(!!needRepair.length);
}

Expand Down
4 changes: 2 additions & 2 deletions d2bs/kolbot/libs/common/Attacks/Druid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

var ClassAttack = {
doAttack: function (unit, preattack) {
if (Config.MercWatch && Town.needMerc()) {
if (Config.MercWatch && Mercenary.needMerc()) {
Town.visitTown();
}

Expand Down Expand Up @@ -77,7 +77,7 @@ var ClassAttack = {

if (result === 2 && Config.TeleStomp && Attack.checkResist(unit, "physical") && !!me.getMerc()) {
while (Attack.checkMonster(unit)) {
if (Town.needMerc()) {
if (Mercenary.needMerc()) {
if (Config.MercWatch && mercRevive++ < 1) {
Town.visitTown();
} else {
Expand Down
4 changes: 2 additions & 2 deletions d2bs/kolbot/libs/common/Attacks/Necromancer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ var ClassAttack = {
this.initCurses();
}

if (Config.MercWatch && Town.needMerc()) {
if (Config.MercWatch && Mercenary.needMerc()) {
Town.visitTown();
}

Expand Down Expand Up @@ -167,7 +167,7 @@ var ClassAttack = {
this.explodeCorpses(unit);
} else if (result === 2 && Config.TeleStomp && Attack.checkResist(unit, "physical") && !!me.getMerc()) {
while (Attack.checkMonster(unit)) {
if (Town.needMerc()) {
if (Mercenary.needMerc()) {
if (Config.MercWatch && mercRevive++ < 1) {
Town.visitTown();
} else {
Expand Down
4 changes: 2 additions & 2 deletions d2bs/kolbot/libs/common/Attacks/Paladin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

var ClassAttack = {
doAttack: function (unit, preattack) {
if (Config.MercWatch && Town.needMerc()) {
if (Config.MercWatch && Mercenary.needMerc()) {
print("mercwatch");
Town.visitTown();
}
Expand Down Expand Up @@ -61,7 +61,7 @@ var ClassAttack = {

if (result === 2 && Config.TeleStomp && Attack.checkResist(unit, "physical") && !!me.getMerc()) {
while (Attack.checkMonster(unit)) {
if (Town.needMerc()) {
if (Mercenary.needMerc()) {
if (Config.MercWatch && mercRevive++ < 1) {
Town.visitTown();
} else {
Expand Down
4 changes: 2 additions & 2 deletions d2bs/kolbot/libs/common/Attacks/Sorceress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

var ClassAttack = {
doAttack: function (unit, preattack) {
if (Config.MercWatch && Town.needMerc()) {
if (Config.MercWatch && Mercenary.needMerc()) {
print("mercwatch");
Town.visitTown();
}
Expand Down Expand Up @@ -114,7 +114,7 @@ var ClassAttack = {

if (result === 2 && Config.TeleStomp && Attack.checkResist(unit, "physical") && !!me.getMerc() && Attack.validSpot(unit.x, unit.y)) {
while (Attack.checkMonster(unit)) {
if (Town.needMerc()) {
if (Mercenary.needMerc()) {
if (Config.MercWatch && mercRevive++ < 1) {
Town.visitTown();
} else {
Expand Down
4 changes: 2 additions & 2 deletions d2bs/kolbot/libs/common/Attacks/Wereform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

var ClassAttack = {
doAttack: function (unit, preattack) {
if (Config.MercWatch && Town.needMerc()) {
if (Config.MercWatch && Mercenary.needMerc()) {
Town.visitTown();
}

Expand Down Expand Up @@ -69,7 +69,7 @@ var ClassAttack = {

if (result === 2 && Config.TeleStomp && Attack.checkResist(unit, "physical") && !!me.getMerc()) {
while (Attack.checkMonster(unit)) {
if (Town.needMerc()) {
if (Mercenary.needMerc()) {
if (Config.MercWatch && mercRevive++ < 1) {
Town.visitTown();
} else {
Expand Down
Loading