Merge branch 'master' into jesusalva/innsjesusalva/inns

4 files changed, 0 insertions, 77 deletions

diff --git a/npc/008-4-1/_import.txt b/npc/008-4-1/_import.txt
deleted file mode 100644
index 0f706bbc..00000000
--- a/npc/008-4-1/_import.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// Map 008-4-1: Cave Of Trials
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/008-4-1/_mobs.txt",
-"npc/008-4-1/_warps.txt",
-"npc/008-4-1/boss.txt",
diff --git a/npc/008-4-1/_mobs.txt b/npc/008-4-1/_mobs.txt
deleted file mode 100644
index ad992a8d..00000000
--- a/npc/008-4-1/_mobs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 008-4-1: Cave Of Trials mobs
-008-4-1,106,73,73,63	monster	Cave Maggot	1027,80,30000,2500
-008-4-1,136,71,47,50	monster	Thief Slime	1105,35,50000,2500
-008-4-1,101,83,73,30	monster	AngryCrafty	1103,60,50000,2500
-008-4-1,100,79,32,31	monster	Black Scorpion	1104,14,45000,2500
-008-4-1,94,98,11,9	monster	Green Slime	1024,4,500,2500
diff --git a/npc/008-4-1/_warps.txt b/npc/008-4-1/_warps.txt
deleted file mode 100644
index b1a26ad0..00000000
--- a/npc/008-4-1/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 008-4-1: Cave Of Trials warps
-008-4-1,175,18,0	warp	#008-4-1_175_18	2,0,008-1,165,170
diff --git a/npc/008-4-1/boss.txt b/npc/008-4-1/boss.txt
deleted file mode 100644
index 17b04880..00000000
--- a/npc/008-4-1/boss.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-// Evol Script
-// Author:
-//  Jesusalva
-// Description:
-//  Controls the boss on 008-4-1 and the Master Book Learning
-// see npc/items/master_skillbook.txt for explanation about variables
-
-008-4-1,0,0,0	script	#BossCtrl_008-4-1	NPC_HIDDEN,{
-    end;
-
-// Test server: 15 minutes only
-OnTimer900000:
-    if (!debug)
-        end;
-
-// Otherwise, respawn every hour
-OnTimer3600000:
-    stopnpctimer;
-OnInit:
-    $@MB_00841=0;
-    monster "008-4-1", 67, 30, strmobinfo(1, GameBalance), GameBalance, 1, "#BossCtrl_008-4-1::OnBossDeath";
-    end;
-
-OnBossDeath:
-    initnpctimer;
-    // Only the party which defeated the boss can learn the skill
-    getmapxy(.@m$, .@x, .@y, 0);
-    .@party=getcharid(1);
-    if (.@party > 0)
-    {
-        $@MB_00841=.@party;
-        areatimer("008-4-1", .@x-15, .@y-15, .@x+15, .@y+15, 10, "#BossCtrl_008-4-1::OnBossCheck");
-        mapannounce "008-4-1", "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
-    }
-    else
-    {
-        addtimer(10, "#BossCtrl_008-4-1::OnBegin");
-        mapannounce "008-4-1", "Boss deafeated by: " + strcharinfo(0), bc_all;
-    }
-    end;
-
-OnBossCheck:
-    // TODO: Check if you really fought or was just lurking
-    // Check if party is correct
-    if (getcharid(1) != $@MB_00841)
-        end;
-OnBegin:
-    @mb_BossId=GameBalance;
-    @mb_SkillId=MG_COLDBOLT;
-    @mb_ItemId=Manana; // Placeholder
-    @mb_ItemAm=1;
-    addtimer(15000, "#BossCtrl_008-4-1::OnFinish");
-    end;
-
-OnFinish:
-    @mb_BossId=0;
-    @mb_SkillId=0;
-    @mb_ItemId=0;
-    @mb_ItemAm=0;
-    end;
-
-}