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

Diff Legend

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