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.24 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.71 by root, Fri Oct 16 01:56:42 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 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>
25#include <spells.h> 26#include <spells.h>
26#include <skills.h> 27#include <skills.h>
27#include <living.h> 28#include <living.h>
… …
33 * offer a range of prices around it such that the maximum price is always one 34 * offer a range of prices around it such that the maximum price is always one
34 * therefore making this number higher, makes specialisation less effective. 35 * therefore making this number higher, makes specialisation less effective.
35 * setting this value above 1 or to a negative value would have interesting, 36 * setting this value above 1 or to a negative value would have interesting,
36 * (though not useful) effects. 37 * (though not useful) effects.
37 */ 38 */
38#define SPECIALISATION_EFFECT 0.5 39#define SPECIALISATION_EFFECT .5
39 40
40/* price a shopkeeper will give someone they neither like nor dislike */ 41// price a shopkeeper will give someone that is not of their race
41#define NEUTRAL_RATIO 0.8 42#define DISLIKE_RATIO 0.8
42 43
43static void pay_from_container (object *pl, object *pouch, sint64 &to_pay); 44static void pay_from_container (object *pl, object *pouch, sint64 &to_pay);
44static sint64 value_limit (sint64 val, int quantity, const object *who, int isshop); 45static sint64 value_limit (sint64 val, int quantity, const object *who, int isshop);
45static double shop_specialisation_ratio (const object *item, const maptile *map); 46static double shop_specialisation_ratio (const object *item, const maptile *map);
46static double shop_greed (const maptile *map); 47static double shop_greed (const maptile *map);
47
48#define NUM_COINS 4 /* number of coin types */
49static const char *const coins[] = { "royalty", "platinacoin", "goldcoin", "silvercoin", NULL };
50 48
51/* Added F_TRUE flag to define.h to mean that the price should not 49/* Added F_TRUE flag to define.h to mean that the price should not
52 * be adjusted by players charisma. With F_TRUE, it returns the amount 50 * be adjusted by players charisma. With F_TRUE, it returns the amount
53 * that the item is worth, if it was sold, but unadjusted by charisma. 51 * that the item is worth, if it was sold, but unadjusted by charisma.
54 * This is needed for alchemy, to to determine what value of gold nuggets 52 * This is needed for alchemy, to to determine what value of gold nuggets
… …
77 75
78sint64 76sint64
79query_cost (const object *tmp, object *who, int flag) 77query_cost (const object *tmp, object *who, int flag)
80{ 78{
81 double val; 79 double val;
82 int number; /* used to better calculate value */
83 int no_bargain; 80 int no_bargain;
84 int identified; 81 int identified;
85 int not_cursed; 82 int not_cursed;
86 int approximate; 83 int approximate;
87 int shop; 84 int shop;
… …
112 109
113 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 ());
114 return 0; 111 return 0;
115 } 112 }
116 113
117 number = tmp->nrof; 114 int number = tmp->number_of ();
118 if (number == 0) 115
119 number = 1;
120 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 116 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified)
121 { 117 {
122 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)))
123 return 0; 119 return 0;
124 else 120 else
125 val = tmp->value * number; 121 val = tmp->value * number;
126 } 122 }
127 /* 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 */
128 else 124 else
129 { 125 {
130 if (tmp->arch != NULL) 126 if (flag == F_BUY)
131 { 127 {
132 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
133 { 136 {
134 LOG (llevError, "Asking for buy-value of unidentified object.\n"); 137 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
135 val = tmp->arch->clone.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;
136 } 144 }
137 else
138 { /* Trying to sell something, or get true value */
139 if (tmp->type == POTION)
140 val = number * 40; /* Don't want to give anything away */
141 else
142 {
143 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
144 * unknown objects
145 */
146 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
147 val = number * tmp->arch->clone.value * 2 / 3;
148 else
149 val = number * tmp->arch->clone.value / 3;
150 }
151 }
152 }
153 else
154 { /* No archetype with this object */
155 LOG (llevDebug, "In sell item: Have object with no archetype: %s\n", &tmp->name);
156 if (flag == F_BUY)
157 {
158 LOG (llevError, "Asking for buy-value of unidentified object without arch.\n");
159 val = number * tmp->value * 10;
160 }
161 else
162 val = number * tmp->value / 5;
163 } 145 }
164 } 146 }
165 147
166 /* 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
167 * identified, AND the object is magical and the archetype is non 149 * identified, AND the object is magical and the archetype is non
168 * magical, then change values accordingly. The tmp->arch==NULL is 150 * magical, then change values accordingly. The tmp->arch==NULL is
169 * really just a check to prevent core dumps for when it checks 151 * really just a check to prevent core dumps for when it checks
170 * tmp->arch->clone.magic for any magic. The check for archetype 152 * tmp->arch->magic for any magic. The check for archetype
171 * magic is to not give extra money for archetypes that are by 153 * magic is to not give extra money for archetypes that are by
172 * default magical. This is because the archetype value should have 154 * default magical. This is because the archetype value should have
173 * already figured in that value. 155 * already figured in that value.
174 */ 156 */
175 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified || 157 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified ||
176 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->clone.magic)) 158 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->magic))
177 { 159 {
178 if (tmp->magic > 0) 160 if (tmp->magic > 0)
179 val *= (3 * tmp->magic * tmp->magic * tmp->magic); 161 val *= (3 * tmp->magic * tmp->magic * tmp->magic);
180 else 162 else
181 /* Note that tmp->magic is negative, so that this 163 /* Note that tmp->magic is negative, so that this
… …
209 * AND Cha = 30 will get optimal price. 191 * AND Cha = 30 will get optimal price.
210 * Thus charisma will never get useless. 192 * Thus charisma will never get useless.
211 * -b.e. edler@heydernet.de 193 * -b.e. edler@heydernet.de
212 */ 194 */
213 195
214 if (who != NULL && who->type == PLAYER) 196 if (who && who->type == PLAYER)
215 { 197 {
216 int lev_bargain = 0; 198 int lev_bargain = 0;
217 int lev_identify = 0; 199 int lev_identify = 0;
218 int idskill1 = 0;
219 int idskill2 = 0;
220 const typedata *tmptype;
221
222 tmptype = get_typedata (tmp->type);
223 200
224 if (find_skill_by_number (who, SK_BARGAINING)) 201 if (find_skill_by_number (who, SK_BARGAINING))
225 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level; 202 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level;
226 203
227 if (tmptype) 204 if (const typedata *tmptype = get_typedata (tmp->type))
228 { 205 {
229 idskill1 = tmptype->identifyskill; 206 if (int idskill1 = tmptype->identifyskill)
230
231 if (idskill1)
232 { 207 {
233 idskill2 = tmptype->identifyskill2; 208 int idskill2 = tmptype->identifyskill2;
234 209
235 if (find_skill_by_number (who, idskill1)) 210 if (find_skill_by_number (who, idskill1))
236 lev_identify = find_skill_by_number (who, idskill1)->level; 211 lev_identify = find_skill_by_number (who, idskill1)->level;
237 212
238 if (idskill2 && find_skill_by_number (who, idskill2)) 213 if (idskill2 && find_skill_by_number (who, idskill2))
239 lev_identify += find_skill_by_number (who, idskill2)->level; 214 lev_identify += find_skill_by_number (who, idskill2)->level;
240 } 215 }
241 } 216 }
242 else
243 LOG (llevError, "Query_cost: item %s hasn't got a valid type\n", tmp->debug_desc ());
244 217
245 /* ratio determines how much of the price modification 218 /* ratio determines how much of the price modification
246 * will come from the basic stat charisma 219 * will come from the basic stat charisma
247 * the rest will come from the level in bargaining skill 220 * the rest will come from the level in bargaining skill
248 */ 221 */
249 const double cha_ratio = 0.40; 222 const double cha_ratio = 0.40;
250 223
251 diff = no_bargain ? 1.0 : 1. - pow (lev_bargain / (double) settings.max_level, 0.25); 224 diff = no_bargain ? 1.0 : 1. - pow (lev_bargain / (double) settings.max_level, 0.25);
252
253 diff = (1. - cha_ratio) * diff + cha_ratio * (cha_bonus[who->stats.Cha] - 1.) / (cha_bonus[who->stats.Cha] + 1.); 225 diff = (1. - cha_ratio) * diff + cha_ratio * (cha_bonus[who->stats.Cha] - 1.) / (cha_bonus[who->stats.Cha] + 1.);
254
255 diff = .02 + (.80 - .02) * diff; 226 diff = .02 + (.80 - .02) * diff;
256 227
257 if (flag == F_BUY) 228 if (flag == F_BUY)
258 val += (val * diff); 229 val += val * diff;
259 else if (flag == F_SELL) 230 else if (flag == F_SELL)
260 val -= (val * diff); 231 val -= val * diff;
261 232
262 // now find a price range. the less good we can judge, the larger the range is 233 // now find a price range. the less good we can judge, the larger the range is
263 // then the range is adjusted randomly around the correct value 234 // then the range is adjusted randomly around the correct value
264 if (approximate) 235 if (approximate)
265 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1)); 236 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1));
266 } 237 }
267 238
268 /* I don't think this should really happen - if it does, it indicates and 239 /* I don't think this should really happen - if it does, it indicates and
269 * overflow of diff above. That shoudl only happen if 240 * overflow of diff above. That should only happen if
270 * we are selling objects - in that case, the person just 241 * we are selling objects - in that case, the person just
271 * gets no money. 242 * gets no money.
272 */ 243 */
273 if ((sint64) val < 0) 244 if ((sint64) val < 0)
274 val = 0; 245 val = 0;
… …
302 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD)) 273 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD))
303 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who)); 274 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who));
304 else 275 else
305 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who))); 276 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who)));
306 } 277 }
278
307 /* we will also have an extra 0-5% variation between shops of the same type 279 /* we will also have an extra 0-5% variation between shops of the same type
308 * for valuable items (below a value of 50 this effect wouldn't be very 280 * for valuable items (below a value of 50 this effect wouldn't be very
309 * pointful, and could give fun with rounding. 281 * pointful, and could give fun with rounding.
310 */ 282 */
311 if (who->map->path != NULL && val > 50) 283 //TODO: why use cosf at all, just % and scale linearly, gives more even distribution
312 val = (val + 0.05 * (sint64) val * cos (tmp->count + strlen (who->map->path))); 284 if (val > 50)
285 val += float (val) * .05f * cosf ((tmp->uuid.seq & 0xffff) * float (M_PI * 2. / 0x10000));
313 } 286 }
287
314 return (sint64) val; 288 return (sint64) val;
315} 289}
316 290
317/* Find the coin type that is worth more the 'c'. Starts at the 291/* Find the coin type that is worth more the 'c'. Starts at the
318 * cointype placement. 292 * cointype placement.
… …
330 coin = archetype::find (coins[*cointype]); 304 coin = archetype::find (coins[*cointype]);
331 if (coin == NULL) 305 if (coin == NULL)
332 return NULL; 306 return NULL;
333 *cointype += 1; 307 *cointype += 1;
334 } 308 }
335 while (coin->clone.value > c); 309 while (coin->value > c);
336 310
337 return coin; 311 return coin;
338} 312}
339 313
340/* This returns a string of how much something is worth based on 314/* This returns a string of how much something is worth based on
… …
356 330
357 coin = find_next_coin (cost, &cointype); 331 coin = find_next_coin (cost, &cointype);
358 if (coin == NULL) 332 if (coin == NULL)
359 return "nothing"; 333 return "nothing";
360 334
361 num = cost / coin->clone.value; 335 num = cost / coin->value;
362 /* so long as nrof is 32 bit, this is true. 336 /* so long as nrof is 32 bit, this is true.
363 * If it takes more coins than a person can possibly carry, this 337 * If it takes more coins than a person can possibly carry, this
364 * is basically true. 338 * is basically true.
365 */ 339 */
366 if ((cost / coin->clone.value) > UINT32_MAX) 340 if ((cost / coin->value) > UINT32_MAX)
367 { 341 {
368 strcpy (buf, "an unimaginable sum of money"); 342 strcpy (buf, "an unimaginable sum of money");
369 return buf; 343 return buf;
370 } 344 }
371 345
372 cost -= num * (sint64)coin->clone.value; 346 cost -= num * (sint64)coin->value;
373 347
374 sprintf (buf, "%d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 348 sprintf (buf, "%d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
375 349
376 next_coin = find_next_coin (cost, &cointype); 350 next_coin = find_next_coin (cost, &cointype);
377 if (next_coin == NULL || approx) 351 if (next_coin == NULL || approx)
378 return buf; 352 return buf;
379 353
380 coin = next_coin; 354 coin = next_coin;
381 num = cost / coin->clone.value; 355 num = cost / coin->value;
382 cost -= num * (sint64)coin->clone.value; 356 cost -= num * (sint64)coin->value;
383 357
384 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 358 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
385 359
386 return buf; 360 return buf;
387} 361}
388 362
389const char * 363const char *
… …
419 archetype *coin = find_next_coin (real_value, &cointype); 393 archetype *coin = find_next_coin (real_value, &cointype);
420 394
421 if (coin == NULL) 395 if (coin == NULL)
422 return "nothing"; 396 return "nothing";
423 397
424 num = real_value / coin->clone.value; 398 num = real_value / coin->value;
399
425 if (num == 1) 400 if (num == 1)
426 sprintf (buf, "about one %s", &coin->clone.name); 401 sprintf (buf, "about one %s", &coin->object::name);
427 else if (num < 5) 402 else if (num < 5)
428 sprintf (buf, "a few %s", &coin->clone.name_pl); 403 sprintf (buf, "a few %s", &coin->object::name_pl);
429 else if (num < 10) 404 else if (num < 10)
430 sprintf (buf, "several %s", &coin->clone.name_pl); 405 sprintf (buf, "several %s", &coin->object::name_pl);
431 else if (num < 25) 406 else if (num < 25)
432 sprintf (buf, "a moderate amount of %s", &coin->clone.name_pl); 407 sprintf (buf, "a moderate amount of %s", &coin->object::name_pl);
433 else if (num < 100) 408 else if (num < 100)
434 sprintf (buf, "lots of %s", &coin->clone.name_pl); 409 sprintf (buf, "lots of %s", &coin->object::name_pl);
435 else if (num < 1000) 410 else if (num < 1000)
436 sprintf (buf, "a great many %s", &coin->clone.name_pl); 411 sprintf (buf, "a great many %s", &coin->object::name_pl);
437 else 412 else
438 sprintf (buf, "a vast quantity of %s", &coin->clone.name_pl); 413 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
414
439 return buf; 415 return buf;
440 } 416 }
441 } 417 }
442 } 418 }
443 419
… …
474 } 450 }
475 451
476 for (tmp = op->inv; tmp; tmp = tmp->below) 452 for (tmp = op->inv; tmp; tmp = tmp->below)
477 if (tmp->type == MONEY) 453 if (tmp->type == MONEY)
478 total += tmp->nrof * (sint64)tmp->value; 454 total += tmp->nrof * (sint64)tmp->value;
479 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")))
480 total += query_money (tmp); 456 total += query_money (tmp);
481 457
482 return total; 458 return total;
483} 459}
484 460
… …
499 return 0; 475 return 0;
500 476
501 pay_from_container (pl, pl, to_pay); 477 pay_from_container (pl, pl, to_pay);
502 478
503 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 479 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
504 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")))
505 pay_from_container (pl, pouch, to_pay); 481 pay_from_container (pl, pouch, to_pay);
506 482
507 fix_player (pl); 483 pl->update_stats ();
508 return 1; 484 return 1;
509} 485}
510 486
511/* DAMN: This is now a wrapper for pay_from_container, which is 487/* DAMN: This is now a wrapper for pay_from_container, which is
512 * called for the player, then for each active container that can hold 488 * called for the player, then for each active container that can hold
… …
536 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE); 512 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE);
537 513
538 pay_from_container (pl, pl, to_pay); 514 pay_from_container (pl, pl, to_pay);
539 515
540 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 516 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
541 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")))
542 pay_from_container (pl, pouch, to_pay); 518 pay_from_container (pl, pouch, to_pay);
543 519
544 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ)) 520 pl->update_stats ();
545 SET_FLAG (op, FLAG_WAS_WIZ);
546 521
547 fix_player (pl);
548 return 1; 522 return 1;
549} 523}
550 524
551/* This pays for the item, and takes the proper amount of money off 525/* This pays for the item, and takes the proper amount of money off
552 * the player. 526 * the player.
… …
581 555
582 if (tmp->type == MONEY) 556 if (tmp->type == MONEY)
583 { 557 {
584 for (i = 0; i < NUM_COINS; i++) 558 for (i = 0; i < NUM_COINS; i++)
585 { 559 {
586 if (tmp->value == tmp->arch->clone.value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->name)) 560 if (tmp->value == tmp->arch->value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->archname))
587 { 561 {
588 // 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.
589 if (coin_objs [i]) 563 if (coin_objs [i])
590 { 564 {
591 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]);
592 tmp->remove ();
593 coin_objs[i]->nrof += tmp->nrof; 566 coin_objs[i]->nrof += tmp->nrof;
594 esrv_del_item (pl->contr, tmp->count);
595 tmp->destroy (); 567 tmp->destroy ();
596 } 568 }
597 else 569 else
598 { 570 {
599 tmp->remove (); 571 tmp->remove ();
600
601 if (pouch->type == PLAYER)
602 esrv_del_item (pl->contr, tmp->count);
603
604 coin_objs[i] = tmp; 572 coin_objs[i] = tmp;
605 } 573 }
606 574
607 break; 575 break;
608 } 576 }
609 } 577 }
610 578
611 if (i == NUM_COINS) 579 if (i == NUM_COINS)
612 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->name); 580 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->archname);
613 } 581 }
614 } 582 }
615 583
616 /* Fill in any gaps in the coin_objs array - needed to make change. */ 584 /* Fill in any gaps in the coin_objs array - needed to make change. */
617 /* Note that the coin_objs array goes from least value to greatest value */ 585 /* Note that the coin_objs array goes from least value to greatest value */
… …
628 } 596 }
629 597
630 for (i = 0; i < NUM_COINS; i++) 598 for (i = 0; i < NUM_COINS; i++)
631 { 599 {
632 object &coin = *coin_objs[i]; 600 object &coin = *coin_objs[i];
633 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);
634 to_pay -= num_coins * coin.value; 602 to_pay -= num_coins * coin.value;
635 603
636 coin.nrof -= num_coins; 604 coin.nrof -= num_coins;
637 /* Now start making change. Start at the coin value 605 /* Now start making change. Start at the coin value
638 * below the one we just did, and work down to 606 * below the one we just did, and work down to
… …
648 count--; 616 count--;
649 } 617 }
650 } 618 }
651 619
652 for (i = 0; i < NUM_COINS; i++) 620 for (i = 0; i < NUM_COINS; i++)
653 {
654 if (coin_objs[i]->nrof) 621 if (coin_objs[i]->nrof)
655 {
656 object *tmp = insert_ob_in_ob (coin_objs[i], pouch); 622 insert_ob_in_ob (coin_objs [i], pouch);
657
658 esrv_send_item (pl, tmp);
659 esrv_send_item (pl, pouch);
660
661 if (pl != pouch)
662 esrv_update_item (UPD_WEIGHT, pl, pouch);
663
664 if (pl->type != PLAYER)
665 esrv_send_item (pl, pl);
666 }
667 else 623 else
668 coin_objs[i]->destroy (); 624 coin_objs[i]->destroy ();
669 }
670} 625}
671 626
672/* 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
673 * 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.
674 * 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
… …
694 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP); 649 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
695 } 650 }
696 651
697 if (unpaid_price > player_wealth) 652 if (unpaid_price > player_wealth)
698 { 653 {
699 char buf[MAX_BUF]; 654 dynbuf_text &buf = msg_dynbuf; buf.clear ();
700 char cost[MAX_BUF];
701 char missing[MAX_BUF];
702 655
703 snprintf (cost, MAX_BUF, "%s", cost_string_from_value (unpaid_price, 0)); 656 buf << "You have " << unpaid_count
704 snprintf (missing, MAX_BUF, "%s", cost_string_from_value (unpaid_price - player_wealth, 0)); 657 << " unpaid item(s) that would cost you " << cost_string_from_value (unpaid_price, 0)
658 << ". You need another " << cost_string_from_value (unpaid_price - player_wealth, 0)
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.>";
705 661
706 snprintf (buf, MAX_BUF, "You have %d unpaid items that would cost you %s. You need another %s to be able to afford that.", 662 pl->failmsg (buf);
707 unpaid_count, cost, missing);
708 new_draw_info (NDI_UNIQUE, 0, pl, buf);
709 663
710 return 0; 664 return 0;
711 } 665 }
712 else 666 else
713 return 1; 667 return 1;
… …
742 SET_FLAG (op, FLAG_UNPAID); 696 SET_FLAG (op, FLAG_UNPAID);
743 return 0; 697 return 0;
744 } 698 }
745 else 699 else
746 { 700 {
747 object *tmp;
748
749 CLEAR_FLAG (op, FLAG_UNPAID); 701 CLEAR_FLAG (op, FLAG_UNPAID);
750 CLEAR_FLAG (op, FLAG_PLAYER_SOLD); 702 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
751 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); 703 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
752 tmp = merge_ob (op, NULL);
753 704
754 if (pl->type == PLAYER) 705 if (!merge_ob (op, op->env->inv))
755 {
756 if (tmp)
757 { /* it was merged */
758 esrv_del_item (pl->contr, op->count);
759 op = tmp;
760 }
761
762 esrv_send_item (pl, op); 706 esrv_update_item (UPD_FLAGS, pl, op);
763 }
764 707
765 goto next_item; 708 goto next_item;
766 } 709 }
767 } 710 }
768 } 711 }
… …
787{ 730{
788 int count = 0; 731 int count = 0;
789 archetype *at = 0; 732 archetype *at = 0;
790 object *pouch = 0, *tmp = 0; 733 object *pouch = 0, *tmp = 0;
791 734
792 for (count = 0; coins[count] != NULL; count++) 735 for (count = 0; coins[count]; count++)
793 { 736 {
794 at = archetype::find (coins[count]); 737 at = archetype::find (coins[count]);
795 738
796 if (at == NULL) 739 if (at == NULL)
797 LOG (llevError, "Could not find %s archetype\n", coins[count]); 740 LOG (llevError, "Could not find %s archetype\n", coins[count]);
798 else if ((amount / at->clone.value) > 0) 741 else if ((amount / at->value) > 0)
799 { 742 {
800 for (pouch = pl->inv; pouch; pouch = pouch->below) 743 for (pouch = pl->inv; pouch; pouch = pouch->below)
801 { 744 {
802 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"))
803 { 746 {
804 int w = at->clone.weight * (100 - pouch->stats.Str) / 100; 747 int w = at->weight * (100 - pouch->stats.Str) / 100;
805 int n = amount / at->clone.value; 748 int n = amount / at->value;
806 749
807 if (w == 0) 750 if (w == 0)
808 w = 1; /* Prevent divide by zero */ 751 w = 1; /* Prevent divide by zero */
809 752
810 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit)) 753 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit))
811 { 754 {
812 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n) 755 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n)
813 n = (pouch->weight_limit - pouch->carrying) / w; 756 n = (pouch->weight_limit - pouch->carrying) / w;
814 757
815 tmp = arch_to_object (at); 758 object *tmp = arch_to_object (at);
816 tmp->nrof = n; 759 tmp->nrof = n;
817 amount -= tmp->nrof * tmp->value; 760 amount -= tmp->nrof * tmp->value;
818 tmp = insert_ob_in_ob (tmp, pouch); 761 pouch->insert (tmp);
819 esrv_send_item (pl, tmp);
820 esrv_send_item (pl, pouch);
821 esrv_update_item (UPD_WEIGHT, pl, pouch);
822 esrv_send_item (pl, pl);
823 } 762 }
824 } 763 }
825 } 764 }
826 765
827 if (amount / at->clone.value > 0) 766 if (amount / at->value > 0)
828 { 767 {
829 tmp = arch_to_object (at); 768 object *tmp = arch_to_object (at);
830 tmp->nrof = amount / tmp->value; 769 tmp->nrof = amount / tmp->value;
831 amount -= tmp->nrof * tmp->value; 770 amount -= tmp->nrof * tmp->value;
832 tmp = insert_ob_in_ob (tmp, pl); 771 pl->insert (tmp);
833 esrv_send_item (pl, tmp);
834 esrv_send_item (pl, pl);
835 } 772 }
836 } 773 }
837 } 774 }
838 775
839 if (amount != 0) 776 if (amount != 0)
… …
842 779
843/* elmex: this is for the bank plugin :( */ 780/* elmex: this is for the bank plugin :( */
844sint64 781sint64
845pay_player_arch (object *pl, const char *arch, sint64 amount) 782pay_player_arch (object *pl, const char *arch, sint64 amount)
846{ 783{
847 archetype *at = archetype::find (arch);
848 object *tmp = NULL;
849
850 if (at == NULL)
851 return 0;
852
853 if (amount > 0) 784 if (amount)
854 { 785 {
855 tmp = arch_to_object (at); 786 object *ob = archetype::get (arch);
787
788 if (!ob)
789 return 0;
790
856 tmp->nrof = amount; 791 ob->nrof = amount;
857 tmp = insert_ob_in_ob (tmp, pl); 792 pl->insert (ob);
858 esrv_send_item (pl, tmp);
859 esrv_send_item (pl, pl);
860 } 793 }
861 794
862 return 1; 795 return 1;
863} 796}
864 797
… …
867 * buy item. 800 * buy item.
868 * 801 *
869 * Modified to fill available race: gold containers before dumping 802 * Modified to fill available race: gold containers before dumping
870 * remaining coins in character's inventory. 803 * remaining coins in character's inventory.
871 */ 804 */
872void 805bool
873sell_item (object *op, object *pl) 806sell_item (object *op, object *pl)
874{ 807{
875 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain; 808 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain;
876 809
877 if (pl == NULL || pl->type != PLAYER) 810 if (pl == NULL || pl->type != PLAYER)
878 { 811 {
879 LOG (llevDebug, "Object other than player tried to sell something.\n"); 812 LOG (llevDebug, "Object other than player tried to sell something.\n");
880 return; 813 return false;
881 } 814 }
882 815
883 op->custom_name = 0; 816 op->custom_name = 0;
884 817
885 if (!amount) 818 if (!amount)
886 { 819 {
887 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.", query_name (op)); 820 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.",
888 821 query_name (op));
889 /* Even if the character doesn't get anything for it, it may still be 822 // elmex: change: the player now gets the item back if the shop is not
890 * worth something. If so, make it unpaid 823 // interested in it.
891 */
892 if (op->value)
893 {
894 SET_FLAG (op, FLAG_UNPAID);
895 SET_FLAG (op, FLAG_PLAYER_SOLD);
896 }
897
898 identify (op);
899 return; 824 return false;
900 } 825 }
901 826
902 /* We compare the price with the one for a player 827 /* We compare the price with the one for a player
903 * without bargaining skill. 828 * without bargaining skill.
904 * This determins the amount of exp (if any) gained for bargaining. 829 * This determins the amount of exp (if any) gained for bargaining.
… …
909 if (extra_gain > 0) 834 if (extra_gain > 0)
910 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE); 835 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE);
911 836
912 pay_player (pl, amount); 837 pay_player (pl, amount);
913 838
914 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.", query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op)); 839 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.",
840 query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op));
841 pl->play_sound (sound_find ("shop_sell"));
915 842
916 SET_FLAG (op, FLAG_UNPAID); 843 SET_FLAG (op, FLAG_UNPAID);
917 identify (op); 844 identify (op);
918}
919 845
846 return true;
847}
920 848
921/* returns a double that is the ratio of the price that a shop will offer for 849/* returns a double that is the ratio of the price that a shop will offer for
922 * item based on the shops specialisation. Does not take account of greed, 850 * item based on the shops specialisation. Does not take account of greed,
923 * returned value is between (2*SPECIALISATION_EFFECT-1) and 1 and in any 851 * returned value is between SPECIALISATION_EFFECT and 1.
924 * event is never less than 0.1 (calling functions divide by it)
925 */ 852 */
926static double 853static double
927shop_specialisation_ratio (const object *item, const maptile *map) 854shop_specialisation_ratio (const object *item, const maptile *map)
928{ 855{
929 shopitems *items = map->shopitems; 856 shopitems *items = map->shopitems;
930 double ratio = SPECIALISATION_EFFECT, likedness = 0.001; 857 double likedness = 0.;
931 int i; 858 int i;
932 859
933 if (item == NULL) 860 if (item == NULL)
934 { 861 {
935 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", map->path); 862 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
936 return 0; 863 return 0;
937 } 864 }
938 865
939 if (!item->type) 866 if (!item->type)
940 { 867 {
941 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n"); 868 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n");
942 /* 869 /*
943 * I'm not really sure what the /right/ thing to do here is, these types of 870 * I'm not really sure what the /right/ thing to do here is, these types of
944 * item shouldn't exist anyway, but returning the ratio is probably the best bet.." 871 * item shouldn't exist anyway, but returning the ratio is probably the best bet.."
945 */ 872 */
946 return ratio; 873 return SPECIALISATION_EFFECT;
947 } 874 }
948 875
949 if (map->shopitems) 876 if (map->shopitems)
950 { 877 {
951 for (i = 0; i < items[0].index; i++) 878 for (i = 0; i < items[0].index; i++)
… …
953 likedness = items[i].strength / 100.0; 880 likedness = items[i].strength / 100.0;
954 } 881 }
955 882
956 if (likedness > 1.0) 883 if (likedness > 1.0)
957 { /* someone has been rather silly with the map headers. */ 884 { /* someone has been rather silly with the map headers. */
958 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, map->path); 885 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path);
959 likedness = 1.0; 886 likedness = 1.0;
960 } 887 }
961 888
962 if (likedness < -1.0) 889 if (likedness < -1.0)
963 { 890 {
964 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, map->path); 891 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
965 likedness = -1.0; 892 likedness = -1.0;
966 } 893 }
967 894
968 ratio = ratio + (1.0 - ratio) * likedness; 895 return lerp (likedness, -1., 1., SPECIALISATION_EFFECT, 1.);
969
970 if (ratio <= 0.1)
971 ratio = 0.1; /* if the ratio were much lower than this, we would get silly prices */
972
973 return ratio;
974} 896}
975 897
976/*returns the greed of the shop on map, or 1 if it isn't specified. */ 898/*returns the greed of the shop on map, or 1 if it isn't specified. */
977static double 899static double
978shop_greed (const maptile *map) 900shop_greed (const maptile *map)
979{ 901{
980 double greed = 1.0;
981
982 if (map->shopgreed)
983 return map->shopgreed; 902 return map->shopgreed
984 return greed; 903 ? map->shopgreed
904 : 1.;
985} 905}
986 906
987/* Returns a double based on how much the shopkeeper approves of the player. 907/* Returns a double based on how much the shopkeeper approves of the player.
988 * this is based on the race of the shopkeeper and that of the player. 908 * this is based on the race of the shopkeeper and that of the player.
989 */ 909 */
990double 910double
991shopkeeper_approval (const maptile *map, const object *player) 911shopkeeper_approval (const maptile *map, const object *player)
992{ 912{
993 double approval = 1.0; 913 return map->shoprace && player->race != map->shoprace
994 914 ? DISLIKE_RATIO
995 if (map->shoprace) 915 : 1.;
996 {
997 approval = NEUTRAL_RATIO;
998 if (player->race && !strcmp (player->race, map->shoprace))
999 approval = 1.0;
1000 }
1001
1002 return approval;
1003} 916}
1004 917
1005/* limit the value of items based on the wealth of the shop. If the item is close 918/* limit the value of items based on the wealth of the shop. If the item is close
1006 * to the maximum value a shop will offer, we start to reduce it, if the item is 919 * to the maximum value a shop will offer, we start to reduce it, if the item is
1007 * below the minimum value the shop is prepared to trade in, then we don't 920 * below the minimum value the shop is prepared to trade in, then we don't
… …
1051 964
1052/* gives a desciption of the shop on their current map to the player op. */ 965/* gives a desciption of the shop on their current map to the player op. */
1053int 966int
1054describe_shop (const object *op) 967describe_shop (const object *op)
1055{ 968{
969 dynbuf_text buf;
1056 maptile *map = op->map; 970 maptile *map = op->map;
1057 971
1058 /*shopitems *items=map->shopitems; */ 972 /*shopitems *items=map->shopitems; */
1059 int pos = 0, i; 973 int pos = 0, i;
1060 double opinion = 0; 974 double opinion = 0;
1061 char tmp[MAX_BUF] = "\0";
1062 975
1063 if (op->type != PLAYER) 976 if (op->type != PLAYER)
1064 return 0; 977 return 0;
1065 978
1066 /*check if there is a shop specified for this map */ 979 /*check if there is a shop specified for this map */
1067 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax) 980 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax)
1068 { 981 {
1069 new_draw_info (NDI_UNIQUE, 0, op, "From looking at the nearby shop you determine that it trades in:"); 982 buf << "From looking at the nearby shop you determine that it trades in ";
983
984 char tmp[MAX_BUF];
1070 985
1071 if (map->shopitems) 986 if (map->shopitems)
1072 for (i = 0; i < map->shopitems[0].index; i++) 987 for (i = 0; i < map->shopitems[0].index; i++)
1073 if (map->shopitems[i].name && map->shopitems[i].strength > 10) 988 if (map->shopitems[i].name && map->shopitems[i].strength > 10)
1074 { 989 {
1075 snprintf (tmp + pos, sizeof (tmp) - pos, "%s, ", map->shopitems[i].name_pl); 990 snprintf (tmp + pos, sizeof (tmp) - pos, "%s, ", map->shopitems[i].name_pl);
1076 pos += strlen (tmp + pos); 991 pos += strlen (tmp + pos);
1077 } 992 }
1078 993
1079 if (!pos) 994 if (pos)
995 make_list_like (tmp);
996 else
1080 strcat (tmp, "a little of everything."); 997 strcat (tmp, "a little of everything.");
1081 998
1082 /* format the string into a list */ 999 /* format the string into a list */
1083 make_list_like (tmp); 1000 buf << tmp << "\n\n";
1084 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", tmp);
1085 1001
1086 if (map->shopmax) 1002 if (map->shopmax)
1087 new_draw_info_format (NDI_UNIQUE, 0, op, "It won't trade for items above %s.", cost_string_from_value (map->shopmax, 0)); 1003 buf << "It won't trade for items above " << cost_string_from_value (map->shopmax, 0) << ".\n\n";
1088 1004
1089 if (map->shopmin) 1005 if (map->shopmin)
1090 new_draw_info_format (NDI_UNIQUE, 0, op, "It won't trade in items worth less than %s.", cost_string_from_value (map->shopmin, 0)); 1006 buf << "It won't trade in items worth less than " << cost_string_from_value (map->shopmin, 0) << ".\n\n";
1091 1007
1092 if (map->shopgreed) 1008 if (map->shopgreed)
1093 { 1009 {
1094 if (map->shopgreed > 2.0) 1010 if (map->shopgreed > 2.0)
1095 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge massively."); 1011 buf << "It tends to overcharge massively.\n\n";
1096 else if (map->shopgreed > 1.5) 1012 else if (map->shopgreed > 1.5)
1097 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge substantially."); 1013 buf << "It tends to overcharge substantially.\n\n";
1098 else if (map->shopgreed > 1.1) 1014 else if (map->shopgreed > 1.1)
1099 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge slightly."); 1015 buf << "It tends to overcharge slightly.\n\n";
1100 else if (map->shopgreed < 0.9) 1016 else if (map->shopgreed < 0.9)
1101 new_draw_info (NDI_UNIQUE, 0, op, "It tends to undercharge."); 1017 buf << "It tends to undercharge.\n\n";
1102 } 1018 }
1103 1019
1104 if (map->shoprace) 1020 if (map->shoprace)
1105 { 1021 {
1106 opinion = shopkeeper_approval (map, op); 1022 opinion = shopkeeper_approval (map, op);
1023
1107 if (opinion > 0.8) 1024 if (opinion > 0.8)
1108 new_draw_info (NDI_UNIQUE, 0, op, "You think the shopkeeper likes you."); 1025 buf << "You think the shopkeeper likes you.\n\n";
1109 else if (opinion > 0.5) 1026 else if (opinion > 0.5)
1110 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper seems unconcerned by you."); 1027 buf << "The shopkeeper seems unconcerned by you.\n\n";
1111 else 1028 else
1112 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper seems to have taken a dislike to you."); 1029 buf << "The shopkeeper seems to have taken a dislike to you.\n\n";
1113 } 1030 }
1114 } 1031 }
1115 else 1032 else
1116 new_draw_info (NDI_UNIQUE, 0, op, "There is no shop nearby."); 1033 buf << "There is no shop nearby.\n\n";
1034
1035 op->contr->infobox (MSG_CHANNEL ("shopinfo"), buf);
1117 1036
1118 return 1; 1037 return 1;
1119} 1038}
1120 1039
1121struct shopinv 1040struct shopinv
… …
1136{ 1055{
1137 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2; 1056 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2;
1138 1057
1139 if (s1->type < s2->type) 1058 if (s1->type < s2->type)
1140 return -1; 1059 return -1;
1060
1141 if (s1->type > s2->type) 1061 if (s1->type > s2->type)
1142 return 1; 1062 return 1;
1143 1063
1144 /* the type is the same (what atoi gets), so do a strcasecmp to sort 1064 /* the type is the same (what atoi gets), so do a strcasecmp to sort
1145 * via alphabetical order 1065 * via alphabetical order
… …
1188 items[*numitems].item_sort = strdup (query_base_name (tmp, 0)); 1108 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1189 items[*numitems].item_real = strdup (query_base_name (tmp, 1)); 1109 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1190 (*numitems)++; 1110 (*numitems)++;
1191 break; 1111 break;
1192 } 1112 }
1113
1193 SET_FLAG (tmp, FLAG_UNPAID); 1114 SET_FLAG (tmp, FLAG_UNPAID);
1194} 1115}
1195 1116
1196void 1117void
1197shop_listing (object *op) 1118shop_listing (object *sign, object *op)
1198{ 1119{
1199 int i, j, numitems = 0, numallocated = 0, nx, ny; 1120 int i, j, x1, x2, y1, y2;
1200 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 1121 const char *shop_coords = sign->kv (shstr_shop_coords);
1201 object *stack; 1122 object *stack;
1202 shopinv *items; 1123 shopinv *items;
1203 1124
1204 /* Should never happen, but just in case a monster does apply a sign */ 1125 /* Should never happen, but just in case a monster does apply a sign */
1205 if (op->type != PLAYER) 1126 if (!op->is_player ())
1206 return; 1127 return;
1207 1128
1208 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:"); 1129 dynbuf_text &buf = msg_dynbuf; buf.clear ();
1209 1130
1210 magic_mapping_mark (op, map_mark, 3); 1131 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1211 items = (shopinv *) malloc (40 * sizeof (shopinv)); 1132 {
1133 x1 = 0;
1134 y1 = 0;
1135 x2 = op->map->width - 1;
1136 y2 = op->map->height - 1;
1137 }
1138
1212 numallocated = 40; 1139 int numallocated = 40;
1140 int numitems = 0;
1141 items = (shopinv *)malloc (sizeof (shopinv) * numallocated);
1213 1142
1214 /* Find all the appropriate items */ 1143 /* Find all the appropriate items */
1215 for (i = 0; i < MAP_WIDTH (op->map); i++) 1144 for (i = x1; i <= x2; i++)
1216 { 1145 for (j = y1; j < y2; j++)
1217 for (j = 0; j < MAP_HEIGHT (op->map); j++) 1146 if (is_in_shop (op->map, i, j))
1218 { 1147 {
1219 /* magic map code now centers the map on the object at MAGIC_MAP_HALF. 1148 stack = GET_MAP_OB (op->map, i, j);
1220 *
1221 */
1222 nx = i - op->x + MAGIC_MAP_HALF;
1223 ny = j - op->y + MAGIC_MAP_HALF;
1224 /* unlikely, but really big shops could run into this issue */
1225 if (nx < 0 || ny < 0 || nx > MAGIC_MAP_SIZE || ny > MAGIC_MAP_SIZE)
1226 continue;
1227 1149
1228 if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR) 1150 while (stack)
1229 { 1151 {
1230 stack = get_map_ob (op->map, i, j); 1152 if (QUERY_FLAG (stack, FLAG_UNPAID))
1231
1232 while (stack)
1233 { 1153 {
1234 if (QUERY_FLAG (stack, FLAG_UNPAID))
1235 {
1236 if (numitems == numallocated) 1154 if (numitems == numallocated)
1237 {
1238 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1155 items = (shopinv *)realloc (items, sizeof (shopinv) * (numallocated *= 2));
1239 numallocated += 10; 1156
1240 }
1241 add_shop_item (stack, items, &numitems, &numallocated); 1157 add_shop_item (stack, items, &numitems, &numallocated);
1242 }
1243 stack = stack->above;
1244 } 1158 }
1159
1160 stack = stack->above;
1245 } 1161 }
1246 } 1162 }
1247 }
1248 1163
1249 free (map_mark); 1164 buf << (numitems ? "T<This shop contains:>\n\n"
1250 1165 : "T<This shop is currently empty.>");
1251 if (numitems == 0)
1252 {
1253 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1254 free (items);
1255 return;
1256 }
1257 1166
1258 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort); 1167 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
1259 1168
1260 for (i = 0; i < numitems; i++) 1169 for (i = 0; i < numitems; i++)
1261 { 1170 {
1262 /* Collapse items of the same name together */ 1171 /* Collapse items of the same name together */
1263 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real)) 1172 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
1264 {
1265 items[i + 1].nrof += items[i].nrof; 1173 items[i + 1].nrof += items[i].nrof;
1266 free (items[i].item_sort);
1267 free (items[i].item_real);
1268 }
1269 else 1174 else
1270 {
1271 new_draw_info_format (NDI_UNIQUE, 0, op, "%d %s",
1272 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real); 1175 buf.printf (" %4d %s\n", items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
1176
1273 free (items[i].item_sort); 1177 free (items[i].item_sort);
1274 free (items[i].item_real); 1178 free (items[i].item_real);
1275 }
1276 } 1179 }
1180
1181 op->contr->infobox (MSG_CHANNEL ("shopitems"), buf);
1182
1277 free (items); 1183 free (items);
1278} 1184}
1279 1185
1280/* elmex: this function checks whether the object is in a shop */ 1186/* elmex: this function checks whether the object is in a shop */
1281bool 1187bool
1282is_in_shop (object *o) 1188is_in_shop (object *o)
1283{ 1189{
1284 if (!o->map) 1190 if (!o->is_on_map ())
1285 return false; 1191 return false;
1286 1192
1287 return is_in_shop (o->map, o->x, o->y); 1193 return is_in_shop (o->map, o->x, o->y);
1288} 1194}
1289 1195
1290/* elmex: this function checks whether we are in a shop or not */ 1196/* elmex: this function checks whether we are in a shop or not
1197 - change 2007-11-26: enhanced the O(n) case by stopping at the first
1198 floor tile. this possibly will make map bugs where shopfloors are above
1199 floors more obvious.
1200*/
1201
1291bool 1202bool
1292is_in_shop (maptile *map, int x, int y) 1203is_in_shop (maptile *map, int x, int y)
1293{ 1204{
1294 for (object *floor = get_map_ob (map, x, y); floor; floor = floor->above) 1205 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
1206 if (QUERY_FLAG (floor, FLAG_IS_FLOOR))
1295 if (floor->type == SHOP_FLOOR) 1207 return floor->type == SHOP_FLOOR;
1296 return true;
1297 1208
1298 return false; 1209 return false;
1299} 1210}
1211

Diff Legend

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