--- deliantra/server/common/item.C 2008/04/20 18:48:51 1.45
+++ deliantra/server/common/item.C 2009/10/15 20:12:35 1.60
@@ -1,28 +1,28 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 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.
+ * 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
#include
#include
@@ -172,7 +172,7 @@
{SPINNER, "spinner", "spinners", 0, 0},
{GATE, "gate", "gates", 0, 0},
{BUTTON, "button", "buttons", 0, 0},
- {CF_HANDLE, "cf handle", "cf handles", 0, 0},
+ {T_HANDLE, "cf handle", "cf handles", 0, 0},
{HOLE, "hole", "holes", 0, 0},
{TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
{SIGN, "sign", "signs", 0, 0},
@@ -255,10 +255,7 @@
int
get_power_from_ench (int ench)
{
- if (ench < 0) ench = 0;
- if (ench > 20) ench = 20;
-
- return enc_to_item_power[ench];
+ return enc_to_item_power [clamp (ench, 0, 20)];
}
/* This takes an object 'op' and figures out what its item_power
@@ -302,9 +299,11 @@
for (i = 1; i < NROFATTACKS; i++)
if (op->attacktype & (1 << i))
enc++;
+
if (op->slaying)
enc += 2; /* What it slays is probably more relevent */
}
+
/* Items the player can equip */
if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) ||
(op->type == SHIELD) || (op->type == RING) ||
@@ -317,6 +316,7 @@
enc += op->stats.grace; /* grace regen */
enc += op->stats.exp; /* speed bonus */
}
+
enc += op->stats.luck;
/* Do spell paths now */
@@ -330,20 +330,13 @@
enc--;
}
- if (QUERY_FLAG (op, FLAG_LIFESAVE))
- enc += 5;
- if (QUERY_FLAG (op, FLAG_REFL_SPELL))
- enc += 3;
- if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
- enc += 2;
- if (QUERY_FLAG (op, FLAG_STEALTH))
- enc += 1;
- if (QUERY_FLAG (op, FLAG_XRAYS))
- enc += 2;
- if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
- enc += 1;
- if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
- enc += 1;
+ if (op->flag [FLAG_LIFESAVE ]) enc += 5;
+ if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
+ if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
+ if (op->flag [FLAG_XRAYS ]) enc += 2;
+ if (op->flag [FLAG_STEALTH ]) enc += 1;
+ if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
+ if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
return get_power_from_ench (enc);
}
@@ -353,11 +346,10 @@
const typedata *
get_typedata (int itemtype)
{
- int i;
-
- for (i = 0; i < item_types_size; i++)
+ for (int i = 0; i < item_types_size; i++)
if (item_types[i].number == itemtype)
return &item_types[i];
+
return NULL;
}
@@ -367,19 +359,19 @@
const typedata *
get_typedata_by_name (const char *name)
{
- int i;
-
- for (i = 0; i < item_types_size; i++)
+ for (int i = 0; i < item_types_size; i++)
if (!strcmp (item_types[i].name, name))
return &item_types[i];
- for (i = 0; i < item_types_size; i++)
+
+ for (int i = 0; i < item_types_size; i++)
if (!strcmp (item_types[i].name_pl, name))
{
LOG (llevInfo,
- "get_typedata_by_name: I have been sent the plural %s, the singular form %s is preffered\n", name, item_types[i].name);
+ "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name);
return &item_types[i];
}
- return NULL;
+
+ return 0;
}
/* describe_resistance generates the visible naming for resistances.
@@ -391,23 +383,12 @@
const char *
describe_resistance (const object *op, int newline)
{
- static char buf[VERY_BIG_BUF];
- char buf1[VERY_BIG_BUF];
- int tmpvar;
+ static dynbuf_text buf; buf.clear ();
- buf[0] = 0;
- for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
- {
- if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1))
- {
- if (!newline)
- sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
- else
- sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
+ for (int i = 0; i < NROFATTACKS; i++)
+ if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
+ buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
- strcat (buf, buf1);
- }
- }
return buf;
}
@@ -416,12 +397,14 @@
* query_weight(object) returns a character pointer to a static buffer
* containing the text-representation of the weight of the given object.
* The buffer will be overwritten by the next call to query_weight().
+ *
+ * Seems to be used only by unimportant stuff. Remove?
*/
const char *
query_weight (const object *op)
{
static char buf[10];
- sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
+ sint32 i = op->total_weight ();
if (op->weight < 0)
return " ";
@@ -451,6 +434,7 @@
if (i < 21)
return levelnumbers[i];
+
if (!(i % 10))
return levelnumbers_10[i / 10];
@@ -536,11 +520,13 @@
/*
* query_short_name(object) is similar to query_name, but doesn't
* contain any information about object status (worn/cursed/etc.)
+ *
+ * It is sometimes used when printing messages, so should fit well into a sentence.
*/
const char *
query_short_name (const object *op)
{
- if (op->name == 0)
+ if (!op->name)
return "(null)";
if (!op->nrof
@@ -573,30 +559,30 @@
}
break;
- case ALTAR:
- case TRIGGER_ALTAR:
- case IDENTIFY_ALTAR:
- case CONVERTER:
- if (op->slaying == shstr_money)
- {
- bool wrap = !!buf.size ();
+ case ALTAR:
+ case TRIGGER_ALTAR:
+ case IDENTIFY_ALTAR:
+ case CONVERTER:
+ if (op->slaying == shstr_money)
+ {
+ bool wrap = !!buf.size ();
- if (wrap) buf << " [";
+ if (wrap) buf << " [";
- archetype *coin = 0;
+ archetype *coin = 0;
- for (char const *const *c = coins; *coins; ++c)
- if ((coin = archetype::find (*c)))
- if (op->stats.food % coin->value == 0)
- break;
+ for (char const *const *c = coins; *coins; ++c)
+ if ((coin = archetype::find (*c)))
+ if (op->stats.food % coin->value == 0)
+ break;
- sint32 coins = op->stats.food / coin->value;
+ sint32 coins = op->stats.food / coin->value;
- buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
+ buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
- if (wrap) buf << ']';
- }
- break;
+ if (wrap) buf << ']';
+ }
+ break;
case SKILL:
case AMULET:
@@ -629,6 +615,8 @@
* returned is good forever.) However, it makes printing statements that
* use several names much easier (don't need to store them to temp variables.)
*
+ * It is used extensively within messages, so should return only a prose
+ * and short description of the item.
*/
const char *
query_name (const object *op)
@@ -675,7 +663,7 @@
buf << " (magic)";
#if 0
- /* item_power will be returned in desribe_item - it shouldn't really
+ /* item_power will be returned in describe_item - it shouldn't really
* be returned in the name.
*/
if (op->item_power)
@@ -717,6 +705,25 @@
}
}
+ switch (op->type)
+ {
+ case LAMP:
+ if (op->glow_radius)
+ buf << " (on)";
+ else if (op->stats.food <= 0)
+ buf << " (empty)";
+ else
+ buf << " (off)";
+ break;
+
+ case TORCH:
+ if (op->glow_radius)
+ buf << " (burning)";
+ else if (op->stats.food <= 0)
+ buf << " (burned out)";
+ break;
+ }
+
if (QUERY_FLAG (op, FLAG_UNPAID))
buf << " (unpaid)";
@@ -731,6 +738,9 @@
* don't include the item count or item status. Used for inventory sorting
* and sending to client.
* If plural is set, we generate the plural name of this.
+ *
+ * It is sometimes used to display messages, and usually only used to match stuff,
+ * so maybe this function should be removed.
*/
const char *
query_base_name (const object *op, int plural)
@@ -810,7 +820,7 @@
switch ((int) ((FABS (op->speed)) * 15))
{
case 0:
- buf << "(very slow movement";
+ buf << "(very slow movement)";
break;
case 1:
buf << "(slow movement)";
@@ -935,11 +945,6 @@
* a dwarven axe, in which the full abilities are only known to
* dwarves, etc.
*
- * This function is really much more complicated than it should
- * be, because different objects have different meanings
- * for the same field (eg, wands use 'food' for charges). This
- * means these special cases need to be worked out.
- *
* Add 'owner' who is the person examining this object.
* owner can be null if no one is being associated with this
* item (eg, debug dump or the like)
@@ -1009,6 +1014,28 @@
buf << "almost full.";
break;
+ case LAMP:
+ {
+ int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
+ buf << "(fuel: ";
+ if (percent == 0)
+ buf << "empty";
+ else if (percent < 10)
+ buf << "very low";
+ else if (percent < 25)
+ buf << "low";
+ else if (percent < 50)
+ buf << "half empty";
+ else if (percent < 75)
+ buf << "half full";
+ else if (percent < 95)
+ buf << "well filled";
+ else if (percent <= 100)
+ buf << "full";
+ buf << ")";
+ }
+ break;
+
case FOOD:
case FLESH:
case DRINK:
@@ -1172,6 +1199,9 @@
if (op->slaying && op->type != FOOD)
buf.printf ("(slay %s)", &op->slaying);
+ if (op->type == SKILL_TOOL && op->skill)
+ buf.printf ("(%s)", &op->skill);
+
buf.add_abilities ("Attacks", op->attacktype);
/* resistance on flesh is only visible for quetzals. If
* non flesh, everyone can see its resistances
@@ -1197,6 +1227,7 @@
examine (object *op, object *tmp)
{
std::string info = tmp->describe (op);
+
op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
}
@@ -1212,12 +1243,12 @@
for (object *tmp = inv; tmp; tmp = tmp->below)
if (who && QUERY_FLAG (who, FLAG_WIZ))
- buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, query_name (tmp), tmp->count, query_weight (tmp));
+ buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ());
else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
- buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp));
+ buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
if (buf.size ())
- buf.printf ("%s(total weight: %s)\n", indent, query_weight (this));
+ buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
else
buf.printf ("%s(empty)\n", indent);
@@ -1359,8 +1390,6 @@
void
identify (object *op)
{
- object *pl;
-
SET_FLAG (op, FLAG_IDENTIFIED);
CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);
@@ -1377,7 +1406,7 @@
op->title = op->inv->name;
else if (op->arch)
{
- op->name = op->arch->object::name;
+ op->name = op->arch->object::name;
op->name_pl = op->arch->object::name_pl;
}
}
@@ -1385,14 +1414,11 @@
/* If the object is on a map, make sure we update its face */
if (op->map)
update_object (op, UP_OBJ_CHANGE);
- else
- {
- pl = op->in_player ();
- if (pl)
- /* A lot of the values can change from an update - might as well send
- * it all.
- */
- esrv_send_item (pl, op);
- }
+
+ if (object *pl = op->visible_to ())
+ /* A lot of the values can change from an update - might as well send
+ * it all.
+ */
+ esrv_send_item (pl, op);
}