Merge pull request #55 from wushin/Double-Xp-On-Demand

Enable Dynamic Double Xp

3 files changed, 60 insertions, 25 deletions

diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index f226706..9a35d30 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -1586,6 +1586,25 @@ ATCE atcommand_pvpoff(Session *s, dumb_ptr<map_session_data> sd,
 }
 
 static
+ATCE atcommand_exprate(Session *s, dumb_ptr<map_session_data>,
+        ZString message)
+{
+    int rate;
+
+    if (!extract(message, &rate) || !rate)
+    {
+        clif_displaymessage(s,
+                "Please, enter a rate adjustement (usage: @exprate <percent>)."_s);
+        return ATCE::USAGE;
+    }
+    battle_config.base_exp_rate = rate;
+    battle_config.job_exp_rate = rate;
+    AString output = STRPRINTF("All Xp at %d percent"_fmt, rate);
+    clif_displaymessage(s, output);
+    return ATCE::OKAY;
+}
+
+static
 ATCE atcommand_pvpon(Session *s, dumb_ptr<map_session_data> sd,
         ZString)
 {
@@ -4982,6 +5001,9 @@ Map<XString, AtCommandInfo> atcommand_info =
     {"pvpoff"_s, {""_s,
         60, atcommand_pvpoff,
         "Enable PvP on your map"_s}},
+    {"exprate"_s, {"<percent>"_s,
+        60, atcommand_exprate,
+        "Set base job/exp rate"_s}},
     {"pvpon"_s, {""_s,
         60, atcommand_pvpon,
         "Disable PvP on your map"_s}},
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index cdb348c..539b547 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -333,8 +333,7 @@ int mob_gen_exp(mob_db_ *mob)
     int xp = floor(effective_hp * pow(sqrt(attack_factor)
             + sqrt(dodge_factor)
             + sqrt(persuit_factor) + 55, 3)
-        * aggression_factor / 2000000.0
-        * static_cast<double>(battle_config.base_exp_rate) / 100.);
+        * aggression_factor / 2000000.0);
     if (xp < 1)
         xp = 1;
     PRINTF("Exp for mob '%s' generated: %d\n"_fmt, mob->name, xp);
@@ -3531,30 +3530,33 @@ bool mob_readdb(ZString filename)
                 continue;
             }
 
-            // TODO move this lower
-            get_mob_db(mob_class) = std::move(mdbv);
-
             if (get_mob_db(mob_class).base_exp < 0)
-                get_mob_db(mob_class).base_exp = 0;
-            else if (get_mob_db(mob_class).base_exp > 0
-                     && (get_mob_db(mob_class).base_exp *
-                         battle_config.base_exp_rate / 100 > 1000000000
-                         || get_mob_db(mob_class).base_exp *
-                         battle_config.base_exp_rate / 100 < 0))
-                get_mob_db(mob_class).base_exp = 1000000000;
-            else
-                get_mob_db(mob_class).base_exp = get_mob_db(mob_class).base_exp * battle_config.base_exp_rate / 100;
-
+            {
+                PRINTF("bad mob line: Xp needs to be greater than 0.  %s\n"_fmt, line);
+                rv = false;
+                continue;
+            }
+            if (get_mob_db(mob_class).base_exp > 1000000000)
+            {
+                PRINTF("bad mob line: Xp needs to be less than 1000000000.  %s\n"_fmt, line);
+                rv = false;
+                continue;
+            }
             if (get_mob_db(mob_class).job_exp < 0)
-                get_mob_db(mob_class).job_exp = 0;
-            else if (get_mob_db(mob_class).job_exp > 0
-                     && (get_mob_db(mob_class).job_exp * battle_config.job_exp_rate /
-                         100 > 1000000000
-                         || get_mob_db(mob_class).job_exp *
-                         battle_config.job_exp_rate / 100 < 0))
-                get_mob_db(mob_class).job_exp = 1000000000;
-            else
-                get_mob_db(mob_class).job_exp = get_mob_db(mob_class).job_exp * battle_config.job_exp_rate / 100;
+            {
+                PRINTF("bad mob line: Job Xp needs to be greater than 0.  %s\n"_fmt, line);
+                rv = false;
+                continue;
+            }
+            if (get_mob_db(mob_class).job_exp > 1000000000)
+            {
+                PRINTF("bad mob line: Job Xp needs to be less than 1000000000.  %s\n"_fmt, line);
+                rv = false;
+                continue;
+            }
+
+            // TODO move this lower
+            get_mob_db(mob_class) = std::move(mdbv);
 
             for (int i = 0; i < 8; i++)
             {
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index e73d79f..1e840ea 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -2883,6 +2883,12 @@ int pc_gainexp_reason(dumb_ptr<map_session_data> sd, int base_exp, int job_exp,
         }
     }
 
+    // Double Xp Weekends
+    base_exp = (base_exp * static_cast<double>(battle_config.base_exp_rate) / 100.);
+    if (base_exp <= 0)
+        base_exp = 0;
+    else if (base_exp > 1000000000)
+        base_exp = 1000000000;
     sd->status.base_exp += base_exp;
 
     // [Fate] Adjust experience points that healers can extract from this character
@@ -2890,7 +2896,6 @@ int pc_gainexp_reason(dumb_ptr<map_session_data> sd, int base_exp, int job_exp,
     {
         const int max_heal_xp =
             20 + (sd->status.base_level * sd->status.base_level);
-
         sd->heal_xp += base_exp;
         if (sd->heal_xp > max_heal_xp)
             sd->heal_xp = max_heal_xp;
@@ -2913,6 +2918,12 @@ int pc_gainexp_reason(dumb_ptr<map_session_data> sd, int base_exp, int job_exp,
         }
     }
 
+    // Double Xp Weekends
+    job_exp = (job_exp * static_cast<double>(battle_config.job_exp_rate) / 100.);
+    if (job_exp <= 0)
+        job_exp = 0;
+    else if (job_exp > 1000000000)
+        job_exp = 1000000000;
     sd->status.job_exp += job_exp;
     if (sd->status.job_exp < 0)
         sd->status.job_exp = 0;