ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/shop.C
(Generate patch)

Comparing deliantra/server/server/shop.C (file contents):
Revision 1.13 by root, Tue Sep 12 01:09:54 2006 UTC vs.
Revision 1.92 by root, Mon Oct 29 23:55:55 2012 UTC

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

Diff Legend

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