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.13 by root, Tue Sep 12 01:09:54 2006 UTC vs.
Revision 1.46 by root, Wed Apr 9 14:36:47 2008 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.13 2006/09/12 01:09:54 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007 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
14 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
15 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
16 (at your option) any later version. 11 * (at your 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 GNU General Public License
24 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
26 21 * The authors can be reached via e-mail to <support@deliantra.net>
27 The authors can be reached via e-mail at crossfire-devel@real-time.com
28*/ 22 */
29 23
30#include <global.h> 24#include <global.h>
31#include <spells.h> 25#include <spells.h>
32#include <skills.h> 26#include <skills.h>
33#include <living.h> 27#include <living.h>
34#include <newclient.h>
35#ifndef __CEXTRACT__
36# include <sproto.h> 28#include <sproto.h>
37#endif
38#include <math.h> 29#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
… …
104 approximate = flag & F_APPROX; 92 approximate = flag & F_APPROX;
105 shop = flag & F_SHOP; 93 shop = flag & F_SHOP;
106 flag &= ~(F_NO_BARGAIN | F_IDENTIFIED | F_NOT_CURSED | F_APPROX | F_SHOP); 94 flag &= ~(F_NO_BARGAIN | F_IDENTIFIED | F_NOT_CURSED | F_APPROX | F_SHOP);
107 95
108 if (tmp->type == MONEY) 96 if (tmp->type == MONEY)
109 return (tmp->nrof * tmp->value); 97 return tmp->nrof * tmp->value;
98
110 if (tmp->type == GEM) 99 if (tmp->type == GEM)
111 { 100 {
112 if (flag == F_TRUE) 101 if (flag == F_TRUE)
113 return (tmp->nrof * tmp->value); 102 return (tmp->nrof * tmp->value);
103
114 if (flag == F_BUY) 104 if (flag == F_BUY)
115 return (sint64) (1.03 * tmp->nrof * tmp->value); 105 return (sint64) (1.03 * tmp->nrof * tmp->value);
106
116 if (flag == F_SELL) 107 if (flag == F_SELL)
117 return (sint64) (0.97 * tmp->nrof * tmp->value); 108 return (sint64) (0.97 * tmp->nrof * tmp->value);
109
118 LOG (llevError, "Query_cost: Gem type with unknown flag : %d\n", flag); 110 LOG (llevError, "Query_cost: Gem type with unknown flag %d: %s\n", flag, tmp->debug_desc ());
119 return 0; 111 return 0;
120 } 112 }
113
121 number = tmp->nrof; 114 number = tmp->nrof;
122 if (number == 0) 115 if (number == 0)
123 number = 1; 116 number = 1;
124 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 117 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified)
125 { 118 {
… …
134 if (tmp->arch != NULL) 127 if (tmp->arch != NULL)
135 { 128 {
136 if (flag == F_BUY) 129 if (flag == F_BUY)
137 { 130 {
138 LOG (llevError, "Asking for buy-value of unidentified object.\n"); 131 LOG (llevError, "Asking for buy-value of unidentified object.\n");
139 val = tmp->arch->clone.value * 50 * number; 132 val = tmp->arch->value * 50 * number;
140 } 133 }
141 else 134 else
142 { /* Trying to sell something, or get true value */ 135 { /* Trying to sell something, or get true value */
143 if (tmp->type == POTION) 136 if (tmp->type == POTION)
144 val = number * 40; /* Don't want to give anything away */ 137 val = number * 40; /* Don't want to give anything away */
… …
146 { 139 {
147 /* Get 2/3'rd value for applied objects, 1/3'rd for totally 140 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
148 * unknown objects 141 * unknown objects
149 */ 142 */
150 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) 143 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
151 val = number * tmp->arch->clone.value * 2 / 3; 144 val = number * tmp->arch->value * 2 / 3;
152 else 145 else
153 val = number * tmp->arch->clone.value / 3; 146 val = number * tmp->arch->value / 3;
154 } 147 }
155 } 148 }
156 } 149 }
157 else 150 else
158 { /* No archetype with this object */ 151 { /* No archetype with this object */
… …
169 162
170 /* If the item has been applied or identifed or does not need to be 163 /* If the item has been applied or identifed or does not need to be
171 * identified, AND the object is magical and the archetype is non 164 * identified, AND the object is magical and the archetype is non
172 * magical, then change values accordingly. The tmp->arch==NULL is 165 * magical, then change values accordingly. The tmp->arch==NULL is
173 * really just a check to prevent core dumps for when it checks 166 * really just a check to prevent core dumps for when it checks
174 * tmp->arch->clone.magic for any magic. The check for archetype 167 * tmp->arch->magic for any magic. The check for archetype
175 * magic is to not give extra money for archetypes that are by 168 * magic is to not give extra money for archetypes that are by
176 * default magical. This is because the archetype value should have 169 * default magical. This is because the archetype value should have
177 * already figured in that value. 170 * already figured in that value.
178 */ 171 */
179 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified || 172 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified ||
180 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->clone.magic)) 173 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->magic))
181 { 174 {
182 if (tmp->magic > 0) 175 if (tmp->magic > 0)
183 val *= (3 * tmp->magic * tmp->magic * tmp->magic); 176 val *= (3 * tmp->magic * tmp->magic * tmp->magic);
184 else 177 else
185 /* Note that tmp->magic is negative, so that this 178 /* Note that tmp->magic is negative, so that this
… …
224 const typedata *tmptype; 217 const typedata *tmptype;
225 218
226 tmptype = get_typedata (tmp->type); 219 tmptype = get_typedata (tmp->type);
227 220
228 if (find_skill_by_number (who, SK_BARGAINING)) 221 if (find_skill_by_number (who, SK_BARGAINING))
229 {
230 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level; 222 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level;
231 } 223
232 if (tmptype) 224 if (tmptype)
233 { 225 {
234 idskill1 = tmptype->identifyskill; 226 idskill1 = tmptype->identifyskill;
227
235 if (idskill1) 228 if (idskill1)
236 { 229 {
237 idskill2 = tmptype->identifyskill2; 230 idskill2 = tmptype->identifyskill2;
231
238 if (find_skill_by_number (who, idskill1)) 232 if (find_skill_by_number (who, idskill1))
239 {
240 lev_identify = find_skill_by_number (who, idskill1)->level; 233 lev_identify = find_skill_by_number (who, idskill1)->level;
241 } 234
242 if (idskill2 && find_skill_by_number (who, idskill2)) 235 if (idskill2 && find_skill_by_number (who, idskill2))
243 {
244 lev_identify += find_skill_by_number (who, idskill2)->level; 236 lev_identify += find_skill_by_number (who, idskill2)->level;
245 }
246 } 237 }
247 } 238 }
248 else 239 else
249 LOG (llevError, "Query_cost: item %s hasn't got a valid type\n", &tmp->name); 240 LOG (llevError, "Query_cost: item %s hasn't got a valid type\n", tmp->debug_desc ());
250 241
251 /* ratio determines how much of the price modification 242 /* ratio determines how much of the price modification
252 * will come from the basic stat charisma 243 * will come from the basic stat charisma
253 * the rest will come from the level in bargaining skill 244 * the rest will come from the level in bargaining skill
254 */ 245 */
255 const double cha_ratio = 0.40; 246 const double cha_ratio = 0.40;
256 247
257 diff = no_bargain ? 1.0 : 1. - pow (lev_bargain / (double) settings.max_level, 0.25); 248 diff = no_bargain ? 1.0 : 1. - pow (lev_bargain / (double) settings.max_level, 0.25);
258
259 diff = (1. - cha_ratio) * diff + cha_ratio * (cha_bonus[who->stats.Cha] - 1.) / (cha_bonus[who->stats.Cha] + 1.); 249 diff = (1. - cha_ratio) * diff + cha_ratio * (cha_bonus[who->stats.Cha] - 1.) / (cha_bonus[who->stats.Cha] + 1.);
260
261 diff = .02 + (.80 - .02) * diff; 250 diff = .02 + (.80 - .02) * diff;
262 251
263 if (flag == F_BUY) 252 if (flag == F_BUY)
264 val += (val * diff); 253 val += val * diff;
265 else if (flag == F_SELL) 254 else if (flag == F_SELL)
266 val -= (val * diff); 255 val -= val * diff;
267 256
268 // now find a price range. the less good we can judge, the larger the range is 257 // now find a price range. the less good we can judge, the larger the range is
269 // then the range is adjusted randomly around the correct value 258 // then the range is adjusted randomly around the correct value
270 if (approximate) 259 if (approximate)
271 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1)); 260 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1));
272 } 261 }
273 262
274 /* I don't think this should really happen - if it does, it indicates and 263 /* I don't think this should really happen - if it does, it indicates and
275 * overflow of diff above. That shoudl only happen if 264 * overflow of diff above. That should only happen if
276 * we are selling objects - in that case, the person just 265 * we are selling objects - in that case, the person just
277 * gets no money. 266 * gets no money.
278 */ 267 */
279 if ((sint64) val < 0) 268 if ((sint64) val < 0)
280 val = 0; 269 val = 0;
… …
308 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD)) 297 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD))
309 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who)); 298 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who));
310 else 299 else
311 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who))); 300 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who)));
312 } 301 }
302
313 /* we will also have an extra 0-5% variation between shops of the same type 303 /* we will also have an extra 0-5% variation between shops of the same type
314 * for valuable items (below a value of 50 this effect wouldn't be very 304 * for valuable items (below a value of 50 this effect wouldn't be very
315 * pointful, and could give fun with rounding. 305 * pointful, and could give fun with rounding.
316 */ 306 */
317 if (who->map->path != NULL && val > 50) 307 //TODO: why use cosf at all, just % and scale linearly, gives more even distribution
318 val = (val + 0.05 * (sint64) val * cos (tmp->count + strlen (who->map->path))); 308 if (val > 50)
309 val += float (val) * .05f * cosf ((tmp->uuid.seq & 0xffff) * float (M_PI * 2. / 0x10000));
319 } 310 }
311
320 return (sint64) val; 312 return (sint64) val;
321} 313}
322 314
323/* Find the coin type that is worth more the 'c'. Starts at the 315/* Find the coin type that is worth more the 'c'. Starts at the
324 * cointype placement. 316 * cointype placement.
… …
331 323
332 do 324 do
333 { 325 {
334 if (coins[*cointype] == NULL) 326 if (coins[*cointype] == NULL)
335 return NULL; 327 return NULL;
336 coin = find_archetype (coins[*cointype]); 328 coin = archetype::find (coins[*cointype]);
337 if (coin == NULL) 329 if (coin == NULL)
338 return NULL; 330 return NULL;
339 *cointype += 1; 331 *cointype += 1;
340 } 332 }
341 while (coin->clone.value > c); 333 while (coin->value > c);
342 334
343 return coin; 335 return coin;
344} 336}
345 337
346/* This returns a string of how much something is worth based on 338/* This returns a string of how much something is worth based on
… …
362 354
363 coin = find_next_coin (cost, &cointype); 355 coin = find_next_coin (cost, &cointype);
364 if (coin == NULL) 356 if (coin == NULL)
365 return "nothing"; 357 return "nothing";
366 358
367 num = cost / coin->clone.value; 359 num = cost / coin->value;
368 /* so long as nrof is 32 bit, this is true. 360 /* so long as nrof is 32 bit, this is true.
369 * If it takes more coins than a person can possibly carry, this 361 * If it takes more coins than a person can possibly carry, this
370 * is basically true. 362 * is basically true.
371 */ 363 */
372 if ((cost / coin->clone.value) > UINT32_MAX) 364 if ((cost / coin->value) > UINT32_MAX)
373 { 365 {
374 strcpy (buf, "an unimaginable sum of money"); 366 strcpy (buf, "an unimaginable sum of money");
375 return buf; 367 return buf;
376 } 368 }
377 369
378 cost -= num * (sint64)coin->clone.value; 370 cost -= num * (sint64)coin->value;
379 371
380 sprintf (buf, "%d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 372 sprintf (buf, "%d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
381 373
382 next_coin = find_next_coin (cost, &cointype); 374 next_coin = find_next_coin (cost, &cointype);
383 if (next_coin == NULL || approx) 375 if (next_coin == NULL || approx)
384 return buf; 376 return buf;
385 377
386 coin = next_coin; 378 coin = next_coin;
387 num = cost / coin->clone.value; 379 num = cost / coin->value;
388 cost -= num * (sint64)coin->clone.value; 380 cost -= num * (sint64)coin->value;
389 381
390 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 382 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
391 383
392 return buf; 384 return buf;
393} 385}
394 386
395const char * 387const char *
… …
425 archetype *coin = find_next_coin (real_value, &cointype); 417 archetype *coin = find_next_coin (real_value, &cointype);
426 418
427 if (coin == NULL) 419 if (coin == NULL)
428 return "nothing"; 420 return "nothing";
429 421
430 num = real_value / coin->clone.value; 422 num = real_value / coin->value;
431 if (num == 1) 423 if (num == 1)
432 sprintf (buf, "about one %s", &coin->clone.name); 424 sprintf (buf, "about one %s", &coin->object::name);
433 else if (num < 5) 425 else if (num < 5)
434 sprintf (buf, "a few %s", &coin->clone.name_pl); 426 sprintf (buf, "a few %s", &coin->object::name_pl);
435 else if (num < 10) 427 else if (num < 10)
436 sprintf (buf, "several %s", &coin->clone.name_pl); 428 sprintf (buf, "several %s", &coin->object::name_pl);
437 else if (num < 25) 429 else if (num < 25)
438 sprintf (buf, "a moderate amount of %s", &coin->clone.name_pl); 430 sprintf (buf, "a moderate amount of %s", &coin->object::name_pl);
439 else if (num < 100) 431 else if (num < 100)
440 sprintf (buf, "lots of %s", &coin->clone.name_pl); 432 sprintf (buf, "lots of %s", &coin->object::name_pl);
441 else if (num < 1000) 433 else if (num < 1000)
442 sprintf (buf, "a great many %s", &coin->clone.name_pl); 434 sprintf (buf, "a great many %s", &coin->object::name_pl);
443 else 435 else
444 sprintf (buf, "a vast quantity of %s", &coin->clone.name_pl); 436 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
445 return buf; 437 return buf;
446 } 438 }
447 } 439 }
448 } 440 }
449 441
… …
508 500
509 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 501 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
510 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 502 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold")))
511 pay_from_container (pl, pouch, to_pay); 503 pay_from_container (pl, pouch, to_pay);
512 504
513 fix_player (pl); 505 pl->update_stats ();
514 return 1; 506 return 1;
515} 507}
516 508
517/* DAMN: This is now a wrapper for pay_from_container, which is 509/* DAMN: This is now a wrapper for pay_from_container, which is
518 * called for the player, then for each active container that can hold 510 * called for the player, then for each active container that can hold
… …
545 537
546 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 538 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
547 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 539 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold")))
548 pay_from_container (pl, pouch, to_pay); 540 pay_from_container (pl, pouch, to_pay);
549 541
550 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ)) 542 pl->update_stats ();
551 SET_FLAG (op, FLAG_WAS_WIZ);
552 543
553 fix_player (pl);
554 return 1; 544 return 1;
555} 545}
556 546
557/* This pays for the item, and takes the proper amount of money off 547/* This pays for the item, and takes the proper amount of money off
558 * the player. 548 * the player.
… …
587 577
588 if (tmp->type == MONEY) 578 if (tmp->type == MONEY)
589 { 579 {
590 for (i = 0; i < NUM_COINS; i++) 580 for (i = 0; i < NUM_COINS; i++)
591 { 581 {
592 if (tmp->value == tmp->arch->clone.value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->name)) 582 if (tmp->value == tmp->arch->value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->archname))
593 { 583 {
594 // This should not happen, but if it does, just merge the two. 584 // This should not happen, but if it does, just merge the two.
595 if (coin_objs [i]) 585 if (coin_objs [i])
596 { 586 {
597 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); 587 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]);
598 remove_ob (tmp); 588 tmp->remove ();
599 coin_objs[i]->nrof += tmp->nrof; 589 coin_objs[i]->nrof += tmp->nrof;
600 esrv_del_item (pl->contr, tmp->count); 590 esrv_del_item (pl->contr, tmp->count);
601 free_object (tmp); 591 tmp->destroy ();
602 } 592 }
603 else 593 else
604 { 594 {
605 remove_ob (tmp); 595 tmp->remove ();
606 596
607 if (pouch->type == PLAYER) 597 if (pouch->type == PLAYER)
608 esrv_del_item (pl->contr, tmp->count); 598 esrv_del_item (pl->contr, tmp->count);
609 599
610 coin_objs[i] = tmp; 600 coin_objs[i] = tmp;
… …
613 break; 603 break;
614 } 604 }
615 } 605 }
616 606
617 if (i == NUM_COINS) 607 if (i == NUM_COINS)
618 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->name); 608 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->archname);
619 } 609 }
620 } 610 }
621 611
622 /* Fill in any gaps in the coin_objs array - needed to make change. */ 612 /* Fill in any gaps in the coin_objs array - needed to make change. */
623 /* Note that the coin_objs array goes from least value to greatest value */ 613 /* Note that the coin_objs array goes from least value to greatest value */
624 for (i = 0; i < NUM_COINS; i++) 614 for (i = 0; i < NUM_COINS; i++)
625 if (!coin_objs[i]) 615 if (!coin_objs[i])
626 { 616 {
627 at = find_archetype (coins[NUM_COINS - 1 - i]); 617 at = archetype::find (coins[NUM_COINS - 1 - i]);
628 618
629 if (at == NULL) 619 if (at == NULL)
630 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]); 620 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]);
631 621
632 coin_objs[i] = arch_to_object (at); 622 coin_objs[i] = arch_to_object (at);
… …
669 659
670 if (pl->type != PLAYER) 660 if (pl->type != PLAYER)
671 esrv_send_item (pl, pl); 661 esrv_send_item (pl, pl);
672 } 662 }
673 else 663 else
674 free_object (coin_objs[i]); 664 coin_objs[i]->destroy ();
675 } 665 }
676} 666}
677 667
678/* Checks all unpaid items in op's inventory, adds up all the money they 668/* Checks all unpaid items in op's inventory, adds up all the money they
679 * have, and checks that they can actually afford what they want to buy. 669 * have, and checks that they can actually afford what they want to buy.
… …
684can_pay (object *pl) 674can_pay (object *pl)
685{ 675{
686 int unpaid_count = 0; 676 int unpaid_count = 0;
687 sint64 unpaid_price = 0; 677 sint64 unpaid_price = 0;
688 sint64 player_wealth = query_money (pl); 678 sint64 player_wealth = query_money (pl);
689 object *item;
690 679
691 if (!pl || pl->type != PLAYER) 680 if (!pl || pl->type != PLAYER)
692 { 681 {
693 LOG (llevError, "can_pay(): called against something that isn't a player\n"); 682 LOG (llevError, "can_pay(): called against something that isn't a player\n");
694 return 0; 683 return 0;
… …
750 return 0; 739 return 0;
751 } 740 }
752 else 741 else
753 { 742 {
754 object *tmp; 743 object *tmp;
755 tag_t c = op->count;
756 744
757 CLEAR_FLAG (op, FLAG_UNPAID); 745 CLEAR_FLAG (op, FLAG_UNPAID);
758 CLEAR_FLAG (op, FLAG_PLAYER_SOLD); 746 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
759 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); 747 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
760 tmp = merge_ob (op, NULL); 748 tmp = merge_ob (op, NULL);
761 749
762 if (pl->type == PLAYER) 750 if (pl->type == PLAYER)
763 { 751 {
764 if (tmp) 752 if (tmp)
765 { /* it was merged */ 753 { /* it was merged */
766 esrv_del_item (pl->contr, c); 754 esrv_del_item (pl->contr, op->count);
767 op = tmp; 755 op = tmp;
768 } 756 }
769 757
770 esrv_send_item (pl, op); 758 esrv_send_item (pl, op);
771 } 759 }
… …
795{ 783{
796 int count = 0; 784 int count = 0;
797 archetype *at = 0; 785 archetype *at = 0;
798 object *pouch = 0, *tmp = 0; 786 object *pouch = 0, *tmp = 0;
799 787
800 for (count = 0; coins[count] != NULL; count++) 788 for (count = 0; coins[count]; count++)
801 { 789 {
802 at = find_archetype (coins[count]); 790 at = archetype::find (coins[count]);
803 791
804 if (at == NULL) 792 if (at == NULL)
805 LOG (llevError, "Could not find %s archetype\n", coins[count]); 793 LOG (llevError, "Could not find %s archetype\n", coins[count]);
806 else if ((amount / at->clone.value) > 0) 794 else if ((amount / at->value) > 0)
807 { 795 {
808 for (pouch = pl->inv; pouch; pouch = pouch->below) 796 for (pouch = pl->inv; pouch; pouch = pouch->below)
809 { 797 {
810 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold")) 798 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold"))
811 { 799 {
812 int w = at->clone.weight * (100 - pouch->stats.Str) / 100; 800 int w = at->weight * (100 - pouch->stats.Str) / 100;
813 int n = amount / at->clone.value; 801 int n = amount / at->value;
814 802
815 if (w == 0) 803 if (w == 0)
816 w = 1; /* Prevent divide by zero */ 804 w = 1; /* Prevent divide by zero */
817 805
818 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit)) 806 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit))
… …
830 esrv_send_item (pl, pl); 818 esrv_send_item (pl, pl);
831 } 819 }
832 } 820 }
833 } 821 }
834 822
835 if (amount / at->clone.value > 0) 823 if (amount / at->value > 0)
836 { 824 {
837 tmp = arch_to_object (at); 825 tmp = arch_to_object (at);
838 tmp->nrof = amount / tmp->value; 826 tmp->nrof = amount / tmp->value;
839 amount -= tmp->nrof * tmp->value; 827 amount -= tmp->nrof * tmp->value;
840 tmp = insert_ob_in_ob (tmp, pl); 828 tmp = insert_ob_in_ob (tmp, pl);
… …
843 } 831 }
844 } 832 }
845 } 833 }
846 834
847 if (amount != 0) 835 if (amount != 0)
848#ifndef WIN32
849 LOG (llevError, "Warning - payment in pay_player () not zero: %llu\n", amount); 836 LOG (llevError, "Warning - payment in pay_player () not zero: %llu\n", amount);
850#else
851 LOG (llevError, "Warning - payment in pay_player () not zero: %I64u\n", amount);
852#endif
853} 837}
854 838
855/* elmex: this is for the bank plugin :( */ 839/* elmex: this is for the bank plugin :( */
856sint64 840sint64
857pay_player_arch (object *pl, const char *arch, sint64 amount) 841pay_player_arch (object *pl, const char *arch, sint64 amount)
858{ 842{
859 archetype *at = find_archetype (arch); 843 archetype *at = archetype::find (arch);
860 object *tmp = NULL; 844 object *tmp = NULL;
861 845
862 if (at == NULL) 846 if (at == NULL)
863 return 0; 847 return 0;
864 848
… …
922 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE); 906 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE);
923 907
924 pay_player (pl, amount); 908 pay_player (pl, amount);
925 909
926 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)); 910 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));
911 pl->play_sound (sound_find ("shop_sell"));
927 912
928 SET_FLAG (op, FLAG_UNPAID); 913 SET_FLAG (op, FLAG_UNPAID);
929 identify (op); 914 identify (op);
930} 915}
931 916
932
933/* returns a double that is the ratio of the price that a shop will offer for 917/* returns a double that is the ratio of the price that a shop will offer for
934 * item based on the shops specialisation. Does not take account of greed, 918 * item based on the shops specialisation. Does not take account of greed,
935 * returned value is between (2*SPECIALISATION_EFFECT-1) and 1 and in any 919 * returned value is between SPECIALISATION_EFFECT and 1.
936 * event is never less than 0.1 (calling functions divide by it)
937 */ 920 */
938static double 921static double
939shop_specialisation_ratio (const object *item, const mapstruct *map) 922shop_specialisation_ratio (const object *item, const maptile *map)
940{ 923{
941 shopitems *items = map->shopitems; 924 shopitems *items = map->shopitems;
942 double ratio = SPECIALISATION_EFFECT, likedness = 0.001; 925 double likedness = 0.;
943 int i; 926 int i;
944 927
945 if (item == NULL) 928 if (item == NULL)
946 { 929 {
947 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", map->path); 930 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
948 return 0; 931 return 0;
949 } 932 }
950 933
951 if (!item->type) 934 if (!item->type)
952 { 935 {
953 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n"); 936 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n");
954 /* 937 /*
955 * I'm not really sure what the /right/ thing to do here is, these types of 938 * I'm not really sure what the /right/ thing to do here is, these types of
956 * item shouldn't exist anyway, but returning the ratio is probably the best bet.." 939 * item shouldn't exist anyway, but returning the ratio is probably the best bet.."
957 */ 940 */
958 return ratio; 941 return SPECIALISATION_EFFECT;
959 } 942 }
960 943
961 if (map->shopitems) 944 if (map->shopitems)
962 { 945 {
963 for (i = 0; i < items[0].index; i++) 946 for (i = 0; i < items[0].index; i++)
… …
965 likedness = items[i].strength / 100.0; 948 likedness = items[i].strength / 100.0;
966 } 949 }
967 950
968 if (likedness > 1.0) 951 if (likedness > 1.0)
969 { /* someone has been rather silly with the map headers. */ 952 { /* someone has been rather silly with the map headers. */
970 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, map->path); 953 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path);
971 likedness = 1.0; 954 likedness = 1.0;
972 } 955 }
973 956
974 if (likedness < -1.0) 957 if (likedness < -1.0)
975 { 958 {
976 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, map->path); 959 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
977 likedness = -1.0; 960 likedness = -1.0;
978 } 961 }
979 962
980 ratio = ratio + (1.0 - ratio) * likedness; 963 return lerp (likedness, -1., 1., SPECIALISATION_EFFECT, 1.);
981
982 if (ratio <= 0.1)
983 ratio = 0.1; /* if the ratio were much lower than this, we would get silly prices */
984
985 return ratio;
986} 964}
987 965
988/*returns the greed of the shop on map, or 1 if it isn't specified. */ 966/*returns the greed of the shop on map, or 1 if it isn't specified. */
989static double 967static double
990shop_greed (const mapstruct *map) 968shop_greed (const maptile *map)
991{ 969{
992 double greed = 1.0;
993
994 if (map->shopgreed)
995 return map->shopgreed; 970 return map->shopgreed
996 return greed; 971 ? map->shopgreed
972 : 1.;
997} 973}
998 974
999/* Returns a double based on how much the shopkeeper approves of the player. 975/* Returns a double based on how much the shopkeeper approves of the player.
1000 * this is based on the race of the shopkeeper and that of the player. 976 * this is based on the race of the shopkeeper and that of the player.
1001 */ 977 */
1002double 978double
1003shopkeeper_approval (const mapstruct *map, const object *player) 979shopkeeper_approval (const maptile *map, const object *player)
1004{ 980{
1005 double approval = 1.0; 981 return map->shoprace && player->race != map->shoprace
1006 982 ? DISLIKE_RATIO
1007 if (map->shoprace) 983 : 1.;
1008 {
1009 approval = NEUTRAL_RATIO;
1010 if (player->race && !strcmp (player->race, map->shoprace))
1011 approval = 1.0;
1012 }
1013
1014 return approval;
1015} 984}
1016 985
1017/* limit the value of items based on the wealth of the shop. If the item is close 986/* limit the value of items based on the wealth of the shop. If the item is close
1018 * to the maximum value a shop will offer, we start to reduce it, if the item is 987 * to the maximum value a shop will offer, we start to reduce it, if the item is
1019 * below the minimum value the shop is prepared to trade in, then we don't 988 * below the minimum value the shop is prepared to trade in, then we don't
… …
1023 */ 992 */
1024static sint64 993static sint64
1025value_limit (sint64 val, int quantity, const object *who, int isshop) 994value_limit (sint64 val, int quantity, const object *who, int isshop)
1026{ 995{
1027 sint64 newval, unit_price, tmpshopmax; 996 sint64 newval, unit_price, tmpshopmax;
1028 mapstruct *map; 997 maptile *map;
1029 998
1030 unit_price = val / quantity; 999 unit_price = val / quantity;
1031 1000
1032 if (!isshop || !who) 1001 if (!isshop || !who)
1033 { 1002 {
… …
1063 1032
1064/* gives a desciption of the shop on their current map to the player op. */ 1033/* gives a desciption of the shop on their current map to the player op. */
1065int 1034int
1066describe_shop (const object *op) 1035describe_shop (const object *op)
1067{ 1036{
1068 mapstruct *map = op->map; 1037 maptile *map = op->map;
1069 1038
1070 /*shopitems *items=map->shopitems; */ 1039 /*shopitems *items=map->shopitems; */
1071 int pos = 0, i; 1040 int pos = 0, i;
1072 double opinion = 0; 1041 double opinion = 0;
1073 char tmp[MAX_BUF] = "\0"; 1042 char tmp[MAX_BUF] = "\0";
… …
1187 case RING: 1156 case RING:
1188 case AMULET: 1157 case AMULET:
1189 case BRACERS: 1158 case BRACERS:
1190 case GIRDLE: 1159 case GIRDLE:
1191 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL)); 1160 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL));
1192 items[*numitems].item_sort = strdup_local (buf); 1161 items[*numitems].item_sort = strdup (buf);
1193 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL)); 1162 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL));
1194 items[*numitems].item_real = strdup_local (buf); 1163 items[*numitems].item_real = strdup (buf);
1195 (*numitems)++; 1164 (*numitems)++;
1196 break; 1165 break;
1197#endif 1166#endif
1198 1167
1199 default: 1168 default:
1200 items[*numitems].item_sort = strdup_local (query_base_name (tmp, 0)); 1169 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1201 items[*numitems].item_real = strdup_local (query_base_name (tmp, 1)); 1170 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1202 (*numitems)++; 1171 (*numitems)++;
1203 break; 1172 break;
1204 } 1173 }
1205 SET_FLAG (tmp, FLAG_UNPAID); 1174 SET_FLAG (tmp, FLAG_UNPAID);
1206} 1175}
1207 1176
1208void 1177void
1209shop_listing (object *op) 1178shop_listing (object *sign, object *op)
1210{ 1179{
1211 int i, j, numitems = 0, numallocated = 0, nx, ny; 1180 int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2;
1212 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 1181 const char *shop_coords = get_ob_key_value (sign, "shop_coords");
1213 object *stack; 1182 object *stack;
1214 shopinv *items; 1183 shopinv *items;
1215 1184
1216 /* Should never happen, but just in case a monster does apply a sign */ 1185 /* Should never happen, but just in case a monster does apply a sign */
1217 if (op->type != PLAYER) 1186 if (op->type != PLAYER)
1218 return; 1187 return;
1219 1188
1220 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:"); 1189 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1190 {
1191 x1 = 0;
1192 y1 = 0;
1193 x2 = op->map->width - 1;
1194 y2 = op->map->height - 1;
1195 }
1221 1196
1222 magic_mapping_mark (op, map_mark, 3);
1223 items = (shopinv *) malloc (40 * sizeof (shopinv)); 1197 items = (shopinv *) malloc (40 * sizeof (shopinv));
1224 numallocated = 40; 1198 numallocated = 40;
1225 1199
1226 /* Find all the appropriate items */ 1200 /* Find all the appropriate items */
1227 for (i = 0; i < MAP_WIDTH (op->map); i++) 1201 for (i = x1; i <= x2; i++)
1228 { 1202 {
1229 for (j = 0; j < MAP_HEIGHT (op->map); j++) 1203 for (j = y1; j < y2; j++)
1230 {
1231 /* magic map code now centers the map on the object at MAGIC_MAP_HALF.
1232 * 1204 {
1233 */ 1205 if (is_in_shop (op->map, i, j))
1234 nx = i - op->x + MAGIC_MAP_HALF;
1235 ny = j - op->y + MAGIC_MAP_HALF;
1236 /* unlikely, but really big shops could run into this issue */
1237 if (nx < 0 || ny < 0 || nx > MAGIC_MAP_SIZE || ny > MAGIC_MAP_SIZE)
1238 continue;
1239
1240 if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR)
1241 { 1206 {
1242 stack = get_map_ob (op->map, i, j); 1207 stack = GET_MAP_OB (op->map, i, j);
1243 1208
1244 while (stack) 1209 while (stack)
1245 { 1210 {
1246 if (QUERY_FLAG (stack, FLAG_UNPAID)) 1211 if (QUERY_FLAG (stack, FLAG_UNPAID))
1247 { 1212 {
1248 if (numitems == numallocated) 1213 if (numitems == numallocated)
1249 { 1214 {
1250 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1215 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10));
1251 numallocated += 10; 1216 numallocated += 10;
1252 } 1217 }
1218
1253 add_shop_item (stack, items, &numitems, &numallocated); 1219 add_shop_item (stack, items, &numitems, &numallocated);
1254 } 1220 }
1221
1255 stack = stack->above; 1222 stack = stack->above;
1256 } 1223 }
1257 } 1224 }
1258 } 1225 }
1259 } 1226 }
1260 1227
1261 free (map_mark);
1262
1263 if (numitems == 0) 1228 if (numitems == 0)
1264 { 1229 {
1265 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n"); 1230 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1266 free (items); 1231 free (items);
1267 return; 1232 return;
1268 } 1233 }
1269 1234
1270 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort); 1235 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
1236
1237 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
1271 1238
1272 for (i = 0; i < numitems; i++) 1239 for (i = 0; i < numitems; i++)
1273 { 1240 {
1274 /* Collapse items of the same name together */ 1241 /* Collapse items of the same name together */
1275 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real)) 1242 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
… …
1284 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real); 1251 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
1285 free (items[i].item_sort); 1252 free (items[i].item_sort);
1286 free (items[i].item_real); 1253 free (items[i].item_real);
1287 } 1254 }
1288 } 1255 }
1256
1289 free (items); 1257 free (items);
1290} 1258}
1291 1259
1292/* elmex: this function checks whether the object is in a shop */ 1260/* elmex: this function checks whether the object is in a shop */
1293bool 1261bool
… …
1297 return false; 1265 return false;
1298 1266
1299 return is_in_shop (o->map, o->x, o->y); 1267 return is_in_shop (o->map, o->x, o->y);
1300} 1268}
1301 1269
1302/* elmex: this function checks whether we are in a shop or not */ 1270/* elmex: this function checks whether we are in a shop or not
1271 - change 2007-11-26: enhanced the O(n) case by stopping at the first
1272 floor tile. this possibly will make map bugs where shopfloors are above
1273 floors more obvious.
1274*/
1275
1303bool 1276bool
1304is_in_shop (mapstruct *map, int x, int y) 1277is_in_shop (maptile *map, int x, int y)
1305{ 1278{
1306 for (object *floor = get_map_ob (map, x, y); floor; floor = floor->above) 1279 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
1280 if (QUERY_FLAG (floor, FLAG_IS_FLOOR))
1307 if (floor->type == SHOP_FLOOR) 1281 return floor->type == SHOP_FLOOR;
1308 return true;
1309
1310 return false; 1282 return false;
1311} 1283}
1284

Diff Legend

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