From 935fbebe66b6007c86dd519458b27d74c7e74ade Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 9 Feb 2019 18:28:53 -0200
Subject: Allow @toevent to reach Valentine Highlands
---
npc/001-11/Demure.txt | 3 ++-
npc/commands/event.txt | 9 +++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/npc/001-11/Demure.txt b/npc/001-11/Demure.txt
index 5cad9f2fb..462fa74e7 100644
--- a/npc/001-11/Demure.txt
+++ b/npc/001-11/Demure.txt
@@ -9,7 +9,7 @@
// Functions
function ScoreValentine {
- .@nb = query_sql("SELECT c.name, i.value FROM `acc_reg_num_db` AS i, `char` AS c WHERE i.key='#VALENTINE_POINTS' AND i.account_id=c.account_id ORDER BY i.value DESC LIMIT 10", .@name$, .@value);
+ .@nb = query_sql("SELECT c.name, i.value FROM `acc_reg_num_db` AS i, `char` AS c WHERE i.key='#VALENTINE_POINTS' AND i.account_id=c.account_id AND c.char_num='0' ORDER BY i.value DESC LIMIT 10", .@name$, .@value);
mes "##B"+l("Top 10 - Valentine Day")+"##b";
mes("1." +.@name$[0]+" ("+.@value[0]+")");
@@ -175,6 +175,7 @@ L_Main:
next;
mes l("As with all TMW2 Major Events, the top 1 receive a special pet, and the other ranked ones get diverse rewards.");
mes l("There might be reward for anyone who doesn't gets a rank, but I never count on that. So, let's start?");
+ mesc l("Note: You must have a char on the first slot to leaderboard work. Points are shared accross all chars on your account."), 1;
next;
break;
case 2:
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index a4583159a..729a87684 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -204,6 +204,15 @@ OnCall:
end;
OnCall:
+ if (!$@GM_EVENT && $EVENT$ == "Valentine") {
+ if (readparam(Hp) == readparam(MaxHp) && readparam(Sp) == readparam(MaxSp) && !(getmapname() == "boss" || getmapname() == "sec_pri" || getmapname() ~= "000-*" || getmapname() ~= "008-*" || getmapname() ~= "sore*")) {
+ warp "001-11", 38, 32;
+ message strcharinfo(0), l("You are now at the Valentine Highlands.");
+ } else {
+ dispbottom l("You cannot be hurt, must have full mana, and must be in a area where the Mana Plane is connected so @toevent work.");
+ }
+ }
+
if (!$@GM_EVENT)
dispbottom l("The mana bridge is closed at the moment.");
else if (BaseLevel < 10)
--
cgit v1.2.3-70-g09d2