From 40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Wed, 30 Mar 2016 19:52:24 -0400
Subject: slowly getting things done

explain the debug spell is deprecated

upmarmu typo

cooldown fix

make maps with updated converter, make nodes

update permissions
---
 world/map/npc/007-2/_import.txt |  1 +
 world/map/npc/007-2/_mobs.txt   |  6 ------
 world/map/npc/007-2/_nodes.txt  |  4 ++++
 world/map/npc/007-2/witch.txt   | 38 +++++++++++++++++++++-----------------
 4 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 world/map/npc/007-2/_nodes.txt

(limited to 'world/map/npc/007-2')

diff --git a/world/map/npc/007-2/_import.txt b/world/map/npc/007-2/_import.txt
index bce6eb02..e68bb71b 100644
--- a/world/map/npc/007-2/_import.txt
+++ b/world/map/npc/007-2/_import.txt
@@ -2,5 +2,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 007-2
 npc: npc/007-2/_mobs.txt
+npc: npc/007-2/_nodes.txt
 npc: npc/007-2/_warps.txt
 npc: npc/007-2/witch.txt
diff --git a/world/map/npc/007-2/_mobs.txt b/world/map/npc/007-2/_mobs.txt
index ca392cc6..1d91c286 100644
--- a/world/map/npc/007-2/_mobs.txt
+++ b/world/map/npc/007-2/_mobs.txt
@@ -1,9 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Illia forsaken inn mobs
 
-
-
-007-2,0,0,0|script|Mob007-2|32767
-{
-    end;
-}
diff --git a/world/map/npc/007-2/_nodes.txt b/world/map/npc/007-2/_nodes.txt
new file mode 100644
index 00000000..38010d03
--- /dev/null
+++ b/world/map/npc/007-2/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Illia forsaken inn nodes
+
+// (no nodes)
diff --git a/world/map/npc/007-2/witch.txt b/world/map/npc/007-2/witch.txt
index f5fcda32..3e80dccc 100644
--- a/world/map/npc/007-2/witch.txt
+++ b/world/map/npc/007-2/witch.txt
@@ -23,7 +23,7 @@
     set @illia_iced_water, 4;
     set $@illia_min_level, 90;
 
-    if (getgmlevel() >= 40 && getequipid(equip_head) == 647)
+    if ((GM >= get(.valia, "GM") || debug) && getequipid(equip_head) == 647)
         goto L_DeveloperBoard;
 
     if (BaseLevel < $@illia_min_level) goto L_Unexperienced;
@@ -35,22 +35,7 @@
     end;
 
 L_DeveloperBoard:
-    mes "[Developer Board]";
-    mes "$Illia_Luvia_Harvest: "+$Illia_Luvia_Harvest;
-    mes "$Illia_Win_Counter: "+$Illia_Win_Counter;
-    next;
-    mes "[Developer Board]";
-    mes "$@illia_progress: "+$@illia_progress;
-    if ($@illia_begin_time > 0)
-        mes "Time: "+(gettimetick(2) - $@illia_begin_time)+"/"+$@illia_max_time;
-    mes "";
-    mes "$@illia_level_1_progress: "+$@illia_level_1_progress;
-    mes "$@illia_level_2_progress: "+$@illia_level_2_progress;
-    mes "$@illia_level_3_progress: "+$@illia_level_3_progress;
-    mes "$@illia_level_4_progress: "+$@illia_level_4_progress;
-    mes "$@illia_level_5_progress: "+$@illia_level_5_progress;
-    mes "$@illia_level_6_progress: "+$@illia_level_6_progress;
-    mes "$@illia_level_7_progress: "+$@illia_level_7_progress;
+    callfunc "IlliaDebug";
     close;
 
 L_Introduce:
@@ -1020,3 +1005,22 @@ end;
 {
 end;
 }
+
+function|script|IlliaDebug
+{
+    mes "$Illia_Luvia_Harvest: "+$Illia_Luvia_Harvest;
+    mes "$Illia_Win_Counter: "+$Illia_Win_Counter;
+    mes "---";
+    mes "$@illia_progress: "+$@illia_progress;
+    if ($@illia_begin_time > 0)
+        mes "Time: "+(gettimetick(2) - $@illia_begin_time)+"/"+$@illia_max_time;
+    mes "---";
+    mes "$@illia_level_1_progress: "+$@illia_level_1_progress;
+    mes "$@illia_level_2_progress: "+$@illia_level_2_progress;
+    mes "$@illia_level_3_progress: "+$@illia_level_3_progress;
+    mes "$@illia_level_4_progress: "+$@illia_level_4_progress;
+    mes "$@illia_level_5_progress: "+$@illia_level_5_progress;
+    mes "$@illia_level_6_progress: "+$@illia_level_6_progress;
+    mes "$@illia_level_7_progress: "+$@illia_level_7_progress;
+    return;
+}
-- 
cgit v1.2.3-70-g09d2