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.39 by root, Mon Jun 4 13:04:00 2007 UTC

1
2/* 1/*
3 * static char *rcsid_shop_c = 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
4 * "$Id: shop.C,v 1.14 2006/09/12 19:20:08 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it
14 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
15 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
16 (at your option) any later version. 11 * 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, but
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
21 GNU General Public License for more details. 16 * 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 along
24 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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 <crossfire@schmorp.de>
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> 30#include <math.h>
39 31
40/* this is a measure of how effective store specialisation is. A general store 32/* 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 33 * 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 34 * offer a range of prices around it such that the maximum price is always one
… …
49/* price a shopkeeper will give someone they neither like nor dislike */ 41/* price a shopkeeper will give someone they neither like nor dislike */
50#define NEUTRAL_RATIO 0.8 42#define NEUTRAL_RATIO 0.8
51 43
52static void pay_from_container (object *pl, object *pouch, sint64 &to_pay); 44static void pay_from_container (object *pl, object *pouch, sint64 &to_pay);
53static sint64 value_limit (sint64 val, int quantity, const object *who, int isshop); 45static sint64 value_limit (sint64 val, int quantity, const object *who, int isshop);
54static double shop_specialisation_ratio (const object *item, const mapstruct *map); 46static double shop_specialisation_ratio (const object *item, const maptile *map);
55static double shop_greed (const mapstruct *map); 47static double shop_greed (const maptile *map);
56 48
57#define NUM_COINS 4 /* number of coin types */ 49#define NUM_COINS 4 /* number of coin types */
58static const char *const coins[] = { "royalty", "platinacoin", "goldcoin", "silvercoin", NULL }; 50static const char *const coins[] = { "royalty", "platinacoin", "goldcoin", "silvercoin", NULL };
59 51
60/* Added F_TRUE flag to define.h to mean that the price should not 52/* Added F_TRUE flag to define.h to mean that the price should not
… …
139 if (tmp->arch != NULL) 131 if (tmp->arch != NULL)
140 { 132 {
141 if (flag == F_BUY) 133 if (flag == F_BUY)
142 { 134 {
143 LOG (llevError, "Asking for buy-value of unidentified object.\n"); 135 LOG (llevError, "Asking for buy-value of unidentified object.\n");
144 val = tmp->arch->clone.value * 50 * number; 136 val = tmp->arch->value * 50 * number;
145 } 137 }
146 else 138 else
147 { /* Trying to sell something, or get true value */ 139 { /* Trying to sell something, or get true value */
148 if (tmp->type == POTION) 140 if (tmp->type == POTION)
149 val = number * 40; /* Don't want to give anything away */ 141 val = number * 40; /* Don't want to give anything away */
… …
151 { 143 {
152 /* Get 2/3'rd value for applied objects, 1/3'rd for totally 144 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
153 * unknown objects 145 * unknown objects
154 */ 146 */
155 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) 147 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
156 val = number * tmp->arch->clone.value * 2 / 3; 148 val = number * tmp->arch->value * 2 / 3;
157 else 149 else
158 val = number * tmp->arch->clone.value / 3; 150 val = number * tmp->arch->value / 3;
159 } 151 }
160 } 152 }
161 } 153 }
162 else 154 else
163 { /* No archetype with this object */ 155 { /* No archetype with this object */
… …
174 166
175 /* If the item has been applied or identifed or does not need to be 167 /* 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 168 * identified, AND the object is magical and the archetype is non
177 * magical, then change values accordingly. The tmp->arch==NULL is 169 * magical, then change values accordingly. The tmp->arch==NULL is
178 * really just a check to prevent core dumps for when it checks 170 * really just a check to prevent core dumps for when it checks
179 * tmp->arch->clone.magic for any magic. The check for archetype 171 * tmp->arch->magic for any magic. The check for archetype
180 * magic is to not give extra money for archetypes that are by 172 * magic is to not give extra money for archetypes that are by
181 * default magical. This is because the archetype value should have 173 * default magical. This is because the archetype value should have
182 * already figured in that value. 174 * already figured in that value.
183 */ 175 */
184 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified || 176 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)) 177 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->magic))
186 { 178 {
187 if (tmp->magic > 0) 179 if (tmp->magic > 0)
188 val *= (3 * tmp->magic * tmp->magic * tmp->magic); 180 val *= (3 * tmp->magic * tmp->magic * tmp->magic);
189 else 181 else
190 /* Note that tmp->magic is negative, so that this 182 /* Note that tmp->magic is negative, so that this
… …
256 * the rest will come from the level in bargaining skill 248 * the rest will come from the level in bargaining skill
257 */ 249 */
258 const double cha_ratio = 0.40; 250 const double cha_ratio = 0.40;
259 251
260 diff = no_bargain ? 1.0 : 1. - pow (lev_bargain / (double) settings.max_level, 0.25); 252 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.); 253 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; 254 diff = .02 + (.80 - .02) * diff;
265 255
266 if (flag == F_BUY) 256 if (flag == F_BUY)
267 val += (val * diff); 257 val += val * diff;
268 else if (flag == F_SELL) 258 else if (flag == F_SELL)
269 val -= (val * diff); 259 val -= val * diff;
270 260
271 // now find a price range. the less good we can judge, the larger the range is 261 // 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 262 // then the range is adjusted randomly around the correct value
273 if (approximate) 263 if (approximate)
274 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1)); 264 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1));
275 } 265 }
276 266
277 /* I don't think this should really happen - if it does, it indicates and 267 /* I don't think this should really happen - if it does, it indicates and
278 * overflow of diff above. That shoudl only happen if 268 * overflow of diff above. That should only happen if
279 * we are selling objects - in that case, the person just 269 * we are selling objects - in that case, the person just
280 * gets no money. 270 * gets no money.
281 */ 271 */
282 if ((sint64) val < 0) 272 if ((sint64) val < 0)
283 val = 0; 273 val = 0;
… …
311 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD)) 301 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)); 302 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who));
313 else 303 else
314 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who))); 304 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who)));
315 } 305 }
306
316 /* we will also have an extra 0-5% variation between shops of the same type 307 /* 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 308 * for valuable items (below a value of 50 this effect wouldn't be very
318 * pointful, and could give fun with rounding. 309 * pointful, and could give fun with rounding.
319 */ 310 */
320 if (who->map->path != NULL && val > 50) 311 //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))); 312 if (val > 50)
313 val += float (val) * .05f * cosf ((tmp->uuid.seq & 0xffff) * float (M_PI * 2. / 0x10000));
322 } 314 }
315
323 return (sint64) val; 316 return (sint64) val;
324} 317}
325 318
326/* Find the coin type that is worth more the 'c'. Starts at the 319/* Find the coin type that is worth more the 'c'. Starts at the
327 * cointype placement. 320 * cointype placement.
… …
334 327
335 do 328 do
336 { 329 {
337 if (coins[*cointype] == NULL) 330 if (coins[*cointype] == NULL)
338 return NULL; 331 return NULL;
339 coin = find_archetype (coins[*cointype]); 332 coin = archetype::find (coins[*cointype]);
340 if (coin == NULL) 333 if (coin == NULL)
341 return NULL; 334 return NULL;
342 *cointype += 1; 335 *cointype += 1;
343 } 336 }
344 while (coin->clone.value > c); 337 while (coin->value > c);
345 338
346 return coin; 339 return coin;
347} 340}
348 341
349/* This returns a string of how much something is worth based on 342/* This returns a string of how much something is worth based on
… …
365 358
366 coin = find_next_coin (cost, &cointype); 359 coin = find_next_coin (cost, &cointype);
367 if (coin == NULL) 360 if (coin == NULL)
368 return "nothing"; 361 return "nothing";
369 362
370 num = cost / coin->clone.value; 363 num = cost / coin->value;
371 /* so long as nrof is 32 bit, this is true. 364 /* so long as nrof is 32 bit, this is true.
372 * If it takes more coins than a person can possibly carry, this 365 * If it takes more coins than a person can possibly carry, this
373 * is basically true. 366 * is basically true.
374 */ 367 */
375 if ((cost / coin->clone.value) > UINT32_MAX) 368 if ((cost / coin->value) > UINT32_MAX)
376 { 369 {
377 strcpy (buf, "an unimaginable sum of money"); 370 strcpy (buf, "an unimaginable sum of money");
378 return buf; 371 return buf;
379 } 372 }
380 373
381 cost -= num * (sint64)coin->clone.value; 374 cost -= num * (sint64)coin->value;
382 375
383 sprintf (buf, "%d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 376 sprintf (buf, "%d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
384 377
385 next_coin = find_next_coin (cost, &cointype); 378 next_coin = find_next_coin (cost, &cointype);
386 if (next_coin == NULL || approx) 379 if (next_coin == NULL || approx)
387 return buf; 380 return buf;
388 381
389 coin = next_coin; 382 coin = next_coin;
390 num = cost / coin->clone.value; 383 num = cost / coin->value;
391 cost -= num * (sint64)coin->clone.value; 384 cost -= num * (sint64)coin->value;
392 385
393 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 386 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
394 387
395 return buf; 388 return buf;
396} 389}
397 390
398const char * 391const char *
… …
428 archetype *coin = find_next_coin (real_value, &cointype); 421 archetype *coin = find_next_coin (real_value, &cointype);
429 422
430 if (coin == NULL) 423 if (coin == NULL)
431 return "nothing"; 424 return "nothing";
432 425
433 num = real_value / coin->clone.value; 426 num = real_value / coin->value;
434 if (num == 1) 427 if (num == 1)
435 sprintf (buf, "about one %s", &coin->clone.name); 428 sprintf (buf, "about one %s", &coin->object::name);
436 else if (num < 5) 429 else if (num < 5)
437 sprintf (buf, "a few %s", &coin->clone.name_pl); 430 sprintf (buf, "a few %s", &coin->object::name_pl);
438 else if (num < 10) 431 else if (num < 10)
439 sprintf (buf, "several %s", &coin->clone.name_pl); 432 sprintf (buf, "several %s", &coin->object::name_pl);
440 else if (num < 25) 433 else if (num < 25)
441 sprintf (buf, "a moderate amount of %s", &coin->clone.name_pl); 434 sprintf (buf, "a moderate amount of %s", &coin->object::name_pl);
442 else if (num < 100) 435 else if (num < 100)
443 sprintf (buf, "lots of %s", &coin->clone.name_pl); 436 sprintf (buf, "lots of %s", &coin->object::name_pl);
444 else if (num < 1000) 437 else if (num < 1000)
445 sprintf (buf, "a great many %s", &coin->clone.name_pl); 438 sprintf (buf, "a great many %s", &coin->object::name_pl);
446 else 439 else
447 sprintf (buf, "a vast quantity of %s", &coin->clone.name_pl); 440 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
448 return buf; 441 return buf;
449 } 442 }
450 } 443 }
451 } 444 }
452 445
… …
511 504
512 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 505 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"))) 506 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold")))
514 pay_from_container (pl, pouch, to_pay); 507 pay_from_container (pl, pouch, to_pay);
515 508
516 fix_player (pl); 509 pl->update_stats ();
517 return 1; 510 return 1;
518} 511}
519 512
520/* DAMN: This is now a wrapper for pay_from_container, which is 513/* 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 514 * called for the player, then for each active container that can hold
… …
548 541
549 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 542 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"))) 543 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold")))
551 pay_from_container (pl, pouch, to_pay); 544 pay_from_container (pl, pouch, to_pay);
552 545
553 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ)) 546 pl->update_stats ();
554 SET_FLAG (op, FLAG_WAS_WIZ);
555 547
556 fix_player (pl);
557 return 1; 548 return 1;
558} 549}
559 550
560/* This pays for the item, and takes the proper amount of money off 551/* This pays for the item, and takes the proper amount of money off
561 * the player. 552 * the player.
… …
590 581
591 if (tmp->type == MONEY) 582 if (tmp->type == MONEY)
592 { 583 {
593 for (i = 0; i < NUM_COINS; i++) 584 for (i = 0; i < NUM_COINS; i++)
594 { 585 {
595 if (tmp->value == tmp->arch->clone.value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->name)) 586 if (tmp->value == tmp->arch->value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->archname))
596 { 587 {
597 // This should not happen, but if it does, just merge the two. 588 // This should not happen, but if it does, just merge the two.
598 if (coin_objs [i]) 589 if (coin_objs [i])
599 { 590 {
600 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); 591 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]);
601 remove_ob (tmp); 592 tmp->remove ();
602 coin_objs[i]->nrof += tmp->nrof; 593 coin_objs[i]->nrof += tmp->nrof;
603 esrv_del_item (pl->contr, tmp->count); 594 esrv_del_item (pl->contr, tmp->count);
604 free_object (tmp); 595 tmp->destroy ();
605 } 596 }
606 else 597 else
607 { 598 {
608 remove_ob (tmp); 599 tmp->remove ();
609 600
610 if (pouch->type == PLAYER) 601 if (pouch->type == PLAYER)
611 esrv_del_item (pl->contr, tmp->count); 602 esrv_del_item (pl->contr, tmp->count);
612 603
613 coin_objs[i] = tmp; 604 coin_objs[i] = tmp;
… …
616 break; 607 break;
617 } 608 }
618 } 609 }
619 610
620 if (i == NUM_COINS) 611 if (i == NUM_COINS)
621 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->name); 612 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->archname);
622 } 613 }
623 } 614 }
624 615
625 /* Fill in any gaps in the coin_objs array - needed to make change. */ 616 /* 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 */ 617 /* Note that the coin_objs array goes from least value to greatest value */
627 for (i = 0; i < NUM_COINS; i++) 618 for (i = 0; i < NUM_COINS; i++)
628 if (!coin_objs[i]) 619 if (!coin_objs[i])
629 { 620 {
630 at = find_archetype (coins[NUM_COINS - 1 - i]); 621 at = archetype::find (coins[NUM_COINS - 1 - i]);
631 622
632 if (at == NULL) 623 if (at == NULL)
633 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]); 624 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]);
634 625
635 coin_objs[i] = arch_to_object (at); 626 coin_objs[i] = arch_to_object (at);
… …
672 663
673 if (pl->type != PLAYER) 664 if (pl->type != PLAYER)
674 esrv_send_item (pl, pl); 665 esrv_send_item (pl, pl);
675 } 666 }
676 else 667 else
677 free_object (coin_objs[i]); 668 coin_objs[i]->destroy ();
678 } 669 }
679} 670}
680 671
681/* Checks all unpaid items in op's inventory, adds up all the money they 672/* 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. 673 * have, and checks that they can actually afford what they want to buy.
… …
687can_pay (object *pl) 678can_pay (object *pl)
688{ 679{
689 int unpaid_count = 0; 680 int unpaid_count = 0;
690 sint64 unpaid_price = 0; 681 sint64 unpaid_price = 0;
691 sint64 player_wealth = query_money (pl); 682 sint64 player_wealth = query_money (pl);
692 object *item;
693 683
694 if (!pl || pl->type != PLAYER) 684 if (!pl || pl->type != PLAYER)
695 { 685 {
696 LOG (llevError, "can_pay(): called against something that isn't a player\n"); 686 LOG (llevError, "can_pay(): called against something that isn't a player\n");
697 return 0; 687 return 0;
… …
753 return 0; 743 return 0;
754 } 744 }
755 else 745 else
756 { 746 {
757 object *tmp; 747 object *tmp;
758 tag_t c = op->count;
759 748
760 CLEAR_FLAG (op, FLAG_UNPAID); 749 CLEAR_FLAG (op, FLAG_UNPAID);
761 CLEAR_FLAG (op, FLAG_PLAYER_SOLD); 750 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
762 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); 751 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
763 tmp = merge_ob (op, NULL); 752 tmp = merge_ob (op, NULL);
764 753
765 if (pl->type == PLAYER) 754 if (pl->type == PLAYER)
766 { 755 {
767 if (tmp) 756 if (tmp)
768 { /* it was merged */ 757 { /* it was merged */
769 esrv_del_item (pl->contr, c); 758 esrv_del_item (pl->contr, op->count);
770 op = tmp; 759 op = tmp;
771 } 760 }
772 761
773 esrv_send_item (pl, op); 762 esrv_send_item (pl, op);
774 } 763 }
… …
800 archetype *at = 0; 789 archetype *at = 0;
801 object *pouch = 0, *tmp = 0; 790 object *pouch = 0, *tmp = 0;
802 791
803 for (count = 0; coins[count] != NULL; count++) 792 for (count = 0; coins[count] != NULL; count++)
804 { 793 {
805 at = find_archetype (coins[count]); 794 at = archetype::find (coins[count]);
806 795
807 if (at == NULL) 796 if (at == NULL)
808 LOG (llevError, "Could not find %s archetype\n", coins[count]); 797 LOG (llevError, "Could not find %s archetype\n", coins[count]);
809 else if ((amount / at->clone.value) > 0) 798 else if ((amount / at->value) > 0)
810 { 799 {
811 for (pouch = pl->inv; pouch; pouch = pouch->below) 800 for (pouch = pl->inv; pouch; pouch = pouch->below)
812 { 801 {
813 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold")) 802 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold"))
814 { 803 {
815 int w = at->clone.weight * (100 - pouch->stats.Str) / 100; 804 int w = at->weight * (100 - pouch->stats.Str) / 100;
816 int n = amount / at->clone.value; 805 int n = amount / at->value;
817 806
818 if (w == 0) 807 if (w == 0)
819 w = 1; /* Prevent divide by zero */ 808 w = 1; /* Prevent divide by zero */
820 809
821 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit)) 810 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit))
… …
833 esrv_send_item (pl, pl); 822 esrv_send_item (pl, pl);
834 } 823 }
835 } 824 }
836 } 825 }
837 826
838 if (amount / at->clone.value > 0) 827 if (amount / at->value > 0)
839 { 828 {
840 tmp = arch_to_object (at); 829 tmp = arch_to_object (at);
841 tmp->nrof = amount / tmp->value; 830 tmp->nrof = amount / tmp->value;
842 amount -= tmp->nrof * tmp->value; 831 amount -= tmp->nrof * tmp->value;
843 tmp = insert_ob_in_ob (tmp, pl); 832 tmp = insert_ob_in_ob (tmp, pl);
… …
846 } 835 }
847 } 836 }
848 } 837 }
849 838
850 if (amount != 0) 839 if (amount != 0)
851#ifndef WIN32
852 LOG (llevError, "Warning - payment in pay_player () not zero: %llu\n", amount); 840 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} 841}
857 842
858/* elmex: this is for the bank plugin :( */ 843/* elmex: this is for the bank plugin :( */
859sint64 844sint64
860pay_player_arch (object *pl, const char *arch, sint64 amount) 845pay_player_arch (object *pl, const char *arch, sint64 amount)
861{ 846{
862 archetype *at = find_archetype (arch); 847 archetype *at = archetype::find (arch);
863 object *tmp = NULL; 848 object *tmp = NULL;
864 849
865 if (at == NULL) 850 if (at == NULL)
866 return 0; 851 return 0;
867 852
… …
937 * item based on the shops specialisation. Does not take account of greed, 922 * 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 923 * returned value is between (2*SPECIALISATION_EFFECT-1) and 1 and in any
939 * event is never less than 0.1 (calling functions divide by it) 924 * event is never less than 0.1 (calling functions divide by it)
940 */ 925 */
941static double 926static double
942shop_specialisation_ratio (const object *item, const mapstruct *map) 927shop_specialisation_ratio (const object *item, const maptile *map)
943{ 928{
944 shopitems *items = map->shopitems; 929 shopitems *items = map->shopitems;
945 double ratio = SPECIALISATION_EFFECT, likedness = 0.001; 930 double ratio = SPECIALISATION_EFFECT, likedness = 0.001;
946 int i; 931 int i;
947 932
948 if (item == NULL) 933 if (item == NULL)
949 { 934 {
950 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", map->path); 935 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
951 return 0; 936 return 0;
952 } 937 }
953 938
954 if (!item->type) 939 if (!item->type)
955 { 940 {
… …
968 likedness = items[i].strength / 100.0; 953 likedness = items[i].strength / 100.0;
969 } 954 }
970 955
971 if (likedness > 1.0) 956 if (likedness > 1.0)
972 { /* someone has been rather silly with the map headers. */ 957 { /* 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); 958 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path);
974 likedness = 1.0; 959 likedness = 1.0;
975 } 960 }
976 961
977 if (likedness < -1.0) 962 if (likedness < -1.0)
978 { 963 {
979 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, map->path); 964 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
980 likedness = -1.0; 965 likedness = -1.0;
981 } 966 }
982 967
983 ratio = ratio + (1.0 - ratio) * likedness; 968 ratio = ratio + (1.0 - ratio) * likedness;
984 969
… …
988 return ratio; 973 return ratio;
989} 974}
990 975
991/*returns the greed of the shop on map, or 1 if it isn't specified. */ 976/*returns the greed of the shop on map, or 1 if it isn't specified. */
992static double 977static double
993shop_greed (const mapstruct *map) 978shop_greed (const maptile *map)
994{ 979{
995 double greed = 1.0; 980 double greed = 1.0;
996 981
997 if (map->shopgreed) 982 if (map->shopgreed)
998 return map->shopgreed; 983 return map->shopgreed;
… …
1001 986
1002/* Returns a double based on how much the shopkeeper approves of the player. 987/* 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. 988 * this is based on the race of the shopkeeper and that of the player.
1004 */ 989 */
1005double 990double
1006shopkeeper_approval (const mapstruct *map, const object *player) 991shopkeeper_approval (const maptile *map, const object *player)
1007{ 992{
1008 double approval = 1.0; 993 double approval = 1.0;
1009 994
1010 if (map->shoprace) 995 if (map->shoprace)
1011 { 996 {
… …
1026 */ 1011 */
1027static sint64 1012static sint64
1028value_limit (sint64 val, int quantity, const object *who, int isshop) 1013value_limit (sint64 val, int quantity, const object *who, int isshop)
1029{ 1014{
1030 sint64 newval, unit_price, tmpshopmax; 1015 sint64 newval, unit_price, tmpshopmax;
1031 mapstruct *map; 1016 maptile *map;
1032 1017
1033 unit_price = val / quantity; 1018 unit_price = val / quantity;
1034 1019
1035 if (!isshop || !who) 1020 if (!isshop || !who)
1036 { 1021 {
… …
1066 1051
1067/* gives a desciption of the shop on their current map to the player op. */ 1052/* gives a desciption of the shop on their current map to the player op. */
1068int 1053int
1069describe_shop (const object *op) 1054describe_shop (const object *op)
1070{ 1055{
1071 mapstruct *map = op->map; 1056 maptile *map = op->map;
1072 1057
1073 /*shopitems *items=map->shopitems; */ 1058 /*shopitems *items=map->shopitems; */
1074 int pos = 0, i; 1059 int pos = 0, i;
1075 double opinion = 0; 1060 double opinion = 0;
1076 char tmp[MAX_BUF] = "\0"; 1061 char tmp[MAX_BUF] = "\0";
… …
1190 case RING: 1175 case RING:
1191 case AMULET: 1176 case AMULET:
1192 case BRACERS: 1177 case BRACERS:
1193 case GIRDLE: 1178 case GIRDLE:
1194 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL)); 1179 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL));
1195 items[*numitems].item_sort = strdup_local (buf); 1180 items[*numitems].item_sort = strdup (buf);
1196 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL)); 1181 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL));
1197 items[*numitems].item_real = strdup_local (buf); 1182 items[*numitems].item_real = strdup (buf);
1198 (*numitems)++; 1183 (*numitems)++;
1199 break; 1184 break;
1200#endif 1185#endif
1201 1186
1202 default: 1187 default:
1203 items[*numitems].item_sort = strdup_local (query_base_name (tmp, 0)); 1188 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1204 items[*numitems].item_real = strdup_local (query_base_name (tmp, 1)); 1189 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1205 (*numitems)++; 1190 (*numitems)++;
1206 break; 1191 break;
1207 } 1192 }
1208 SET_FLAG (tmp, FLAG_UNPAID); 1193 SET_FLAG (tmp, FLAG_UNPAID);
1209} 1194}
1210 1195
1211void 1196void
1212shop_listing (object *op) 1197shop_listing (object *sign, object *op)
1213{ 1198{
1214 int i, j, numitems = 0, numallocated = 0, nx, ny; 1199 int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2;
1215 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 1200 const char *shop_coords = get_ob_key_value (sign, "shop_coords");
1216 object *stack; 1201 object *stack;
1217 shopinv *items; 1202 shopinv *items;
1218 1203
1219 /* Should never happen, but just in case a monster does apply a sign */ 1204 /* Should never happen, but just in case a monster does apply a sign */
1220 if (op->type != PLAYER) 1205 if (op->type != PLAYER)
1221 return; 1206 return;
1222 1207
1223 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:"); 1208 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1209 {
1210 x1 = 0;
1211 y1 = 0;
1212 x2 = op->map->width - 1;
1213 y2 = op->map->height - 1;
1214 }
1224 1215
1225 magic_mapping_mark (op, map_mark, 3);
1226 items = (shopinv *) malloc (40 * sizeof (shopinv)); 1216 items = (shopinv *) malloc (40 * sizeof (shopinv));
1227 numallocated = 40; 1217 numallocated = 40;
1228 1218
1229 /* Find all the appropriate items */ 1219 /* Find all the appropriate items */
1230 for (i = 0; i < MAP_WIDTH (op->map); i++) 1220 for (i = x1; i <= x2; i++)
1231 { 1221 {
1232 for (j = 0; j < MAP_HEIGHT (op->map); j++) 1222 for (j = y1; j < y2; j++)
1233 {
1234 /* magic map code now centers the map on the object at MAGIC_MAP_HALF.
1235 * 1223 {
1236 */ 1224 if (is_in_shop (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
1243 if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR)
1244 { 1225 {
1245 stack = get_map_ob (op->map, i, j); 1226 stack = GET_MAP_OB (op->map, i, j);
1246 1227
1247 while (stack) 1228 while (stack)
1248 { 1229 {
1249 if (QUERY_FLAG (stack, FLAG_UNPAID)) 1230 if (QUERY_FLAG (stack, FLAG_UNPAID))
1250 { 1231 {
1251 if (numitems == numallocated) 1232 if (numitems == numallocated)
1252 { 1233 {
1253 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1234 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10));
1254 numallocated += 10; 1235 numallocated += 10;
1255 } 1236 }
1237
1256 add_shop_item (stack, items, &numitems, &numallocated); 1238 add_shop_item (stack, items, &numitems, &numallocated);
1257 } 1239 }
1240
1258 stack = stack->above; 1241 stack = stack->above;
1259 } 1242 }
1260 } 1243 }
1261 } 1244 }
1262 } 1245 }
1263 1246
1264 free (map_mark);
1265
1266 if (numitems == 0) 1247 if (numitems == 0)
1267 { 1248 {
1268 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n"); 1249 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1269 free (items); 1250 free (items);
1270 return; 1251 return;
1271 } 1252 }
1272 1253
1273 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort); 1254 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
1255
1256 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
1274 1257
1275 for (i = 0; i < numitems; i++) 1258 for (i = 0; i < numitems; i++)
1276 { 1259 {
1277 /* Collapse items of the same name together */ 1260 /* Collapse items of the same name together */
1278 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real)) 1261 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
… …
1287 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real); 1270 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
1288 free (items[i].item_sort); 1271 free (items[i].item_sort);
1289 free (items[i].item_real); 1272 free (items[i].item_real);
1290 } 1273 }
1291 } 1274 }
1275
1292 free (items); 1276 free (items);
1293} 1277}
1294 1278
1295/* elmex: this function checks whether the object is in a shop */ 1279/* elmex: this function checks whether the object is in a shop */
1296bool 1280bool
… …
1302 return is_in_shop (o->map, o->x, o->y); 1286 return is_in_shop (o->map, o->x, o->y);
1303} 1287}
1304 1288
1305/* elmex: this function checks whether we are in a shop or not */ 1289/* elmex: this function checks whether we are in a shop or not */
1306bool 1290bool
1307is_in_shop (mapstruct *map, int x, int y) 1291is_in_shop (maptile *map, int x, int y)
1308{ 1292{
1309 for (object *floor = get_map_ob (map, x, y); floor; floor = floor->above) 1293 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
1310 if (floor->type == SHOP_FLOOR) 1294 if (floor->type == SHOP_FLOOR)
1311 return true; 1295 return true;
1312 1296
1313 return false; 1297 return false;
1314} 1298}

Diff Legend

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