summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/item_db.conf4
-rw-r--r--npc/002-2/ratto.txt2
-rw-r--r--npc/003-1/_warps.txt9
-rw-r--r--npc/003-1/lieutenantdausen.txt36
4 files changed, 26 insertions, 25 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index ce8bf6328..fb4cfb9ab 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2631,7 +2631,7 @@ item_db: (
},
{
Id: 579
- AegisName: "Forest Card"
+ AegisName: "ForestCard"
Name: "Forest Card"
Type: "IT_HEALING"
Buy: 50
@@ -5475,7 +5475,7 @@ item_db: (
},
{
Id: 800
- AegisName: "Lazurite Heart"
+ AegisName: "LazuriteHeart"
Name: "Lazurite Heart"
Type: "IT_ETC"
Buy: 10000
diff --git a/npc/002-2/ratto.txt b/npc/002-2/ratto.txt
index 39827420a..32499f437 100644
--- a/npc/002-2/ratto.txt
+++ b/npc/002-2/ratto.txt
@@ -17,7 +17,7 @@
// [8] = Shows how many seconds passed since ratto number 4 died.
// [9] = Shows how many seconds passed since the player started the quest.
-000-2,47,30,0 script RattosControl NPC_HIDDEN,{
+002-2,47,30,0 script RattosControl NPC_HIDDEN,{
OnSpawn:
areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index 16531a287..e73d16ada 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -1,18 +1,19 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Some warps were manually disabled because missing map
// Map 003-1: Tulimshar warps
003-1,49,72,0 warp #003-1_49_72 0,0,003-2,35,40
003-1,46,72,0 warp #003-1_46_72 0,0,003-2,32,40
003-1,52,72,0 warp #003-1_52_72 0,0,003-2,38,40
003-1,56,99,0 warp #003-1_56_99 0,0,003-3,39,40
-003-1,54,137,0 warp #003-1_54_137 0,0,003-4,35,40
+//003-1,54,137,0 warp #003-1_54_137 0,0,003-4,35,40
003-1,51,119,0 warp #003-1_51_119 0,0,003-1,82,119
003-1,81,119,0 warp #003-1_81_119 0,0,003-1,52,119
003-1,96,144,0 warp #003-1_96_144 0,0,003-5,38,40
-003-1,106,147,0 warp #003-1_106_147 0,0,003-6,35,40
-003-1,112,147,0 warp #003-1_112_147 0,0,003-6,35,40
+//003-1,106,147,0 warp #003-1_106_147 0,0,003-6,35,40
+//003-1,112,147,0 warp #003-1_112_147 0,0,003-6,35,40
003-1,111,137,0 warp #003-1_111_137 0,0,003-7,39,40
003-1,107,132,0 warp #003-1_107_132 0,0,003-7,29,31
003-1,112,100,0 warp #003-1_112_100 0,0,003-8,31,43
-003-1,82,68,0 warp #003-1_82_68 0,0,003-9,35,40
+//003-1,82,68,0 warp #003-1_82_68 0,0,003-9,35,40
003-1,51,65,0 warp #003-1_51_65 0,0,003-2,42,34
003-1,115,93,0 warp #003-1_115_93 0,0,003-8,41,28
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 0c9d739d7..30b4cfdb0 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -83,7 +83,7 @@ function script CheckGuard {
003-1,98,100,0 script Guard Philip 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant(); // FIXME and everywhere else: Missing Function
}
end;
OnInit:
@@ -94,7 +94,7 @@ OnInit:
003-1,98,121,0 script Guard Defou 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -105,7 +105,7 @@ OnInit:
003-1,102,121,0 script Guard Avou 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -116,7 +116,7 @@ OnInit:
003-1,58,158,0 script Guard Benji 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -127,7 +127,7 @@ OnInit:
003-1,62,158,0 script Guard Valou 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -138,7 +138,7 @@ OnInit:
003-1,71,138,0 script Guard Nutelo 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -149,7 +149,7 @@ OnInit:
003-1,58,128,0 script Guard Moustacha 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -160,7 +160,7 @@ OnInit:
003-1,58,100,0 script Guard Popaul 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -171,7 +171,7 @@ OnInit:
003-1,51,73,0 script Guard Yen 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -182,7 +182,7 @@ OnInit:
003-2,41,37,0 script Guard Youn 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -193,7 +193,7 @@ OnInit:
003-1,54,52,0 script Guard Maxim 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -204,7 +204,7 @@ OnInit:
003-1,50,36,0 script Guard Totor 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -215,7 +215,7 @@ OnInit:
003-1,53,36,0 script Guard Roukin 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -226,7 +226,7 @@ OnInit:
003-1,35,34,0 script Guard Falko 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -237,7 +237,7 @@ OnInit:
003-3,39,37,0 script Guard Malindax 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -248,7 +248,7 @@ OnInit:
003-1,111,101,0 script Guard Fromag 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -259,7 +259,7 @@ OnInit:
003-1,102,80,0 script Guard Tetric 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit:
@@ -270,7 +270,7 @@ OnInit:
003-1,107,80,0 script Guard Biscop 451,{
if (getq(CandorQuest_HAS) == 1)
{
- CheckEnfant();
+ //CheckEnfant();
}
end;
OnInit: