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.36 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.79 by root, Thu Apr 15 02:51:40 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * 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
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 2 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, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <spells.h> 26#include <spells.h>
27#include <skills.h> 27#include <skills.h>
28#include <living.h> 28#include <living.h>
29#include <sproto.h> 29#include <sproto.h>
30#include <math.h>
31 30
32/* this is a measure of how effective store specialisation is. A general store 31/* this is a measure of how effective store specialisation is. A general store
33 * will offer this proportion of the 'maximum' price, a specialised store will 32 * will offer this proportion of the 'maximum' price, a specialised store will
34 * offer a range of prices around it such that the maximum price is always one 33 * offer a range of prices around it such that the maximum price is always one
35 * therefore making this number higher, makes specialisation less effective. 34 * therefore making this number higher, makes specialisation less effective.
36 * setting this value above 1 or to a negative value would have interesting, 35 * setting this value above 1 or to a negative value would have interesting,
37 * (though not useful) effects. 36 * (though not useful) effects.
38 */ 37 */
39#define SPECIALISATION_EFFECT 0.5 38#define SPECIALISATION_EFFECT .5
40 39
41/* price a shopkeeper will give someone they neither like nor dislike */ 40// price a shopkeeper will give someone that is not of their race
42#define NEUTRAL_RATIO 0.8 41#define DISLIKE_RATIO 0.8
43 42
44static void pay_from_container (object *pl, object *pouch, sint64 &to_pay); 43static void pay_from_container (object *pl, object *pouch, sint64 &to_pay);
45static sint64 value_limit (sint64 val, int quantity, const object *who, int isshop); 44static sint64 value_limit (sint64 val, int quantity, const object *who, int isshop);
46static double shop_specialisation_ratio (const object *item, const maptile *map); 45static double shop_specialisation_ratio (const object *item, const maptile *map);
47static double shop_greed (const maptile *map); 46static double shop_greed (const maptile *map);
48
49#define NUM_COINS 4 /* number of coin types */
50static const char *const coins[] = { "royalty", "platinacoin", "goldcoin", "silvercoin", NULL };
51 47
52/* Added F_TRUE flag to define.h to mean that the price should not 48/* Added F_TRUE flag to define.h to mean that the price should not
53 * be adjusted by players charisma. With F_TRUE, it returns the amount 49 * be adjusted by players charisma. With F_TRUE, it returns the amount
54 * that the item is worth, if it was sold, but unadjusted by charisma. 50 * that the item is worth, if it was sold, but unadjusted by charisma.
55 * This is needed for alchemy, to to determine what value of gold nuggets 51 * This is needed for alchemy, to to determine what value of gold nuggets
… …
78 74
79sint64 75sint64
80query_cost (const object *tmp, object *who, int flag) 76query_cost (const object *tmp, object *who, int flag)
81{ 77{
82 double val; 78 double val;
83 int number; /* used to better calculate value */
84 int no_bargain; 79 int no_bargain;
85 int identified; 80 int identified;
86 int not_cursed; 81 int not_cursed;
87 int approximate; 82 int approximate;
88 int shop; 83 int shop;
… …
113 108
114 LOG (llevError, "Query_cost: Gem type with unknown flag %d: %s\n", flag, tmp->debug_desc ()); 109 LOG (llevError, "Query_cost: Gem type with unknown flag %d: %s\n", flag, tmp->debug_desc ());
115 return 0; 110 return 0;
116 } 111 }
117 112
118 number = tmp->nrof; 113 int number = tmp->number_of ();
119 if (number == 0) 114
120 number = 1;
121 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 115 if (tmp->flag [FLAG_IDENTIFIED] || !tmp->need_identify () || identified)
122 { 116 {
123 if (!not_cursed && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 117 if (!not_cursed && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
124 return 0; 118 return 0;
125 else 119 else
126 val = tmp->value * number; 120 val = tmp->value * number;
127 } 121 }
128 /* This area deals with objects that are not identified, but can be */ 122 /* This area deals with objects that are not identified, but can be */
129 else 123 else
130 { 124 {
131 if (tmp->arch != NULL)
132 {
133 if (flag == F_BUY) 125 if (flag == F_BUY)
126 {
127 LOG (llevError | logBacktrace, "Asking for buy-value of unidentified object: %s\n", tmp->debug_desc ());
128 val = tmp->arch->value * 50 * number;
129 }
130 else
131 { /* Trying to sell something, or get true value */
132 if (tmp->type == POTION)
133 val = number * 40; /* Don't want to give anything away */
134 else
134 { 135 {
135 LOG (llevError, "Asking for buy-value of unidentified object.\n"); 136 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
136 val = tmp->arch->clone.value * 50 * number; 137 * unknown objects
138 */
139 if (tmp->flag [FLAG_BEEN_APPLIED])
140 val = number * tmp->arch->value * 2 / 3;
141 else
142 val = number * tmp->arch->value / 3;
137 } 143 }
138 else
139 { /* Trying to sell something, or get true value */
140 if (tmp->type == POTION)
141 val = number * 40; /* Don't want to give anything away */
142 else
143 {
144 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
145 * unknown objects
146 */
147 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
148 val = number * tmp->arch->clone.value * 2 / 3;
149 else
150 val = number * tmp->arch->clone.value / 3;
151 }
152 }
153 }
154 else
155 { /* No archetype with this object */
156 LOG (llevDebug, "In sell item: Have object with no archetype: %s\n", &tmp->name);
157 if (flag == F_BUY)
158 {
159 LOG (llevError, "Asking for buy-value of unidentified object without arch.\n");
160 val = number * tmp->value * 10;
161 }
162 else
163 val = number * tmp->value / 5;
164 } 144 }
165 } 145 }
166 146
167 /* If the item has been applied or identifed or does not need to be 147 /* If the item has been applied or identifed or does not need to be
168 * identified, AND the object is magical and the archetype is non 148 * identified, AND the object is magical and the archetype is non
169 * magical, then change values accordingly. The tmp->arch==NULL is 149 * magical, then change values accordingly. The tmp->arch==NULL is
170 * really just a check to prevent core dumps for when it checks 150 * really just a check to prevent core dumps for when it checks
171 * tmp->arch->clone.magic for any magic. The check for archetype 151 * tmp->arch->magic for any magic. The check for archetype
172 * magic is to not give extra money for archetypes that are by 152 * magic is to not give extra money for archetypes that are by
173 * default magical. This is because the archetype value should have 153 * default magical. This is because the archetype value should have
174 * already figured in that value. 154 * already figured in that value.
175 */ 155 */
176 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified || 156 if ((tmp->flag [FLAG_IDENTIFIED] || !tmp->need_identify () || identified || tmp->flag [FLAG_BEEN_APPLIED])
177 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->clone.magic)) 157 && tmp->magic && (!tmp->arch || !tmp->arch->magic))
178 { 158 {
179 if (tmp->magic > 0) 159 if (tmp->magic > 0)
180 val *= (3 * tmp->magic * tmp->magic * tmp->magic); 160 val *= (3 * tmp->magic * tmp->magic * tmp->magic);
181 else 161 else
182 /* Note that tmp->magic is negative, so that this 162 /* Note that tmp->magic is negative, so that this
… …
189 { 169 {
190 /* Value of the wand is multiplied by the number of 170 /* Value of the wand is multiplied by the number of
191 * charges. the treasure code already sets up the value 171 * charges. the treasure code already sets up the value
192 * 50 charges is used as the baseline. 172 * 50 charges is used as the baseline.
193 */ 173 */
194 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 174 if (tmp->flag [FLAG_IDENTIFIED] || !tmp->need_identify () || identified)
195 val = (val * tmp->stats.food) / 50; 175 val = (val * tmp->stats.food) / 50;
196 else /* if not identified, presume one charge */ 176 else /* if not identified, presume one charge */
197 val /= 50; 177 val /= 50;
198 } 178 }
199 179
… …
210 * AND Cha = 30 will get optimal price. 190 * AND Cha = 30 will get optimal price.
211 * Thus charisma will never get useless. 191 * Thus charisma will never get useless.
212 * -b.e. edler@heydernet.de 192 * -b.e. edler@heydernet.de
213 */ 193 */
214 194
215 if (who != NULL && who->type == PLAYER) 195 if (who && who->type == PLAYER)
216 { 196 {
217 int lev_bargain = 0; 197 int lev_bargain = 0;
218 int lev_identify = 0; 198 int lev_identify = 0;
219 int idskill1 = 0;
220 int idskill2 = 0;
221 const typedata *tmptype;
222
223 tmptype = get_typedata (tmp->type);
224 199
225 if (find_skill_by_number (who, SK_BARGAINING)) 200 if (find_skill_by_number (who, SK_BARGAINING))
226 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level; 201 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level;
227 202
228 if (tmptype) 203 if (const typedata *tmptype = get_typedata (tmp->type))
229 { 204 {
230 idskill1 = tmptype->identifyskill; 205 if (int idskill1 = tmptype->identifyskill)
231
232 if (idskill1)
233 { 206 {
234 idskill2 = tmptype->identifyskill2; 207 int idskill2 = tmptype->identifyskill2;
235 208
236 if (find_skill_by_number (who, idskill1)) 209 if (find_skill_by_number (who, idskill1))
237 lev_identify = find_skill_by_number (who, idskill1)->level; 210 lev_identify = find_skill_by_number (who, idskill1)->level;
238 211
239 if (idskill2 && find_skill_by_number (who, idskill2)) 212 if (idskill2 && find_skill_by_number (who, idskill2))
240 lev_identify += find_skill_by_number (who, idskill2)->level; 213 lev_identify += find_skill_by_number (who, idskill2)->level;
241 } 214 }
242 } 215 }
243 else
244 LOG (llevError, "Query_cost: item %s hasn't got a valid type\n", tmp->debug_desc ());
245 216
246 /* ratio determines how much of the price modification 217 /* ratio determines how much of the price modification
247 * will come from the basic stat charisma 218 * will come from the basic stat charisma
248 * the rest will come from the level in bargaining skill 219 * the rest will come from the level in bargaining skill
249 */ 220 */
… …
271 */ 242 */
272 if ((sint64) val < 0) 243 if ((sint64) val < 0)
273 val = 0; 244 val = 0;
274 245
275 /* Unidentified stuff won't sell for more than 60gp */ 246 /* Unidentified stuff won't sell for more than 60gp */
276 if (flag == F_SELL && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && need_identify (tmp) && !identified) 247 if (flag == F_SELL && !tmp->flag [FLAG_IDENTIFIED] && tmp->need_identify () && !identified)
277 { 248 min_it (val, 600);
278 val = (val > 600) ? 600 : val;
279 }
280 249
281 /* if we are in a shop, check how the type of shop should affect the price */ 250 /* if we are in a shop, check how the type of shop should affect the price */
282 if (shop && who) 251 if (shop && who)
283 { 252 {
284 if (flag == F_SELL) 253 if (flag == F_SELL)
… …
296 * be sold for (otherwise players could camp map resets to make money). 265 * be sold for (otherwise players could camp map resets to make money).
297 * In game terms, a non-specialist shop, might not recognise the true 266 * In game terms, a non-specialist shop, might not recognise the true
298 * value of the items they sell (much like how people sometimes find 267 * value of the items they sell (much like how people sometimes find
299 * antiques in a junk shop in real life). 268 * antiques in a junk shop in real life).
300 */ 269 */
301 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD)) 270 if (tmp->flag [FLAG_PLAYER_SOLD])
302 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who)); 271 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who));
303 else 272 else
304 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who))); 273 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who)));
305 } 274 }
306 275
… …
332 coin = archetype::find (coins[*cointype]); 301 coin = archetype::find (coins[*cointype]);
333 if (coin == NULL) 302 if (coin == NULL)
334 return NULL; 303 return NULL;
335 *cointype += 1; 304 *cointype += 1;
336 } 305 }
337 while (coin->clone.value > c); 306 while (coin->value > c);
338 307
339 return coin; 308 return coin;
340} 309}
341 310
342/* This returns a string of how much something is worth based on 311/* This returns a string of how much something is worth based on
… …
358 327
359 coin = find_next_coin (cost, &cointype); 328 coin = find_next_coin (cost, &cointype);
360 if (coin == NULL) 329 if (coin == NULL)
361 return "nothing"; 330 return "nothing";
362 331
363 num = cost / coin->clone.value; 332 num = cost / coin->value;
364 /* so long as nrof is 32 bit, this is true. 333 /* so long as nrof is 32 bit, this is true.
365 * If it takes more coins than a person can possibly carry, this 334 * If it takes more coins than a person can possibly carry, this
366 * is basically true. 335 * is basically true.
367 */ 336 */
368 if ((cost / coin->clone.value) > UINT32_MAX) 337 if ((cost / coin->value) > UINT32_MAX)
369 { 338 {
370 strcpy (buf, "an unimaginable sum of money"); 339 strcpy (buf, "an unimaginable sum of money");
371 return buf; 340 return buf;
372 } 341 }
373 342
374 cost -= num * (sint64)coin->clone.value; 343 cost -= num * (sint64)coin->value;
375 344
376 sprintf (buf, "%d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 345 sprintf (buf, "%d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
377 346
378 next_coin = find_next_coin (cost, &cointype); 347 next_coin = find_next_coin (cost, &cointype);
379 if (next_coin == NULL || approx) 348 if (next_coin == NULL || approx)
380 return buf; 349 return buf;
381 350
382 coin = next_coin; 351 coin = next_coin;
383 num = cost / coin->clone.value; 352 num = cost / coin->value;
384 cost -= num * (sint64)coin->clone.value; 353 cost -= num * (sint64)coin->value;
385 354
386 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 355 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
387 356
388 return buf; 357 return buf;
389} 358}
390 359
391const char * 360const char *
… …
421 archetype *coin = find_next_coin (real_value, &cointype); 390 archetype *coin = find_next_coin (real_value, &cointype);
422 391
423 if (coin == NULL) 392 if (coin == NULL)
424 return "nothing"; 393 return "nothing";
425 394
426 num = real_value / coin->clone.value; 395 num = real_value / coin->value;
396
427 if (num == 1) 397 if (num == 1)
428 sprintf (buf, "about one %s", &coin->clone.name); 398 sprintf (buf, "about one %s", &coin->object::name);
429 else if (num < 5) 399 else if (num < 5)
430 sprintf (buf, "a few %s", &coin->clone.name_pl); 400 sprintf (buf, "a few %s", &coin->object::name_pl);
431 else if (num < 10) 401 else if (num < 10)
432 sprintf (buf, "several %s", &coin->clone.name_pl); 402 sprintf (buf, "several %s", &coin->object::name_pl);
433 else if (num < 25) 403 else if (num < 25)
434 sprintf (buf, "a moderate amount of %s", &coin->clone.name_pl); 404 sprintf (buf, "a moderate amount of %s", &coin->object::name_pl);
435 else if (num < 100) 405 else if (num < 100)
436 sprintf (buf, "lots of %s", &coin->clone.name_pl); 406 sprintf (buf, "lots of %s", &coin->object::name_pl);
437 else if (num < 1000) 407 else if (num < 1000)
438 sprintf (buf, "a great many %s", &coin->clone.name_pl); 408 sprintf (buf, "a great many %s", &coin->object::name_pl);
439 else 409 else
440 sprintf (buf, "a vast quantity of %s", &coin->clone.name_pl); 410 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
411
441 return buf; 412 return buf;
442 } 413 }
443 } 414 }
444 } 415 }
445 416
… …
476 } 447 }
477 448
478 for (tmp = op->inv; tmp; tmp = tmp->below) 449 for (tmp = op->inv; tmp; tmp = tmp->below)
479 if (tmp->type == MONEY) 450 if (tmp->type == MONEY)
480 total += tmp->nrof * (sint64)tmp->value; 451 total += tmp->nrof * (sint64)tmp->value;
481 else if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && (tmp->race == NULL || strstr (tmp->race, "gold"))) 452 else if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && (!tmp->race || tmp->race.contains ("gold")))
482 total += query_money (tmp); 453 total += query_money (tmp);
483 454
484 return total; 455 return total;
485} 456}
486 457
… …
501 return 0; 472 return 0;
502 473
503 pay_from_container (pl, pl, to_pay); 474 pay_from_container (pl, pl, to_pay);
504 475
505 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 476 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
506 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 477 if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && (!pouch->race || pouch->race.contains ("gold")))
507 pay_from_container (pl, pouch, to_pay); 478 pay_from_container (pl, pouch, to_pay);
508 479
509 pl->update_stats (); 480 pl->update_stats ();
510 return 1; 481 return 1;
511} 482}
… …
538 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE); 509 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE);
539 510
540 pay_from_container (pl, pl, to_pay); 511 pay_from_container (pl, pl, to_pay);
541 512
542 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 513 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
543 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 514 if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && (!pouch->race || pouch->race.contains ("gold")))
544 pay_from_container (pl, pouch, to_pay); 515 pay_from_container (pl, pouch, to_pay);
545 516
546 pl->update_stats (); 517 pl->update_stats ();
547 518
548 return 1; 519 return 1;
… …
581 552
582 if (tmp->type == MONEY) 553 if (tmp->type == MONEY)
583 { 554 {
584 for (i = 0; i < NUM_COINS; i++) 555 for (i = 0; i < NUM_COINS; i++)
585 { 556 {
586 if (tmp->value == tmp->arch->clone.value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->name)) 557 if (tmp->value == tmp->arch->value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->archname))
587 { 558 {
588 // This should not happen, but if it does, just merge the two. 559 // This should not happen, but if it does, just merge the two.
589 if (coin_objs [i]) 560 if (coin_objs [i])
590 { 561 {
591 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); 562 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; 563 coin_objs[i]->nrof += tmp->nrof;
594 esrv_del_item (pl->contr, tmp->count);
595 tmp->destroy (); 564 tmp->destroy ();
596 } 565 }
597 else 566 else
598 { 567 {
599 tmp->remove (); 568 tmp->remove ();
600
601 if (pouch->type == PLAYER)
602 esrv_del_item (pl->contr, tmp->count);
603
604 coin_objs[i] = tmp; 569 coin_objs[i] = tmp;
605 } 570 }
606 571
607 break; 572 break;
608 } 573 }
609 } 574 }
610 575
611 if (i == NUM_COINS) 576 if (i == NUM_COINS)
612 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->name); 577 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->archname);
613 } 578 }
614 } 579 }
615 580
616 /* Fill in any gaps in the coin_objs array - needed to make change. */ 581 /* 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 */ 582 /* Note that the coin_objs array goes from least value to greatest value */
… …
621 at = archetype::find (coins[NUM_COINS - 1 - i]); 586 at = archetype::find (coins[NUM_COINS - 1 - i]);
622 587
623 if (at == NULL) 588 if (at == NULL)
624 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]); 589 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]);
625 590
626 coin_objs[i] = arch_to_object (at); 591 coin_objs[i] = at->instance ();
627 coin_objs[i]->nrof = 0; 592 coin_objs[i]->nrof = 0;
628 } 593 }
629 594
630 for (i = 0; i < NUM_COINS; i++) 595 for (i = 0; i < NUM_COINS; i++)
631 { 596 {
632 object &coin = *coin_objs[i]; 597 object &coin = *coin_objs[i];
633 sint64 num_coins = min ((to_pay + coin.value - 1) / coin.value, coin.nrof); 598 sint64 num_coins = min ((to_pay + coin.value - 1) / coin.value, (sint64) coin.nrof);
634 to_pay -= num_coins * coin.value; 599 to_pay -= num_coins * coin.value;
635 600
636 coin.nrof -= num_coins; 601 coin.nrof -= num_coins;
637 /* Now start making change. Start at the coin value 602 /* Now start making change. Start at the coin value
638 * below the one we just did, and work down to 603 * below the one we just did, and work down to
… …
648 count--; 613 count--;
649 } 614 }
650 } 615 }
651 616
652 for (i = 0; i < NUM_COINS; i++) 617 for (i = 0; i < NUM_COINS; i++)
653 {
654 if (coin_objs[i]->nrof) 618 if (coin_objs[i]->nrof)
655 {
656 object *tmp = insert_ob_in_ob (coin_objs[i], pouch); 619 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 620 else
668 coin_objs[i]->destroy (); 621 coin_objs[i]->destroy ();
669 }
670} 622}
671 623
672/* Checks all unpaid items in op's inventory, adds up all the money they 624/* 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. 625 * 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 626 * Returns 1 if they can, and 0 if they can't. also prints an appropriate message
… …
686 LOG (llevError, "can_pay(): called against something that isn't a player\n"); 638 LOG (llevError, "can_pay(): called against something that isn't a player\n");
687 return 0; 639 return 0;
688 } 640 }
689 641
690 for (object::depth_iterator item = pl->begin (); item != pl->end (); ++item) 642 for (object::depth_iterator item = pl->begin (); item != pl->end (); ++item)
691 if (QUERY_FLAG (item, FLAG_UNPAID)) 643 if (item->flag [FLAG_UNPAID])
692 { 644 {
693 unpaid_count++; 645 unpaid_count++;
694 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP); 646 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
695 } 647 }
696 648
697 if (unpaid_price > player_wealth) 649 if (unpaid_price > player_wealth)
698 { 650 {
699 char buf[MAX_BUF]; 651 dynbuf_text &buf = msg_dynbuf; buf.clear ();
700 char cost[MAX_BUF];
701 char missing[MAX_BUF];
702 652
703 snprintf (cost, MAX_BUF, "%s", cost_string_from_value (unpaid_price, 0)); 653 buf << "You have " << unpaid_count
704 snprintf (missing, MAX_BUF, "%s", cost_string_from_value (unpaid_price - player_wealth, 0)); 654 << " unpaid item(s) that would cost you " << cost_string_from_value (unpaid_price, 0)
655 << ". You need another " << cost_string_from_value (unpaid_price - player_wealth, 0)
656 << " to be able to afford that. "
657 "H<You cannot leave a shop without paying - drop unpaid items first to be able to leave.>";
705 658
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.", 659 pl->failmsg (buf);
707 unpaid_count, cost, missing);
708 new_draw_info (NDI_UNIQUE, 0, pl, buf);
709 660
710 return 0; 661 return 0;
711 } 662 }
712 else 663 else
713 return 1; 664 return 1;
… …
726 { 677 {
727 next_item: 678 next_item:
728 679
729 for (object::depth_iterator op = pl->begin (); op != pl->end (); ++op) 680 for (object::depth_iterator op = pl->begin (); op != pl->end (); ++op)
730 { 681 {
731 if (QUERY_FLAG (op, FLAG_UNPAID)) 682 if (op->flag [FLAG_UNPAID])
732 { 683 {
733 char buf[MAX_BUF]; 684 char buf[MAX_BUF];
734 snprintf (buf, MAX_BUF, "%s", query_cost_string (op, pl, F_BUY | F_SHOP)); 685 snprintf (buf, MAX_BUF, "%s", query_cost_string (op, pl, F_BUY | F_SHOP));
735 686
736 if (!pay_for_item (op, pl)) 687 if (!pay_for_item (op, pl))
737 { 688 {
738 sint64 i = query_cost (op, pl, F_BUY | F_SHOP) - query_money (pl); 689 sint64 i = query_cost (op, pl, F_BUY | F_SHOP) - query_money (pl);
739 690
740 CLEAR_FLAG (op, FLAG_UNPAID); 691 op->clr_flag (FLAG_UNPAID);
741 new_draw_info_format (NDI_UNIQUE, 0, pl, "You lack %s to buy %s.", cost_string_from_value (i, 0), query_name (op)); 692 new_draw_info_format (NDI_UNIQUE, 0, pl, "You lack %s to buy %s.", cost_string_from_value (i, 0), query_name (op));
742 SET_FLAG (op, FLAG_UNPAID); 693 op->set_flag (FLAG_UNPAID);
743 return 0; 694 return 0;
744 } 695 }
745 else 696 else
746 { 697 {
747 object *tmp; 698 op->clr_flag (FLAG_UNPAID);
748 699 op->clr_flag (FLAG_PLAYER_SOLD);
749 CLEAR_FLAG (op, FLAG_UNPAID);
750 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
751 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); 700 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
752 tmp = merge_ob (op, NULL);
753 701
754 if (pl->type == PLAYER) 702 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); 703 esrv_update_item (UPD_FLAGS, pl, op);
763 }
764 704
765 goto next_item; 705 goto next_item;
766 } 706 }
767 } 707 }
768 } 708 }
… …
787{ 727{
788 int count = 0; 728 int count = 0;
789 archetype *at = 0; 729 archetype *at = 0;
790 object *pouch = 0, *tmp = 0; 730 object *pouch = 0, *tmp = 0;
791 731
792 for (count = 0; coins[count] != NULL; count++) 732 for (count = 0; coins[count]; count++)
793 { 733 {
794 at = archetype::find (coins[count]); 734 at = archetype::find (coins[count]);
795 735
796 if (at == NULL) 736 if (at == NULL)
797 LOG (llevError, "Could not find %s archetype\n", coins[count]); 737 LOG (llevError, "Could not find %s archetype\n", coins[count]);
798 else if ((amount / at->clone.value) > 0) 738 else if ((amount / at->value) > 0)
799 { 739 {
800 for (pouch = pl->inv; pouch; pouch = pouch->below) 740 for (pouch = pl->inv; pouch; pouch = pouch->below)
801 { 741 {
802 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold")) 742 if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && pouch->race.contains ("gold"))
803 { 743 {
804 int w = at->clone.weight * (100 - pouch->stats.Str) / 100; 744 int w = at->weight * (100 - pouch->stats.Str) / 100;
805 int n = amount / at->clone.value; 745 int n = amount / at->value;
806 746
807 if (w == 0) 747 if (w == 0)
808 w = 1; /* Prevent divide by zero */ 748 w = 1; /* Prevent divide by zero */
809 749
810 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit)) 750 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit))
811 { 751 {
812 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n) 752 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n)
813 n = (pouch->weight_limit - pouch->carrying) / w; 753 n = (pouch->weight_limit - pouch->carrying) / w;
814 754
815 tmp = arch_to_object (at); 755 object *tmp = at->instance ();
816 tmp->nrof = n; 756 tmp->nrof = n;
817 amount -= tmp->nrof * tmp->value; 757 amount -= tmp->nrof * tmp->value;
818 tmp = insert_ob_in_ob (tmp, pouch); 758 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 } 759 }
824 } 760 }
825 } 761 }
826 762
827 if (amount / at->clone.value > 0) 763 if (amount / at->value > 0)
828 { 764 {
829 tmp = arch_to_object (at); 765 object *tmp = at->instance ();
830 tmp->nrof = amount / tmp->value; 766 tmp->nrof = amount / tmp->value;
831 amount -= tmp->nrof * tmp->value; 767 amount -= tmp->nrof * tmp->value;
832 tmp = insert_ob_in_ob (tmp, pl); 768 pl->insert (tmp);
833 esrv_send_item (pl, tmp);
834 esrv_send_item (pl, pl);
835 } 769 }
836 } 770 }
837 } 771 }
838 772
839 if (amount != 0) 773 if (amount != 0)
… …
842 776
843/* elmex: this is for the bank plugin :( */ 777/* elmex: this is for the bank plugin :( */
844sint64 778sint64
845pay_player_arch (object *pl, const char *arch, sint64 amount) 779pay_player_arch (object *pl, const char *arch, sint64 amount)
846{ 780{
847 archetype *at = archetype::find (arch);
848 object *tmp = NULL;
849
850 if (at == NULL)
851 return 0;
852
853 if (amount > 0) 781 if (amount)
854 { 782 {
855 tmp = arch_to_object (at); 783 object *ob = archetype::get (arch);
784
785 if (!ob)
786 return 0;
787
856 tmp->nrof = amount; 788 ob->nrof = amount;
857 tmp = insert_ob_in_ob (tmp, pl); 789 pl->insert (ob);
858 esrv_send_item (pl, tmp);
859 esrv_send_item (pl, pl);
860 } 790 }
861 791
862 return 1; 792 return 1;
863} 793}
864 794
… …
867 * buy item. 797 * buy item.
868 * 798 *
869 * Modified to fill available race: gold containers before dumping 799 * Modified to fill available race: gold containers before dumping
870 * remaining coins in character's inventory. 800 * remaining coins in character's inventory.
871 */ 801 */
872void 802bool
873sell_item (object *op, object *pl) 803sell_item (object *op, object *pl)
874{ 804{
875 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain; 805 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain;
876 806
877 if (pl == NULL || pl->type != PLAYER) 807 if (pl == NULL || pl->type != PLAYER)
878 { 808 {
879 LOG (llevDebug, "Object other than player tried to sell something.\n"); 809 LOG (llevDebug, "Object other than player tried to sell something.\n");
880 return; 810 return false;
881 } 811 }
882 812
883 op->custom_name = 0; 813 op->custom_name = 0;
884 814
885 if (!amount) 815 if (!amount)
886 { 816 {
887 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.", query_name (op)); 817 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.",
888 818 query_name (op));
889 /* Even if the character doesn't get anything for it, it may still be 819 // elmex: change: the player now gets the item back if the shop is not
890 * worth something. If so, make it unpaid 820 // 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; 821 return false;
900 } 822 }
901 823
902 /* We compare the price with the one for a player 824 /* We compare the price with the one for a player
903 * without bargaining skill. 825 * without bargaining skill.
904 * This determins the amount of exp (if any) gained for bargaining. 826 * This determins the amount of exp (if any) gained for bargaining.
… …
909 if (extra_gain > 0) 831 if (extra_gain > 0)
910 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE); 832 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE);
911 833
912 pay_player (pl, amount); 834 pay_player (pl, amount);
913 835
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)); 836 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.",
837 query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op));
838 pl->play_sound (sound_find ("shop_sell"));
915 839
916 SET_FLAG (op, FLAG_UNPAID); 840 op->set_flag (FLAG_UNPAID);
917 identify (op); 841 identify (op);
918}
919 842
843 return true;
844}
920 845
921/* returns a double that is the ratio of the price that a shop will offer for 846/* 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, 847 * 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 848 * returned value is between SPECIALISATION_EFFECT and 1.
924 * event is never less than 0.1 (calling functions divide by it)
925 */ 849 */
926static double 850static double
927shop_specialisation_ratio (const object *item, const maptile *map) 851shop_specialisation_ratio (const object *item, const maptile *map)
928{ 852{
929 shopitems *items = map->shopitems; 853 shopitems *items = map->shopitems;
930 double ratio = SPECIALISATION_EFFECT, likedness = 0.001; 854 int likedness = 0;
931 int i; 855 int i;
932 856
933 if (item == NULL) 857 if (item == NULL)
934 { 858 {
935 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path); 859 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
… …
941 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n"); 865 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n");
942 /* 866 /*
943 * I'm not really sure what the /right/ thing to do here is, these types of 867 * 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.." 868 * item shouldn't exist anyway, but returning the ratio is probably the best bet.."
945 */ 869 */
946 return ratio; 870 return SPECIALISATION_EFFECT;
947 } 871 }
948 872
949 if (map->shopitems) 873 if (map->shopitems)
950 {
951 for (i = 0; i < items[0].index; i++) 874 for (i = 0; i < items[0].index; i++)
952 if (items[i].typenum == item->type || (!items[i].typenum && likedness == 0.001)) 875 if (items[i].typenum == item->type || (!items[i].typenum && !likedness))
953 likedness = items[i].strength / 100.0; 876 likedness = items[i].strength;
954 }
955 877
956 if (likedness > 1.0) 878 if (likedness > 100)
957 { /* someone has been rather silly with the map headers. */ 879 { /* 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); 880 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path);
959 likedness = 1.0; 881 likedness = 100;
960 } 882 }
961 883
962 if (likedness < -1.0) 884 if (likedness < -100)
963 { 885 {
964 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path); 886 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
965 likedness = -1.0; 887 likedness = -100;
966 } 888 }
967 889
968 ratio = ratio + (1.0 - ratio) * likedness; 890 return lerp (double (likedness), -100., 100., 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} 891}
975 892
976/*returns the greed of the shop on map, or 1 if it isn't specified. */ 893/*returns the greed of the shop on map, or 1 if it isn't specified. */
977static double 894static double
978shop_greed (const maptile *map) 895shop_greed (const maptile *map)
979{ 896{
980 double greed = 1.0;
981
982 if (map->shopgreed)
983 return map->shopgreed; 897 return map->shopgreed
984 return greed; 898 ? map->shopgreed
899 : 1.;
985} 900}
986 901
987/* Returns a double based on how much the shopkeeper approves of the player. 902/* 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. 903 * this is based on the race of the shopkeeper and that of the player.
989 */ 904 */
990double 905double
991shopkeeper_approval (const maptile *map, const object *player) 906shopkeeper_approval (const maptile *map, const object *player)
992{ 907{
993 double approval = 1.0; 908 return map->shoprace && player->race != map->shoprace
994 909 ? DISLIKE_RATIO
995 if (map->shoprace) 910 : 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} 911}
1004 912
1005/* limit the value of items based on the wealth of the shop. If the item is close 913/* 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 914 * 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 915 * below the minimum value the shop is prepared to trade in, then we don't
… …
1037 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default 945 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default
1038 946
1039 if (map->shopmin && unit_price < map->shopmin) 947 if (map->shopmin && unit_price < map->shopmin)
1040 return 0; 948 return 0;
1041 else if (unit_price > tmpshopmax / 2) 949 else if (unit_price > tmpshopmax / 2)
1042 newval = MIN ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax); 950 newval = min ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax);
1043 else 951 else
1044 newval = unit_price; 952 newval = unit_price;
1045 } 953 }
1046 954
1047 newval *= quantity; 955 newval *= quantity;
… …
1051 959
1052/* gives a desciption of the shop on their current map to the player op. */ 960/* gives a desciption of the shop on their current map to the player op. */
1053int 961int
1054describe_shop (const object *op) 962describe_shop (const object *op)
1055{ 963{
964 dynbuf_text buf;
1056 maptile *map = op->map; 965 maptile *map = op->map;
1057 966
1058 /*shopitems *items=map->shopitems; */ 967 /*shopitems *items=map->shopitems; */
1059 int pos = 0, i; 968 int pos = 0, i;
1060 double opinion = 0; 969 double opinion = 0;
1061 char tmp[MAX_BUF] = "\0";
1062 970
1063 if (op->type != PLAYER) 971 if (op->type != PLAYER)
1064 return 0; 972 return 0;
1065 973
1066 /*check if there is a shop specified for this map */ 974 /*check if there is a shop specified for this map */
1067 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax) 975 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax)
1068 { 976 {
1069 new_draw_info (NDI_UNIQUE, 0, op, "From looking at the nearby shop you determine that it trades in:"); 977 buf << "From looking at the nearby shop you determine that it trades in ";
978 int lastcomma = 0, prevcomma = 0;
1070 979
1071 if (map->shopitems) 980 if (map->shopitems)
1072 for (i = 0; i < map->shopitems[0].index; i++) 981 for (i = 0; i < map->shopitems[0].index; i++)
1073 if (map->shopitems[i].name && map->shopitems[i].strength > 10) 982 if (map->shopitems[i].name && map->shopitems[i].strength > 10)
1074 { 983 {
1075 snprintf (tmp + pos, sizeof (tmp) - pos, "%s, ", map->shopitems[i].name_pl); 984 buf << map->shopitems[i].name_pl;
1076 pos += strlen (tmp + pos); 985 prevcomma = lastcomma;
986 lastcomma = buf.size (); // remember offset
987 buf << ", ";
1077 } 988 }
1078 989
1079 if (!pos) 990 if (lastcomma)
991 {
992 buf.splice (lastcomma, 2);
993
994 if (prevcomma)
995 buf.splice (prevcomma, 2, " and ");
996 }
997 else
1080 strcat (tmp, "a little of everything."); 998 buf << "a little of everything.";
1081 999
1082 /* format the string into a list */ 1000 buf << ".\n\n";
1083 make_list_like (tmp);
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
… …
1156 /* clear unpaid flag so that doesn't come up in query 1076 /* clear unpaid flag so that doesn't come up in query
1157 * string. We clear nrof so that we can better sort 1077 * string. We clear nrof so that we can better sort
1158 * the object names. 1078 * the object names.
1159 */ 1079 */
1160 1080
1161 CLEAR_FLAG (tmp, FLAG_UNPAID); 1081 tmp->clr_flag (FLAG_UNPAID);
1162 items[*numitems].nrof = tmp->nrof; 1082 items[*numitems].nrof = tmp->nrof;
1163 /* Non mergable items have nrof of 0, but count them as one 1083 /* Non mergable items have nrof of 0, but count them as one
1164 * so the display is properly. 1084 * so the display is properly.
1165 */ 1085 */
1166 if (tmp->nrof == 0) 1086 if (tmp->nrof == 0)
… …
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 }
1193 SET_FLAG (tmp, FLAG_UNPAID); 1113
1114 tmp->set_flag (FLAG_UNPAID);
1194} 1115}
1195 1116
1196void 1117void
1197shop_listing (object *sign, object *op) 1118shop_listing (object *sign, object *op)
1198{ 1119{
1199 int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2; 1120 int i, j, x1, x2, y1, y2;
1200 const char *shop_coords = get_ob_key_value (sign, "shop_coords"); 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;
1128
1129 dynbuf_text &buf = msg_dynbuf; buf.clear ();
1207 1130
1208 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2))) 1131 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1209 { 1132 {
1210 x1 = 0; 1133 x1 = 0;
1211 y1 = 0; 1134 y1 = 0;
1212 x2 = op->map->width - 1; 1135 x2 = op->map->width - 1;
1213 y2 = op->map->height - 1; 1136 y2 = op->map->height - 1;
1214 } 1137 }
1215 1138
1216 items = (shopinv *) malloc (40 * sizeof (shopinv));
1217 numallocated = 40; 1139 int numallocated = 40;
1140 int numitems = 0;
1141 items = (shopinv *)malloc (sizeof (shopinv) * numallocated);
1218 1142
1219 /* Find all the appropriate items */ 1143 /* Find all the appropriate items */
1220 for (i = x1; i <= x2; i++) 1144 for (i = x1; i <= x2; i++)
1221 {
1222 for (j = y1; j < y2; j++) 1145 for (j = y1; j < y2; j++)
1146 if (op->map->is_in_shop (i, j))
1223 { 1147 {
1224 if (is_in_shop (op->map, i, j)) 1148 stack = GET_MAP_OB (op->map, i, j);
1149
1150 while (stack)
1225 { 1151 {
1226 stack = GET_MAP_OB (op->map, i, j); 1152 if (stack->flag [FLAG_UNPAID])
1227
1228 while (stack)
1229 { 1153 {
1230 if (QUERY_FLAG (stack, FLAG_UNPAID))
1231 {
1232 if (numitems == numallocated) 1154 if (numitems == numallocated)
1233 {
1234 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1155 items = (shopinv *)realloc (items, sizeof (shopinv) * (numallocated *= 2));
1235 numallocated += 10;
1236 }
1237 1156
1238 add_shop_item (stack, items, &numitems, &numallocated); 1157 add_shop_item (stack, items, &numitems, &numallocated);
1239 }
1240
1241 stack = stack->above;
1242 } 1158 }
1159
1160 stack = stack->above;
1243 } 1161 }
1244 } 1162 }
1245 }
1246 1163
1247 if (numitems == 0) 1164 buf << (numitems ? "T<This shop contains:>\n\n"
1248 { 1165 : "T<This shop is currently empty.>");
1249 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1250 free (items);
1251 return;
1252 }
1253 1166
1254 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);
1255
1256 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
1257 1168
1258 for (i = 0; i < numitems; i++) 1169 for (i = 0; i < numitems; i++)
1259 { 1170 {
1260 /* Collapse items of the same name together */ 1171 /* Collapse items of the same name together */
1261 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))
1262 {
1263 items[i + 1].nrof += items[i].nrof; 1173 items[i + 1].nrof += items[i].nrof;
1264 free (items[i].item_sort);
1265 free (items[i].item_real);
1266 }
1267 else 1174 else
1268 {
1269 new_draw_info_format (NDI_UNIQUE, 0, op, "%d %s",
1270 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
1271 free (items[i].item_sort); 1177 free (items[i].item_sort);
1272 free (items[i].item_real); 1178 free (items[i].item_real);
1273 }
1274 } 1179 }
1180
1181 op->contr->infobox (MSG_CHANNEL ("shopitems"), buf);
1275 1182
1276 free (items); 1183 free (items);
1277} 1184}
1278 1185
1279/* elmex: this function checks whether the object is in a shop */ 1186/* elmex: this function checks whether we are in a shop or not
1187 - change 2007-11-26: enhanced the O(n) case by stopping at the first
1188 floor tile. this possibly will make map bugs where shopfloors are above
1189 floors more obvious.
1190*/
1280bool 1191bool
1281is_in_shop (object *o) 1192maptile::is_in_shop (int x, int y) const
1282{ 1193{
1283 if (!o->map)
1284 return false;
1285
1286 return is_in_shop (o->map, o->x, o->y);
1287}
1288
1289/* elmex: this function checks whether we are in a shop or not */
1290bool
1291is_in_shop (maptile *map, int x, int y)
1292{
1293 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above) 1194 for (object *floor = at (x, y).bot; floor; floor = floor->above)
1195 if (floor->flag [FLAG_IS_FLOOR])
1294 if (floor->type == SHOP_FLOOR) 1196 return floor->type == SHOP_FLOOR;
1295 return true;
1296 1197
1297 return false; 1198 return false;
1298} 1199}
1200

Diff Legend

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