[ViewVC] Diff of: cvs/deliantra/server/server/shop.C

Comparing deliantra/server/server/shop.C (file contents):
Revision 1.83 by root, Fri Apr 30 21:00:40 2010 UTC vs.
Revision 1.87 by root, Sat Apr 23 04:56:57 2011 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 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
       /* Value of the wand is multiplied by the number of
        * charges.  the treasure code already sets up the value
        * 50 charges is used as the baseline.
        */
       if (tmp->flag [FLAG_IDENTIFIED] || !tmp->need_identify () || identified)
-        val *= tmp->stats.food / 50;
+        val *= tmp->stats.food;
-      else                      /* if not identified, presume one charge */
+      /* if not identified, presume one charge */
-        val /= 50;
+      val /= 50;
     }
   /* Limit amount of money you can get for really great items. */
   if (flag == F_SELL)
     val = value_limit (val, number, who, shop);
    * AND Cha = 30 will get optimal price.
    * Thus charisma will never get useless.
    * -b.e. edler@heydernet.de
    */
-  if (who && who->type == PLAYER)
+  if (who && who->is_player ())
     {
       int lev_bargain  = 0;
       int lev_identify = 0;
       if (!no_bargain)
       /* ratio determines how much of the price modification
        * will come from the basic stat charisma
        * the rest will come from the level in bargaining skill
        */
       const double cha_ratio = 0.40;
-      double bargaining = min (0., 1. - powf (lev_bargain / MAXLEVEL_TREASURE, 0.25));
+      double bargaining = max (0., 1. - powf (double (lev_bargain) / MAXLEVEL_TREASURE, 0.25));
       double charisma   = (cha_bonus[who->stats.Cha] - 1.) / (cha_bonus[who->stats.Cha] + 1.);
       double factor = (1. - cha_ratio) * bargaining + cha_ratio * charisma;
       // scale 0..1 to 2 .. 80%
     }
   for (tmp = op->inv; tmp; tmp = tmp->below)
     if (tmp->type == MONEY)
       total += tmp->nrof * (sint64)tmp->value;
-    else if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && (!tmp->race || tmp->race.contains ("gold")))
+    else if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && (!tmp->race || tmp->race.contains (shstr_gold)))
       total += query_money (tmp);
   return total;
 }
     return 0;
   pay_from_container (pl, pl, to_pay);
   for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
-    if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && (!pouch->race || pouch->race.contains ("gold")))
+    if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && (!pouch->race || pouch->race.contains (shstr_gold)))
       pay_from_container (pl, pouch, to_pay);
   pl->update_stats ();
   return 1;
 }
     change_exp (pl, saved_money, shstr_bargaining, SK_EXP_NONE);
   pay_from_container (pl, pl, to_pay);
   for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
-    if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && (!pouch->race || pouch->race.contains ("gold")))
+    if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && (!pouch->race || pouch->race.contains (shstr_gold)))
       pay_from_container (pl, pouch, to_pay);
   pl->update_stats ();
   return 1;
         LOG (llevError, "Could not find %s archetype\n", coins[count]);
       else if ((amount / at->value) > 0)
         {
           for (pouch = pl->inv; pouch; pouch = pouch->below)
             {
-              if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && pouch->race.contains ("gold"))
+              if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && pouch->race.contains (shstr_gold))
                 {
                   int w = at->weight * (100 - pouch->stats.Str) / 100;
                   int n = amount / at->value;
                   if (w == 0)
 struct shopinv
 {
   char *item_sort;
   char *item_real;
+  sint64 value;
   uint16 type;
   uint32 nrof;
 };
 /* There are a lot fo extra casts in here just to suppress warnings - it
    * so the display is properly.
    */
   if (tmp->nrof == 0)
     items[*numitems].nrof++;
   items[*numitems].type = tmp->type;
+  items[*numitems].value = tmp->value;
   switch (tmp->type)
     {
 #if 0
         case BOOTS:
 #endif
         default:
           items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
           items[*numitems].item_real = strdup (query_base_name (tmp, 1));
+          items[*numitems].value += tmp->value;
           (*numitems)++;
           break;
     }
   tmp->set_flag (FLAG_UNPAID);
     {
       /* Collapse items of the same name together */
       if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
         items[i + 1].nrof += items[i].nrof;
       else
-        buf.printf (" %4d %s\n", items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
+        {
+          buf.printf (
+            " %4d %s\n         for %s\n",
+            items[i].nrof ? items[i].nrof : 1,
+            items[i].nrof == 1 ? items[i].item_sort : items[i].item_real,
+            cost_string_from_value (items[i].value, op->flag [FLAG_WIZ] ? 0 : 1));
+        }
       free (items[i].item_sort);
       free (items[i].item_real);
     }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/shop.C (file contents): Revision 1.83 by root, Fri Apr 30 21:00:40 2010 UTC vs. Revision 1.87 by root, Sat Apr 23 04:56:57 2011 UTC

Diff Legend

Comparing deliantra/server/server/shop.C (file contents):
Revision 1.83 by root, Fri Apr 30 21:00:40 2010 UTC vs.
Revision 1.87 by root, Sat Apr 23 04:56:57 2011 UTC