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.50 by elmex, Thu Apr 24 11:26:41 2008 UTC vs.
Revision 1.76 by root, Fri Mar 26 01:04:45 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <spells.h> 26#include <spells.h>
26#include <skills.h> 27#include <skills.h>
27#include <living.h> 28#include <living.h>
28#include <sproto.h> 29#include <sproto.h>
29#include <math.h>
30 30
31/* 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
32 * 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
33 * 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
34 * therefore making this number higher, makes specialisation less effective. 34 * therefore making this number higher, makes specialisation less effective.
… …
74 74
75sint64 75sint64
76query_cost (const object *tmp, object *who, int flag) 76query_cost (const object *tmp, object *who, int flag)
77{ 77{
78 double val; 78 double val;
79 int number; /* used to better calculate value */
80 int no_bargain; 79 int no_bargain;
81 int identified; 80 int identified;
82 int not_cursed; 81 int not_cursed;
83 int approximate; 82 int approximate;
84 int shop; 83 int shop;
… …
109 108
110 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 ());
111 return 0; 110 return 0;
112 } 111 }
113 112
114 number = tmp->nrof; 113 int number = tmp->number_of ();
115 if (number == 0) 114
116 number = 1;
117 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 115 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified)
118 { 116 {
119 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)))
120 return 0; 118 return 0;
121 else 119 else
122 val = tmp->value * number; 120 val = tmp->value * number;
123 } 121 }
124 /* 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 */
125 else 123 else
126 { 124 {
127 if (tmp->arch != NULL)
128 {
129 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
130 { 135 {
131 LOG (llevError, "Asking for buy-value of unidentified object.\n"); 136 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
132 val = tmp->arch->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;
133 } 143 }
134 else
135 { /* Trying to sell something, or get true value */
136 if (tmp->type == POTION)
137 val = number * 40; /* Don't want to give anything away */
138 else
139 {
140 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
141 * unknown objects
142 */
143 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
144 val = number * tmp->arch->value * 2 / 3;
145 else
146 val = number * tmp->arch->value / 3;
147 }
148 }
149 }
150 else
151 { /* No archetype with this object */
152 LOG (llevDebug, "In sell item: Have object with no archetype: %s\n", &tmp->name);
153 if (flag == F_BUY)
154 {
155 LOG (llevError, "Asking for buy-value of unidentified object without arch.\n");
156 val = number * tmp->value * 10;
157 }
158 else
159 val = number * tmp->value / 5;
160 } 144 }
161 } 145 }
162 146
163 /* 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
164 * identified, AND the object is magical and the archetype is non 148 * identified, AND the object is magical and the archetype is non
… …
206 * AND Cha = 30 will get optimal price. 190 * AND Cha = 30 will get optimal price.
207 * Thus charisma will never get useless. 191 * Thus charisma will never get useless.
208 * -b.e. edler@heydernet.de 192 * -b.e. edler@heydernet.de
209 */ 193 */
210 194
211 if (who != NULL && who->type == PLAYER) 195 if (who && who->type == PLAYER)
212 { 196 {
213 int lev_bargain = 0; 197 int lev_bargain = 0;
214 int lev_identify = 0; 198 int lev_identify = 0;
215 int idskill1 = 0;
216 int idskill2 = 0;
217 const typedata *tmptype;
218
219 tmptype = get_typedata (tmp->type);
220 199
221 if (find_skill_by_number (who, SK_BARGAINING)) 200 if (find_skill_by_number (who, SK_BARGAINING))
222 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level; 201 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level;
223 202
224 if (tmptype) 203 if (const typedata *tmptype = get_typedata (tmp->type))
225 { 204 {
226 idskill1 = tmptype->identifyskill; 205 if (int idskill1 = tmptype->identifyskill)
227
228 if (idskill1)
229 { 206 {
230 idskill2 = tmptype->identifyskill2; 207 int idskill2 = tmptype->identifyskill2;
231 208
232 if (find_skill_by_number (who, idskill1)) 209 if (find_skill_by_number (who, idskill1))
233 lev_identify = find_skill_by_number (who, idskill1)->level; 210 lev_identify = find_skill_by_number (who, idskill1)->level;
234 211
235 if (idskill2 && find_skill_by_number (who, idskill2)) 212 if (idskill2 && find_skill_by_number (who, idskill2))
236 lev_identify += find_skill_by_number (who, idskill2)->level; 213 lev_identify += find_skill_by_number (who, idskill2)->level;
237 } 214 }
238 } 215 }
239 else
240 LOG (llevError, "Query_cost: item %s hasn't got a valid type\n", tmp->debug_desc ());
241 216
242 /* ratio determines how much of the price modification 217 /* ratio determines how much of the price modification
243 * will come from the basic stat charisma 218 * will come from the basic stat charisma
244 * the rest will come from the level in bargaining skill 219 * the rest will come from the level in bargaining skill
245 */ 220 */
… …
418 393
419 if (coin == NULL) 394 if (coin == NULL)
420 return "nothing"; 395 return "nothing";
421 396
422 num = real_value / coin->value; 397 num = real_value / coin->value;
398
423 if (num == 1) 399 if (num == 1)
424 sprintf (buf, "about one %s", &coin->object::name); 400 sprintf (buf, "about one %s", &coin->object::name);
425 else if (num < 5) 401 else if (num < 5)
426 sprintf (buf, "a few %s", &coin->object::name_pl); 402 sprintf (buf, "a few %s", &coin->object::name_pl);
427 else if (num < 10) 403 else if (num < 10)
… …
432 sprintf (buf, "lots of %s", &coin->object::name_pl); 408 sprintf (buf, "lots of %s", &coin->object::name_pl);
433 else if (num < 1000) 409 else if (num < 1000)
434 sprintf (buf, "a great many %s", &coin->object::name_pl); 410 sprintf (buf, "a great many %s", &coin->object::name_pl);
435 else 411 else
436 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl); 412 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
413
437 return buf; 414 return buf;
438 } 415 }
439 } 416 }
440 } 417 }
441 418
… …
472 } 449 }
473 450
474 for (tmp = op->inv; tmp; tmp = tmp->below) 451 for (tmp = op->inv; tmp; tmp = tmp->below)
475 if (tmp->type == MONEY) 452 if (tmp->type == MONEY)
476 total += tmp->nrof * (sint64)tmp->value; 453 total += tmp->nrof * (sint64)tmp->value;
477 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")))
478 total += query_money (tmp); 455 total += query_money (tmp);
479 456
480 return total; 457 return total;
481} 458}
482 459
… …
497 return 0; 474 return 0;
498 475
499 pay_from_container (pl, pl, to_pay); 476 pay_from_container (pl, pl, to_pay);
500 477
501 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 478 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
502 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")))
503 pay_from_container (pl, pouch, to_pay); 480 pay_from_container (pl, pouch, to_pay);
504 481
505 pl->update_stats (); 482 pl->update_stats ();
506 return 1; 483 return 1;
507} 484}
… …
534 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE); 511 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE);
535 512
536 pay_from_container (pl, pl, to_pay); 513 pay_from_container (pl, pl, to_pay);
537 514
538 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 515 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
539 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")))
540 pay_from_container (pl, pouch, to_pay); 517 pay_from_container (pl, pouch, to_pay);
541 518
542 pl->update_stats (); 519 pl->update_stats ();
543 520
544 return 1; 521 return 1;
… …
611 at = archetype::find (coins[NUM_COINS - 1 - i]); 588 at = archetype::find (coins[NUM_COINS - 1 - i]);
612 589
613 if (at == NULL) 590 if (at == NULL)
614 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]);
615 592
616 coin_objs[i] = arch_to_object (at); 593 coin_objs[i] = at->instance ();
617 coin_objs[i]->nrof = 0; 594 coin_objs[i]->nrof = 0;
618 } 595 }
619 596
620 for (i = 0; i < NUM_COINS; i++) 597 for (i = 0; i < NUM_COINS; i++)
621 { 598 {
622 object &coin = *coin_objs[i]; 599 object &coin = *coin_objs[i];
623 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);
624 to_pay -= num_coins * coin.value; 601 to_pay -= num_coins * coin.value;
625 602
626 coin.nrof -= num_coins; 603 coin.nrof -= num_coins;
627 /* Now start making change. Start at the coin value 604 /* Now start making change. Start at the coin value
628 * below the one we just did, and work down to 605 * below the one we just did, and work down to
… …
638 count--; 615 count--;
639 } 616 }
640 } 617 }
641 618
642 for (i = 0; i < NUM_COINS; i++) 619 for (i = 0; i < NUM_COINS; i++)
643 {
644 if (coin_objs[i]->nrof) 620 if (coin_objs[i]->nrof)
645 insert_ob_in_ob (coin_objs [i], pouch); 621 insert_ob_in_ob (coin_objs [i], pouch);
646 else 622 else
647 coin_objs[i]->destroy (); 623 coin_objs[i]->destroy ();
648 }
649} 624}
650 625
651/* 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
652 * 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.
653 * 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
… …
673 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP); 648 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
674 } 649 }
675 650
676 if (unpaid_price > player_wealth) 651 if (unpaid_price > player_wealth)
677 { 652 {
678 char buf[MAX_BUF]; 653 dynbuf_text &buf = msg_dynbuf; buf.clear ();
679 char cost[MAX_BUF];
680 char missing[MAX_BUF];
681 654
682 snprintf (cost, MAX_BUF, "%s", cost_string_from_value (unpaid_price, 0)); 655 buf << "You have " << unpaid_count
683 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.>";
684 660
685 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);
686 unpaid_count, cost, missing);
687 new_draw_info (NDI_UNIQUE, 0, pl, buf);
688 662
689 return 0; 663 return 0;
690 } 664 }
691 else 665 else
692 return 1; 666 return 1;
… …
765 LOG (llevError, "Could not find %s archetype\n", coins[count]); 739 LOG (llevError, "Could not find %s archetype\n", coins[count]);
766 else if ((amount / at->value) > 0) 740 else if ((amount / at->value) > 0)
767 { 741 {
768 for (pouch = pl->inv; pouch; pouch = pouch->below) 742 for (pouch = pl->inv; pouch; pouch = pouch->below)
769 { 743 {
770 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"))
771 { 745 {
772 int w = at->weight * (100 - pouch->stats.Str) / 100; 746 int w = at->weight * (100 - pouch->stats.Str) / 100;
773 int n = amount / at->value; 747 int n = amount / at->value;
774 748
775 if (w == 0) 749 if (w == 0)
… …
778 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))
779 { 753 {
780 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n) 754 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n)
781 n = (pouch->weight_limit - pouch->carrying) / w; 755 n = (pouch->weight_limit - pouch->carrying) / w;
782 756
783 object *tmp = arch_to_object (at); 757 object *tmp = at->instance ();
784 tmp->nrof = n; 758 tmp->nrof = n;
785 amount -= tmp->nrof * tmp->value; 759 amount -= tmp->nrof * tmp->value;
786 pouch->insert (tmp); 760 pouch->insert (tmp);
787 } 761 }
788 } 762 }
789 } 763 }
790 764
791 if (amount / at->value > 0) 765 if (amount / at->value > 0)
792 { 766 {
793 object *tmp = arch_to_object (at); 767 object *tmp = at->instance ();
794 tmp->nrof = amount / tmp->value; 768 tmp->nrof = amount / tmp->value;
795 amount -= tmp->nrof * tmp->value; 769 amount -= tmp->nrof * tmp->value;
796 pl->insert (tmp); 770 pl->insert (tmp);
797 } 771 }
798 } 772 }
… …
804 778
805/* elmex: this is for the bank plugin :( */ 779/* elmex: this is for the bank plugin :( */
806sint64 780sint64
807pay_player_arch (object *pl, const char *arch, sint64 amount) 781pay_player_arch (object *pl, const char *arch, sint64 amount)
808{ 782{
809 archetype *at = archetype::find (arch);
810
811 if (!at)
812 return 0;
813
814 if (amount > 0) 783 if (amount)
815 { 784 {
816 object *tmp = arch_to_object (at); 785 object *ob = archetype::get (arch);
786
787 if (!ob)
788 return 0;
789
817 tmp->nrof = amount; 790 ob->nrof = amount;
818 insert_ob_in_ob (tmp, pl); 791 pl->insert (ob);
819 } 792 }
820 793
821 return 1; 794 return 1;
822} 795}
823 796
… …
878 */ 851 */
879static double 852static double
880shop_specialisation_ratio (const object *item, const maptile *map) 853shop_specialisation_ratio (const object *item, const maptile *map)
881{ 854{
882 shopitems *items = map->shopitems; 855 shopitems *items = map->shopitems;
883 double likedness = 0.; 856 int likedness = 0;
884 int i; 857 int i;
885 858
886 if (item == NULL) 859 if (item == NULL)
887 { 860 {
888 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);
… …
898 */ 871 */
899 return SPECIALISATION_EFFECT; 872 return SPECIALISATION_EFFECT;
900 } 873 }
901 874
902 if (map->shopitems) 875 if (map->shopitems)
903 {
904 for (i = 0; i < items[0].index; i++) 876 for (i = 0; i < items[0].index; i++)
905 if (items[i].typenum == item->type || (!items[i].typenum && likedness == 0.001)) 877 if (items[i].typenum == item->type || (!items[i].typenum && !likedness))
906 likedness = items[i].strength / 100.0; 878 likedness = items[i].strength;
907 }
908 879
909 if (likedness > 1.0) 880 if (likedness > 100)
910 { /* someone has been rather silly with the map headers. */ 881 { /* someone has been rather silly with the map headers. */
911 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);
912 likedness = 1.0; 883 likedness = 100;
913 } 884 }
914 885
915 if (likedness < -1.0) 886 if (likedness < -100)
916 { 887 {
917 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);
918 likedness = -1.0; 889 likedness = -100;
919 } 890 }
920 891
921 return lerp (likedness, -1., 1., SPECIALISATION_EFFECT, 1.); 892 return lerp (double (likedness), -100., 100., SPECIALISATION_EFFECT, 1.);
922} 893}
923 894
924/*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. */
925static double 896static double
926shop_greed (const maptile *map) 897shop_greed (const maptile *map)
… …
976 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default 947 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default
977 948
978 if (map->shopmin && unit_price < map->shopmin) 949 if (map->shopmin && unit_price < map->shopmin)
979 return 0; 950 return 0;
980 else if (unit_price > tmpshopmax / 2) 951 else if (unit_price > tmpshopmax / 2)
981 newval = MIN ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax); 952 newval = min ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax);
982 else 953 else
983 newval = unit_price; 954 newval = unit_price;
984 } 955 }
985 956
986 newval *= quantity; 957 newval *= quantity;
… …
990 961
991/* 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. */
992int 963int
993describe_shop (const object *op) 964describe_shop (const object *op)
994{ 965{
966 dynbuf_text buf;
995 maptile *map = op->map; 967 maptile *map = op->map;
996 968
997 /*shopitems *items=map->shopitems; */ 969 /*shopitems *items=map->shopitems; */
998 int pos = 0, i; 970 int pos = 0, i;
999 double opinion = 0; 971 double opinion = 0;
1000 char tmp[MAX_BUF] = "\0";
1001 972
1002 if (op->type != PLAYER) 973 if (op->type != PLAYER)
1003 return 0; 974 return 0;
1004 975
1005 /*check if there is a shop specified for this map */ 976 /*check if there is a shop specified for this map */
1006 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax) 977 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax)
1007 { 978 {
1008 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;
1009 981
1010 if (map->shopitems) 982 if (map->shopitems)
1011 for (i = 0; i < map->shopitems[0].index; i++) 983 for (i = 0; i < map->shopitems[0].index; i++)
1012 if (map->shopitems[i].name && map->shopitems[i].strength > 10) 984 if (map->shopitems[i].name && map->shopitems[i].strength > 10)
1013 { 985 {
1014 snprintf (tmp + pos, sizeof (tmp) - pos, "%s, ", map->shopitems[i].name_pl); 986 buf << map->shopitems[i].name_pl;
1015 pos += strlen (tmp + pos); 987 prevcomma = lastcomma;
988 lastcomma = buf.size (); // remember offset
989 buf << ", ";
1016 } 990 }
1017 991
1018 if (!pos) 992 if (lastcomma)
993 {
994 buf.splice (lastcomma, 2);
995
996 if (prevcomma)
997 buf.splice (prevcomma, 2, " and ");
998 }
999 else
1019 strcat (tmp, "a little of everything."); 1000 buf << "a little of everything.";
1020 1001
1021 /* format the string into a list */ 1002 buf << ".\n\n";
1022 make_list_like (tmp);
1023 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", tmp);
1024 1003
1025 if (map->shopmax) 1004 if (map->shopmax)
1026 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";
1027 1006
1028 if (map->shopmin) 1007 if (map->shopmin)
1029 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";
1030 1009
1031 if (map->shopgreed) 1010 if (map->shopgreed)
1032 { 1011 {
1033 if (map->shopgreed > 2.0) 1012 if (map->shopgreed > 2.0)
1034 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge massively."); 1013 buf << "It tends to overcharge massively.\n\n";
1035 else if (map->shopgreed > 1.5) 1014 else if (map->shopgreed > 1.5)
1036 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge substantially."); 1015 buf << "It tends to overcharge substantially.\n\n";
1037 else if (map->shopgreed > 1.1) 1016 else if (map->shopgreed > 1.1)
1038 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge slightly."); 1017 buf << "It tends to overcharge slightly.\n\n";
1039 else if (map->shopgreed < 0.9) 1018 else if (map->shopgreed < 0.9)
1040 new_draw_info (NDI_UNIQUE, 0, op, "It tends to undercharge."); 1019 buf << "It tends to undercharge.\n\n";
1041 } 1020 }
1042 1021
1043 if (map->shoprace) 1022 if (map->shoprace)
1044 { 1023 {
1045 opinion = shopkeeper_approval (map, op); 1024 opinion = shopkeeper_approval (map, op);
1025
1046 if (opinion > 0.8) 1026 if (opinion > 0.8)
1047 new_draw_info (NDI_UNIQUE, 0, op, "You think the shopkeeper likes you."); 1027 buf << "You think the shopkeeper likes you.\n\n";
1048 else if (opinion > 0.5) 1028 else if (opinion > 0.5)
1049 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper seems unconcerned by you."); 1029 buf << "The shopkeeper seems unconcerned by you.\n\n";
1050 else 1030 else
1051 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";
1052 } 1032 }
1053 } 1033 }
1054 else 1034 else
1055 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);
1056 1038
1057 return 1; 1039 return 1;
1058} 1040}
1059 1041
1060struct shopinv 1042struct shopinv
… …
1075{ 1057{
1076 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2; 1058 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2;
1077 1059
1078 if (s1->type < s2->type) 1060 if (s1->type < s2->type)
1079 return -1; 1061 return -1;
1062
1080 if (s1->type > s2->type) 1063 if (s1->type > s2->type)
1081 return 1; 1064 return 1;
1082 1065
1083 /* 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
1084 * via alphabetical order 1067 * via alphabetical order
… …
1127 items[*numitems].item_sort = strdup (query_base_name (tmp, 0)); 1110 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1128 items[*numitems].item_real = strdup (query_base_name (tmp, 1)); 1111 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1129 (*numitems)++; 1112 (*numitems)++;
1130 break; 1113 break;
1131 } 1114 }
1115
1132 SET_FLAG (tmp, FLAG_UNPAID); 1116 SET_FLAG (tmp, FLAG_UNPAID);
1133} 1117}
1134 1118
1135void 1119void
1136shop_listing (object *sign, object *op) 1120shop_listing (object *sign, object *op)
1137{ 1121{
1138 int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2; 1122 int i, j, x1, x2, y1, y2;
1139 const char *shop_coords = get_ob_key_value (sign, "shop_coords"); 1123 const char *shop_coords = sign->kv (shstr_shop_coords);
1140 object *stack; 1124 object *stack;
1141 shopinv *items; 1125 shopinv *items;
1142 1126
1143 /* 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 */
1144 if (op->type != PLAYER) 1128 if (!op->is_player ())
1145 return; 1129 return;
1130
1131 dynbuf_text &buf = msg_dynbuf; buf.clear ();
1146 1132
1147 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2))) 1133 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1148 { 1134 {
1149 x1 = 0; 1135 x1 = 0;
1150 y1 = 0; 1136 y1 = 0;
1151 x2 = op->map->width - 1; 1137 x2 = op->map->width - 1;
1152 y2 = op->map->height - 1; 1138 y2 = op->map->height - 1;
1153 } 1139 }
1154 1140
1155 items = (shopinv *) malloc (40 * sizeof (shopinv));
1156 numallocated = 40; 1141 int numallocated = 40;
1142 int numitems = 0;
1143 items = (shopinv *)malloc (sizeof (shopinv) * numallocated);
1157 1144
1158 /* Find all the appropriate items */ 1145 /* Find all the appropriate items */
1159 for (i = x1; i <= x2; i++) 1146 for (i = x1; i <= x2; i++)
1160 {
1161 for (j = y1; j < y2; j++) 1147 for (j = y1; j < y2; j++)
1162 {
1163 if (is_in_shop (op->map, i, j)) 1148 if (is_in_shop (op->map, i, j))
1149 {
1150 stack = GET_MAP_OB (op->map, i, j);
1151
1152 while (stack)
1164 { 1153 {
1165 stack = GET_MAP_OB (op->map, i, j); 1154 if (QUERY_FLAG (stack, FLAG_UNPAID))
1166
1167 while (stack)
1168 { 1155 {
1169 if (QUERY_FLAG (stack, FLAG_UNPAID))
1170 {
1171 if (numitems == numallocated) 1156 if (numitems == numallocated)
1172 {
1173 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1157 items = (shopinv *)realloc (items, sizeof (shopinv) * (numallocated *= 2));
1174 numallocated += 10;
1175 }
1176 1158
1177 add_shop_item (stack, items, &numitems, &numallocated); 1159 add_shop_item (stack, items, &numitems, &numallocated);
1178 }
1179
1180 stack = stack->above;
1181 } 1160 }
1161
1162 stack = stack->above;
1182 } 1163 }
1183 } 1164 }
1184 }
1185 1165
1186 if (numitems == 0) 1166 buf << (numitems ? "T<This shop contains:>\n\n"
1187 { 1167 : "T<This shop is currently empty.>");
1188 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1189 free (items);
1190 return;
1191 }
1192 1168
1193 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);
1194
1195 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
1196 1170
1197 for (i = 0; i < numitems; i++) 1171 for (i = 0; i < numitems; i++)
1198 { 1172 {
1199 /* Collapse items of the same name together */ 1173 /* Collapse items of the same name together */
1200 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))
1201 {
1202 items[i + 1].nrof += items[i].nrof; 1175 items[i + 1].nrof += items[i].nrof;
1203 free (items[i].item_sort);
1204 free (items[i].item_real);
1205 }
1206 else 1176 else
1207 {
1208 new_draw_info_format (NDI_UNIQUE, 0, op, "%d %s",
1209 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
1210 free (items[i].item_sort); 1179 free (items[i].item_sort);
1211 free (items[i].item_real); 1180 free (items[i].item_real);
1212 }
1213 } 1181 }
1182
1183 op->contr->infobox (MSG_CHANNEL ("shopitems"), buf);
1214 1184
1215 free (items); 1185 free (items);
1216} 1186}
1217 1187
1218/* elmex: this function checks whether the object is in a shop */ 1188/* elmex: this function checks whether the object is in a shop */
1219bool 1189bool
1220is_in_shop (object *o) 1190is_in_shop (object *o)
1221{ 1191{
1222 if (!o->map) 1192 if (!o->is_on_map ())
1223 return false; 1193 return false;
1224 1194
1225 return is_in_shop (o->map, o->x, o->y); 1195 return is_in_shop (o->map, o->x, o->y);
1226} 1196}
1227 1197
… …
1235is_in_shop (maptile *map, int x, int y) 1205is_in_shop (maptile *map, int x, int y)
1236{ 1206{
1237 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)
1238 if (QUERY_FLAG (floor, FLAG_IS_FLOOR)) 1208 if (QUERY_FLAG (floor, FLAG_IS_FLOOR))
1239 return floor->type == SHOP_FLOOR; 1209 return floor->type == SHOP_FLOOR;
1210
1240 return false; 1211 return false;
1241} 1212}
1242 1213

Diff Legend

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