summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--GNUmakefile4
-rw-r--r--world/map/npc/029-2/sorfina.txt12
2 files changed, 2 insertions, 14 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 35036514..415d91a4 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -10,8 +10,8 @@ maps:
conf: world/map/conf/magic-secrets.sex \
login/conf/login_local.conf login/conf/ladmin_local.conf login/save/gm_account.txt login/save/account.txt \
world/conf/char_local.conf \
-world/map/conf/map_local.conf world/map/conf/battle_local.conf world/map/conf/motd.txt world/map/conf/atcommand_local.conf world/map/db/const-debugflag.txt \
-conf/monitor_local.conf
+world/map/conf/map_local.conf world/map/conf/battle_local.conf world/map/conf/atcommand_local.conf world/map/db/const-debugflag.txt \
+world/map/npc/functions/motd.txt
world/map/conf/magic-secrets.sex: world/map/conf/magic-secrets.sex.template world/map/conf/secrets-build
cd world/map/conf && ./build-magic.sh
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 181a2589..f083396c 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -255,9 +255,6 @@ OnTouch:
029-2,33,27,0|script|#Carpet|32767,1,1
{
- end;
-
-OnTouch:
if (QL_BEGIN != 1)
end;
mes "[Sorfina]";
@@ -309,9 +306,6 @@ L_CloseDis:
029-2,44,31,0|script|#DoorOutTut1|45,0,0
{
- end;
-
-OnTouch:
if (QL_BEGIN < 4)
goto L_Block;
warp "029-2", 112, 85;
@@ -323,9 +317,6 @@ L_Block:
}
029-2,23,24,0|script|#GameRules1|32767,0,1
{
- end;
-
-OnTouch:
if (TUT_var > 0)
end;
mes "[Server/Client Notice]";
@@ -336,9 +327,6 @@ OnTouch:
}
029-2,21,24,0|script|#GameRules2|32767,0,1
{
- end;
-
-OnTouch:
if (TUT_var > 0)
end;
callfunc "GameRules";