This is test server event patch

4 files changed, 82 insertions, 88 deletions

diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 3df6382b8..c50f687b9 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -24,6 +24,16 @@ OnTouch:
     .@lang = requestlang();
     if (.@lang >= 0 && .@lang <= 9) Lang = .@lang;
 
+    // Test Server
+    mesn "TMW 2 Staff";
+    mesc l("Before we start, to be eligible for rewards, please insert your CHARACTER NAME on Live Server."), 1;
+    mesc l("You can leave it blank if you wish no reward."), 1;
+    mesc l("This can be changed later, don't worry."), 1;
+    mesc l("(Click next button to advance dialogs)"), 3;
+    next;
+    input OFFICIAL_NICKNAME$;
+    clear;
+
     showavatar 3;
 
     mesn "Narrator";
diff --git a/npc/002-3/nard.txt b/npc/002-3/nard.txt
index aaec6ce3d..d543f3d46 100644
--- a/npc/002-3/nard.txt
+++ b/npc/002-3/nard.txt
@@ -75,8 +75,6 @@ L_Checker:
     next;
     mesn;
     mesq l("The Alliance can help you in finding out about who you are, why you are here, or from where you came from. So, about the tasks I want completed.");
-    LOCATION$ = "Candor";
-    setq ShipQuests_Julia, 3;
     next;
     .@price=1200;
     mesc b(l(".:: Main Quest 1-3 ::.")), 3;
@@ -85,61 +83,48 @@ L_Checker:
     msObjective(getq(CandorQuest_Barrel) >= 4, l("* Ask Zegas, the mayoress, if she needs help."));
     msObjective(Zeny >= .@price, l("* Collect @@/@@ GP", Zeny, .@price));
 
-L_Referral:
-    // Referral program
-    if (#REFERRAL_PROG == 0 && $REFERRAL_ENABLED) {
-        next;
-        clear;
-        showavatar NPC_LOF_RICH;
-        mesc l("But before, a message from our developers!"), 3;
-        next;
-        mesn l("TMW2 Staff");
-        mesc l("Hello, and welcome to TMW2: Moubootaur Legends!"), 3;
-        next;
-        mesn l("TMW2 Staff");
-        mesc l("Did you came here by someone advise? If yes, write their name down here!"), 3;
-        next;
-        mesc l("If this is not the case, just click on \"Send\"."), 3;
-        .@ref$="";
-        do
-        {
-            input .@ref$;
-            //debugmes "Player invite: "+.@ref$;
-            mes "";
-            if (.@ref$ != "") {
-                .@ref=gf_accid(strip(.@ref$));
-                if (.@ref > 0) {
-                    if (.@ref == getcharid(3)) {
-                        mesn l("TMW2 Staff");
-                        mesc l("Hahah, silly, that's yourself!"), 3;
-                        mesc l("Try again!"), 3;
-                        next;
-                        .@ref$="";
-                    } else {
-                        #REFERRAL_PROG=.@ref;
-                        getitembound FriendGift, 1, 1;
-                        mesn l("TMW2 Staff");
-                        mesc l("Well, welcome to the game! If you have any doubt, shout on #world for help!"), 3;
-                        mesc l("Your friend also sent you a gift - open it when you get level 5!"), 3;
-                        next;
-                    }
-                } else {
-                    mesn l("TMW2 Staff");
-                    mesc l("Oops, there is nobody known as @@ on this game.", .@ref$), 3;
-                    mesc l("Could you try again? There could be a typo!"), 3;
-                    next;
-                    .@ref$="";
-                }
-            } else {
-                .@ref$="None";
-                mesn l("TMW2 Staff");
-                mesc l("I see. Well, welcome to the game! If you have any doubt, shout on #world for help!"), 3;
-                next;
+L_FirstLogin:
+    next;
+    clear;
+    showavatar NPC_LOF_RICH;
+    mesc l("But before, a message from our developers!"), 3;
+    next;
+    mesn l("TMW2 Staff");
+    mesc l("First of all: Thank you for playing during this event."), 1;
+    mesc l("You may now choose your bonus."), 1;
+    mesc b(l("IT CANNOT BE CHANGED LATER")), 1;
+    next;
+    do {
+        select
+            l("I'm just skipping dialogs, sorry"),
+            l("HP +75% (not recommended)"),
+            l("EXP +50%"),
+            l("DMG +50%");
+        mes "";
+        if (@menu != 1) {
+            getitembound(PlushMouboo, 1, 4);
+            delinventorylist(); // Needed, because we'll rely on rfind()
+            getinventorylist();
+            .@index=array_rfind(@inventorylist_id, PlushMouboo);
+            switch (@menu) {
+                case 2:
+                    .@vartp=VAR_MAXHPPERCENT; .@bonus=75; break;
+                case 3:
+                    .@vartp=IOPT_EXPGAIN; .@bonus=50; break;
+                case 4:
+                    .@vartp=VAR_ATKPERCENT; .@bonus=50; break;
+                default:
+                    Exception("Invalid menu entry: "+@menu, RB_SPEECH|RB_DEBUGMES|RB_PLEASEREPORT); .@vartp=any(VAR_ATKPERCENT, IOPT_EXPGAIN); .@bonus=50; break;
             }
-        } while (.@ref$ == "");
-    showavatar NPC_NARD;
-    }
-
+            setitemoptionbyindex(.@index, 0, .@vartp, .@bonus);
+        }
+    } while (@menu == 1);
+    Zeny+=50000;
+    getitem TimeFlask, 1;
+    getitem FatesPotion, 30;
+    getitem ReturnPotion, 100;
+    LOCATION$ = "Candor";
+    setq ShipQuests_Julia, 3;
     close;
 
 
@@ -173,18 +158,14 @@ L_NotYet:
     mes "";
     select
         rif(Zeny >= .@price, l("I've brought the money you've asked for.")),
-        rif(#REFERRAL_PROG == 0 && $REFERRAL_ENABLED && BaseLevel <= 10,
-            l("I forgot to say earlier, but indeed, I was invited by someone!")),
         l("Captain, why have you brought me to a deserted boring island?!"),
         l("I don't want to help your \"friends\", bring me to somewhere useful!"),
         l("Please excuse me, captain.");
 
     mes "";
     if (@menu == 2)
-        goto L_Referral;
-    if (@menu == 3)
         goto L_CandorIsland;
-    if (@menu == 4)
+    if (@menu == 3)
         goto L_NeedHelp;
 
     mesn;
diff --git a/npc/commands/rate-management.txt b/npc/commands/rate-management.txt
index f04597ca9..f3e7ba77c 100644
--- a/npc/commands/rate-management.txt
+++ b/npc/commands/rate-management.txt
@@ -122,7 +122,7 @@ OnInit:
     bindatcmd "exprate", "@exprate::OnCall", 80, 80, 1; // change exp rate
 
     // WARNING: using @reloadscript will change the "original" value
-    .original_exp_rate = 100;//getbattleflag("base_exp_rate");
+    .original_exp_rate = 300;//getbattleflag("base_exp_rate");
     .current_rate = .original_exp_rate;
 
     // XXX: maybe in the future:
@@ -149,17 +149,17 @@ OnReload:
         stopnpctimer;
         .hours = 0;
         .max_hours = 0;
-        .current_rate = 100;
-        setbattleflag("item_rate_common", 100);
-        setbattleflag("item_rate_common_boss", 100);
-        setbattleflag("item_rate_heal", 100);
-        setbattleflag("item_rate_heal_boss", 100);
-        setbattleflag("item_rate_use", 100);
-        setbattleflag("item_rate_use_boss", 100);
-        setbattleflag("item_rate_equip", 100);
-        setbattleflag("item_rate_equip_boss", 100);
-        setbattleflag("item_rate_card", 100);
-        setbattleflag("item_rate_card_boss", 100);
+        .current_rate = 1000;
+        setbattleflag("item_rate_common", 1000);
+        setbattleflag("item_rate_common_boss", 1000);
+        setbattleflag("item_rate_heal", 1000);
+        setbattleflag("item_rate_heal_boss", 1000);
+        setbattleflag("item_rate_use", 1000);
+        setbattleflag("item_rate_use_boss", 1000);
+        setbattleflag("item_rate_equip", 1000);
+        setbattleflag("item_rate_equip_boss", 1000);
+        setbattleflag("item_rate_card", 1000);
+        setbattleflag("item_rate_card_boss", 1000);
         charcommand("@reloadmobdb"); // this is on purpose (callable without RID) - no idea what is the purpose
         SeasonReload(1);
         channelmes("#world", "The Drop Rate Bonus is now over.");
@@ -250,17 +250,17 @@ OnInit:
     bindatcmd "droprate", "@droprate::OnCall", 80, 80, 1; // change drop rate
 
     // WARNING: using @reloadscript will change the "original" value, use @reloadbattleconf before!
-    .org_dcn = 100;//getbattleflag("item_rate_common");
-    .org_dcb = 100;//getbattleflag("item_rate_common_boss");
-    .org_dhn = 100;//getbattleflag("item_rate_heal");
-    .org_dhb = 100;//getbattleflag("item_rate_heal_boss");
-    .org_dun = 100;//getbattleflag("item_rate_use");
-    .org_dub = 100;//getbattleflag("item_rate_use_boss");
-    .org_den = 100;//getbattleflag("item_rate_equip");
-    .org_deb = 100;//getbattleflag("item_rate_equip_boss");
-    .org_dxn = 100;//getbattleflag("item_rate_card");
-    .org_dxb = 100;//getbattleflag("item_rate_card_boss");
-    .current_rate = 100;
+    .org_dcn = 1000;//getbattleflag("item_rate_common");
+    .org_dcb = 1000;//getbattleflag("item_rate_common_boss");
+    .org_dhn = 1000;//getbattleflag("item_rate_heal");
+    .org_dhb = 1000;//getbattleflag("item_rate_heal_boss");
+    .org_dun = 1000;//getbattleflag("item_rate_use");
+    .org_dub = 1000;//getbattleflag("item_rate_use_boss");
+    .org_den = 1000;//getbattleflag("item_rate_equip");
+    .org_deb = 1000;//getbattleflag("item_rate_equip_boss");
+    .org_dxn = 1000;//getbattleflag("item_rate_card");
+    .org_dxb = 1000;//getbattleflag("item_rate_card_boss");
+    .current_rate = 1000;
 
     // XXX: maybe in the future:
     //.original_job_rate = getbattleflag("base_job_rate");
diff --git a/npc/functions/daily.txt b/npc/functions/daily.txt
index 8f4b71551..9896d5304 100644
--- a/npc/functions/daily.txt
+++ b/npc/functions/daily.txt
@@ -88,26 +88,29 @@ function	script	daily_login_bonus_handler	{
             getitem BronzeGift, 1;
             dispbottom l("##2 14 Days login bonus: ##B1x @@##b", getitemlink(BronzeGift));
         } else if (#LOGIN_STREAK == 7) {
-            getitem StrangeCoin, 3;
-            dispbottom l("##2 7 Days login bonus: ##B3x @@##b", getitemlink(StrangeCoin));
+            getitem StrangeCoin, 30;
+            dispbottom l("##2 7 Days login bonus: ##B30x @@##b", getitemlink(StrangeCoin));
         } else if (#LOGIN_STREAK == 3) {
-            getitem StrangeCoin, 1;
-            dispbottom l("##2 3 Days login bonus: ##B1x @@##b", getitemlink(StrangeCoin));
+            getitem StrangeCoin, 10;
+            dispbottom l("##2 3 Days login bonus: ##B10x @@##b", getitemlink(StrangeCoin));
         } else if (#LOGIN_STREAK % 3 == 0) {
             .@value=max(20, rand(0, (#LOGIN_STREAK*2)));
             .@value+=(BaseLevel*2)+rand(JobLevel, JobLevel*3);
+            .@value*=20;
             Zeny=Zeny+.@value;
             dispbottom l("##2Daily login bonus: ##B@@ GP##b", .@value);
         } else if (#LOGIN_STREAK % 3 == 2) {
             .@value=max(5, rand(0, (#LOGIN_STREAK/4)));
             .@value+=(BaseLevel**2);
             .@value=(.@value/2)+#LOGIN_STREAK;
+            .@value*=20;
             getexp .@value, 0;
             dispbottom l("##2Daily login bonus: ##B@@ EXP##b", .@value);
         } else {
             .@value=max(5, rand(0, (#LOGIN_STREAK/4)));
             .@value+=(JobLevel**2);
             .@value=(.@value/3)+#LOGIN_STREAK;
+            .@value*=20;
             getexp 0, .@value;
             dispbottom l("##2Daily login bonus: ##B@@ Job Exp.##b", .@value);
         }