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

Diff Legend

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