--- deliantra/server/common/exp.C 2007/11/08 19:43:23 1.17
+++ deliantra/server/common/exp.C 2016/11/16 23:41:59 1.42
@@ -1,32 +1,33 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
- *
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
+ *
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
+ *
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
+ *
* The authors can be reached via e-mail to
*/
#include
#include
-sint64 *levels;
+sint64 levels[MAXNUMLEVELS];
-float exp_att_mult[NROFATTACKS + 2] = {
+static const float exp_att_mult[NROFATTACKS + 2] = {
0.0, /* AT_PHYSICAL */
0.0, /* AT_MAGIC */
0.0, /* AT_FIRE */
@@ -49,7 +50,7 @@
0.0 /* AT_COUNTERSPELL */
};
-float exp_prot_mult[NROFATTACKS + 2] = {
+static const float exp_prot_mult[NROFATTACKS + 2] = {
0.4, /* AT_PHYSICAL */
0.5, /* AT_MAGIC */
0.1, /* AT_FIRE */
@@ -73,6 +74,19 @@
};
/*
+ * Returns true if the monster specified has any innate abilities.
+ */
+static int
+has_ability (const object *ob)
+{
+ for (object *tmp = ob->inv; tmp; tmp = tmp->below)
+ if (tmp->type == SPELL || tmp->type == SPELLBOOK)
+ return true;
+
+ return false;
+}
+
+/*
* new_exp() is an alternative way to calculate experience based
* on the ability of a monster.
* It's far from perfect, and doesn't consider everything which
@@ -99,150 +113,105 @@
*/
prot_mult += (exp_prot_mult[i] * 200 * ob->resist[i]) / 100.0;
}
- spec_mult += (0.3 * (QUERY_FLAG (ob, FLAG_SEE_INVISIBLE) != 0)) +
- (0.5 * (QUERY_FLAG (ob, FLAG_SPLITTING) != 0)) +
- (0.3 * (QUERY_FLAG (ob, FLAG_HITBACK) != 0)) +
- (0.1 * (QUERY_FLAG (ob, FLAG_REFL_MISSILE) != 0)) +
- (0.3 * (QUERY_FLAG (ob, FLAG_REFL_SPELL) != 0)) +
- (1.0 * (QUERY_FLAG (ob, FLAG_NO_MAGIC) != 0)) +
- (0.1 * (QUERY_FLAG (ob, FLAG_PICK_UP) != 0)) +
- (0.1 * (QUERY_FLAG (ob, FLAG_USE_SCROLL) != 0)) +
- (0.2 * (QUERY_FLAG (ob, FLAG_USE_RANGE) != 0)) + (0.1 * (QUERY_FLAG (ob, FLAG_USE_BOW) != 0));
+
+ spec_mult += (0.3 * (ob->flag [FLAG_SEE_INVISIBLE] != 0)) +
+ (0.5 * (ob->flag [FLAG_SPLITTING] != 0)) +
+ (0.3 * (ob->flag [FLAG_HITBACK] != 0)) +
+ (0.1 * (ob->flag [FLAG_REFL_MISSILE] != 0)) +
+ (0.3 * (ob->flag [FLAG_REFL_SPELL] != 0)) +
+ (1.0 * (ob->flag [FLAG_NO_MAGIC] != 0)) +
+ (0.1 * (ob->flag [FLAG_PICK_UP] != 0)) +
+ (0.1 * (ob->flag [FLAG_USE_SCROLL] != 0)) +
+ (0.2 * (ob->flag [FLAG_USE_RANGE] != 0)) + (0.1 * (ob->flag [FLAG_USE_BOW] != 0));
exp = (ob->stats.maxhp < 5) ? 5 : ob->stats.maxhp;
- exp *= (QUERY_FLAG (ob, FLAG_CAST_SPELL) && has_ability (ob)) ? (40 + (ob->stats.maxsp > 80 ? 80 : ob->stats.maxsp)) / 40 : 1;
+ exp *= (ob->flag [FLAG_CAST_SPELL] && has_ability (ob)) ? (40 + (ob->stats.maxsp > 80 ? 80 : ob->stats.maxsp)) / 40 : 1;
exp *= (80.0 / (70.0 + ob->stats.wc)) * (80.0 / (70.0 + ob->stats.ac)) * (50.0 + ob->stats.dam) / 50.0;
exp *= att_mult * prot_mult * spec_mult;
- exp *= 2.0 / (2.0 - ((fabs (ob->speed) < 0.95) ? fabs (ob->speed) : 0.95));
+ exp *= 2.0 / (2.0 - min (ob->speed, 0.95));
exp *= (20.0 + ob->stats.Con) / 20.0;
- if (QUERY_FLAG (ob, FLAG_STAND_STILL))
+ if (ob->flag [FLAG_STAND_STILL])
exp /= 2;
- return (int) exp;
+ return exp;
}
-/*
- * Returns true if the monster specified has any innate abilities.
- */
-
+//TODO: binary search...
int
-has_ability (const object *ob)
+exp_to_level (sint64 exp)
{
- object *tmp;
+ for (int i = 1; i <= settings.max_level; i++)
+ if (levels [i] > exp)
+ return i - 1;
- for (tmp = ob->inv; tmp != NULL; tmp = tmp->below)
- if (tmp->type == SPELL || tmp->type == SPELLBOOK)
- return true;
- return false;
+ return settings.max_level;
+}
+
+sint64
+level_to_min_exp (int level)
+{
+ return levels [clamp (level, 0, settings.max_level)];
}
/* This loads the experience table from the exp_table
- * file. This tends to exit on any errors, since it
- * populates the table as it goes along, so if there
- * are errors, the table is likely in an inconsistent
- * state.
+ * file.
*/
void
-init_experience (void)
+_reload_exp_table ()
{
- char buf[MAX_BUF], *cp;
- int lastlevel = 0, comp;
- sint64 lastexp = -1, tmpexp;
- FILE *fp;
+ int lastlevel = 0;
+ sint64 lastexp = -1;
+ object_thawer thawer (settings.datadir, "exp_table");
- sprintf (buf, "%s/exp_table", settings.confdir);
+ if (!thawer)
+ {
+ LOG (llevError, "unable to load experience table file");
+ return;
+ }
- if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
+ if (thawer.kw != KW_max_level)
{
+ thawer.parse_error ("experience table file");
return;
}
- while (fgets (buf, MAX_BUF - 1, fp) != NULL)
+
+ thawer.get (settings.max_level);
+
+ sint64 newlevels [MAXNUMLEVELS];
+
+ while (thawer.next_line ())
{
- if (buf[0] == '#')
- continue;
+ sint64 tmpexp;
+ thawer.get (tmpexp);
- /* eliminate newline */
- if ((cp = strrchr (buf, '\n')) != NULL)
- *cp = '\0';
-
- /* Skip over empty lines */
- if (buf[0] == 0)
- continue;
- cp = buf;
- while (isspace (*cp) && *cp != 0)
- cp++;
- if (!strncasecmp (cp, "max_level", 9))
+ /* Do some sanity checking - if value is bogus, just exit because
+ * the table otherwise is probably in an inconsistent state
+ */
+ if (tmpexp <= lastexp)
{
- if (settings.max_level)
- {
- LOG (llevDebug, "Got more than one max_level value from exp_table file?\n");
- free (levels);
- }
- settings.max_level = atoi (cp + 9);
- if (!settings.max_level)
- {
- LOG (llevDebug, "Got invalid max_level from exp_table file? %s\n", buf);
- }
- else
- {
- levels = (sint64 *) calloc (settings.max_level + 1, sizeof (sint64));
- }
+ LOG (llevError, "Experience for level %d is lower than previous level (%" PRId64 " <= %" PRId64 ")\n", lastlevel + 1, tmpexp, lastexp);
+ return;
}
- while (isdigit (*cp) && *cp != 0)
+
+ lastlevel++;
+
+ if (lastlevel > settings.max_level)
{
- if (!settings.max_level)
- {
- LOG (llevError, "max_level is not set in exp_table file. Did you remember to update it?\n");
- exit (1);
- }
-
- tmpexp = atoll (cp);
- /* Do some sanity checking - if value is bogus, just exit because
- * the table otherwise is probably in an inconsistent state
- */
- if (tmpexp <= lastexp)
- {
- LOG (llevError, "Experience for level %d is lower than previous level (%" PRId64 " <= %" PRId64 ")\n", lastlevel + 1, tmpexp, lastexp);
- exit (1);
- }
- lastlevel++;
- if (lastlevel > settings.max_level)
- {
- LOG (llevError, "Too many levels specified in table (%d > %d)\n", lastlevel, settings.max_level);
- exit (1);
- }
- levels[lastlevel] = tmpexp;
- lastexp = tmpexp;
- /* First, skip over the number we just processed. Then skip over
- * any spaces, commas, etc.
- */
- while (isdigit (*cp) && *cp != 0)
- cp++;
- while (!isdigit (*cp) && *cp != 0)
- cp++;
+ LOG (llevError, "Too many levels specified in table (%d > %d)\n", lastlevel, settings.max_level);
+ exit (1);
}
+
+ newlevels [lastlevel] = tmpexp;
+ lastexp = tmpexp;
}
- close_and_delete (fp, comp);
+
if (lastlevel != settings.max_level && lastlevel != 0)
{
LOG (llevError, "Warning: exp_table does not have %d entries (%d)\n", settings.max_level, lastlevel);
- exit (1);
+ return;
}
-}
-
-/* Dump the table - useful in terms of debugging to make sure the
- * format of the exp_table is correct.
- */
-void
-dump_experience ()
-{
- int i;
-
- for (i = 1; i <= settings.max_level; i++)
- {
- fprintf (logfile, "%4d %20lld\n", i, (long long) levels[i]);
- }
- exit (0);
+ memcpy (levels, newlevels, sizeof (levels));
}
+