ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/shop.C
(Generate patch)

Comparing deliantra/server/server/shop.C (file contents):
Revision 1.56 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.70 by root, Mon Oct 12 14:00:59 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
74 75
75sint64 76sint64
76query_cost (const object *tmp, object *who, int flag) 77query_cost (const object *tmp, object *who, int flag)
77{ 78{
78 double val; 79 double val;
79 int number; /* used to better calculate value */
80 int no_bargain; 80 int no_bargain;
81 int identified; 81 int identified;
82 int not_cursed; 82 int not_cursed;
83 int approximate; 83 int approximate;
84 int shop; 84 int shop;
… …
109 109
110 LOG (llevError, "Query_cost: Gem type with unknown flag %d: %s\n", flag, tmp->debug_desc ()); 110 LOG (llevError, "Query_cost: Gem type with unknown flag %d: %s\n", flag, tmp->debug_desc ());
111 return 0; 111 return 0;
112 } 112 }
113 113
114 number = tmp->nrof; 114 int number = tmp->number_of ();
115 if (number == 0) 115
116 number = 1;
117 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 116 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified)
118 { 117 {
119 if (!not_cursed && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 118 if (!not_cursed && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
120 return 0; 119 return 0;
121 else 120 else
122 val = tmp->value * number; 121 val = tmp->value * number;
123 } 122 }
124 /* This area deals with objects that are not identified, but can be */ 123 /* This area deals with objects that are not identified, but can be */
125 else 124 else
126 { 125 {
127 if (tmp->arch != NULL) 126 if (flag == F_BUY)
128 { 127 {
129 if (flag == F_BUY) 128 LOG (llevError | logBacktrace, "Asking for buy-value of unidentified object: %s\n", tmp->debug_desc ());
129 val = tmp->arch->value * 50 * number;
130 }
131 else
132 { /* Trying to sell something, or get true value */
133 if (tmp->type == POTION)
134 val = number * 40; /* Don't want to give anything away */
135 else
130 { 136 {
131 LOG (llevError | logBacktrace, "Asking for buy-value of unidentified object.\n"); 137 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
132 val = tmp->arch->value * 50 * number; 138 * unknown objects
139 */
140 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
141 val = number * tmp->arch->value * 2 / 3;
142 else
143 val = number * tmp->arch->value / 3;
133 } 144 }
134 else
135 { /* Trying to sell something, or get true value */
136 if (tmp->type == POTION)
137 val = number * 40; /* Don't want to give anything away */
138 else
139 {
140 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
141 * unknown objects
142 */
143 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
144 val = number * tmp->arch->value * 2 / 3;
145 else
146 val = number * tmp->arch->value / 3;
147 }
148 }
149 }
150 else
151 { /* No archetype with this object */
152 LOG (llevDebug, "In sell item: Have object with no archetype: %s\n", &tmp->name);
153 if (flag == F_BUY)
154 {
155 LOG (llevError | logBacktrace, "Asking for buy-value of unidentified object without arch.\n");
156 val = number * tmp->value * 10;
157 }
158 else
159 val = number * tmp->value / 5;
160 } 145 }
161 } 146 }
162 147
163 /* If the item has been applied or identifed or does not need to be 148 /* If the item has been applied or identifed or does not need to be
164 * identified, AND the object is magical and the archetype is non 149 * identified, AND the object is magical and the archetype is non
… …
465 } 450 }
466 451
467 for (tmp = op->inv; tmp; tmp = tmp->below) 452 for (tmp = op->inv; tmp; tmp = tmp->below)
468 if (tmp->type == MONEY) 453 if (tmp->type == MONEY)
469 total += tmp->nrof * (sint64)tmp->value; 454 total += tmp->nrof * (sint64)tmp->value;
470 else if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && (tmp->race == NULL || strstr (tmp->race, "gold"))) 455 else if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && (!tmp->race || tmp->race.contains ("gold")))
471 total += query_money (tmp); 456 total += query_money (tmp);
472 457
473 return total; 458 return total;
474} 459}
475 460
… …
490 return 0; 475 return 0;
491 476
492 pay_from_container (pl, pl, to_pay); 477 pay_from_container (pl, pl, to_pay);
493 478
494 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 479 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
495 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 480 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (!pouch->race || pouch->race.contains ("gold")))
496 pay_from_container (pl, pouch, to_pay); 481 pay_from_container (pl, pouch, to_pay);
497 482
498 pl->update_stats (); 483 pl->update_stats ();
499 return 1; 484 return 1;
500} 485}
… …
527 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE); 512 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE);
528 513
529 pay_from_container (pl, pl, to_pay); 514 pay_from_container (pl, pl, to_pay);
530 515
531 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 516 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
532 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 517 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (!pouch->race || pouch->race.contains ("gold")))
533 pay_from_container (pl, pouch, to_pay); 518 pay_from_container (pl, pouch, to_pay);
534 519
535 pl->update_stats (); 520 pl->update_stats ();
536 521
537 return 1; 522 return 1;
… …
577 // This should not happen, but if it does, just merge the two. 562 // This should not happen, but if it does, just merge the two.
578 if (coin_objs [i]) 563 if (coin_objs [i])
579 { 564 {
580 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); 565 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]);
581 coin_objs[i]->nrof += tmp->nrof; 566 coin_objs[i]->nrof += tmp->nrof;
582 tmp->destroy (true); 567 tmp->destroy ();
583 } 568 }
584 else 569 else
585 { 570 {
586 tmp->remove (); 571 tmp->remove ();
587 coin_objs[i] = tmp; 572 coin_objs[i] = tmp;
… …
611 } 596 }
612 597
613 for (i = 0; i < NUM_COINS; i++) 598 for (i = 0; i < NUM_COINS; i++)
614 { 599 {
615 object &coin = *coin_objs[i]; 600 object &coin = *coin_objs[i];
616 sint64 num_coins = min ((to_pay + coin.value - 1) / coin.value, coin.nrof); 601 sint64 num_coins = min ((to_pay + coin.value - 1) / coin.value, (sint64) coin.nrof);
617 to_pay -= num_coins * coin.value; 602 to_pay -= num_coins * coin.value;
618 603
619 coin.nrof -= num_coins; 604 coin.nrof -= num_coins;
620 /* Now start making change. Start at the coin value 605 /* Now start making change. Start at the coin value
621 * below the one we just did, and work down to 606 * below the one we just did, and work down to
… …
634 619
635 for (i = 0; i < NUM_COINS; i++) 620 for (i = 0; i < NUM_COINS; i++)
636 if (coin_objs[i]->nrof) 621 if (coin_objs[i]->nrof)
637 insert_ob_in_ob (coin_objs [i], pouch); 622 insert_ob_in_ob (coin_objs [i], pouch);
638 else 623 else
639 coin_objs[i]->destroy (true); 624 coin_objs[i]->destroy ();
640} 625}
641 626
642/* Checks all unpaid items in op's inventory, adds up all the money they 627/* Checks all unpaid items in op's inventory, adds up all the money they
643 * have, and checks that they can actually afford what they want to buy. 628 * have, and checks that they can actually afford what they want to buy.
644 * Returns 1 if they can, and 0 if they can't. also prints an appropriate message 629 * Returns 1 if they can, and 0 if they can't. also prints an appropriate message
… …
664 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP); 649 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
665 } 650 }
666 651
667 if (unpaid_price > player_wealth) 652 if (unpaid_price > player_wealth)
668 { 653 {
669 dynbuf_text buf; 654 dynbuf_text &buf = msg_dynbuf; buf.clear ();
670 655
671 buf << "You have " << unpaid_count 656 buf << "You have " << unpaid_count
672 << " unpaid item(s) that would cost you " << cost_string_from_value (unpaid_price, 0) 657 << " unpaid item(s) that would cost you " << cost_string_from_value (unpaid_price, 0)
673 << ". You need another " << cost_string_from_value (unpaid_price - player_wealth, 0) 658 << ". You need another " << cost_string_from_value (unpaid_price - player_wealth, 0)
674 << " to be able to afford that."; 659 << " to be able to afford that. "
660 "H<You cannot leave a shop without paying - drop unpaid items first to be able to leave.>";
675 661
676 pl->failmsg (buf); 662 pl->failmsg (buf);
677 663
678 return 0; 664 return 0;
679 } 665 }
… …
754 LOG (llevError, "Could not find %s archetype\n", coins[count]); 740 LOG (llevError, "Could not find %s archetype\n", coins[count]);
755 else if ((amount / at->value) > 0) 741 else if ((amount / at->value) > 0)
756 { 742 {
757 for (pouch = pl->inv; pouch; pouch = pouch->below) 743 for (pouch = pl->inv; pouch; pouch = pouch->below)
758 { 744 {
759 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold")) 745 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race.contains ("gold"))
760 { 746 {
761 int w = at->weight * (100 - pouch->stats.Str) / 100; 747 int w = at->weight * (100 - pouch->stats.Str) / 100;
762 int n = amount / at->value; 748 int n = amount / at->value;
763 749
764 if (w == 0) 750 if (w == 0)
… …
1116 items[*numitems].item_sort = strdup (query_base_name (tmp, 0)); 1102 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1117 items[*numitems].item_real = strdup (query_base_name (tmp, 1)); 1103 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1118 (*numitems)++; 1104 (*numitems)++;
1119 break; 1105 break;
1120 } 1106 }
1107
1121 SET_FLAG (tmp, FLAG_UNPAID); 1108 SET_FLAG (tmp, FLAG_UNPAID);
1122} 1109}
1123 1110
1124void 1111void
1125shop_listing (object *sign, object *op) 1112shop_listing (object *sign, object *op)
1126{ 1113{
1127 int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2; 1114 int i, j, x1, x2, y1, y2;
1128 const char *shop_coords = sign->kv (shstr_shop_coords); 1115 const char *shop_coords = sign->kv (shstr_shop_coords);
1129 object *stack; 1116 object *stack;
1130 shopinv *items; 1117 shopinv *items;
1131 1118
1132 /* Should never happen, but just in case a monster does apply a sign */ 1119 /* Should never happen, but just in case a monster does apply a sign */
1133 if (op->type != PLAYER) 1120 if (!op->is_player ())
1134 return; 1121 return;
1122
1123 dynbuf_text &buf = msg_dynbuf; buf.clear ();
1135 1124
1136 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2))) 1125 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1137 { 1126 {
1138 x1 = 0; 1127 x1 = 0;
1139 y1 = 0; 1128 y1 = 0;
1140 x2 = op->map->width - 1; 1129 x2 = op->map->width - 1;
1141 y2 = op->map->height - 1; 1130 y2 = op->map->height - 1;
1142 } 1131 }
1143 1132
1144 items = (shopinv *) malloc (40 * sizeof (shopinv));
1145 numallocated = 40; 1133 int numallocated = 40;
1134 int numitems = 0;
1135 items = (shopinv *)malloc (sizeof (shopinv) * numallocated);
1146 1136
1147 /* Find all the appropriate items */ 1137 /* Find all the appropriate items */
1148 for (i = x1; i <= x2; i++) 1138 for (i = x1; i <= x2; i++)
1149 {
1150 for (j = y1; j < y2; j++) 1139 for (j = y1; j < y2; j++)
1140 if (is_in_shop (op->map, i, j))
1151 { 1141 {
1152 if (is_in_shop (op->map, i, j)) 1142 stack = GET_MAP_OB (op->map, i, j);
1143
1144 while (stack)
1153 { 1145 {
1154 stack = GET_MAP_OB (op->map, i, j); 1146 if (QUERY_FLAG (stack, FLAG_UNPAID))
1155
1156 while (stack)
1157 { 1147 {
1158 if (QUERY_FLAG (stack, FLAG_UNPAID))
1159 {
1160 if (numitems == numallocated) 1148 if (numitems == numallocated)
1161 {
1162 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1149 items = (shopinv *)realloc (items, sizeof (shopinv) * (numallocated *= 2));
1163 numallocated += 10;
1164 }
1165 1150
1166 add_shop_item (stack, items, &numitems, &numallocated); 1151 add_shop_item (stack, items, &numitems, &numallocated);
1167 }
1168
1169 stack = stack->above;
1170 } 1152 }
1153
1154 stack = stack->above;
1171 } 1155 }
1172 } 1156 }
1173 }
1174 1157
1175 if (numitems == 0) 1158 buf << (numitems ? "T<This shop contains:>\n\n"
1176 { 1159 : "T<This shop is currently empty.>");
1177 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1178 free (items);
1179 return;
1180 }
1181 1160
1182 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort); 1161 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
1183
1184 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
1185 1162
1186 for (i = 0; i < numitems; i++) 1163 for (i = 0; i < numitems; i++)
1187 { 1164 {
1188 /* Collapse items of the same name together */ 1165 /* Collapse items of the same name together */
1189 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real)) 1166 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
1190 {
1191 items[i + 1].nrof += items[i].nrof; 1167 items[i + 1].nrof += items[i].nrof;
1192 free (items[i].item_sort);
1193 free (items[i].item_real);
1194 }
1195 else 1168 else
1196 {
1197 new_draw_info_format (NDI_UNIQUE, 0, op, "%d %s",
1198 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real); 1169 buf.printf (" %4d %s\n", items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
1170
1199 free (items[i].item_sort); 1171 free (items[i].item_sort);
1200 free (items[i].item_real); 1172 free (items[i].item_real);
1201 }
1202 } 1173 }
1174
1175 op->contr->infobox (MSG_CHANNEL ("shopitems"), buf);
1203 1176
1204 free (items); 1177 free (items);
1205} 1178}
1206 1179
1207/* elmex: this function checks whether the object is in a shop */ 1180/* elmex: this function checks whether the object is in a shop */

Diff Legend

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