summaryrefslogtreecommitdiff
path: root/npc/027-2_Caretakers_House
diff options
context:
space:
mode:
authorWombat <hpwombat@yahoo.com>2011-02-22 11:30:42 -0500
committerJessica Tölke <jtoelke@mail.upb.de>2011-03-01 17:12:44 +0100
commit707756cb63fa4ec02d212137e011d9849d4edf06 (patch)
tree6d33d498c2a3cff64939e67f4d18d6d197260e2a /npc/027-2_Caretakers_House
parent0ebda301eb4e0b4dca8f9f9ba1f17250901bab76 (diff)
downloadserverdata-707756cb63fa4ec02d212137e011d9849d4edf06.tar.gz
serverdata-707756cb63fa4ec02d212137e011d9849d4edf06.tar.bz2
serverdata-707756cb63fa4ec02d212137e011d9849d4edf06.tar.xz
serverdata-707756cb63fa4ec02d212137e011d9849d4edf06.zip
fix to 012-4 removing "terranite island" and map changes from converter
012-4.tmx removed terranite island where monsters were spawning and couldn't be killed. Ran the java converter afterwards and recieved a number of changes Those changes added to this patch for review. Amendment: marked out ("//") golbenez and alacrius inside their scripts. This is to be done instead of marking out inside _import.txt.
Diffstat (limited to 'npc/027-2_Caretakers_House')
-rw-r--r--npc/027-2_Caretakers_House/_import.txt6
-rwxr-xr-xnpc/027-2_Caretakers_House/alacrius2.txt2
2 files changed, 4 insertions, 4 deletions
diff --git a/npc/027-2_Caretakers_House/_import.txt b/npc/027-2_Caretakers_House/_import.txt
index 4dbb7fcb..7e19c61f 100644
--- a/npc/027-2_Caretakers_House/_import.txt
+++ b/npc/027-2_Caretakers_House/_import.txt
@@ -2,18 +2,18 @@ map: 027-2.gat
npc: npc/027-2_Caretakers_House/_mobs.txt
npc: npc/027-2_Caretakers_House/_warps.txt
npc: npc/027-2_Caretakers_House/alacrius.txt
-//npc: npc/027-2_Caretakers_House/alacrius2.txt
+npc: npc/027-2_Caretakers_House/alacrius2.txt
npc: npc/027-2_Caretakers_House/caretaker.txt
npc: npc/027-2_Caretakers_House/cerhan.txt
-npc: npc/027-2_Caretakers_House/evil_guard.txt
+npc: npc/027-2_Caretakers_House/crying_child.txt
npc: npc/027-2_Caretakers_House/diary.txt
npc: npc/027-2_Caretakers_House/door.txt
+npc: npc/027-2_Caretakers_House/evil_guard.txt
npc: npc/027-2_Caretakers_House/golbenez.txt
npc: npc/027-2_Caretakers_House/gy_inn_shops.txt
npc: npc/027-2_Caretakers_House/headless_man.txt
npc: npc/027-2_Caretakers_House/husband.txt
npc: npc/027-2_Caretakers_House/innkeeper.txt
-npc: npc/027-2_Caretakers_House/crying_child.txt
npc: npc/027-2_Caretakers_House/lover.txt
npc: npc/027-2_Caretakers_House/testnpcs.txt
npc: npc/027-2_Caretakers_House/werewolf.txt
diff --git a/npc/027-2_Caretakers_House/alacrius2.txt b/npc/027-2_Caretakers_House/alacrius2.txt
index bd2c90a3..aa5eda08 100755
--- a/npc/027-2_Caretakers_House/alacrius2.txt
+++ b/npc/027-2_Caretakers_House/alacrius2.txt
@@ -1,6 +1,6 @@
// Starts the reaper quest
-027-2.gat,107,29,0 script Alacrius 313,{
+//027-2.gat,107,29,0 script Alacrius 313,{
if ($@FIGHT_ALACRIUS_STATUS != 0) goto L_Enjoy;