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.31 by pippijn, Mon Jan 15 21:06:20 2007 UTC

1
2/* 1/*
3 * static char *rcsid_shop_c =
4 * "$Id: shop.C,v 1.14 2006/09/12 19:20:08 root Exp $";
5 */
6
7/*
8 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
9 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
12 7 *
13 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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 at <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
… …
334 326
335 do 327 do
336 { 328 {
337 if (coins[*cointype] == NULL) 329 if (coins[*cointype] == NULL)
338 return NULL; 330 return NULL;
339 coin = find_archetype (coins[*cointype]); 331 coin = archetype::find (coins[*cointype]);
340 if (coin == NULL) 332 if (coin == NULL)
341 return NULL; 333 return NULL;
342 *cointype += 1; 334 *cointype += 1;
343 } 335 }
344 while (coin->clone.value > c); 336 while (coin->clone.value > c);
… …
511 503
512 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 504 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"))) 505 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold")))
514 pay_from_container (pl, pouch, to_pay); 506 pay_from_container (pl, pouch, to_pay);
515 507
516 fix_player (pl); 508 pl->update_stats ();
517 return 1; 509 return 1;
518} 510}
519 511
520/* DAMN: This is now a wrapper for pay_from_container, which is 512/* 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 513 * called for the player, then for each active container that can hold
… …
551 pay_from_container (pl, pouch, to_pay); 543 pay_from_container (pl, pouch, to_pay);
552 544
553 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ)) 545 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ))
554 SET_FLAG (op, FLAG_WAS_WIZ); 546 SET_FLAG (op, FLAG_WAS_WIZ);
555 547
556 fix_player (pl); 548 pl->update_stats ();
557 return 1; 549 return 1;
558} 550}
559 551
560/* This pays for the item, and takes the proper amount of money off 552/* This pays for the item, and takes the proper amount of money off
561 * the player. 553 * the player.
… …
596 { 588 {
597 // This should not happen, but if it does, just merge the two. 589 // This should not happen, but if it does, just merge the two.
598 if (coin_objs [i]) 590 if (coin_objs [i])
599 { 591 {
600 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); 592 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]);
601 remove_ob (tmp); 593 tmp->remove ();
602 coin_objs[i]->nrof += tmp->nrof; 594 coin_objs[i]->nrof += tmp->nrof;
603 esrv_del_item (pl->contr, tmp->count); 595 esrv_del_item (pl->contr, tmp->count);
604 free_object (tmp); 596 tmp->destroy ();
605 } 597 }
606 else 598 else
607 { 599 {
608 remove_ob (tmp); 600 tmp->remove ();
609 601
610 if (pouch->type == PLAYER) 602 if (pouch->type == PLAYER)
611 esrv_del_item (pl->contr, tmp->count); 603 esrv_del_item (pl->contr, tmp->count);
612 604
613 coin_objs[i] = tmp; 605 coin_objs[i] = tmp;
… …
625 /* Fill in any gaps in the coin_objs array - needed to make change. */ 617 /* 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 */ 618 /* Note that the coin_objs array goes from least value to greatest value */
627 for (i = 0; i < NUM_COINS; i++) 619 for (i = 0; i < NUM_COINS; i++)
628 if (!coin_objs[i]) 620 if (!coin_objs[i])
629 { 621 {
630 at = find_archetype (coins[NUM_COINS - 1 - i]); 622 at = archetype::find (coins[NUM_COINS - 1 - i]);
631 623
632 if (at == NULL) 624 if (at == NULL)
633 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]); 625 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]);
634 626
635 coin_objs[i] = arch_to_object (at); 627 coin_objs[i] = arch_to_object (at);
… …
672 664
673 if (pl->type != PLAYER) 665 if (pl->type != PLAYER)
674 esrv_send_item (pl, pl); 666 esrv_send_item (pl, pl);
675 } 667 }
676 else 668 else
677 free_object (coin_objs[i]); 669 coin_objs[i]->destroy ();
678 } 670 }
679} 671}
680 672
681/* Checks all unpaid items in op's inventory, adds up all the money they 673/* 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. 674 * have, and checks that they can actually afford what they want to buy.
… …
687can_pay (object *pl) 679can_pay (object *pl)
688{ 680{
689 int unpaid_count = 0; 681 int unpaid_count = 0;
690 sint64 unpaid_price = 0; 682 sint64 unpaid_price = 0;
691 sint64 player_wealth = query_money (pl); 683 sint64 player_wealth = query_money (pl);
692 object *item;
693 684
694 if (!pl || pl->type != PLAYER) 685 if (!pl || pl->type != PLAYER)
695 { 686 {
696 LOG (llevError, "can_pay(): called against something that isn't a player\n"); 687 LOG (llevError, "can_pay(): called against something that isn't a player\n");
697 return 0; 688 return 0;
… …
753 return 0; 744 return 0;
754 } 745 }
755 else 746 else
756 { 747 {
757 object *tmp; 748 object *tmp;
758 tag_t c = op->count;
759 749
760 CLEAR_FLAG (op, FLAG_UNPAID); 750 CLEAR_FLAG (op, FLAG_UNPAID);
761 CLEAR_FLAG (op, FLAG_PLAYER_SOLD); 751 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
762 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); 752 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
763 tmp = merge_ob (op, NULL); 753 tmp = merge_ob (op, NULL);
764 754
765 if (pl->type == PLAYER) 755 if (pl->type == PLAYER)
766 { 756 {
767 if (tmp) 757 if (tmp)
768 { /* it was merged */ 758 { /* it was merged */
769 esrv_del_item (pl->contr, c); 759 esrv_del_item (pl->contr, op->count);
770 op = tmp; 760 op = tmp;
771 } 761 }
772 762
773 esrv_send_item (pl, op); 763 esrv_send_item (pl, op);
774 } 764 }
… …
800 archetype *at = 0; 790 archetype *at = 0;
801 object *pouch = 0, *tmp = 0; 791 object *pouch = 0, *tmp = 0;
802 792
803 for (count = 0; coins[count] != NULL; count++) 793 for (count = 0; coins[count] != NULL; count++)
804 { 794 {
805 at = find_archetype (coins[count]); 795 at = archetype::find (coins[count]);
806 796
807 if (at == NULL) 797 if (at == NULL)
808 LOG (llevError, "Could not find %s archetype\n", coins[count]); 798 LOG (llevError, "Could not find %s archetype\n", coins[count]);
809 else if ((amount / at->clone.value) > 0) 799 else if ((amount / at->clone.value) > 0)
810 { 800 {
… …
846 } 836 }
847 } 837 }
848 } 838 }
849 839
850 if (amount != 0) 840 if (amount != 0)
851#ifndef WIN32
852 LOG (llevError, "Warning - payment in pay_player () not zero: %llu\n", amount); 841 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} 842}
857 843
858/* elmex: this is for the bank plugin :( */ 844/* elmex: this is for the bank plugin :( */
859sint64 845sint64
860pay_player_arch (object *pl, const char *arch, sint64 amount) 846pay_player_arch (object *pl, const char *arch, sint64 amount)
861{ 847{
862 archetype *at = find_archetype (arch); 848 archetype *at = archetype::find (arch);
863 object *tmp = NULL; 849 object *tmp = NULL;
864 850
865 if (at == NULL) 851 if (at == NULL)
866 return 0; 852 return 0;
867 853
… …
937 * item based on the shops specialisation. Does not take account of greed, 923 * 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 924 * 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) 925 * event is never less than 0.1 (calling functions divide by it)
940 */ 926 */
941static double 927static double
942shop_specialisation_ratio (const object *item, const mapstruct *map) 928shop_specialisation_ratio (const object *item, const maptile *map)
943{ 929{
944 shopitems *items = map->shopitems; 930 shopitems *items = map->shopitems;
945 double ratio = SPECIALISATION_EFFECT, likedness = 0.001; 931 double ratio = SPECIALISATION_EFFECT, likedness = 0.001;
946 int i; 932 int i;
947 933
948 if (item == NULL) 934 if (item == NULL)
949 { 935 {
950 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", map->path); 936 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
951 return 0; 937 return 0;
952 } 938 }
953 939
954 if (!item->type) 940 if (!item->type)
955 { 941 {
… …
968 likedness = items[i].strength / 100.0; 954 likedness = items[i].strength / 100.0;
969 } 955 }
970 956
971 if (likedness > 1.0) 957 if (likedness > 1.0)
972 { /* someone has been rather silly with the map headers. */ 958 { /* 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); 959 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path);
974 likedness = 1.0; 960 likedness = 1.0;
975 } 961 }
976 962
977 if (likedness < -1.0) 963 if (likedness < -1.0)
978 { 964 {
979 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, map->path); 965 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
980 likedness = -1.0; 966 likedness = -1.0;
981 } 967 }
982 968
983 ratio = ratio + (1.0 - ratio) * likedness; 969 ratio = ratio + (1.0 - ratio) * likedness;
984 970
… …
988 return ratio; 974 return ratio;
989} 975}
990 976
991/*returns the greed of the shop on map, or 1 if it isn't specified. */ 977/*returns the greed of the shop on map, or 1 if it isn't specified. */
992static double 978static double
993shop_greed (const mapstruct *map) 979shop_greed (const maptile *map)
994{ 980{
995 double greed = 1.0; 981 double greed = 1.0;
996 982
997 if (map->shopgreed) 983 if (map->shopgreed)
998 return map->shopgreed; 984 return map->shopgreed;
… …
1001 987
1002/* Returns a double based on how much the shopkeeper approves of the player. 988/* 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. 989 * this is based on the race of the shopkeeper and that of the player.
1004 */ 990 */
1005double 991double
1006shopkeeper_approval (const mapstruct *map, const object *player) 992shopkeeper_approval (const maptile *map, const object *player)
1007{ 993{
1008 double approval = 1.0; 994 double approval = 1.0;
1009 995
1010 if (map->shoprace) 996 if (map->shoprace)
1011 { 997 {
… …
1026 */ 1012 */
1027static sint64 1013static sint64
1028value_limit (sint64 val, int quantity, const object *who, int isshop) 1014value_limit (sint64 val, int quantity, const object *who, int isshop)
1029{ 1015{
1030 sint64 newval, unit_price, tmpshopmax; 1016 sint64 newval, unit_price, tmpshopmax;
1031 mapstruct *map; 1017 maptile *map;
1032 1018
1033 unit_price = val / quantity; 1019 unit_price = val / quantity;
1034 1020
1035 if (!isshop || !who) 1021 if (!isshop || !who)
1036 { 1022 {
… …
1066 1052
1067/* gives a desciption of the shop on their current map to the player op. */ 1053/* gives a desciption of the shop on their current map to the player op. */
1068int 1054int
1069describe_shop (const object *op) 1055describe_shop (const object *op)
1070{ 1056{
1071 mapstruct *map = op->map; 1057 maptile *map = op->map;
1072 1058
1073 /*shopitems *items=map->shopitems; */ 1059 /*shopitems *items=map->shopitems; */
1074 int pos = 0, i; 1060 int pos = 0, i;
1075 double opinion = 0; 1061 double opinion = 0;
1076 char tmp[MAX_BUF] = "\0"; 1062 char tmp[MAX_BUF] = "\0";
… …
1190 case RING: 1176 case RING:
1191 case AMULET: 1177 case AMULET:
1192 case BRACERS: 1178 case BRACERS:
1193 case GIRDLE: 1179 case GIRDLE:
1194 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL)); 1180 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL));
1195 items[*numitems].item_sort = strdup_local (buf); 1181 items[*numitems].item_sort = strdup (buf);
1196 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL)); 1182 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL));
1197 items[*numitems].item_real = strdup_local (buf); 1183 items[*numitems].item_real = strdup (buf);
1198 (*numitems)++; 1184 (*numitems)++;
1199 break; 1185 break;
1200#endif 1186#endif
1201 1187
1202 default: 1188 default:
1203 items[*numitems].item_sort = strdup_local (query_base_name (tmp, 0)); 1189 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1204 items[*numitems].item_real = strdup_local (query_base_name (tmp, 1)); 1190 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1205 (*numitems)++; 1191 (*numitems)++;
1206 break; 1192 break;
1207 } 1193 }
1208 SET_FLAG (tmp, FLAG_UNPAID); 1194 SET_FLAG (tmp, FLAG_UNPAID);
1209} 1195}
… …
1225 magic_mapping_mark (op, map_mark, 3); 1211 magic_mapping_mark (op, map_mark, 3);
1226 items = (shopinv *) malloc (40 * sizeof (shopinv)); 1212 items = (shopinv *) malloc (40 * sizeof (shopinv));
1227 numallocated = 40; 1213 numallocated = 40;
1228 1214
1229 /* Find all the appropriate items */ 1215 /* Find all the appropriate items */
1230 for (i = 0; i < MAP_WIDTH (op->map); i++) 1216 for (i = 0; i < op->map->width; i++)
1231 { 1217 {
1232 for (j = 0; j < MAP_HEIGHT (op->map); j++) 1218 for (j = 0; j < op->map->height; j++)
1233 { 1219 {
1234 /* magic map code now centers the map on the object at MAGIC_MAP_HALF. 1220 // magic map code now centers the map on the object at MAGIC_MAP_HALF.
1235 *
1236 */
1237 nx = i - op->x + MAGIC_MAP_HALF; 1221 nx = i - op->x + MAGIC_MAP_HALF;
1238 ny = j - op->y + MAGIC_MAP_HALF; 1222 ny = j - op->y + MAGIC_MAP_HALF;
1239 /* unlikely, but really big shops could run into this issue */ 1223 /* unlikely, but really big shops could run into this issue */
1240 if (nx < 0 || ny < 0 || nx > MAGIC_MAP_SIZE || ny > MAGIC_MAP_SIZE) 1224 if (nx < 0 || ny < 0 || nx > MAGIC_MAP_SIZE || ny > MAGIC_MAP_SIZE)
1241 continue; 1225 continue;
1242 1226
1243 if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR) 1227 if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR)
1244 { 1228 {
1245 stack = get_map_ob (op->map, i, j); 1229 stack = GET_MAP_OB (op->map, i, j);
1246 1230
1247 while (stack) 1231 while (stack)
1248 { 1232 {
1249 if (QUERY_FLAG (stack, FLAG_UNPAID)) 1233 if (QUERY_FLAG (stack, FLAG_UNPAID))
1250 { 1234 {
1251 if (numitems == numallocated) 1235 if (numitems == numallocated)
1252 { 1236 {
1253 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1237 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10));
1254 numallocated += 10; 1238 numallocated += 10;
1255 } 1239 }
1240
1256 add_shop_item (stack, items, &numitems, &numallocated); 1241 add_shop_item (stack, items, &numitems, &numallocated);
1257 } 1242 }
1243
1258 stack = stack->above; 1244 stack = stack->above;
1259 } 1245 }
1260 } 1246 }
1261 } 1247 }
1262 } 1248 }
… …
1287 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real); 1273 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); 1274 free (items[i].item_sort);
1289 free (items[i].item_real); 1275 free (items[i].item_real);
1290 } 1276 }
1291 } 1277 }
1278
1292 free (items); 1279 free (items);
1293} 1280}
1294 1281
1295/* elmex: this function checks whether the object is in a shop */ 1282/* elmex: this function checks whether the object is in a shop */
1296bool 1283bool
… …
1302 return is_in_shop (o->map, o->x, o->y); 1289 return is_in_shop (o->map, o->x, o->y);
1303} 1290}
1304 1291
1305/* elmex: this function checks whether we are in a shop or not */ 1292/* elmex: this function checks whether we are in a shop or not */
1306bool 1293bool
1307is_in_shop (mapstruct *map, int x, int y) 1294is_in_shop (maptile *map, int x, int y)
1308{ 1295{
1309 for (object *floor = get_map_ob (map, x, y); floor; floor = floor->above) 1296 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
1310 if (floor->type == SHOP_FLOOR) 1297 if (floor->type == SHOP_FLOOR)
1311 return true; 1298 return true;
1312 1299
1313 return false; 1300 return false;
1314} 1301}

Diff Legend

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