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.14 by root, Tue Sep 12 19:20:08 2006 UTC vs.
Revision 1.74 by root, Sun Nov 29 17:41:08 2009 UTC

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

Diff Legend

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