Revert "Add Mercenary Library"

This reverts commit a19ba9b.
kolton · Apr 14, 2019 · 504066a · 504066a
1 parent 788f849
commit 504066a
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 581 deletions.
diff --git a/d2bs/kolbot/default.dbj b/d2bs/kolbot/default.dbj
@@ -22,7 +22,6 @@ 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() {

diff --git a/d2bs/kolbot/libs/GameAction.js b/d2bs/kolbot/libs/GameAction.js
@@ -494,7 +494,7 @@ var GameAction = {
 
 		if (this.LogMerc) {
 			for (i = 0; i < 3; i += 1) {
-				merc = Mercenary.getMerc();
+				merc = me.getMerc();
 
 				if (merc) {
 					break;

diff --git a/d2bs/kolbot/libs/MuleLogger.js b/d2bs/kolbot/libs/MuleLogger.js
@@ -373,7 +373,7 @@ var MuleLogger = {
 
 		if (this.LogMerc) {
 			for (i = 0; i < 3; i += 1) {
-				merc = Mercenary.getMerc();
+				merc = me.getMerc();
 
 				if (merc) {
 					break;

diff --git a/d2bs/kolbot/libs/common/Attack.js b/d2bs/kolbot/libs/common/Attack.js
@@ -164,7 +164,7 @@ var Attack = {
 		var i, merc, item;
 
 		for (i = 0; i < 3; i += 1) {
-			merc = Mercenary.getMerc();
+			merc = me.getMerc();
 
 			if (merc) {
 				break;