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.7 by elmex, Tue Aug 29 10:51:43 2006 UTC vs.
Revision 1.47 by root, Sun Apr 13 01:34:09 2008 UTC

1/* 1/*
2 * static char *rcsid_shop_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * "$Id: shop.C,v 1.7 2006/08/29 10:51:43 elmex Exp $"; 3 *
4 */ 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
13 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
14 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
15 (at your option) any later version. 11 * (at your option) any later version.
16 12 *
17 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,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 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
23 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
25 21 * The authors can be reached via e-mail to <support@deliantra.net>
26 The authors can be reached via e-mail at crossfire-devel@real-time.com
27*/ 22 */
28 23
29#include <global.h> 24#include <global.h>
30#include <spells.h> 25#include <spells.h>
31#include <skills.h> 26#include <skills.h>
32#include <living.h> 27#include <living.h>
33#include <newclient.h>
34#ifndef __CEXTRACT__
35#include <sproto.h> 28#include <sproto.h>
36#endif
37#include <math.h> 29#include <math.h>
38 30
39/* 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
40 * 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
41 * 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
42 * therefore making this number higher, makes specialisation less effective. 34 * therefore making this number higher, makes specialisation less effective.
43 * 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,
44 * (though not useful) effects. 36 * (though not useful) effects.
45 */ 37 */
46#define SPECIALISATION_EFFECT 0.5 38#define SPECIALISATION_EFFECT .5
47 39
48/* price a shopkeeper will give someone they neither like nor dislike */ 40// price a shopkeeper will give someone that is not of their race
49#define NEUTRAL_RATIO 0.8 41#define DISLIKE_RATIO 0.8
50 42
51static uint64 pay_from_container(object *pl, object *pouch, uint64 to_pay); 43static void pay_from_container (object *pl, object *pouch, sint64 &to_pay);
52static uint64 value_limit(uint64 val, int quantity, const object *who, int isshop); 44static sint64 value_limit (sint64 val, int quantity, const object *who, int isshop);
53static double shop_specialisation_ratio(const object *item, const mapstruct *map); 45static double shop_specialisation_ratio (const object *item, const maptile *map);
54static double shop_greed(const mapstruct *map); 46static double shop_greed (const maptile *map);
55
56#define NUM_COINS 4 /* number of coin types */
57static const char* const coins[] = {"royalty", "platinacoin", "goldcoin", "silvercoin", NULL};
58 47
59/* 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
60 * 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
61 * 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.
62 * 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
79 * thus remained 0. 68 * thus remained 0.
80 * 69 *
81 * Mark Wedel (mwedel@pyramid.com) 70 * Mark Wedel (mwedel@pyramid.com)
82 */ 71 */
83 72
84static uint64 approx_range; 73static sint64 approx_range;
85 74
75sint64
86uint64 query_cost(const object *tmp, object *who, int flag) { 76query_cost (const object *tmp, object *who, int flag)
77{
87 double val; 78 double val;
88 int number; /* used to better calculate value */ 79 int number; /* used to better calculate value */
89 int no_bargain; 80 int no_bargain;
90 int identified; 81 int identified;
91 int not_cursed; 82 int not_cursed;
92 int approximate; 83 int approximate;
93 int shop; 84 int shop;
94 double diff; 85 double diff;
95 86
96 approx_range = 0; 87 approx_range = 0;
97 88
98 no_bargain = flag & F_NO_BARGAIN; 89 no_bargain = flag & F_NO_BARGAIN;
99 identified = flag & F_IDENTIFIED; 90 identified = flag & F_IDENTIFIED;
100 not_cursed = flag & F_NOT_CURSED; 91 not_cursed = flag & F_NOT_CURSED;
101 approximate = flag & F_APPROX; 92 approximate = flag & F_APPROX;
102 shop = flag & F_SHOP; 93 shop = flag & F_SHOP;
103 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);
104 95
105 if (tmp->type==MONEY) return (tmp->nrof * tmp->value); 96 if (tmp->type == MONEY)
97 return tmp->nrof * tmp->value;
98
106 if (tmp->type==GEM) { 99 if (tmp->type == GEM)
100 {
101 if (flag == F_TRUE)
107 if (flag==F_TRUE) return (tmp->nrof * tmp->value); 102 return (tmp->nrof * tmp->value);
103
104 if (flag == F_BUY)
108 if (flag==F_BUY) return (uint64) (1.03 * tmp->nrof * tmp->value); 105 return (sint64) (1.03 * tmp->nrof * tmp->value);
106
107 if (flag == F_SELL)
109 if (flag==F_SELL) return (uint64) (0.97 * tmp->nrof * tmp->value); 108 return (sint64) (0.97 * tmp->nrof * tmp->value);
109
110 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 ());
111 return 0;
112 }
113
114 number = tmp->nrof;
115 if (number == 0)
116 number = 1;
117 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified)
118 {
119 if (!not_cursed && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
111 return 0; 120 return 0;
112 }
113 number = tmp->nrof;
114 if (number==0) number=1;
115 if (QUERY_FLAG(tmp, FLAG_IDENTIFIED) || !need_identify(tmp) || identified) {
116 if (!not_cursed && (QUERY_FLAG(tmp, FLAG_CURSED) || QUERY_FLAG(tmp, FLAG_DAMNED)))
117 return 0;
118 else 121 else
119 val=tmp->value * number; 122 val = tmp->value * number;
120 } 123 }
121 /* This area deals with objects that are not identified, but can be */ 124 /* This area deals with objects that are not identified, but can be */
122 else { 125 else
126 {
123 if (tmp->arch != NULL) { 127 if (tmp->arch != NULL)
128 {
124 if (flag == F_BUY) { 129 if (flag == F_BUY)
130 {
125 LOG(llevError, "Asking for buy-value of unidentified object.\n"); 131 LOG (llevError, "Asking for buy-value of unidentified object.\n");
126 val = tmp->arch->clone.value * 50 * number; 132 val = tmp->arch->value * 50 * number;
127 } 133 }
134 else
128 else { /* Trying to sell something, or get true value */ 135 { /* Trying to sell something, or get true value */
129 if (tmp->type == POTION) 136 if (tmp->type == POTION)
130 val = number * 40; /* Don't want to give anything away */ 137 val = number * 40; /* Don't want to give anything away */
131 else { 138 else
139 {
132 /* 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
133 * unknown objects 141 * unknown objects
134 */ 142 */
135 if (QUERY_FLAG(tmp, FLAG_BEEN_APPLIED)) 143 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
136 val = number * tmp->arch->clone.value *2 / 3; 144 val = number * tmp->arch->value * 2 / 3;
137 else 145 else
138 val = number * tmp->arch->clone.value / 3; 146 val = number * tmp->arch->value / 3;
139 } 147 }
140 } 148 }
149 }
150 else
141 } else { /* No archetype with this object */ 151 { /* No archetype with this object */
142 LOG(llevDebug,"In sell item: Have object with no archetype: %s\n", tmp->name); 152 LOG (llevDebug, "In sell item: Have object with no archetype: %s\n", &tmp->name);
143 if (flag == F_BUY) { 153 if (flag == F_BUY)
154 {
144 LOG(llevError, "Asking for buy-value of unidentified object without arch.\n"); 155 LOG (llevError, "Asking for buy-value of unidentified object without arch.\n");
145 val = number * tmp->value * 10; 156 val = number * tmp->value * 10;
146 } 157 }
147 else 158 else
148 val = number * tmp->value / 5; 159 val = number * tmp->value / 5;
149 } 160 }
150 } 161 }
151 162
152 /* 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
153 * identified, AND the object is magical and the archetype is non 164 * identified, AND the object is magical and the archetype is non
154 * magical, then change values accordingly. The tmp->arch==NULL is 165 * magical, then change values accordingly. The tmp->arch==NULL is
155 * 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
156 * tmp->arch->clone.magic for any magic. The check for archetype 167 * tmp->arch->magic for any magic. The check for archetype
157 * 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
158 * default magical. This is because the archetype value should have 169 * default magical. This is because the archetype value should have
159 * already figured in that value. 170 * already figured in that value.
160 */ 171 */
161 if((QUERY_FLAG(tmp, FLAG_IDENTIFIED)||!need_identify(tmp)||identified|| 172 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified ||
162 QUERY_FLAG(tmp, FLAG_BEEN_APPLIED)) && 173 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->magic))
163 tmp->magic&&(tmp->arch==NULL||!tmp->arch->clone.magic)) { 174 {
164 if(tmp->magic>0) 175 if (tmp->magic > 0)
165 val*=(3*tmp->magic*tmp->magic*tmp->magic); 176 val *= (3 * tmp->magic * tmp->magic * tmp->magic);
166 else 177 else
167 /* Note that tmp->magic is negative, so that this 178 /* Note that tmp->magic is negative, so that this
168 * will actually be something like val /=2, /=3, etc. 179 * will actually be something like val /=2, /=3, etc.
169 */
170 val/=(1-tmp->magic);
171 }
172
173 if (tmp->type==WAND) {
174 /* Value of the wand is multiplied by the number of
175 * charges. the treasure code already sets up the value
176 * 50 charges is used as the baseline.
177 */ 180 */
181 val /= (1 - tmp->magic);
182 }
183
184 if (tmp->type == WAND)
185 {
186 /* Value of the wand is multiplied by the number of
187 * charges. the treasure code already sets up the value
188 * 50 charges is used as the baseline.
189 */
178 if (QUERY_FLAG(tmp, FLAG_IDENTIFIED) || !need_identify(tmp) || identified) 190 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified)
179 val=(val*tmp->stats.food) / 50; 191 val = (val * tmp->stats.food) / 50;
180 else /* if not identified, presume one charge */ 192 else /* if not identified, presume one charge */
181 val/=50; 193 val /= 50;
182 } 194 }
183 195
184 /* Limit amount of money you can get for really great items. */ 196 /* Limit amount of money you can get for really great items. */
185 if (flag==F_SELL) 197 if (flag == F_SELL)
186 val=value_limit((uint64)val, number, who, shop); 198 val = value_limit ((sint64) val, number, who, shop);
187 199
188 // use a nonlinear price adjustment. as my predecessor said, don't change 200 // use a nonlinear price adjustment. as my predecessor said, don't change
189 // the archetypes, its work required for balancing, and we don't care. 201 // the archetypes, its work required for balancing, and we don't care.
190 //val = pow (val, 1.05); 202 //val = pow (val, 1.05);
191 203
192 /* This modification is for bargaining skill. 204 /* This modification is for bargaining skill.
193 * Now only players with max level in bargaining 205 * Now only players with max level in bargaining
194 * AND Cha = 30 will get optimal price. 206 * AND Cha = 30 will get optimal price.
195 * Thus charisma will never get useless. 207 * Thus charisma will never get useless.
196 * -b.e. edler@heydernet.de 208 * -b.e. edler@heydernet.de
197 */ 209 */
198 210
199 if (who!=NULL && who->type==PLAYER) { 211 if (who != NULL && who->type == PLAYER)
212 {
200 int lev_bargain = 0; 213 int lev_bargain = 0;
201 int lev_identify = 0; 214 int lev_identify = 0;
202 int idskill1=0; 215 int idskill1 = 0;
203 int idskill2=0; 216 int idskill2 = 0;
204 const typedata *tmptype; 217 const typedata *tmptype;
205 218
206 tmptype=get_typedata(tmp->type); 219 tmptype = get_typedata (tmp->type);
207 220
208 if (find_skill_by_number(who,SK_BARGAINING)) { 221 if (find_skill_by_number (who, SK_BARGAINING))
209 lev_bargain = find_skill_by_number(who,SK_BARGAINING)->level; 222 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level;
210 } 223
211 if (tmptype) { 224 if (tmptype)
225 {
212 idskill1=tmptype->identifyskill; 226 idskill1 = tmptype->identifyskill;
227
213 if (idskill1) { 228 if (idskill1)
229 {
214 idskill2=tmptype->identifyskill2; 230 idskill2 = tmptype->identifyskill2;
231
215 if (find_skill_by_number(who,idskill1)) { 232 if (find_skill_by_number (who, idskill1))
216 lev_identify = find_skill_by_number(who,idskill1)->level; 233 lev_identify = find_skill_by_number (who, idskill1)->level;
234
235 if (idskill2 && find_skill_by_number (who, idskill2))
236 lev_identify += find_skill_by_number (who, idskill2)->level;
217 } 237 }
218 if (idskill2 && find_skill_by_number(who,idskill2)) {
219 lev_identify += find_skill_by_number(who,idskill2)->level;
220 } 238 }
221 } 239 else
222 }
223 else 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 ());
224 241
225 /* ratio determines how much of the price modification 242 /* ratio determines how much of the price modification
226 * will come from the basic stat charisma 243 * will come from the basic stat charisma
227 * the rest will come from the level in bargaining skill 244 * the rest will come from the level in bargaining skill
228 */ 245 */
229 const double cha_ratio = 0.40; 246 const double cha_ratio = 0.40;
230 247
231 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);
232
233 diff = (1. - cha_ratio) * diff
234 + 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.);
235
236 diff = .02 + (.80 - .02) * diff; 250 diff = .02 + (.80 - .02) * diff;
237
238 if (flag == F_BUY) val += (val * diff);
239 else if (flag == F_SELL) val -= (val * diff);
240 251
252 if (flag == F_BUY)
253 val += val * diff;
254 else if (flag == F_SELL)
255 val -= val * diff;
256
241 // 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
242 // then the range is adjusted randomly around the correct value 258 // then the range is adjusted randomly around the correct value
243 if (approximate) 259 if (approximate)
244 approx_range = uint64 (val / sqrt (lev_identify * 3 + 1)); 260 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1));
245 }
246 261 }
262
247 /* 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
248 * overflow of diff above. That shoudl only happen if 264 * overflow of diff above. That should only happen if
249 * we are selling objects - in that case, the person just 265 * we are selling objects - in that case, the person just
250 * gets no money. 266 * gets no money.
251 */ 267 */
252 if((sint64)val<0) 268 if ((sint64) val < 0)
253 val=0; 269 val = 0;
254 270
255 /* Unidentified stuff won't sell for more than 60gp */ 271 /* Unidentified stuff won't sell for more than 60gp */
256 if(flag==F_SELL && !QUERY_FLAG(tmp, FLAG_IDENTIFIED) && need_identify(tmp) && !identified) { 272 if (flag == F_SELL && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && need_identify (tmp) && !identified)
273 {
257 val = (val > 600)? 600:val; 274 val = (val > 600) ? 600 : val;
258 }
259 275 }
276
260 /* if we are in a shop, check how the type of shop should affect the price */ 277 /* if we are in a shop, check how the type of shop should affect the price */
261 if (shop && who) { 278 if (shop && who)
279 {
262 if (flag==F_SELL) 280 if (flag == F_SELL)
263 val= ( 281 val = (val * shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who) / shop_greed (who->map));
264 val
265 * shop_specialisation_ratio(tmp, who->map)
266 * shopkeeper_approval(who->map, who)
267 / shop_greed(who->map)
268 );
269 else if (flag==F_BUY) { 282 else if (flag == F_BUY)
283 {
270 /* 284 /*
271 * when buying, if the item was sold by another player, it is ok to 285 * when buying, if the item was sold by another player, it is ok to
272 * let the item be sold cheaper, according to the specialisation of 286 * let the item be sold cheaper, according to the specialisation of
273 * the shop. If a player sold an item here, then his sale price was 287 * the shop. If a player sold an item here, then his sale price was
274 * multiplied by the specialisation ratio, to do the same to the buy 288 * multiplied by the specialisation ratio, to do the same to the buy
275 * price will not generate extra money. However, the 289 * price will not generate extra money. However, the
276 * same is not true of generated items, these have to /divide/ by the 290 * same is not true of generated items, these have to /divide/ by the
277 * specialisation, so that the price is never less than what they could 291 * specialisation, so that the price is never less than what they could
278 * be sold for (otherwise players could camp map resets to make money). 292 * be sold for (otherwise players could camp map resets to make money).
279 * In game terms, a non-specialist shop, might not recognise the true 293 * In game terms, a non-specialist shop, might not recognise the true
280 * value of the items they sell (much like how people sometimes find 294 * value of the items they sell (much like how people sometimes find
281 * antiques in a junk shop in real life). 295 * antiques in a junk shop in real life).
282 */ 296 */
283 if (QUERY_FLAG(tmp, FLAG_PLAYER_SOLD)) 297 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD))
284 val= ( 298 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who));
285 val
286 * shop_greed(who->map)
287 * shop_specialisation_ratio(tmp, who->map)
288 / shopkeeper_approval(who->map, who)
289 );
290 else 299 else
291 val= (
292 val
293 * shop_greed(who->map)
294 / (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)));
295 );
296 } 301 }
302
297 /* 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
298 * 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
299 * pointful, and could give fun with rounding. 305 * pointful, and could give fun with rounding.
300 */ 306 */
301 if(who->map->path!=NULL && val > 50) 307 //TODO: why use cosf at all, just % and scale linearly, gives more even distribution
302 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));
303 } 310 }
311
304 return (uint64)val; 312 return (sint64) val;
305} 313}
306 314
307/* 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
308 * cointype placement. 316 * cointype placement.
309 */ 317 */
310 318
319static archetype *
311static archetype *find_next_coin(uint64 c, int *cointype) { 320find_next_coin (sint64 c, int *cointype)
321{
312 archetype *coin; 322 archetype *coin;
313 323
314 do { 324 do
325 {
315 if (coins[*cointype]==NULL) return NULL; 326 if (coins[*cointype] == NULL)
327 return NULL;
316 coin = find_archetype(coins[*cointype]); 328 coin = archetype::find (coins[*cointype]);
317 if (coin == NULL) 329 if (coin == NULL)
318 return NULL; 330 return NULL;
319 *cointype += 1; 331 *cointype += 1;
332 }
320 } while (coin->clone.value > c); 333 while (coin->value > c);
321 334
322 return coin; 335 return coin;
323} 336}
324 337
325/* 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
330 * have so much money that they have more than 2 billion platinum 343 * have so much money that they have more than 2 billion platinum
331 * coins, there are certainly issues - the easiest fix at that 344 * coins, there are certainly issues - the easiest fix at that
332 * time is to add a higher denomination (mithril piece with 345 * time is to add a higher denomination (mithril piece with
333 * 10,000 silver or something) 346 * 10,000 silver or something)
334 */ 347 */
348const char *
335const char *cost_string_from_value(uint64 cost, int approx) 349cost_string_from_value (sint64 cost, int approx)
336{ 350{
337 static char buf[MAX_BUF]; 351 static char buf[MAX_BUF];
338 archetype *coin, *next_coin; 352 archetype *coin, *next_coin;
339 int num, cointype = 0; 353 int num, cointype = 0;
340 354
341 coin = find_next_coin(cost, &cointype); 355 coin = find_next_coin (cost, &cointype);
342 if (coin == NULL) 356 if (coin == NULL)
343 return "nothing"; 357 return "nothing";
344 358
345 num = cost / coin->clone.value; 359 num = cost / coin->value;
346 /* so long as nrof is 32 bit, this is true. 360 /* so long as nrof is 32 bit, this is true.
347 * 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
348 * is basically true. 362 * is basically true.
349 */ 363 */
350 if ( (cost / coin->clone.value) > UINT32_MAX) { 364 if ((cost / coin->value) > UINT32_MAX)
365 {
351 strcpy(buf,"an unimaginable sum of money"); 366 strcpy (buf, "an unimaginable sum of money");
352 return buf; 367 return buf;
353 } 368 }
354 369
355 cost -= (uint64)num * (uint64)coin->clone.value; 370 cost -= num * (sint64)coin->value;
371
356 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);
357 373
358 next_coin = find_next_coin(cost, &cointype); 374 next_coin = find_next_coin (cost, &cointype);
359 if (next_coin == NULL || approx) 375 if (next_coin == NULL || approx)
360 return buf;
361
362 coin = next_coin;
363 num = cost / coin->clone.value;
364 cost -= (uint64)num * (uint64)coin->clone.value;
365
366 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? coin->clone.name_pl : coin->clone.name);
367
368 return buf; 376 return buf;
369}
370 377
378 coin = next_coin;
379 num = cost / coin->value;
380 cost -= num * (sint64)coin->value;
381
382 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
383
384 return buf;
385}
386
387const char *
371const char *query_cost_string(const object *tmp,object *who,int flag) { 388query_cost_string (const object *tmp, object *who, int flag)
389{
372 uint64 real_value = query_cost(tmp,who,flag); 390 sint64 real_value = query_cost (tmp, who, flag);
373 int idskill1=0; 391 int idskill1 = 0;
374 int idskill2=0; 392 int idskill2 = 0;
375 const typedata *tmptype; 393 const typedata *tmptype;
376 394
377 tmptype=get_typedata(tmp->type); 395 tmptype = get_typedata (tmp->type);
378 if (tmptype) { 396 if (tmptype)
397 {
379 idskill1=tmptype->identifyskill; 398 idskill1 = tmptype->identifyskill;
380 idskill2=tmptype->identifyskill2; 399 idskill2 = tmptype->identifyskill2;
381 } 400 }
382 401
383 /* we show an approximate price if 402 /* we show an approximate price if
384 * 1) we are approximating 403 * 1) we are approximating
385 * 2) there either is no id skill(s) for the item, or we don't have them 404 * 2) there either is no id skill(s) for the item, or we don't have them
386 * 3) we don't have bargaining skill either 405 * 3) we don't have bargaining skill either
387 */ 406 */
388 if (flag & F_APPROX) { 407 if (flag & F_APPROX)
408 {
389 if (!idskill1 || !find_skill_by_number(who, idskill1)) { 409 if (!idskill1 || !find_skill_by_number (who, idskill1))
410 {
390 if (!idskill2 || !find_skill_by_number(who, idskill2)) { 411 if (!idskill2 || !find_skill_by_number (who, idskill2))
412 {
391 if (!find_skill_by_number(who,SK_BARGAINING)) { 413 if (!find_skill_by_number (who, SK_BARGAINING))
414 {
392 static char buf[MAX_BUF]; 415 static char buf[MAX_BUF];
393 int num, cointype = 0; 416 int num, cointype = 0;
394 archetype *coin = find_next_coin(real_value, &cointype); 417 archetype *coin = find_next_coin (real_value, &cointype);
395 418
419 if (coin == NULL)
396 if (coin == NULL) return "nothing"; 420 return "nothing";
397 421
398 num = real_value / coin->clone.value; 422 num = real_value / coin->value;
399 if (num == 1) 423 if (num == 1)
400 sprintf(buf, "about one %s", coin->clone.name); 424 sprintf (buf, "about one %s", &coin->object::name);
401 else if (num < 5) 425 else if (num < 5)
402 sprintf(buf, "a few %s", coin->clone.name_pl); 426 sprintf (buf, "a few %s", &coin->object::name_pl);
403 else if (num < 10) 427 else if (num < 10)
404 sprintf(buf, "several %s", coin->clone.name_pl); 428 sprintf (buf, "several %s", &coin->object::name_pl);
405 else if (num < 25) 429 else if (num < 25)
406 sprintf(buf, "a moderate amount of %s", coin->clone.name_pl); 430 sprintf (buf, "a moderate amount of %s", &coin->object::name_pl);
407 else if (num < 100) 431 else if (num < 100)
408 sprintf(buf, "lots of %s", coin->clone.name_pl); 432 sprintf (buf, "lots of %s", &coin->object::name_pl);
409 else if (num < 1000) 433 else if (num < 1000)
410 sprintf(buf, "a great many %s", coin->clone.name_pl); 434 sprintf (buf, "a great many %s", &coin->object::name_pl);
411 else 435 else
412 sprintf(buf, "a vast quantity of %s", coin->clone.name_pl); 436 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
413 return buf; 437 return buf;
414 } 438 }
415 } 439 }
416 } 440 }
417 441
418 int hash = ((unsigned int)tmp->count * 174364621) & 1023; 442 int hash = ((unsigned int) tmp->count * 174364621) & 1023;
419 443
420 if (approx_range) 444 if (approx_range)
421 { 445 {
422 uint64 lo = (sint64)real_value - (approx_range * hash >> 10); 446 sint64 lo = (sint64) real_value - (approx_range * hash >> 10);
423 static char buf[MAX_BUF]; 447 static char buf[MAX_BUF];
424 448
425 sprintf (buf, "between %s", cost_string_from_value (lo, 1)); 449 sprintf (buf, "between %s", cost_string_from_value (lo, 1));
426 sprintf (buf + strlen (buf), " and %s", cost_string_from_value (lo + approx_range, 1)); 450 sprintf (buf + strlen (buf), " and %s", cost_string_from_value (lo + approx_range, 1));
427 451
428 return buf; 452 return buf;
429 } 453 }
430 } 454 }
431 455
432 return cost_string_from_value (real_value, 0); 456 return cost_string_from_value (real_value, 0);
433} 457}
434 458
435/* This function finds out how much money the player is carrying, 459/* This function finds out how much money the player is carrying,
436 * including what is in containers. 460 * including what is in containers.
437 */ 461 */
462sint64
438uint64 query_money(const object *op) { 463query_money (const object *op)
464{
439 object *tmp; 465 object *tmp;
440 uint64 total=0; 466 sint64 total = 0;
441 467
442 if (op->type!=PLAYER && op->type!=CONTAINER) { 468 if (op->type != PLAYER && op->type != CONTAINER)
469 {
443 LOG(llevError, "Query money called with non player/container\n"); 470 LOG (llevError, "Query money called with non player/container\n");
444 return 0; 471 return 0;
445 } 472 }
473
446 for (tmp = op->inv; tmp; tmp= tmp->below) { 474 for (tmp = op->inv; tmp; tmp = tmp->below)
447 if (tmp->type==MONEY) { 475 if (tmp->type == MONEY)
448 total += (uint64)tmp->nrof * (uint64)tmp->value; 476 total += tmp->nrof * (sint64)tmp->value;
449 } else if (tmp->type==CONTAINER && 477 else if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && (tmp->race == NULL || strstr (tmp->race, "gold")))
450 QUERY_FLAG(tmp,FLAG_APPLIED) &&
451 (tmp->race==NULL || strstr(tmp->race,"gold"))) {
452 total += query_money(tmp); 478 total += query_money (tmp);
453 } 479
454 }
455 return total; 480 return total;
456} 481}
482
457/* TCHIZE: This function takes the amount of money from the 483/* TCHIZE: This function takes the amount of money from the
458 * the player inventory and from it's various pouches using the 484 * the player inventory and from it's various pouches using the
459 * pay_from_container function. 485 * pay_from_container function.
460 * returns 0 if not possible. 1 if success 486 * returns 0 if not possible. 1 if success
461 */ 487 */
488int
462int pay_for_amount(uint64 to_pay,object *pl) { 489pay_for_amount (sint64 to_pay, object *pl)
490{
463 object *pouch; 491 object *pouch;
464 492
465 if (to_pay==0) return 1; 493 if (to_pay == 0)
466 if (to_pay > query_money(pl)) return 0;
467
468 to_pay = pay_from_container(pl, pl, to_pay);
469
470 for (pouch=pl->inv; (pouch!=NULL) && (to_pay>0); pouch=pouch->below) {
471 if (pouch->type == CONTAINER
472 && QUERY_FLAG(pouch, FLAG_APPLIED)
473 && (pouch->race == NULL || strstr(pouch->race, "gold"))) {
474 to_pay = pay_from_container(pl, pouch, to_pay);
475 }
476 }
477 fix_player(pl);
478 return 1; 494 return 1;
495
496 if (to_pay > query_money (pl))
497 return 0;
498
499 pay_from_container (pl, pl, to_pay);
500
501 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")))
503 pay_from_container (pl, pouch, to_pay);
504
505 pl->update_stats ();
506 return 1;
479} 507}
480 508
481/* 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
482 * 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
483 * money until op is paid for. Change will be left wherever the last 511 * money until op is paid for. Change will be left wherever the last
484 * of the price was paid from. 512 * of the price was paid from.
485 */ 513 */
514int
486int pay_for_item(object *op,object *pl) { 515pay_for_item (object *op, object *pl)
516{
487 uint64 to_pay = query_cost(op,pl,F_BUY | F_SHOP); 517 sint64 to_pay = query_cost (op, pl, F_BUY | F_SHOP);
488 object *pouch; 518 object *pouch;
489 uint64 saved_money; 519 sint64 saved_money;
490 520
491 if (to_pay==0) return 1; 521 if (to_pay == 0)
492 if (to_pay>query_money(pl)) return 0;
493
494 /* We compare the paid price with the one for a player
495 * without bargaining skill.
496 * This determins the amount of exp (if any) gained for bargaining.
497 */
498 saved_money = query_cost(op,pl,F_BUY | F_NO_BARGAIN | F_SHOP) - to_pay;
499
500 if (saved_money > 0)
501 change_exp(pl,saved_money,"bargaining",SK_EXP_NONE);
502
503 to_pay = pay_from_container(pl, pl, to_pay);
504
505 for (pouch=pl->inv; (pouch!=NULL) && (to_pay>0); pouch=pouch->below) {
506 if (pouch->type == CONTAINER
507 && QUERY_FLAG(pouch, FLAG_APPLIED)
508 && (pouch->race == NULL || strstr(pouch->race, "gold"))) {
509 to_pay = pay_from_container(pl, pouch, to_pay);
510 }
511 }
512 if (settings.real_wiz == FALSE && QUERY_FLAG(pl, FLAG_WAS_WIZ))
513 SET_FLAG(op, FLAG_WAS_WIZ);
514 fix_player(pl);
515 return 1; 522 return 1;
523
524 if (to_pay > query_money (pl))
525 return 0;
526
527 /* We compare the paid price with the one for a player
528 * without bargaining skill.
529 * This determins the amount of exp (if any) gained for bargaining.
530 */
531 saved_money = query_cost (op, pl, F_BUY | F_NO_BARGAIN | F_SHOP) - to_pay;
532
533 if (saved_money > 0)
534 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE);
535
536 pay_from_container (pl, pl, to_pay);
537
538 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")))
540 pay_from_container (pl, pouch, to_pay);
541
542 pl->update_stats ();
543
544 return 1;
516} 545}
517 546
518/* 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
519 * the player. 548 * the player.
520 * CF 0.91.4 - this function is mostly redone in order to fix a bug 549 * CF 0.91.4 - this function is mostly redone in order to fix a bug
527 * 556 *
528 * pouch is the container (pouch or player) to remove the coins from. 557 * pouch is the container (pouch or player) to remove the coins from.
529 * to_pay is the required amount. 558 * to_pay is the required amount.
530 * returns the amount still missing after using "pouch". 559 * returns the amount still missing after using "pouch".
531 */ 560 */
561static void
532static uint64 pay_from_container(object *pl, object *pouch, uint64 to_pay) { 562pay_from_container (object *pl, object *pouch, sint64 &to_pay)
563{
533 int count, i; 564 int count, i;
534 sint64 remain; 565 object *tmp, *next;
535 object *tmp, *coin_objs[NUM_COINS], *next;
536 archetype *at; 566 archetype *at;
537 567
538 if (pouch->type != PLAYER && pouch->type != CONTAINER) return to_pay; 568 if (pouch->type != PLAYER && pouch->type != CONTAINER)
569 return;
539 570
540 remain = to_pay; 571 object *coin_objs[NUM_COINS] = { 0 };
541 for (i=0; i<NUM_COINS; i++) coin_objs[i] = NULL;
542 572
543 /* This hunk should remove all the money objects from the player/container */ 573 /* This hunk should remove all the money objects from the player/container */
544 for (tmp=pouch->inv; tmp; tmp=next) { 574 for (tmp = pouch->inv; tmp; tmp = next)
575 {
545 next = tmp->below; 576 next = tmp->below;
546 577
547 if (tmp->type == MONEY) { 578 if (tmp->type == MONEY)
579 {
548 for (i=0; i<NUM_COINS; i++) { 580 for (i = 0; i < NUM_COINS; i++)
549 if (!strcmp(coins[NUM_COINS-1-i], tmp->arch->name) && 581 {
550 (tmp->value == tmp->arch->clone.value) ) { 582 if (tmp->value == tmp->arch->value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->archname))
551 583 {
552 /* This should not happen, but if it does, just * 584 // This should not happen, but if it does, just merge the two.
553 * merge the two. */
554 if (coin_objs[i]!=NULL) { 585 if (coin_objs [i])
586 {
555 LOG(llevError,"%s has two money entries of (%s)\n", 587 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]);
556 pouch->name, coins[NUM_COINS-1-i]);
557 remove_ob(tmp); 588 tmp->remove ();
558 coin_objs[i]->nrof += tmp->nrof; 589 coin_objs[i]->nrof += tmp->nrof;
559 esrv_del_item(pl->contr, tmp->count); 590 esrv_del_item (pl->contr, tmp->count);
560 free_object(tmp); 591 tmp->destroy ();
561 } 592 }
562 else { 593 else
594 {
563 remove_ob(tmp); 595 tmp->remove ();
596
597 if (pouch->type == PLAYER)
564 if(pouch->type==PLAYER) esrv_del_item(pl->contr, tmp->count); 598 esrv_del_item (pl->contr, tmp->count);
599
565 coin_objs[i] = tmp; 600 coin_objs[i] = tmp;
566 } 601 }
602
567 break; 603 break;
568 } 604 }
569 } 605 }
606
570 if (i==NUM_COINS) 607 if (i == NUM_COINS)
571 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);
572 } 609 }
573 } 610 }
574 611
575 /* 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. */
576 /* 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 */
577 for (i=0; i<NUM_COINS; i++) 614 for (i = 0; i < NUM_COINS; i++)
578 if (coin_objs[i]==NULL) { 615 if (!coin_objs[i])
616 {
579 at = find_archetype(coins[NUM_COINS-1-i]); 617 at = archetype::find (coins[NUM_COINS - 1 - i]);
618
619 if (at == NULL)
580 if (at==NULL) 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]);
621
581 coin_objs[i] = arch_to_object (at); 622 coin_objs[i] = arch_to_object (at);
582 coin_objs[i]->nrof = 0; 623 coin_objs[i]->nrof = 0;
583 } 624 }
584 625
585 for (i=0; i<NUM_COINS; i++) { 626 for (i = 0; i < NUM_COINS; i++)
586 int num_coins; 627 {
628 object &coin = *coin_objs[i];
629 sint64 num_coins = min ((to_pay + coin.value - 1) / coin.value, coin.nrof);
630 to_pay -= num_coins * coin.value;
587 631
588 if (coin_objs[i]->nrof*coin_objs[i]->value> remain) {
589 num_coins = remain / coin_objs[i]->value;
590 if ((uint64)num_coins*(uint64)coin_objs[i]->value < remain) num_coins++;
591 } else {
592 num_coins = coin_objs[i]->nrof;
593 }
594 remain -= (sint64) num_coins * (sint64)coin_objs[i]->value;
595 coin_objs[i]->nrof -= num_coins; 632 coin.nrof -= num_coins;
596 /* Now start making change. Start at the coin value 633 /* Now start making change. Start at the coin value
597 * below the one we just did, and work down to 634 * below the one we just did, and work down to
598 * the lowest value. 635 * the lowest value.
599 */ 636 */
600 count=i-1; 637 count = i - 1;
638
601 while (remain<0 && count>=0) { 639 while (to_pay < 0 && count >= 0)
640 {
602 num_coins = -remain/ coin_objs[count]->value; 641 num_coins = (-to_pay) / coin_objs[count]->value;
603 coin_objs[count]->nrof += num_coins; 642 coin_objs[count]->nrof += num_coins;
604 remain += num_coins * coin_objs[count]->value; 643 to_pay += num_coins * coin_objs[count]->value;
605 count--; 644 count--;
606 } 645 }
607 } 646 }
647
608 for (i=0; i<NUM_COINS; i++) { 648 for (i = 0; i < NUM_COINS; i++)
649 {
609 if (coin_objs[i]->nrof) { 650 if (coin_objs[i]->nrof)
651 {
610 object *tmp = insert_ob_in_ob(coin_objs[i], pouch); 652 object *tmp = insert_ob_in_ob (coin_objs[i], pouch);
611 653
612 esrv_send_item(pl, tmp); 654 esrv_send_item (pl, tmp);
613 esrv_send_item (pl, pouch); 655 esrv_send_item (pl, pouch);
656
657 if (pl != pouch)
614 if (pl != pouch) esrv_update_item (UPD_WEIGHT, pl, pouch); 658 esrv_update_item (UPD_WEIGHT, pl, pouch);
659
615 if (pl->type != PLAYER) { 660 if (pl->type != PLAYER)
616 esrv_send_item (pl, pl); 661 esrv_send_item (pl, pl);
617 } 662 }
618 } else { 663 else
619 free_object(coin_objs[i]); 664 coin_objs[i]->destroy ();
620 }
621 } 665 }
622 return(remain);
623} 666}
624 667
625/* 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
626 * 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.
627 * Returns 1 if they can, and 0 if they can't. also prints an appropriate message 670 * Returns 1 if they can, and 0 if they can't. also prints an appropriate message
628 * to the player 671 * to the player
629 */ 672 */
630 673int
631int can_pay(object *pl) { 674can_pay (object *pl)
675{
632 int unpaid_count = 0, i; 676 int unpaid_count = 0;
633 uint64 unpaid_price = 0; 677 sint64 unpaid_price = 0;
634 uint64 player_wealth = query_money(pl); 678 sint64 player_wealth = query_money (pl);
635 object *item; 679
636 uint32 coincount[NUM_COINS];
637 if (!pl || pl->type != PLAYER) { 680 if (!pl || pl->type != PLAYER)
681 {
638 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");
639 return 0; 683 return 0;
640 } 684 }
641 for (i=0; i< NUM_COINS; i++) coincount[i] = 0; 685
642 for (item = pl->inv;item;) { 686 for (object::depth_iterator item = pl->begin (); item != pl->end (); ++item)
643 if QUERY_FLAG(item, FLAG_UNPAID) { 687 if (QUERY_FLAG (item, FLAG_UNPAID))
688 {
644 unpaid_count++; 689 unpaid_count++;
645 unpaid_price += query_cost(item, pl, F_BUY | F_SHOP); 690 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
646 } 691 }
647 /* merely converting the player's monetary wealth won't do, if we did that, 692
648 * we could print the wrong numbers for the coins, so we count the money instead
649 */
650 for (i=0; i< NUM_COINS; i++)
651 if (!strcmp(coins[i], item->arch->name))
652 coincount[i] += item->nrof;
653 if (item->inv) item = item->inv;
654 else if (item->below) item = item->below;
655 else if (item->env && item->env != pl && item->env->below) item = item->env->below;
656 else item = NULL;
657 }
658 if (unpaid_price > player_wealth) { 693 if (unpaid_price > player_wealth)
659 char buf[MAX_BUF], coinbuf[MAX_BUF]; 694 {
660 int denominations = 0; 695 char buf[MAX_BUF];
661 int has_coins = NUM_COINS;
662 char cost[MAX_BUF]; 696 char cost[MAX_BUF];
663 char missing[MAX_BUF]; 697 char missing[MAX_BUF];
664 698
665 sprintf(cost, "%s", cost_string_from_value (unpaid_price, 0)); 699 snprintf (cost, MAX_BUF, "%s", cost_string_from_value (unpaid_price, 0));
666 sprintf(missing, "%s", cost_string_from_value (unpaid_price - player_wealth, 0)); 700 snprintf (missing, MAX_BUF, "%s", cost_string_from_value (unpaid_price - player_wealth, 0));
667 701
668 sprintf(buf, "You have %d unpaid items that would cost you %s. You need another %s to be able to afford that.", 702 snprintf (buf, MAX_BUF, "You have %d unpaid items that would cost you %s. You need another %s to be able to afford that.",
669 unpaid_count, cost, missing); 703 unpaid_count, cost, missing);
670 new_draw_info(NDI_UNIQUE, 0, pl, buf); 704 new_draw_info (NDI_UNIQUE, 0, pl, buf);
705
671 return 0; 706 return 0;
672 } 707 }
708 else
673 else return 1; 709 return 1;
674} 710}
675
676 711
677/* Better get_payment, descends containers looking for 712/* Better get_payment, descends containers looking for
678 * unpaid items, and pays for them. 713 * unpaid items, and pays for them.
679 * returns 0 if the player still has unpaid items. 714 * returns 0 if the player still has unpaid items.
680 * returns 1 if the player has paid for everything. 715 * returns 1 if the player has paid for everything.
681 * pl is the player buying the stuff. 716 * pl is the player buying the stuff.
682 * op is the object we are examining. If op has
683 * and inventory, we examine that. IF there are objects
684 * below op, we descend down.
685 */ 717 */
686int get_payment(object *pl, object *op) { 718int
719get_payment (object *pl)
720{
721 for (;;)
722 {
723 next_item:
724
725 for (object::depth_iterator op = pl->begin (); op != pl->end (); ++op)
726 {
727 if (QUERY_FLAG (op, FLAG_UNPAID))
728 {
687 char buf[MAX_BUF]; 729 char buf[MAX_BUF];
688 int ret=1; 730 snprintf (buf, MAX_BUF, "%s", query_cost_string (op, pl, F_BUY | F_SHOP));
689 731
690 if (op!=NULL&&op->inv)
691 ret = get_payment(pl, op->inv);
692
693 if (!ret)
694 return 0;
695
696 if (op!=NULL&&op->below)
697 ret = get_payment (pl, op->below);
698
699 if (!ret)
700 return 0;
701
702 if(op!=NULL&&QUERY_FLAG(op,FLAG_UNPAID)) {
703 strncpy(buf,query_cost_string(op,pl,F_BUY | F_SHOP),MAX_BUF);
704 buf[MAX_BUF-1] = '\0';
705 if(!pay_for_item(op,pl)) { 732 if (!pay_for_item (op, pl))
733 {
706 uint64 i=query_cost(op,pl,F_BUY | F_SHOP) - query_money(pl); 734 sint64 i = query_cost (op, pl, F_BUY | F_SHOP) - query_money (pl);
735
707 CLEAR_FLAG(op, FLAG_UNPAID); 736 CLEAR_FLAG (op, FLAG_UNPAID);
708 new_draw_info_format(NDI_UNIQUE, 0, pl, 737 new_draw_info_format (NDI_UNIQUE, 0, pl, "You lack %s to buy %s.", cost_string_from_value (i, 0), query_name (op));
709 "You lack %s to buy %s.", cost_string_from_value (i, 0),
710 query_name(op));
711 SET_FLAG(op, FLAG_UNPAID); 738 SET_FLAG (op, FLAG_UNPAID);
712 return 0; 739 return 0;
713 } else {
714 object *tmp;
715 tag_t c = op->count;
716
717 CLEAR_FLAG(op, FLAG_UNPAID);
718 CLEAR_FLAG(op, FLAG_PLAYER_SOLD);
719 new_draw_info_format(NDI_UNIQUE, 0, op,
720 "You paid %s for %s.",buf,query_name(op));
721 tmp=merge_ob(op,NULL);
722 if (pl->type == PLAYER) {
723 if (tmp) { /* it was merged */
724 esrv_del_item (pl->contr, c);
725 op = tmp;
726 } 740 }
741 else
742 {
743 object *tmp;
744
745 CLEAR_FLAG (op, FLAG_UNPAID);
746 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
747 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
748 tmp = merge_ob (op, NULL);
749
750 if (pl->type == PLAYER)
751 {
752 if (tmp)
753 { /* it was merged */
754 esrv_del_item (pl->contr, op->count);
755 op = tmp;
756 }
757
727 esrv_send_item(pl, op); 758 esrv_send_item (pl, op);
759 }
760
761 goto next_item;
762 }
728 } 763 }
729 } 764 }
730 } 765
731 return 1; 766 return 1;
767 }
732} 768}
733 769
734/* written by elmex: 770/* written by elmex:
735 * moved this code from sell_item () here to have a function 771 * moved this code from sell_item () here to have a function
736 * that pays the player an amount. Mainly put the code here to 772 * that pays the player an amount. Mainly put the code here to
740 * in his inventory anyway. This is the best alternative to not pay any money 776 * in his inventory anyway. This is the best alternative to not pay any money
741 * or put it on the ground under the player. This way the player can still 777 * or put it on the ground under the player. This way the player can still
742 * go somewhere and unload the money at a safe place. 778 * go somewhere and unload the money at a safe place.
743 * 779 *
744 */ 780 */
781void
745void pay_player (object *pl, uint64 amount) { 782pay_player (object *pl, sint64 amount)
783{
746 int count = 0; 784 int count = 0;
747 archetype *at = 0; 785 archetype *at = 0;
748 object *pouch = 0, *tmp = 0; 786 object *pouch = 0, *tmp = 0;
749 787
750 for (count = 0; coins[count] != NULL; count++) 788 for (count = 0; coins[count]; count++)
751 { 789 {
752 at = find_archetype (coins[count]); 790 at = archetype::find (coins[count]);
753 791
754 if (at == NULL) 792 if (at == NULL)
755 LOG(llevError, "Could not find %s archetype\n", coins[count]); 793 LOG (llevError, "Could not find %s archetype\n", coins[count]);
756 else if ((amount / at->clone.value) > 0) 794 else if ((amount / at->value) > 0)
757 { 795 {
758 for (pouch=pl->inv; pouch; pouch=pouch->below) 796 for (pouch = pl->inv; pouch; pouch = pouch->below)
759 { 797 {
760 if (pouch->type == CONTAINER 798 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold"))
761 && QUERY_FLAG (pouch, FLAG_APPLIED)
762 && pouch->race
763 && strstr (pouch->race, "gold"))
764 { 799 {
765 int w = at->clone.weight * (100 - pouch->stats.Str) / 100; 800 int w = at->weight * (100 - pouch->stats.Str) / 100;
766 int n = amount / at->clone.value; 801 int n = amount / at->value;
767 802
768 if (w == 0) 803 if (w == 0)
769 w = 1; /* Prevent divide by zero */ 804 w = 1; /* Prevent divide by zero */
770 805
771 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))
772 { 807 {
773 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n) 808 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n)
774 n = (pouch->weight_limit - pouch->carrying) / w; 809 n = (pouch->weight_limit - pouch->carrying) / w;
775 810
776 tmp = arch_to_object (at); 811 tmp = arch_to_object (at);
777 tmp->nrof = n; 812 tmp->nrof = n;
778 amount -= (uint64)tmp->nrof * (uint64)tmp->value; 813 amount -= tmp->nrof * tmp->value;
779 tmp = insert_ob_in_ob (tmp, pouch); 814 tmp = insert_ob_in_ob (tmp, pouch);
780 esrv_send_item (pl, tmp); 815 esrv_send_item (pl, tmp);
781 esrv_send_item (pl, pouch); 816 esrv_send_item (pl, pouch);
782 esrv_update_item (UPD_WEIGHT, pl, pouch); 817 esrv_update_item (UPD_WEIGHT, pl, pouch);
783 esrv_send_item (pl, pl); 818 esrv_send_item (pl, pl);
784 } 819 }
785 } 820 }
786 } 821 }
787 822
788 if (amount / at->clone.value > 0) 823 if (amount / at->value > 0)
789 { 824 {
790 tmp = arch_to_object (at); 825 tmp = arch_to_object (at);
791 tmp->nrof = amount / tmp->value; 826 tmp->nrof = amount / tmp->value;
792 amount -= (uint64)tmp->nrof * (uint64)tmp->value; 827 amount -= tmp->nrof * tmp->value;
793 tmp = insert_ob_in_ob (tmp, pl); 828 tmp = insert_ob_in_ob (tmp, pl);
794 esrv_send_item (pl, tmp); 829 esrv_send_item (pl, tmp);
795 esrv_send_item (pl, pl); 830 esrv_send_item (pl, pl);
796 } 831 }
797 } 832 }
798 } 833 }
799 834
800 if (amount != 0) 835 if (amount != 0)
801#ifndef WIN32
802 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);
803#else
804 LOG (llevError,"Warning - payment in pay_player () not zero: %I64u\n", amount);
805#endif
806} 837}
807 838
808/* elmex: this is for the bank plugin :( */ 839/* elmex: this is for the bank plugin :( */
840sint64
809uint64 pay_player_arch (object *pl, const char *arch, uint64 amount) { 841pay_player_arch (object *pl, const char *arch, sint64 amount)
842{
810 archetype *at = find_archetype (arch); 843 archetype *at = archetype::find (arch);
811 object *tmp = NULL;
812 844
813 if (at == NULL) 845 if (!at)
814 return 0; 846 return 0;
815 847
816 if (amount > 0) 848 if (amount > 0)
817 { 849 {
818 tmp = arch_to_object (at); 850 object *tmp = arch_to_object (at);
819 tmp->nrof = amount; 851 tmp->nrof = amount;
820 tmp = insert_ob_in_ob (tmp, pl); 852 tmp = insert_ob_in_ob (tmp, pl);
821 esrv_send_item (pl, tmp); 853 esrv_send_item (pl, tmp);
822 esrv_send_item (pl, pl); 854 esrv_send_item (pl, pl);
823 } 855 }
830 * buy item. 862 * buy item.
831 * 863 *
832 * Modified to fill available race: gold containers before dumping 864 * Modified to fill available race: gold containers before dumping
833 * remaining coins in character's inventory. 865 * remaining coins in character's inventory.
834 */ 866 */
867void
835void sell_item(object *op, object *pl) { 868sell_item (object *op, object *pl)
869{
836 uint64 amount = query_cost (op,pl,F_SELL | F_SHOP), extra_gain; 870 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain;
837 871
838 if(pl==NULL || pl->type != PLAYER) 872 if (pl == NULL || pl->type != PLAYER)
839 { 873 {
840 LOG(llevDebug,"Object other than player tried to sell something.\n"); 874 LOG (llevDebug, "Object other than player tried to sell something.\n");
841 return; 875 return;
842 } 876 }
843 877
844 if(op->custom_name) 878 op->custom_name = 0;
845 FREE_AND_CLEAR_STR (op->custom_name);
846 879
847 if(!amount) 880 if (!amount)
848 { 881 {
849 new_draw_info_format (NDI_UNIQUE, 0, pl, 882 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.", query_name (op));
850 "We're not interested in %s.", query_name (op));
851 883
852 /* Even if the character doesn't get anything for it, it may still be 884 /* Even if the character doesn't get anything for it, it may still be
853 * worth something. If so, make it unpaid 885 * worth something. If so, make it unpaid
854 */ 886 */
855 if (op->value) 887 if (op->value)
856 { 888 {
857 SET_FLAG(op, FLAG_UNPAID); 889 SET_FLAG (op, FLAG_UNPAID);
858 SET_FLAG(op, FLAG_PLAYER_SOLD); 890 SET_FLAG (op, FLAG_PLAYER_SOLD);
859 } 891 }
860 892
861 identify (op); 893 identify (op);
862 return; 894 return;
863 } 895 }
868 * exp/10 -> 1 for each gold coin 900 * exp/10 -> 1 for each gold coin
869 */ 901 */
870 extra_gain = amount - query_cost (op, pl, F_SELL | F_NO_BARGAIN | F_SHOP); 902 extra_gain = amount - query_cost (op, pl, F_SELL | F_NO_BARGAIN | F_SHOP);
871 903
872 if (extra_gain > 0) 904 if (extra_gain > 0)
873 change_exp(pl, extra_gain / 10, "bargaining", SK_EXP_NONE); 905 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE);
874 906
875 pay_player (pl, amount); 907 pay_player (pl, amount);
876 908
877 new_draw_info_format (NDI_UNIQUE, 0, pl, 909 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));
878 "You receive %s for %s.", query_cost_string (op, pl, F_SELL | F_SHOP), 910 pl->play_sound (sound_find ("shop_sell"));
879 query_name (op));
880 911
881 SET_FLAG (op, FLAG_UNPAID); 912 SET_FLAG (op, FLAG_UNPAID);
882 identify (op); 913 identify (op);
883} 914}
884 915
885
886/* returns a double that is the ratio of the price that a shop will offer for 916/* returns a double that is the ratio of the price that a shop will offer for
887 * item based on the shops specialisation. Does not take account of greed, 917 * item based on the shops specialisation. Does not take account of greed,
888 * returned value is between (2*SPECIALISATION_EFFECT-1) and 1 and in any 918 * returned value is between SPECIALISATION_EFFECT and 1.
889 * event is never less than 0.1 (calling functions divide by it)
890 */ 919 */
920static double
891static double shop_specialisation_ratio(const object *item, const mapstruct *map) { 921shop_specialisation_ratio (const object *item, const maptile *map)
922{
892 shopitems *items=map->shopitems; 923 shopitems *items = map->shopitems;
893 double ratio = SPECIALISATION_EFFECT, likedness=0.001; 924 double likedness = 0.;
894 int i; 925 int i;
895 926
896 if (item==NULL) { 927 if (item == NULL)
928 {
897 LOG(llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", map->path); 929 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
898 return 0; 930 return 0;
899 } 931 }
932
900 if (!item->type) { 933 if (!item->type)
934 {
901 LOG(llevError, "shop_specialisation_ratio: passed an item with an invalid type\n"); 935 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n");
902 /* 936 /*
903 * I'm not really sure what the /right/ thing to do here is, these types of 937 * I'm not really sure what the /right/ thing to do here is, these types of
904 * item shouldn't exist anyway, but returning the ratio is probably the best bet.." 938 * item shouldn't exist anyway, but returning the ratio is probably the best bet.."
905 */ 939 */
906 return ratio; 940 return SPECIALISATION_EFFECT;
907 } 941 }
942
908 if (map->shopitems) { 943 if (map->shopitems)
944 {
909 for (i=0; i<items[0].index; i++) 945 for (i = 0; i < items[0].index; i++)
910 if (items[i].typenum==item->type || (!items[i].typenum && likedness == 0.001)) 946 if (items[i].typenum == item->type || (!items[i].typenum && likedness == 0.001))
911 likedness = items[i].strength/100.0; 947 likedness = items[i].strength / 100.0;
912 } 948 }
913 if (likedness > 1.0) { /* someone has been rather silly with the map headers. */ 949
950 if (likedness > 1.0)
951 { /* someone has been rather silly with the map headers. */
914 LOG(llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", 952 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path);
915 item->type, map->path);
916 likedness = 1.0; 953 likedness = 1.0;
917 } 954 }
955
918 if (likedness < -1.0) { 956 if (likedness < -1.0)
957 {
919 LOG(llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", 958 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
920 item->type, map->path);
921 likedness = -1.0; 959 likedness = -1.0;
922 } 960 }
923 ratio = ratio + (1.0-ratio) * likedness; 961
924 if (ratio <= 0.1) ratio=0.1; /* if the ratio were much lower than this, we would get silly prices */ 962 return lerp (likedness, -1., 1., SPECIALISATION_EFFECT, 1.);
925 return ratio;
926} 963}
927 964
928/*returns the greed of the shop on map, or 1 if it isn't specified. */ 965/*returns the greed of the shop on map, or 1 if it isn't specified. */
929static double shop_greed(const mapstruct *map) { 966static double
930 double greed=1.0; 967shop_greed (const maptile *map)
931 if (map->shopgreed) 968{
932 return map->shopgreed; 969 return map->shopgreed
933 return greed; 970 ? map->shopgreed
971 : 1.;
934} 972}
935 973
936/* Returns a double based on how much the shopkeeper approves of the player. 974/* Returns a double based on how much the shopkeeper approves of the player.
937 * this is based on the race of the shopkeeper and that of the player. 975 * this is based on the race of the shopkeeper and that of the player.
938 */ 976 */
977double
939double shopkeeper_approval(const mapstruct *map, const object *player) { 978shopkeeper_approval (const maptile *map, const object *player)
940 double approval=1.0; 979{
941 980 return map->shoprace && player->race != map->shoprace
942 if (map->shoprace) { 981 ? DISLIKE_RATIO
943 approval=NEUTRAL_RATIO; 982 : 1.;
944 if (player->race && !strcmp(player->race, map->shoprace)) approval = 1.0;
945 }
946 return approval;
947} 983}
948 984
949/* limit the value of items based on the wealth of the shop. If the item is close 985/* limit the value of items based on the wealth of the shop. If the item is close
950 * to the maximum value a shop will offer, we start to reduce it, if the item is 986 * to the maximum value a shop will offer, we start to reduce it, if the item is
951 * below the minimum value the shop is prepared to trade in, then we don't 987 * below the minimum value the shop is prepared to trade in, then we don't
952 * want it and offer nothing. If it isn't a shop, check whether we should do generic 988 * want it and offer nothing. If it isn't a shop, check whether we should do generic
953 * value reduction. 989 * value reduction.
954 * 990 *
955 */ 991 */
992static sint64
956static uint64 value_limit (uint64 val, int quantity, const object *who, int isshop) { 993value_limit (sint64 val, int quantity, const object *who, int isshop)
994{
957 uint64 newval, unit_price, tmpshopmax; 995 sint64 newval, unit_price, tmpshopmax;
958 mapstruct *map; 996 maptile *map;
959 997
960 unit_price = val / quantity; 998 unit_price = val / quantity;
961 999
962 if (!isshop || !who) 1000 if (!isshop || !who)
963 { 1001 {
964 if (unit_price > 250000) 1002 if (unit_price > 250000)
965 newval = (uint64) (250000. - pow (250000., .75) * 65. + pow (unit_price, .75) * 65.); 1003 newval = (sint64) (250000. - pow (250000., .75) * 65. + pow (unit_price, .75) * 65.);
966 else 1004 else
967 newval = unit_price; 1005 newval = unit_price;
968 } 1006 }
969 else 1007 else
970 { 1008 {
971 if (!who->map) 1009 if (!who->map)
972 { 1010 {
973 LOG(llevError, "value_limit: asked shop price for ob %s on NULL map\n", who->name); 1011 LOG (llevError, "value_limit: asked shop price for ob %s on NULL map\n", &who->name);
974 return val; 1012 return val;
975 } 1013 }
976 1014
977 map = who->map; 1015 map = who->map;
978 1016
979 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default 1017 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default
980 1018
981 if (map->shopmin && unit_price < map->shopmin) 1019 if (map->shopmin && unit_price < map->shopmin)
982 return 0; 1020 return 0;
983 else if (unit_price > tmpshopmax / 2) 1021 else if (unit_price > tmpshopmax / 2)
984 newval = MIN ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax); 1022 newval = MIN ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax);
985 else 1023 else
986 newval=unit_price; 1024 newval = unit_price;
987 } 1025 }
988 1026
989 newval *= quantity; 1027 newval *= quantity;
990 1028
991 return newval; 1029 return newval;
992} 1030}
993 1031
994/* gives a desciption of the shop on their current map to the player op. */ 1032/* gives a desciption of the shop on their current map to the player op. */
1033int
995int describe_shop(const object *op) { 1034describe_shop (const object *op)
1035{
996 mapstruct *map = op->map; 1036 maptile *map = op->map;
1037
997 /*shopitems *items=map->shopitems;*/ 1038 /*shopitems *items=map->shopitems; */
998 int pos=0, i; 1039 int pos = 0, i;
999 double opinion=0; 1040 double opinion = 0;
1000 char tmp[MAX_BUF]="\0"; 1041 char tmp[MAX_BUF] = "\0";
1042
1001 if (op->type != PLAYER) return 0; 1043 if (op->type != PLAYER)
1044 return 0;
1002 1045
1003 /*check if there is a shop specified for this map */ 1046 /*check if there is a shop specified for this map */
1004 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax) { 1047 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax)
1048 {
1005 new_draw_info(NDI_UNIQUE,0,op,"From looking at the nearby shop you determine that it trades in:"); 1049 new_draw_info (NDI_UNIQUE, 0, op, "From looking at the nearby shop you determine that it trades in:");
1050
1006 if (map->shopitems) { 1051 if (map->shopitems)
1007 for (i=0; i < map->shopitems[0].index; i++) { 1052 for (i = 0; i < map->shopitems[0].index; i++)
1008 if (map->shopitems[i].name && map->shopitems[i].strength > 10) { 1053 if (map->shopitems[i].name && map->shopitems[i].strength > 10)
1054 {
1009 snprintf(tmp+pos, sizeof(tmp)-pos, "%s, ", map->shopitems[i].name_pl); 1055 snprintf (tmp + pos, sizeof (tmp) - pos, "%s, ", map->shopitems[i].name_pl);
1010 pos += strlen(tmp+pos); 1056 pos += strlen (tmp + pos);
1011 }
1012 } 1057 }
1013 } 1058
1059 if (!pos)
1014 if (!pos) strcat(tmp, "a little of everything."); 1060 strcat (tmp, "a little of everything.");
1015 1061
1016 /* format the string into a list */ 1062 /* format the string into a list */
1017 make_list_like(tmp); 1063 make_list_like (tmp);
1018 new_draw_info_format(NDI_UNIQUE, 0, op, "%s", tmp); 1064 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", tmp);
1019 1065
1020 if (map->shopmax) 1066 if (map->shopmax)
1021 new_draw_info_format(NDI_UNIQUE,0,op,"It won't trade for items above %s.", 1067 new_draw_info_format (NDI_UNIQUE, 0, op, "It won't trade for items above %s.", cost_string_from_value (map->shopmax, 0));
1022 cost_string_from_value(map->shopmax, 0)); 1068
1023 if (map->shopmin) 1069 if (map->shopmin)
1024 new_draw_info_format(NDI_UNIQUE,0,op,"It won't trade in items worth less than %s.", 1070 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));
1025 cost_string_from_value(map->shopmin, 0)); 1071
1026 if (map->shopgreed) { 1072 if (map->shopgreed)
1073 {
1027 if (map->shopgreed >2.0) 1074 if (map->shopgreed > 2.0)
1028 new_draw_info(NDI_UNIQUE,0,op,"It tends to overcharge massively."); 1075 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge massively.");
1029 else if (map->shopgreed >1.5) 1076 else if (map->shopgreed > 1.5)
1030 new_draw_info(NDI_UNIQUE,0,op,"It tends to overcharge substantially."); 1077 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge substantially.");
1031 else if (map->shopgreed >1.1) 1078 else if (map->shopgreed > 1.1)
1032 new_draw_info(NDI_UNIQUE,0,op,"It tends to overcharge slightly."); 1079 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge slightly.");
1033 else if (map->shopgreed <0.9) 1080 else if (map->shopgreed < 0.9)
1034 new_draw_info(NDI_UNIQUE,0,op,"It tends to undercharge."); 1081 new_draw_info (NDI_UNIQUE, 0, op, "It tends to undercharge.");
1035 } 1082 }
1083
1036 if (map->shoprace) { 1084 if (map->shoprace)
1085 {
1037 opinion=shopkeeper_approval(map, op); 1086 opinion = shopkeeper_approval (map, op);
1038 if (opinion > 0.8) 1087 if (opinion > 0.8)
1039 new_draw_info(NDI_UNIQUE,0,op,"You think the shopkeeper likes you."); 1088 new_draw_info (NDI_UNIQUE, 0, op, "You think the shopkeeper likes you.");
1040 else if (opinion > 0.5) 1089 else if (opinion > 0.5)
1041 new_draw_info(NDI_UNIQUE,0,op,"The shopkeeper seems unconcerned by you."); 1090 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper seems unconcerned by you.");
1042 else 1091 else
1043 new_draw_info(NDI_UNIQUE,0,op,"The shopkeeper seems to have taken a dislike to you."); 1092 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper seems to have taken a dislike to you.");
1044 } 1093 }
1045 } 1094 }
1095 else
1046 else new_draw_info(NDI_UNIQUE,0,op,"There is no shop nearby."); 1096 new_draw_info (NDI_UNIQUE, 0, op, "There is no shop nearby.");
1047 1097
1048 return 1; 1098 return 1;
1049} 1099}
1050typedef struct shopinv { 1100
1101struct shopinv
1102{
1051 char *item_sort; 1103 char *item_sort;
1052 char *item_real; 1104 char *item_real;
1053 uint16 type; 1105 uint16 type;
1054 uint32 nrof; 1106 uint32 nrof;
1055} shopinv; 1107};
1056 1108
1057/* There are a lot fo extra casts in here just to suppress warnings - it 1109/* There are a lot fo extra casts in here just to suppress warnings - it
1058 * makes it look uglier than it really it. 1110 * makes it look uglier than it really it.
1059 * The format of the strings we get is type:name. So we first want to 1111 * The format of the strings we get is type:name. So we first want to
1060 * sort by type (numerical) - if the same type, then sort by name. 1112 * sort by type (numerical) - if the same type, then sort by name.
1061 */ 1113 */
1114static int
1062static int shop_sort(const void *a1, const void *a2) 1115shop_sort (const void *a1, const void *a2)
1063{ 1116{
1064 shopinv *s1 = (shopinv*)a1, *s2= (shopinv*)a2; 1117 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2;
1065 1118
1066 if (s1->type<s2->type) return -1; 1119 if (s1->type < s2->type)
1120 return -1;
1067 if (s1->type>s2->type) return 1; 1121 if (s1->type > s2->type)
1122 return 1;
1123
1068 /* the type is the same (what atoi gets), so do a strcasecmp to sort 1124 /* the type is the same (what atoi gets), so do a strcasecmp to sort
1069 * via alphabetical order 1125 * via alphabetical order
1070 */ 1126 */
1071 return strcasecmp(s1->item_sort, s2->item_sort); 1127 return strcasecmp (s1->item_sort, s2->item_sort);
1072} 1128}
1073 1129
1130static void
1074static void add_shop_item(object *tmp, shopinv *items, int *numitems, int *numallocated) 1131add_shop_item (object *tmp, shopinv * items, int *numitems, int *numallocated)
1075{ 1132{
1076#if 0 1133#if 0
1077 char buf[MAX_BUF]; 1134 char buf[MAX_BUF];
1078#endif 1135#endif
1079 /* clear unpaid flag so that doesn't come up in query 1136 /* clear unpaid flag so that doesn't come up in query
1080 * string. We clear nrof so that we can better sort 1137 * string. We clear nrof so that we can better sort
1081 * the object names. 1138 * the object names.
1082 */ 1139 */
1083 1140
1084 CLEAR_FLAG(tmp, FLAG_UNPAID); 1141 CLEAR_FLAG (tmp, FLAG_UNPAID);
1085 items[*numitems].nrof=tmp->nrof; 1142 items[*numitems].nrof = tmp->nrof;
1086 /* Non mergable items have nrof of 0, but count them as one 1143 /* Non mergable items have nrof of 0, but count them as one
1087 * so the display is properly. 1144 * so the display is properly.
1088 */ 1145 */
1089 if (tmp->nrof == 0) items[*numitems].nrof++; 1146 if (tmp->nrof == 0)
1147 items[*numitems].nrof++;
1090 items[*numitems].type=tmp->type; 1148 items[*numitems].type = tmp->type;
1091 1149
1092 switch (tmp->type) { 1150 switch (tmp->type)
1151 {
1093#if 0 1152#if 0
1094 case BOOTS: 1153 case BOOTS:
1095 case GLOVES: 1154 case GLOVES:
1096 case RING: 1155 case RING:
1097 case AMULET: 1156 case AMULET:
1098 case BRACERS: 1157 case BRACERS:
1099 case GIRDLE: 1158 case GIRDLE:
1100 sprintf(buf,"%s %s",query_base_name(tmp,0),describe_item(tmp, NULL)); 1159 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL));
1101 items[*numitems].item_sort = strdup_local(buf); 1160 items[*numitems].item_sort = strdup (buf);
1102 sprintf(buf,"%s %s",query_name(tmp),describe_item(tmp, NULL)); 1161 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL));
1103 items[*numitems].item_real = strdup_local(buf); 1162 items[*numitems].item_real = strdup (buf);
1104 (*numitems)++; 1163 (*numitems)++;
1105 break; 1164 break;
1106#endif 1165#endif
1107 1166
1108 default: 1167 default:
1109 items[*numitems].item_sort = strdup_local(query_base_name(tmp, 0)); 1168 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1110 items[*numitems].item_real = strdup_local(query_base_name(tmp, 1)); 1169 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1111 (*numitems)++; 1170 (*numitems)++;
1112 break; 1171 break;
1113 } 1172 }
1114 SET_FLAG(tmp, FLAG_UNPAID); 1173 SET_FLAG (tmp, FLAG_UNPAID);
1115} 1174}
1116 1175
1117void shop_listing(object *op) 1176void
1177shop_listing (object *sign, object *op)
1118{ 1178{
1119 int i,j,numitems=0,numallocated=0, nx, ny; 1179 int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2;
1120 char *map_mark = (char *) calloc(MAGIC_MAP_SIZE * MAGIC_MAP_SIZE,1); 1180 const char *shop_coords = get_ob_key_value (sign, "shop_coords");
1121 object *stack; 1181 object *stack;
1122 shopinv *items; 1182 shopinv *items;
1123 1183
1124 /* Should never happen, but just in case a monster does apply a sign */ 1184 /* Should never happen, but just in case a monster does apply a sign */
1125 if (op->type!=PLAYER) return; 1185 if (op->type != PLAYER)
1186 return;
1126 1187
1127 new_draw_info(NDI_UNIQUE, 0, op, "\nThe shop contains:"); 1188 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1189 {
1190 x1 = 0;
1191 y1 = 0;
1192 x2 = op->map->width - 1;
1193 y2 = op->map->height - 1;
1194 }
1128 1195
1129 magic_mapping_mark(op, map_mark, 3);
1130 items=(shopinv*)malloc(40*sizeof(shopinv)); 1196 items = (shopinv *) malloc (40 * sizeof (shopinv));
1131 numallocated=40; 1197 numallocated = 40;
1132 1198
1133 /* Find all the appropriate items */ 1199 /* Find all the appropriate items */
1134 for (i=0; i<MAP_WIDTH(op->map); i++) { 1200 for (i = x1; i <= x2; i++)
1135 for (j=0; j<MAP_HEIGHT(op->map); j++) { 1201 {
1136 /* magic map code now centers the map on the object at MAGIC_MAP_HALF. 1202 for (j = y1; j < y2; j++)
1203 {
1204 if (is_in_shop (op->map, i, j))
1137 * 1205 {
1138 */
1139 nx = i - op->x + MAGIC_MAP_HALF;
1140 ny = j - op->y + MAGIC_MAP_HALF;
1141 /* unlikely, but really big shops could run into this issue */
1142 if (nx < 0 || ny < 0 || nx > MAGIC_MAP_SIZE || ny > MAGIC_MAP_SIZE) continue;
1143
1144 if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR) {
1145 stack =get_map_ob(op->map,i,j); 1206 stack = GET_MAP_OB (op->map, i, j);
1146 1207
1147 while (stack) { 1208 while (stack)
1209 {
1148 if (QUERY_FLAG(stack, FLAG_UNPAID)) { 1210 if (QUERY_FLAG (stack, FLAG_UNPAID))
1211 {
1149 if (numitems==numallocated) { 1212 if (numitems == numallocated)
1213 {
1150 items=(shopinv*)realloc(items, sizeof(shopinv)*(numallocated+10)); 1214 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10));
1151 numallocated+=10; 1215 numallocated += 10;
1152 } 1216 }
1217
1153 add_shop_item(stack, items, &numitems, &numallocated); 1218 add_shop_item (stack, items, &numitems, &numallocated);
1154 } 1219 }
1220
1155 stack = stack->above; 1221 stack = stack->above;
1156 } 1222 }
1157 } 1223 }
1158 } 1224 }
1159 } 1225 }
1160 free(map_mark); 1226
1161 if (numitems == 0) { 1227 if (numitems == 0)
1228 {
1162 new_draw_info(NDI_UNIQUE, 0, op, "The shop is currently empty.\n"); 1229 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1163 free(items); 1230 free (items);
1164 return; 1231 return;
1165 } 1232 }
1233
1166 qsort(items, numitems, sizeof(shopinv), (int (*)(const void*, const void*))shop_sort); 1234 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
1167 1235
1236 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
1237
1168 for (i=0; i<numitems; i++) { 1238 for (i = 0; i < numitems; i++)
1239 {
1169 /* Collapse items of the same name together */ 1240 /* Collapse items of the same name together */
1170 if ((i+1)<numitems && !strcmp(items[i].item_real, items[i+1].item_real)) { 1241 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
1242 {
1171 items[i+1].nrof += items[i].nrof; 1243 items[i + 1].nrof += items[i].nrof;
1172 free(items[i].item_sort); 1244 free (items[i].item_sort);
1173 free(items[i].item_real); 1245 free (items[i].item_real);
1246 }
1174 } else { 1247 else
1248 {
1175 new_draw_info_format(NDI_UNIQUE, 0, op, "%d %s", 1249 new_draw_info_format (NDI_UNIQUE, 0, op, "%d %s",
1176 items[i].nrof? items[i].nrof:1,
1177 items[i].nrof==1?items[i].item_sort: items[i].item_real); 1250 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
1178 free(items[i].item_sort); 1251 free (items[i].item_sort);
1179 free(items[i].item_real); 1252 free (items[i].item_real);
1180 } 1253 }
1181 } 1254 }
1255
1182 free(items); 1256 free (items);
1183} 1257}
1184 1258
1185/* elmex: this function checks whether the object is in a shop */ 1259/* elmex: this function checks whether the object is in a shop */
1260bool
1186bool is_in_shop (object *o) 1261is_in_shop (object *o)
1187{ 1262{
1188 if (!o->map) 1263 if (!o->map)
1189 return false; 1264 return false;
1190 1265
1191 return is_in_shop (o->map, o->x, o->y); 1266 return is_in_shop (o->map, o->x, o->y);
1192} 1267}
1193 1268
1194/* elmex: this function checks whether we are in a shop or not */ 1269/* elmex: this function checks whether we are in a shop or not
1270 - change 2007-11-26: enhanced the O(n) case by stopping at the first
1271 floor tile. this possibly will make map bugs where shopfloors are above
1272 floors more obvious.
1273*/
1274
1275bool
1195bool is_in_shop (mapstruct *map, int x, int y) 1276is_in_shop (maptile *map, int x, int y)
1196{ 1277{
1197 for (object *floor = get_map_ob (map, x, y); floor; floor = floor->above) 1278 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
1279 if (QUERY_FLAG (floor, FLAG_IS_FLOOR))
1198 if (floor->type == SHOP_FLOOR) 1280 return floor->type == SHOP_FLOOR;
1199 return true;
1200
1201 return false; 1281 return false;
1202} 1282}
1283

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines