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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.24 by root, Thu Jan 4 16:19:31 2007 UTC vs.
Revision 1.103 by root, Mon Nov 23 12:19:57 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 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
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <funcpoint.h>
26 26
27/* Handy little macro that adds exp and keeps it within bounds. Since 27/* Handy little macro that adds exp and keeps it within bounds. Since
28 * we are now using 64 bit values, I'm not all concerned about overflow issues 28 * we are now using 64 bit values, I'm not all concerned about overflow issues
29 * with exptotal wrapping. exptotal is typically op->exp, or op->perm_exp 29 * with exptotal wrapping. exptotal is typically op->exp, or op->perm_exp
30 */ 30 */
… …
191static const char *const drain_msg[NUM_STATS] = { 191static const char *const drain_msg[NUM_STATS] = {
192 "Oh no! You are weakened!", 192 "Oh no! You are weakened!",
193 "You're feeling clumsy!", 193 "You're feeling clumsy!",
194 "You feel less healthy", 194 "You feel less healthy",
195 "You suddenly begin to lose your memory!", 195 "You suddenly begin to lose your memory!",
196 "Watch out, your mind is going!",
197 "Your spirit feels drained!",
196 "Your face gets distorted!", 198 "Your face gets distorted!",
197 "Watch out, your mind is going!",
198 "Your spirit feels drained!"
199}; 199};
200const char *const restore_msg[NUM_STATS] = { 200const char *const restore_msg[NUM_STATS] = {
201 "You feel your strength return.", 201 "You feel your strength return.",
202 "You feel your agility return.", 202 "You feel your agility return.",
203 "You feel your health return.", 203 "You feel your health return.",
204 "You feel your memory return.",
204 "You feel your wisdom return.", 205 "You feel your wisdom return.",
206 "You feel your spirits return.",
205 "You feel your charisma return.", 207 "You feel your charisma return.",
206 "You feel your memory return.",
207 "You feel your spirits return."
208}; 208};
209const char *const gain_msg[NUM_STATS] = { 209const char *const gain_msg[NUM_STATS] = {
210 "You feel stronger.", 210 "You feel stronger.",
211 "You feel more agile.", 211 "You feel more agile.",
212 "You feel healthy.", 212 "You feel healthy.",
213 "You feel smarter.",
213 "You feel wiser.", 214 "You feel wiser.",
215 "You feel more potent.",
214 "You seem to look better.", 216 "You seem to look better.",
215 "You feel smarter.",
216 "You feel more potent."
217}; 217};
218const char *const lose_msg[NUM_STATS] = { 218const char *const lose_msg[NUM_STATS] = {
219 "You feel weaker!", 219 "You feel weaker!",
220 "You feel clumsy!", 220 "You feel clumsy!",
221 "You feel less healthy!", 221 "You feel less healthy!",
222 "You feel stupid!",
222 "You lose some of your memory!", 223 "You lose some of your memory!",
224 "You feel less potent!",
223 "You look ugly!", 225 "You look ugly!",
224 "You feel stupid!",
225 "You feel less potent!"
226}; 226};
227 227
228const char *const statname[NUM_STATS] = { 228const char *const statname[NUM_STATS] = {
229 "strength", "dexterity", "constitution", "intelligence", "wisdom", "power", "charisma" 229 "strength", "dexterity", "constitution", "intelligence", "wisdom", "power", "charisma"
230}; 230};
231 231
232const char *const short_stat_name[NUM_STATS] = { 232const char *const short_stat_name[NUM_STATS] = {
233 "Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha" 233 "Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha"
234}; 234};
235
236/*
237 * sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on
238 * what attr is (STR to POW).
239 */
240void
241set_attr_value (living *stats, int attr, sint8 value)
242{
243 switch (attr)
244 {
245 case STR:
246 stats->Str = value;
247 break;
248 case DEX:
249 stats->Dex = value;
250 break;
251 case CON:
252 stats->Con = value;
253 break;
254 case WIS:
255 stats->Wis = value;
256 break;
257 case POW:
258 stats->Pow = value;
259 break;
260 case CHA:
261 stats->Cha = value;
262 break;
263 case INT:
264 stats->Int = value;
265 break;
266 }
267}
268 235
269/* 236/*
270 * Like set_attr_value(), but instead the value (which can be negative) 237 * Like set_attr_value(), but instead the value (which can be negative)
271 * is added to the specified stat. 238 * is added to the specified stat.
272 */ 239 */
273void 240void
274change_attr_value (living *stats, int attr, sint8 value) 241change_attr_value (living *stats, int attr, sint8 value)
275{ 242{
276 if (value == 0) 243 stats->stat (attr) += value;
277 return;
278
279 switch (attr)
280 {
281 case STR:
282 stats->Str += value;
283 break;
284 case DEX:
285 stats->Dex += value;
286 break;
287 case CON:
288 stats->Con += value;
289 break;
290 case WIS:
291 stats->Wis += value;
292 break;
293 case POW:
294 stats->Pow += value;
295 break;
296 case CHA:
297 stats->Cha += value;
298 break;
299 case INT:
300 stats->Int += value;
301 break;
302 default:
303 LOG (llevError, "Invalid attribute in change_attr_value: %d\n", attr);
304 }
305}
306
307/*
308 * returns the specified stat. See also set_attr_value().
309 */
310
311sint8
312get_attr_value (const living *stats, int attr)
313{
314 switch (attr)
315 {
316 case STR: return stats->Str;
317 case DEX: return stats->Dex;
318 case CON: return stats->Con;
319 case WIS: return stats->Wis;
320 case CHA: return stats->Cha;
321 case INT: return stats->Int;
322 case POW: return stats->Pow;
323 }
324
325 return 0;
326} 244}
327 245
328/* 246/*
329 * Ensures that all stats (str/dex/con/wis/cha/int) are within the 247 * Ensures that all stats (str/dex/con/wis/cha/int) are within the
330 * 1-30 stat limit. 248 * 1-30 stat limit.
331 */ 249 */
332
333void 250void
334check_stat_bounds (living *stats) 251check_stat_bounds (living *stats)
335{ 252{
336 int i, v;
337
338 for (i = 0; i < NUM_STATS; i++) 253 for (int i = 0; i < NUM_STATS; i++)
339 if ((v = get_attr_value (stats, i)) > MAX_STAT) 254 {
340 set_attr_value (stats, i, MAX_STAT); 255 sint8 &v = stats->stat (i);
341 else if (v < MIN_STAT) 256 v = clamp (v, MIN_STAT, MAX_STAT);
342 set_attr_value (stats, i, MIN_STAT); 257 }
343} 258}
344 259
345#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc) 260#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc)
346 261
347/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw, 262/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,
… …
356/* flag is set to 1 if we are applying the object, -1 if we are removing 271/* flag is set to 1 if we are applying the object, -1 if we are removing
357 * the object. 272 * the object.
358 * It is the calling functions responsibilty to check to see if the object 273 * It is the calling functions responsibilty to check to see if the object
359 * can be applied or not. 274 * can be applied or not.
360 * The main purpose of calling this function is the messages that are 275 * The main purpose of calling this function is the messages that are
361 * displayed - fix_player should really always be called after this when 276 * displayed - update_stats should really always be called after this when
362 * removing an object - that is because it is impossible to know if some object 277 * removing an object - that is because it is impossible to know if some object
363 * is the only source of an attacktype or spell attunement, so this function 278 * is the only source of an attacktype or spell attunement, so this function
364 * will clear the bits, but the player may still have some other object 279 * will clear the bits, but the player may still have some other object
365 * that gives them that ability. 280 * that gives them that ability.
366 */ 281 */
367int 282int
368change_abil (object *op, object *tmp) 283change_abil (object *op, object *tmp)
369{ 284{
370 int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, i, j, success = 0; 285 int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1;
286 int success = 0;
371 char message[MAX_BUF]; 287 char message[MAX_BUF];
372 int potion_max = 0; 288 int potion_max = 0;
373 289
374 /* remember what object was like before it was changed. note that 290 // keep some stats for comparison purposes
375 * refop is a local copy of op only to be used for detecting changes 291 object::flags_t prev_flag = op->flag;
376 * found by update_stats. refop is not a real object 292 MoveType prev_move_type = op->move_type;
377 */ 293 sint16 prev_resist [NROFATTACKS]; // clumsy
378 object_copy refop = *op; 294 assert (sizeof (prev_resist) == sizeof (op->resist));
295 memcpy (prev_resist, op->resist, sizeof (prev_resist));
379 296
380 if (op->type == PLAYER) 297 if (op->type == PLAYER)
381 { 298 {
382 if (tmp->type == POTION) 299 if (tmp->type == POTION)
383 { 300 {
384 potion_max = 1; 301 potion_max = 1;
302
385 for (j = 0; j < NUM_STATS; j++) 303 for (int j = 0; j < NUM_STATS; j++)
386 { 304 {
387 int nstat, ostat; 305 int ostat = op->contr->orig_stats.stat (j);
388 306 int i = tmp->stats.stat (j);
389 ostat = get_attr_value (&(op->contr->orig_stats), j);
390 i = get_attr_value (&(tmp->stats), j);
391 307
392 /* nstat is what the stat will be after use of the potion */ 308 /* nstat is what the stat will be after use of the potion */
393 nstat = flag * i + ostat; 309 int nstat = flag * i + ostat;
394 310
395 /* Do some bounds checking. While I don't think any 311 /* Do some bounds checking. There is the potential for potions
396 * potions do so right now, there is the potential for potions
397 * that adjust that stat by more than one point, so we need 312 * that adjust that stat by more than one point, so we need
398 * to allow for that. 313 * to allow for that.
399 */ 314 */
400 if (nstat < 1 && i * flag < 0) 315 if (nstat < 1 && i * flag < 0)
401 nstat = 1; 316 nstat = 1;
402 else if (nstat > 20 + get_attr_value (&(op->arch->clone.stats), j)) 317 else if (nstat > 20 + op->arch->stats.stat (j))
403 { 318 nstat = 20 + op->arch->stats.stat (j);
404 nstat = 20 + get_attr_value (&(op->arch->clone.stats), j);
405 }
406 319
407 if (nstat != ostat) 320 if (nstat != ostat)
408 { 321 {
409 set_attr_value (&(op->contr->orig_stats), j, nstat); 322 op->contr->orig_stats.stat (j) = nstat;
410 potion_max = 0; 323 potion_max = 0;
411 } 324 }
412 else if (i) 325 else if (i)
413 { 326 {
414 /* potion is useless - player has already hit the natural maximum */ 327 /* potion is useless - player has already hit the natural maximum */
… …
418 331
419 /* This section of code ups the characters normal stats also. I am not 332 /* This section of code ups the characters normal stats also. I am not
420 * sure if this is strictly necessary, being that fix_player probably 333 * sure if this is strictly necessary, being that fix_player probably
421 * recalculates this anyway. 334 * recalculates this anyway.
422 */ 335 */
423 for (j = 0; j < NUM_STATS; j++) 336 for (int j = 0; j < NUM_STATS; j++)
424 change_attr_value (&(op->stats), j, flag * get_attr_value (&(tmp->stats), j)); 337 change_attr_value (&op->stats, j, flag * tmp->stats.stat (j));
425 338
426 check_stat_bounds (&(op->stats)); 339 check_stat_bounds (&op->stats);
427 } /* end of potion handling code */ 340 } /* end of potion handling code */
428 } 341 }
429 342
430 /* reset attributes that fix_player doesn't reset since it doesn't search 343 /* reset attributes that update_stats doesn't reset since it doesn't search
431 * everything to set 344 * everything to set
432 */ 345 */
433 if (flag == -1) 346 if (flag == -1)
434 { 347 {
435 op->attacktype &= ~tmp->attacktype; 348 op->attacktype &= ~tmp->attacktype;
436 op->path_attuned &= ~tmp->path_attuned; 349 op->path_attuned &= ~tmp->path_attuned;
437 op->path_repelled &= ~tmp->path_repelled; 350 op->path_repelled &= ~tmp->path_repelled;
438 op->path_denied &= ~tmp->path_denied; 351 op->path_denied &= ~tmp->path_denied;
439 /* Presuming here that creatures only have move_type, 352 /* Presuming here that creatures only have move_type,
440 * and not the other move_ fields. 353 * and not the other move_ fields.
441 */ 354 */
442 op->move_type &= ~tmp->move_type; 355 op->move_type &= ~tmp->move_type;
443 } 356 }
444 357
445 /* call fix_player since op object could have whatever attribute due 358 /* call fix_player since op object could have whatever attribute due
446 * to multiple items. if fix_player always has to be called after 359 * to multiple items. if update_stats always has to be called after
447 * change_ability then might as well call it from here 360 * change_ability then might as well call it from here
448 */ 361 */
449 op->update_stats (); 362 op->update_stats ();
450 363
451 /* Fix player won't add the bows ability to the player, so don't 364 /* update_stats won't add the bows ability to the player, so don't
452 * print out message if this is a bow. 365 * print out message if this is a bow.
453 */ 366 */
454 if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW) 367 if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)
455 { 368 {
456 success = 1; 369 success = 1;
457 DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red."); 370 DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red.");
458 } 371 }
459 372
460 if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE)) 373 if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
461 { 374 {
462 success = 1; 375 success = 1;
463 DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore."); 376 DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore.");
464 } 377 }
465 378
466 if (QUERY_FLAG (op, FLAG_REFL_MISSILE) != QUERY_FLAG (&refop, FLAG_REFL_MISSILE)) 379 if (op->flag [FLAG_REFL_MISSILE] != prev_flag [FLAG_REFL_MISSILE])
467 { 380 {
468 success = 1; 381 success = 1;
469 DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away."); 382 DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away.");
470 } 383 }
471 384
472 if (QUERY_FLAG (op, FLAG_REFL_SPELL) != QUERY_FLAG (&refop, FLAG_REFL_SPELL)) 385 if (op->flag [FLAG_REFL_SPELL] != prev_flag [FLAG_REFL_SPELL])
473 { 386 {
474 success = 1; 387 success = 1;
475 DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow."); 388 DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow.");
476 } 389 }
477 390
… …
479 * user has multiple items giving the same type appled like we 392 * user has multiple items giving the same type appled like we
480 * used to - that is more work than what we gain, plus messages 393 * used to - that is more work than what we gain, plus messages
481 * can be misleading (a little higher could be miscontrued from 394 * can be misleading (a little higher could be miscontrued from
482 * from fly high) 395 * from fly high)
483 */ 396 */
484 if (tmp->move_type && op->move_type != refop.move_type) 397 if (tmp->move_type && op->move_type != prev_move_type)
485 { 398 {
486 success = 1; 399 success = 1;
487 400
488 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low 401 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low
489 * status doesn't make a difference if you are flying high 402 * status doesn't make a difference if you are flying high
490 */ 403 */
491 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH)) 404 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH))
492 { 405 {
493 DIFF_MSG (flag, "You start to float in the air!.", "You float down to the ground."); 406 DIFF_MSG (flag, "You start to float in the air!", "You float down to the ground.");
494 } 407 }
495 408
496 if (tmp->move_type & MOVE_FLY_HIGH) 409 if (tmp->move_type & MOVE_FLY_HIGH)
497 { 410 {
498 /* double conditional - second case covers if you have move_fly_low - 411 /* double conditional - second case covers if you have move_fly_low -
499 * in that case, you don't actually land 412 * in that case, you don't actually land
500 */ 413 */
501 DIFF_MSG (flag, "You soar into the air air!.", 414 DIFF_MSG (flag, "You soar into the air!",
502 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground.")); 415 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
503 } 416 }
417
504 if (tmp->move_type & MOVE_SWIM) 418 if (tmp->move_type & MOVE_SWIM)
505 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming"); 419 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
506 420
507 /* Changing move status may mean you are affected by things you weren't before */ 421 /* Changing move status may mean you are affected by things you weren't before */
508 check_move_on (op, op); 422 check_move_on (op, op);
509 } 423 }
510 424
511 /* becoming UNDEAD... a special treatment for this flag. Only those not 425 /* becoming UNDEAD... a special treatment for this flag. Only those not
512 * originally undead may change their status 426 * originally undead may change their status
513 */ 427 */
514 if (!QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 428 if (!op->arch->flag [FLAG_UNDEAD])
515 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) 429 if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
516 { 430 {
517 success = 1; 431 success = 1;
518 if (flag > 0) 432 if (flag > 0)
519 { 433 {
520 op->race = "undead"; 434 op->race = "undead";
521 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!"); 435 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");
522 } 436 }
523 else 437 else
524 { 438 {
525 op->race = op->arch->clone.race; 439 op->race = op->arch->race;
526 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); 440 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
527 } 441 }
528 } 442 }
529 443
530 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH)) 444 if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
531 { 445 {
532 success = 1; 446 success = 1;
533 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily."); 447 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
534 } 448 }
535 449
536 if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS)) 450 if (op->flag [FLAG_MAKE_INVIS] != prev_flag [FLAG_MAKE_INVIS])
537 { 451 {
538 success = 1; 452 success = 1;
539 DIFF_MSG (flag, "You become transparent.", "You can see yourself."); 453 DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
540 } 454 }
541 455
542 /* blinded you can tell if more blinded since blinded player has minimal 456 /* blinded you can tell if more blinded since blinded player has minimal
543 * vision 457 * vision
544 */ 458 */
545 if (QUERY_FLAG (tmp, FLAG_BLIND)) 459 if (tmp->flag [FLAG_BLIND])
546 { 460 {
547 success = 1; 461 success = 1;
548 if (flag > 0) 462 if (flag > 0)
549 { 463 {
550 if (QUERY_FLAG (op, FLAG_WIZ)) 464 if (op->flag [FLAG_WIZ])
551 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded."); 465 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");
552 else 466 else
553 { 467 {
554 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded."); 468 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
555 SET_FLAG (op, FLAG_BLIND); 469 SET_FLAG (op, FLAG_BLIND);
… …
557 op->contr->do_los = 1; 471 op->contr->do_los = 1;
558 } 472 }
559 } 473 }
560 else 474 else
561 { 475 {
562 if (QUERY_FLAG (op, FLAG_WIZ)) 476 if (op->flag [FLAG_WIZ])
563 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again."); 477 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");
564 else 478 else
565 { 479 {
566 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns."); 480 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
567 CLEAR_FLAG (op, FLAG_BLIND); 481 CLEAR_FLAG (op, FLAG_BLIND);
… …
569 op->contr->do_los = 1; 483 op->contr->do_los = 1;
570 } 484 }
571 } 485 }
572 } 486 }
573 487
574 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) != QUERY_FLAG (&refop, FLAG_SEE_IN_DARK)) 488 if (op->flag [FLAG_SEE_IN_DARK] != prev_flag [FLAG_SEE_IN_DARK])
575 { 489 {
576 success = 1; 490 success = 1;
577 if (op->type == PLAYER) 491 if (op->type == PLAYER)
578 op->contr->do_los = 1; 492 op->contr->do_los = 1;
579 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark."); 493 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark.");
580 } 494 }
581 495
582 if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS)) 496 if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
583 { 497 {
584 success = 1; 498 success = 1;
585 if (flag > 0) 499 if (flag > 0)
586 { 500 {
587 if (QUERY_FLAG (op, FLAG_WIZ)) 501 if (op->flag [FLAG_WIZ])
588 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer."); 502 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer.");
589 else 503 else
590 { 504 {
591 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent."); 505 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
592 if (op->type == PLAYER) 506 if (op->type == PLAYER)
593 op->contr->do_los = 1; 507 op->contr->do_los = 1;
594 } 508 }
595 } 509 }
596 else 510 else
597 { 511 {
598 if (QUERY_FLAG (op, FLAG_WIZ)) 512 if (op->flag [FLAG_WIZ])
599 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus."); 513 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus.");
600 else 514 else
601 { 515 {
602 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid."); 516 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid.");
603 if (op->type == PLAYER) 517 if (op->type == PLAYER)
… …
636 success = 1; 550 success = 1;
637 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up."); 551 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
638 } 552 }
639 553
640 /* Messages for changed resistance */ 554 /* Messages for changed resistance */
641 for (i = 0; i < NROFATTACKS; i++) 555 for (int i = 0; i < NROFATTACKS; i++)
642 { 556 {
643 if (i == ATNR_PHYSICAL) 557 if (i == ATNR_PHYSICAL)
644 continue; /* Don't display about armour */ 558 continue; /* Don't display about armour */
645 559
646 if (op->resist[i] != refop.resist[i]) 560 if (op->resist [i] != prev_resist [i])
647 { 561 {
648 success = 1; 562 success = 1;
563
649 if (op->resist[i] > refop.resist[i]) 564 if (op->resist [i] > prev_resist [i])
650 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]); 565 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
651 else 566 else
652 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]); 567 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
653 568
654 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message); 569 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
655 } 570 }
656 } 571 }
657 572
658 if (!potion_max) 573 if (!potion_max)
659 {
660 for (j = 0; j < NUM_STATS; j++) 574 for (int j = 0; j < NUM_STATS; j++)
661 { 575 if (int i = tmp->stats.stat (j))
662 if ((i = get_attr_value (&(tmp->stats), j)) != 0)
663 { 576 {
664 success = 1; 577 success = 1;
665 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); 578 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
666 } 579 }
667 }
668 }
669 580
670 return success; 581 return success;
671} 582}
672 583
673/* 584/*
674 * Stat draining by Vick 930307 585 * Stat draining by Vick 930307
675 * (Feeling evil, I made it work as well now. -Frank 8) 586 * (Feeling evil, I made it work as well now. -Frank 8)
676 */ 587 */
677
678void 588void
679object::drain_stat () 589object::drain_stat ()
680{ 590{
681 drain_specific_stat (RANDOM () % NUM_STATS); 591 drain_specific_stat (rndm (NUM_STATS));
682} 592}
683 593
684void 594void
685object::drain_specific_stat (int deplete_stats) 595object::drain_specific_stat (int deplete_stats)
686{ 596{
687 object *tmp; 597 object *tmp;
688 archetype *at; 598 archetype *at;
689 599
690 at = archetype::find (ARCH_DEPLETION); 600 at = archetype::find (shstr_depletion);
691 if (!at) 601 if (!at)
692 { 602 {
693 LOG (llevError, "Couldn't find archetype depletion.\n"); 603 LOG (llevError, "Couldn't find archetype depletion.\n");
694 return; 604 return;
695 } 605 }
… …
715 * via an applied bad_luck object. 625 * via an applied bad_luck object.
716 */ 626 */
717void 627void
718object::change_luck (int value) 628object::change_luck (int value)
719{ 629{
720 archetype *at = archetype::find ("luck"); 630 archetype *at = archetype::find (shstr_luck);
721 if (!at) 631 if (!at)
722 LOG (llevError, "Couldn't find archetype luck.\n"); 632 LOG (llevError, "Couldn't find archetype luck.\n");
723 else 633 else
724 { 634 {
725 object *tmp = present_arch_in_ob (at, this); 635 object *tmp = present_arch_in_ob (at, this);
… …
754 return; 664 return;
755 665
756 /* Randomly change the players luck. Basically, we move it 666 /* Randomly change the players luck. Basically, we move it
757 * back neutral (if greater>0, subtract, otherwise add) 667 * back neutral (if greater>0, subtract, otherwise add)
758 */ 668 */
759 if (RANDOM () % (FABS (tmp->stats.luck)) >= RANDOM () % 30) 669 if (rndm (abs (tmp->stats.luck)) >= rndm (30))
760 { 670 {
761 int diff = tmp->stats.luck > 0 ? -1 : 1; 671 int diff = tmp->stats.luck > 0 ? -1 : 1;
762 672
763 stats.luck += diff; 673 stats.luck += diff;
764 tmp->stats.luck += diff; 674 tmp->stats.luck += diff;
… …
771 * Subtracts stat-bonuses given by the class which the player has chosen. 681 * Subtracts stat-bonuses given by the class which the player has chosen.
772 */ 682 */
773void 683void
774object::remove_statbonus () 684object::remove_statbonus ()
775{ 685{
776 stats.Str -= arch->clone.stats.Str; 686 for (int i = 0; i < NUM_STATS; ++i)
777 stats.Dex -= arch->clone.stats.Dex; 687 {
778 stats.Con -= arch->clone.stats.Con; 688 sint8 v = arch->stats.stat (i);
779 stats.Wis -= arch->clone.stats.Wis; 689 stats.stat (i) -= v;
780 stats.Pow -= arch->clone.stats.Pow; 690 contr->orig_stats.stat (i) -= v;
781 stats.Cha -= arch->clone.stats.Cha; 691 }
782 stats.Int -= arch->clone.stats.Int;
783
784 contr->orig_stats.Str -= arch->clone.stats.Str;
785 contr->orig_stats.Dex -= arch->clone.stats.Dex;
786 contr->orig_stats.Con -= arch->clone.stats.Con;
787 contr->orig_stats.Wis -= arch->clone.stats.Wis;
788 contr->orig_stats.Pow -= arch->clone.stats.Pow;
789 contr->orig_stats.Cha -= arch->clone.stats.Cha;
790 contr->orig_stats.Int -= arch->clone.stats.Int;
791} 692}
792 693
793/* 694/*
794 * Adds stat-bonuses given by the class which the player has chosen. 695 * Adds stat-bonuses given by the class which the player has chosen.
795 */ 696 */
796void 697void
797object::add_statbonus () 698object::add_statbonus ()
798{ 699{
799 stats.Str += arch->clone.stats.Str; 700 for (int i = 0; i < NUM_STATS; ++i)
800 stats.Dex += arch->clone.stats.Dex; 701 {
801 stats.Con += arch->clone.stats.Con; 702 sint8 v = arch->stats.stat (i);
802 stats.Wis += arch->clone.stats.Wis; 703 stats.stat (i) += v;
803 stats.Pow += arch->clone.stats.Pow; 704 contr->orig_stats.stat (i) += v;
804 stats.Cha += arch->clone.stats.Cha; 705 }
805 stats.Int += arch->clone.stats.Int;
806
807 contr->orig_stats.Str += arch->clone.stats.Str;
808 contr->orig_stats.Dex += arch->clone.stats.Dex;
809 contr->orig_stats.Con += arch->clone.stats.Con;
810 contr->orig_stats.Wis += arch->clone.stats.Wis;
811 contr->orig_stats.Pow += arch->clone.stats.Pow;
812 contr->orig_stats.Cha += arch->clone.stats.Cha;
813 contr->orig_stats.Int += arch->clone.stats.Int;
814} 706}
707
708/* These are the items that currently can change digestion, regeneration,
709 * spell point recovery and mana point recovery. Seems sort of an arbitary
710 * list, but other items store other info into stats array.
711 */
712static struct digest_types : std::bitset<NUM_TYPES>
713{
714 digest_types ()
715 {
716 set (WEAPON);
717 set (BOW);
718 set (ARMOUR);
719 set (HELMET);
720 set (SHIELD);
721 set (RING);
722 set (BOOTS);
723 set (GLOVES);
724 set (AMULET);
725 set (GIRDLE);
726 set (BRACERS);
727 set (CLOAK);
728 set (DISEASE);
729 set (FORCE);
730 set (SKILL);
731 }
732} digest_types;
733
734static struct copy_flags : object::flags_t
735{
736 copy_flags ()
737 {
738 set (FLAG_LIFESAVE);
739 set (FLAG_REFL_SPELL);
740 set (FLAG_REFL_MISSILE);
741 set (FLAG_STEALTH);
742 set (FLAG_XRAYS);
743 set (FLAG_BLIND);
744 set (FLAG_SEE_IN_DARK);
745 }
746} copy_flags;
815 747
816/* 748/*
817 * Updates all abilities given by applied objects in the inventory 749 * Updates all abilities given by applied objects in the inventory
818 * of the given object. Note: This function works for both monsters 750 * of the given object. Note: This function works for both monsters
819 * and players; the "player" in the name is purely an archaic inheritance. 751 * and players; the "player" in the name is purely an archaic inheritance.
820 * This functions starts from base values (archetype or player object) 752 * This functions starts from base values (archetype or player object)
821 * and then adjusts them according to what the player has equipped. 753 * and then adjusts them according to what the player has equipped.
822 */ 754 *
823
824/* July 95 - inserted stuff to handle new skills/exp system - b.t. 755 * July 95 - inserted stuff to handle new skills/exp system - b.t.
825 spell system split, grace points now added to system --peterm 756 * spell system split, grace points now added to system --peterm
826 */ 757 */
827
828void 758void
829object::update_stats () 759object::update_stats ()
830{ 760{
831 int i, j;
832 float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; 761 float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
833 int weapon_weight = 0, weapon_speed = 0; 762 int weapon_weight = 0, weapon_speed = 0;
834 int best_wc = 0, best_ac = 0, wc = 0, ac = 0; 763 int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
835 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 764 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
836 object *grace_obj = NULL, *mana_obj = NULL, *wc_obj = NULL, *tmp; 765 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
837 float old_speed = speed; 766 float old_speed = speed;
767 int stat_sum [NUM_STATS];
838 768
839 /* First task is to clear all the values back to their original values */ 769 /* First task is to clear all the values back to their original values */
840 if (type == PLAYER) 770 if (type == PLAYER)
841 { 771 {
772 contr->delayed_update = false;
773
842 for (i = 0; i < NUM_STATS; i++) 774 for (int i = 0; i < NUM_STATS; i++)
843 set_attr_value (&(stats), i, get_attr_value (&(contr->orig_stats), i)); 775 stat_sum [i] = contr->orig_stats.stat (i);
844 776
845 if (settings.spell_encumbrance == TRUE) 777 if (settings.spell_encumbrance == TRUE)
846 contr->encumbrance = 0; 778 contr->encumbrance = 0;
847 779
848 attacktype = 0; 780 attacktype = 0;
781
849 contr->digestion = 0; 782 contr->digestion = 0;
850 contr->gen_hp = 0; 783 contr->gen_hp = 0;
851 contr->gen_sp = 0; 784 contr->gen_sp = 0;
852 contr->gen_grace = 0; 785 contr->gen_grace = 0;
853 contr->gen_sp_armour = 10; 786 contr->gen_sp_armour = 10;
854 contr->item_power = 0; 787 contr->item_power = 0;
855
856 /* Don't clobber all the range_ values. range_golem otherwise
857 * gets reset for no good reason, and we don't want to reset
858 * range_magic (what spell is readied). These three below
859 * well get filled in based on what the player has equipped.
860 */
861 contr->ranges[range_bow] = NULL;
862 contr->ranges[range_misc] = NULL;
863 contr->ranges[range_skill] = NULL;
864 } 788 }
865 789
866 memcpy (body_used, body_info, sizeof (body_info)); 790 for (int i = NUM_BODY_LOCATIONS; i--; )
791 slot[i].used = slot[i].info;
867 792
868 slaying = 0; 793 slaying = 0;
869 794
870 if (!QUERY_FLAG (this, FLAG_WIZ)) 795 if (!QUERY_FLAG (this, FLAG_WIZ))
871 { 796 {
… …
875 800
876 CLEAR_FLAG (this, FLAG_LIFESAVE); 801 CLEAR_FLAG (this, FLAG_LIFESAVE);
877 CLEAR_FLAG (this, FLAG_STEALTH); 802 CLEAR_FLAG (this, FLAG_STEALTH);
878 CLEAR_FLAG (this, FLAG_BLIND); 803 CLEAR_FLAG (this, FLAG_BLIND);
879 804
880 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); 805 if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
881 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); 806 if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
882 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 807 if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
883 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); 808 if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
884 809
885 path_attuned = arch->clone.path_attuned; 810 path_attuned = arch->path_attuned;
886 path_repelled = arch->clone.path_repelled; 811 path_repelled = arch->path_repelled;
887 path_denied = arch->clone.path_denied; 812 path_denied = arch->path_denied;
888 glow_radius = arch->clone.glow_radius; 813 glow_radius = arch->glow_radius;
889 move_type = arch->clone.move_type; 814 move_type = arch->move_type;
815
890 chosen_skill = NULL; 816 chosen_skill = 0;
891 817
892 /* initializing resistances from the values in player/monster's 818 /* initializing resistances from the values in player/monster's
893 * archetype clone 819 * archetype clone
894 */ 820 */
895 memcpy (&resist, &arch->clone.resist, sizeof (resist)); 821 memcpy (&resist, &arch->resist, sizeof (resist));
896 822
897 for (i = 0; i < NROFATTACKS; i++) 823 for (int i = 0; i < NROFATTACKS; i++)
898 { 824 {
899 if (resist[i] > 0) 825 if (resist[i] > 0)
900 prot[i] = resist[i], vuln[i] = 0; 826 prot[i] = resist[i], vuln[i] = 0;
901 else 827 else
902 vuln[i] = -(resist[i]), prot[i] = 0; 828 vuln[i] = -(resist[i]), prot[i] = 0;
829
903 potion_resist[i] = 0; 830 potion_resist[i] = 0;
904 } 831 }
905 832
906 wc = arch->clone.stats.wc; 833 wc = arch->stats.wc;
907 stats.dam = arch->clone.stats.dam; 834 stats.dam = arch->stats.dam;
908 835
909 /* for players which cannot use armour, they gain AC -1 per 3 levels, 836 /* for players which cannot use armour, they gain AC -1 per 3 levels,
910 * plus a small amount of physical resist, those poor suckers. ;) 837 * plus a small amount of physical resist, those poor suckers. ;)
911 * the fact that maxlevel is factored in could be considered sort of bogus - 838 * the fact that maxlevel is factored in could be considered sort of bogus -
912 * we should probably give them some bonus and cap it off - otherwise, 839 * we should probably give them some bonus and cap it off - otherwise,
913 * basically, if a server updates its max level, these playes may find 840 * basically, if a server updates its max level, these playes may find
914 * that their protection from physical goes down 841 * that their protection from physical goes down
915 */ 842 */
916 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER) 843 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
917 { 844 {
918 ac = MAX (-10, arch->clone.stats.ac - level / 3); 845 ac = max (-10, arch->stats.ac - level / 3);
919 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100; 846 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
920 } 847 }
921 else 848 else
922 ac = arch->clone.stats.ac; 849 ac = arch->stats.ac;
923 850
924 stats.luck = arch->clone.stats.luck; 851 stats.luck = arch->stats.luck;
925 speed = arch->clone.speed; 852 speed = arch->speed;
926 853
927 /* OK - we've reset most all the objects attributes to sane values. 854 /* OK - we've reset most all the objects attributes to sane values.
928 * now go through and make adjustments for what the player has equipped. 855 * now go through and make adjustments for what the player has equipped.
929 */ 856 */
930
931 for (tmp = inv; tmp; tmp = tmp->below) 857 for (tmp = inv; tmp; tmp = tmp->below)
932 { 858 {
933 /* See note in map.c:update_position about making this additive
934 * since light sources are never applied, need to put check here.
935 */
936 if (tmp->glow_radius > glow_radius)
937 glow_radius = tmp->glow_radius;
938
939 /* This happens because apply_potion calls change_abil with the potion 859 /* This happens because apply_potion calls change_abil with the potion
940 * applied so we can tell the player what chagned. But change_abil 860 * applied so we can tell the player what changed. But change_abil
941 * then calls this function. 861 * then calls this function.
942 */ 862 */
943 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 863 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
944 continue; 864 continue;
865
866 glow_radius += tmp->glow_radius;
945 867
946 /* For some things, we don't care what is equipped */ 868 /* For some things, we don't care what is equipped */
947 if (tmp->type == SKILL) 869 if (tmp->type == SKILL)
948 { 870 {
949 /* Want to take the highest skill here. */ 871 /* Want to take the highest skill here. */
… …
962 else if (tmp->level > grace_obj->level) 884 else if (tmp->level > grace_obj->level)
963 grace_obj = tmp; 885 grace_obj = tmp;
964 } 886 }
965 } 887 }
966 888
967 /* Container objects are not meant to adjust a players, but other applied 889 /* Container objects are not meant to adjust players, but other applied
968 * objects need to make adjustments. 890 * objects need to make adjustments.
969 * This block should handle all player specific changes 891 * This block should handle all player specific changes
970 * The check for Praying is a bit of a hack - god given bonuses are put 892 * The check for Praying is a bit of a hack - god given bonuses are put
971 * in the praying skill, and the player should always get those. 893 * in the praying skill, and the player should always get those.
972 * It also means we need to put in additional checks for applied below, 894 * It also means we need to put in additional checks for applied below,
973 * because the skill shouldn't count against body positions being used 895 * because the skill shouldn't count against body positions being used
974 * up, etc. 896 * up, etc.
975 */ 897 */
976 if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) || 898 if ((tmp->flag [FLAG_APPLIED]
899 && tmp->type != CONTAINER
900 && tmp->type != CLOSE_CON)
901 || (tmp->type == SKILL
977 (tmp->type == SKILL && tmp->subtype == SK_PRAYING)) 902 && tmp->subtype == SK_PRAYING))
978 { 903 {
979 if (type == PLAYER) 904 if (type == PLAYER)
980 { 905 {
981 if (tmp->type == BOW) 906 contr->item_power += tmp->item_power;
982 contr->ranges[range_bow] = tmp;
983 907
984 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 908 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
985 contr->ranges[range_misc] = tmp; 909 if (tmp != current_weapon
910 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
911 && !tmp->flag [FLAG_CURSED]
912 && !tmp->flag [FLAG_DAMNED])
913 continue;
986 914
987 for (i = 0; i < NUM_STATS; i++) 915 for (int i = 0; i < NUM_STATS; i++)
988 change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), i)); 916 stat_sum [i] += tmp->stats.stat (i);
989 917
990 /* these are the items that currently can change digestion, regeneration, 918 if (digest_types [tmp->type])
991 * spell point recovery and mana point recovery. Seems sort of an arbitary
992 * list, but other items store other info into stats array.
993 */
994 if ((tmp->type == WEAPON) ||
995 (tmp->type == ARMOUR) || (tmp->type == HELMET) ||
996 (tmp->type == SHIELD) || (tmp->type == RING) ||
997 (tmp->type == BOOTS) || (tmp->type == GLOVES) ||
998 (tmp->type == AMULET) || (tmp->type == GIRDLE) ||
999 (tmp->type == BRACERS) || (tmp->type == CLOAK) ||
1000 (tmp->type == DISEASE) || (tmp->type == FORCE) ||
1001 (tmp->type == SKILL))
1002 { 919 {
1003 contr->digestion += tmp->stats.food; 920 contr->digestion += tmp->stats.food;
1004 contr->gen_hp += tmp->stats.hp; 921 contr->gen_hp += tmp->stats.hp;
922 if (tmp->type != BOW) // ugly exception for bows
1005 contr->gen_sp += tmp->stats.sp; 923 contr->gen_sp += tmp->stats.sp;
1006 contr->gen_grace += tmp->stats.grace; 924 contr->gen_grace += tmp->stats.grace;
1007 contr->gen_sp_armour += tmp->gen_sp_armour; 925 contr->gen_sp_armour += tmp->gen_sp_armour;
1008 contr->item_power += tmp->item_power;
1009 } 926 }
1010 } /* if this is a player */ 927 } /* if this is a player */
928 else
929 {
930 if (tmp->type == WEAPON)
931 current_weapon = tmp;
932 }
1011 933
1012 /* Update slots used for items */ 934 /* Update slots used for items */
1013 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 935 if (QUERY_FLAG (tmp, FLAG_APPLIED))
1014 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 936 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1015 body_used[i] += tmp->body_info[i]; 937 slot[i].used += tmp->slot[i].info;
1016 938
1017 if (tmp->type == SYMPTOM) 939 if (tmp->type == SYMPTOM)
1018 {
1019 speed_reduce_from_disease = tmp->last_sp / 100.0;
1020 if (speed_reduce_from_disease == 0)
1021 speed_reduce_from_disease = 1; 940 speed_reduce_from_disease =
1022 } 941 min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
1023 942
1024 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 943 /* Pos. and neg. protections are counted separate (-> pro/vuln).
1025 * (Negative protections are calculated extactly like positive.) 944 * (Negative protections are calculated exactly like positive.)
1026 * Resistance from potions are treated special as well. If there's 945 * Resistance from potions are treated special as well. If there's
1027 * more than one potion-effect, the bigger prot.-value is taken. 946 * more than one potion-effect, the bigger prot.-value is taken.
1028 */ 947 */
1029 if (tmp->type != POTION) 948 if (tmp->type != POTION)
1030 { 949 {
1031 for (i = 0; i < NROFATTACKS; i++) 950 for (int i = 0; i < NROFATTACKS; i++)
1032 { 951 {
1033 /* Potential for cursed potions, in which case we just can use 952 /* Potential for cursed potions, in which case we just can use
1034 * a straight MAX, as potion_resist is initialised to zero. 953 * a straight MAX, as potion_resist is initialised to zero.
1035 */ 954 */
1036 if (tmp->type == POTION_EFFECT) 955 if (tmp->type == POTION_EFFECT)
1037 { 956 {
1038 if (potion_resist[i]) 957 if (potion_resist[i])
1039 potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]); 958 potion_resist[i] = max (potion_resist[i], tmp->resist[i]);
1040 else 959 else
1041 potion_resist[i] = tmp->resist[i]; 960 potion_resist[i] = tmp->resist[i];
1042 } 961 }
1043 else if (tmp->resist[i] > 0) 962 else if (tmp->resist[i] > 0)
1044 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; 963 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
1045 else if (tmp->resist[i] < 0) 964 else if (tmp->resist[i] < 0)
1046 vuln[i] += ((100 - vuln[i]) * (-tmp->resist[i])) / 100; 965 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
1047 } 966 }
1048 } 967 }
1049 968
1050 /* There may be other things that should not adjust the attacktype */ 969 /* There may be other things that should not adjust the attacktype */
1051 if (tmp->type != BOW && tmp->type != SYMPTOM) 970 if (tmp->type != SYMPTOM)
971 {
1052 attacktype |= tmp->attacktype; 972 attacktype |= tmp->attacktype;
1053
1054 path_attuned |= tmp->path_attuned; 973 path_attuned |= tmp->path_attuned;
1055 path_repelled |= tmp->path_repelled; 974 path_repelled |= tmp->path_repelled;
1056 path_denied |= tmp->path_denied; 975 path_denied |= tmp->path_denied;
976 move_type |= tmp->move_type;
1057 stats.luck += tmp->stats.luck; 977 stats.luck += tmp->stats.luck;
1058 move_type |= tmp->move_type; 978 }
1059 979
1060 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 980 flag |= tmp->flag & copy_flags;
1061 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1062 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1063 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
1064 if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
1065 if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
1066 if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
1067 981
1068 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD)) 982 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
1069 SET_FLAG (this, FLAG_UNDEAD); 983 SET_FLAG (this, FLAG_UNDEAD);
1070 984
1071 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) 985 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
1072 { 986 {
1073 SET_FLAG (this, FLAG_MAKE_INVIS); 987 SET_FLAG (this, FLAG_MAKE_INVIS);
… …
1076 990
1077 if (tmp->stats.exp && tmp->type != SKILL) 991 if (tmp->stats.exp && tmp->type != SKILL)
1078 { 992 {
1079 if (tmp->stats.exp > 0) 993 if (tmp->stats.exp > 0)
1080 { 994 {
1081 added_speed += (float) tmp->stats.exp / 3.0; 995 added_speed += tmp->stats.exp / 3.f;
1082 bonus_speed += 1.0 + (float) tmp->stats.exp / 3.0; 996 bonus_speed += tmp->stats.exp / 3.f + 1.f;
1083 } 997 }
1084 else 998 else
1085 added_speed += (float) tmp->stats.exp; 999 added_speed += tmp->stats.exp;
1086 } 1000 }
1087 1001
1088 switch (tmp->type) 1002 switch (tmp->type)
1089 { 1003 {
1004#if 0
1005 case WAND:
1006 case ROD:
1007 case HORN:
1008 if (type != PLAYER || current_weapon == tmp)
1009 chosen_skill = tmp;
1010 break;
1011#endif
1012
1090 /* skills modifying the character -b.t. */ 1013 /* skills modifying the character -b.t. */
1091 /* for all skills and skill granting objects */ 1014 /* for all skills and skill granting objects */
1092 case SKILL: 1015 case SKILL:
1093 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 1016 {
1017 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)
1094 break; 1018 break;
1095 1019
1096 if (IS_COMBAT_SKILL (tmp->subtype))
1097 wc_obj = tmp;
1098
1099 if (chosen_skill) 1020 if (chosen_skill)
1021 {
1100 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 1022 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
1023 &name, &chosen_skill->name, &tmp->name);
1101 1024
1025 tmp->flag [FLAG_APPLIED] = false;
1026 update_stats ();
1027 return;
1028 }
1029 else
1102 chosen_skill = tmp; 1030 chosen_skill = tmp;
1103 1031
1104 if (tmp->stats.dam > 0) 1032 if (tmp->stats.dam > 0)
1105 { /* skill is a 'weapon' */ 1033 { /* skill is a 'weapon' */
1106 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1034 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1107 weapon_speed = (int) WEAPON_SPEED (tmp); 1035 weapon_speed = WEAPON_SPEED (tmp);
1108 1036
1109 if (weapon_speed < 0) 1037 if (weapon_speed < 0)
1110 weapon_speed = 0; 1038 weapon_speed = 0;
1111 1039
1112 weapon_weight = tmp->weight; 1040 weapon_weight = tmp->weight;
1113 stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9)); 1041 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1114 1042
1115 if (tmp->magic) 1043 if (tmp->magic)
1116 stats.dam += tmp->magic; 1044 stats.dam += tmp->magic;
1117 } 1045 }
1118 1046
1119 if (tmp->stats.wc) 1047 if (tmp->stats.wc)
1120 wc -= (tmp->stats.wc + tmp->magic); 1048 wc -= tmp->stats.wc + tmp->magic;
1121 1049
1122 if (tmp->slaying != NULL) 1050 if (tmp->slaying)
1123 slaying = tmp->slaying; 1051 slaying = tmp->slaying;
1124 1052
1125 if (tmp->stats.ac) 1053 if (tmp->stats.ac)
1126 ac -= (tmp->stats.ac + tmp->magic); 1054 ac -= tmp->stats.ac + tmp->magic;
1127 1055
1128 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1056 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1129 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1057 contr->encumbrance += (int) 3 *tmp->weight / 1000;
1130
1131 if (type == PLAYER)
1132 contr->ranges[range_skill] = this;
1133
1134 break; 1058 }
1135 1059
1136 case SKILL_TOOL:
1137 if (chosen_skill)
1138 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1139
1140 chosen_skill = tmp;
1141
1142 if (type == PLAYER)
1143 contr->ranges[range_skill] = this;
1144 break; 1060 break;
1145 1061
1146 case SHIELD: 1062 case SHIELD:
1147 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1063 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1148 contr->encumbrance += (int) tmp->weight / 2000; 1064 contr->encumbrance += (int) tmp->weight / 2000;
… …
1152 case HELMET: 1068 case HELMET:
1153 case BOOTS: 1069 case BOOTS:
1154 case GLOVES: 1070 case GLOVES:
1155 case CLOAK: 1071 case CLOAK:
1156 if (tmp->stats.wc) 1072 if (tmp->stats.wc)
1157 wc -= (tmp->stats.wc + tmp->magic); 1073 wc -= tmp->stats.wc + tmp->magic;
1158 1074
1159 if (tmp->stats.dam) 1075 if (tmp->stats.dam)
1160 stats.dam += (tmp->stats.dam + tmp->magic); 1076 stats.dam += tmp->stats.dam + tmp->magic;
1161 1077
1162 if (tmp->stats.ac) 1078 if (tmp->stats.ac)
1163 ac -= (tmp->stats.ac + tmp->magic); 1079 ac -= tmp->stats.ac + tmp->magic;
1164 1080
1165 break; 1081 break;
1166 1082
1083 case BOW:
1167 case WEAPON: 1084 case WEAPON:
1085 if (type != PLAYER || current_weapon == tmp)
1086 {
1168 wc -= (tmp->stats.wc + tmp->magic); 1087 wc -= tmp->stats.wc + tmp->magic;
1169 1088
1170 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1089 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1171 ac -= tmp->stats.ac + tmp->magic; 1090 ac -= tmp->stats.ac + tmp->magic;
1172 1091
1173 stats.dam += (tmp->stats.dam + tmp->magic); 1092 stats.dam += tmp->stats.dam + tmp->magic;
1174 weapon_weight = tmp->weight; 1093 weapon_weight = tmp->weight;
1175 weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; 1094 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1176 1095
1177 if (weapon_speed < 0) 1096 if (weapon_speed < 0)
1178 weapon_speed = 0; 1097 weapon_speed = 0;
1179 1098
1180 slaying = tmp->slaying; 1099 slaying = tmp->slaying;
1100
1181 /* If there is desire that two handed weapons should do 1101 /* If there is desire that two handed weapons should do
1182 * extra strength damage, this is where the code should 1102 * extra strength damage, this is where the code should
1183 * go. 1103 * go.
1184 */ 1104 */
1185 current_weapon = tmp; 1105
1186 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1106 if (type == PLAYER)
1107 if (settings.spell_encumbrance)
1187 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1108 contr->encumbrance += tmp->weight * 3 / 1000;
1109 }
1188 1110
1189 break; 1111 break;
1190 1112
1191 case ARMOUR: /* Only the best of these three are used: */ 1113 case ARMOUR: /* Only the best of these three are used: */
1192 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1114 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1193 contr->encumbrance += (int) tmp->weight / 1000; 1115 contr->encumbrance += tmp->weight / 1000;
1194 1116
1195 case BRACERS: 1117 case BRACERS:
1196 case FORCE: 1118 case FORCE:
1197 if (tmp->stats.wc) 1119 if (tmp->stats.wc)
1198 { 1120 {
… …
1215 else /* To nullify the below effect */ 1137 else /* To nullify the below effect */
1216 ac += tmp->stats.ac + tmp->magic; 1138 ac += tmp->stats.ac + tmp->magic;
1217 } 1139 }
1218 1140
1219 if (tmp->stats.wc) 1141 if (tmp->stats.wc)
1220 wc -= (tmp->stats.wc + tmp->magic); 1142 wc -= tmp->stats.wc + tmp->magic;
1221 1143
1222 if (tmp->stats.ac) 1144 if (tmp->stats.ac)
1223 ac -= (tmp->stats.ac + tmp->magic); 1145 ac -= tmp->stats.ac + tmp->magic;
1224 1146
1225 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max) 1147 if (ARMOUR_SPEED (tmp))
1226 max = ARMOUR_SPEED (tmp) / 10.0; 1148 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1227 1149
1228 break; 1150 break;
1229 } /* switch tmp->type */ 1151 } /* switch tmp->type */
1230 } /* item is equipped */ 1152 } /* item is equipped */
1231 } /* for loop of items */ 1153 } /* for loop of items */
1154
1155 glow_radius = min (glow_radius, MAX_LIGHT_RADIUS);
1232 1156
1233 /* We've gone through all the objects the player has equipped. For many things, we 1157 /* We've gone through all the objects the player has equipped. For many things, we
1234 * have generated intermediate values which we now need to assign. 1158 * have generated intermediate values which we now need to assign.
1235 */ 1159 */
1236 1160
… …
1238 * If there is an uncursed potion in effect, granting more protection 1162 * If there is an uncursed potion in effect, granting more protection
1239 * than that, we take: 'total resistance = resistance from potion'. 1163 * than that, we take: 'total resistance = resistance from potion'.
1240 * If there is a cursed (and no uncursed) potion in effect, we take 1164 * If there is a cursed (and no uncursed) potion in effect, we take
1241 * 'total resistance = vulnerability from cursed potion'. 1165 * 'total resistance = vulnerability from cursed potion'.
1242 */ 1166 */
1243 for (i = 0; i < NROFATTACKS; i++) 1167 for (int i = 0; i < NROFATTACKS; i++)
1244 { 1168 {
1245 resist[i] = prot[i] - vuln[i]; 1169 resist[i] = prot[i] - vuln[i];
1246 1170
1247 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) 1171 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0)))
1248 resist[i] = potion_resist[i]; 1172 resist[i] = potion_resist[i];
1249 } 1173 }
1250 1174
1251 /* Figure out the players sp/mana/hp totals. */
1252 if (type == PLAYER) 1175 if (type == PLAYER)
1253 { 1176 {
1177 // clamp various player stats
1178 for (int i = 0; i < NUM_STATS; ++i)
1179 stats.stat (i) = stat_sum [i];
1180
1181 check_stat_bounds (&stats);
1182
1183 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1184
1185 /* Figure out the players sp/mana/hp totals. */
1254 int pl_level; 1186 int pl_level;
1255 1187
1256 check_stat_bounds (&(stats));
1257 pl_level = level;
1258
1259 if (pl_level < 1)
1260 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1188 pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1261 1189
1262 /* You basically get half a con bonus/level. But we do take into account rounding, 1190 /* You basically get half a con bonus/level. But we do take into account rounding,
1263 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. 1191 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1264 */ 1192 */
1265 for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++) 1193 stats.maxhp = 0;
1194 for (int i = 1; i <= min (10, pl_level); i++)
1266 { 1195 {
1267 j = contr->levhp[i] + con_bonus[stats.Con] / 2; 1196 int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1268 1197
1269 if (i % 2 && con_bonus[stats.Con] % 2) 1198 if (i % 2 && con_bonus[stats.Con] % 2)
1270 {
1271 if (con_bonus[stats.Con] > 0) 1199 if (con_bonus[stats.Con] > 0)
1272 j++; 1200 j++;
1273 else 1201 else
1274 j--; 1202 j--;
1275 }
1276 1203
1277 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */ 1204 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1278 } 1205 }
1279 1206
1280 for (i = 11; i <= level; i++) 1207 stats.maxhp += 2 * max (0, level - 10);
1281 stats.maxhp += 2;
1282 1208
1283 if (stats.hp > stats.maxhp) 1209 if (stats.hp > stats.maxhp)
1284 stats.hp = stats.maxhp; 1210 stats.hp = stats.maxhp;
1285 1211
1286 /* Sp gain is controlled by the level of the player's 1212 /* Sp gain is controlled by the level of the player's
… …
1299 1225
1300 if (mana_obj == this && type == PLAYER) 1226 if (mana_obj == this && type == PLAYER)
1301 stats.maxsp = 1; 1227 stats.maxsp = 1;
1302 else 1228 else
1303 { 1229 {
1304 sp_tmp = 0.0; 1230 float sp_tmp = 0.f;
1305 1231
1306 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1232 for (int i = 1; i <= min (10, mana_obj->level); i++)
1307 { 1233 {
1308 float stmp; 1234 float stmp;
1309 1235
1310 /* Got some extra bonus at first level */ 1236 /* Got some extra bonus at first level */
1311 if (i < 2) 1237 if (i < 2)
1312 stmp = contr->levsp[i] + ((2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 6.0); 1238 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1313 else 1239 else
1314 stmp = (float) contr->levsp[i] + (2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 12.0; 1240 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1315 1241
1316 if (stmp < 1.0)
1317 stmp = 1.0;
1318
1319 sp_tmp += stmp; 1242 sp_tmp += max (1.f, stmp);
1320 } 1243 }
1321 1244
1322 stats.maxsp = (int) sp_tmp; 1245 stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1323
1324 for (i = 11; i <= mana_obj->level; i++)
1325 stats.maxsp += 2;
1326 } 1246 }
1247
1327 /* Characters can get their sp supercharged via rune of transferrance */ 1248 /* Characters can get their sp supercharged via rune of transferrance */
1328 if (stats.sp > stats.maxsp * 2) 1249 stats.sp = min (stats.sp, stats.maxsp * 2);
1329 stats.sp = stats.maxsp * 2;
1330 1250
1331 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */ 1251 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1332 if (!grace_obj || !grace_obj->level || type != PLAYER) 1252 if (!grace_obj || !grace_obj->level || type != PLAYER)
1333 grace_obj = this; 1253 grace_obj = this;
1334 1254
… …
1339 /* store grace in a float - this way, the divisions below don't create 1259 /* store grace in a float - this way, the divisions below don't create
1340 * big jumps when you go from level to level - with int's, it then 1260 * big jumps when you go from level to level - with int's, it then
1341 * becomes big jumps when the sums of the bonuses jump to the next 1261 * becomes big jumps when the sums of the bonuses jump to the next
1342 * step of 8 - with floats, even fractional ones are useful. 1262 * step of 8 - with floats, even fractional ones are useful.
1343 */ 1263 */
1344 sp_tmp = 0.0; 1264 float sp_tmp = 0.f;
1345 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) 1265
1266 for (int i = 1; i <= min (10, grace_obj->level); i++)
1346 { 1267 {
1347 float grace_tmp = 0.0; 1268 float grace_tmp = 0.f;
1348 1269
1349 /* Got some extra bonus at first level */ 1270 /* Got some extra bonus at first level */
1350 if (i < 2) 1271 if (i < 2)
1351 grace_tmp = contr->levgrace[i] + (((float) grace_bonus[stats.Pow] + 1272 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1352 2.0 * (float) grace_bonus[stats.Wis]) / 6.0);
1353 else 1273 else
1354 grace_tmp = (float) contr->levgrace[i]
1355 + ((float) grace_bonus[stats.Pow] + 2.0 * (float) grace_bonus[stats.Wis]) / 12.0; 1274 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1356 1275
1357 if (grace_tmp < 1.0)
1358 grace_tmp = 1.0;
1359
1360 sp_tmp += grace_tmp; 1276 sp_tmp += max (1.f, grace_tmp);
1361 } 1277 }
1362 1278
1363 stats.maxgrace = (int) sp_tmp;
1364
1365 /* two grace points per level after 11 */ 1279 /* two grace points per level after 10 */
1366 for (i = 11; i <= grace_obj->level; i++) 1280 stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1367 stats.maxgrace += 2;
1368 } 1281 }
1282
1369 /* No limit on grace vs maxgrace */ 1283 /* No limit on grace vs maxgrace */
1370 1284
1371 if (contr->braced) 1285 if (contr->braced)
1372 { 1286 {
1373 ac += 2; 1287 ac += 2;
… …
1385 * improvement every level, now its fighterlevel/5. So 1299 * improvement every level, now its fighterlevel/5. So
1386 * we give the player a bonus here in wc and dam 1300 * we give the player a bonus here in wc and dam
1387 * to make up for the change. Note that I left the 1301 * to make up for the change. Note that I left the
1388 * monster bonus the same as before. -b.t. 1302 * monster bonus the same as before. -b.t.
1389 */ 1303 */
1304 object *wc_obj = chosen_skill;
1390 1305
1391 if (type == PLAYER && wc_obj && wc_obj->level > 1) 1306 if (contr && wc_obj && wc_obj->level > 1)
1392 { 1307 {
1393 wc -= (wc_obj->level + thaco_bonus[stats.Str]); 1308 wc -= wc_obj->level + thaco_bonus[stats.Str];
1309
1394 for (i = 1; i < wc_obj->level; i++) 1310 for (int i = 1; i < wc_obj->level; i++)
1395 { 1311 {
1396 /* addtional wc every 6 levels */ 1312 /* additional wc every 6 levels */
1397 if (!(i % 6)) 1313 if (!(i % 6))
1398 wc--; 1314 wc--;
1315
1399 /* addtional dam every 4 levels. */ 1316 /* additional dam every 4 levels. */
1400 if (!(i % 4) && (dam_bonus[stats.Str] >= 0)) 1317 if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1401 stats.dam += (1 + (dam_bonus[stats.Str] / 5)); 1318 stats.dam += 1 + dam_bonus[stats.Str] / 5;
1402 } 1319 }
1403 } 1320 }
1404 else 1321 else
1405 wc -= (level + thaco_bonus[stats.Str]); 1322 wc -= level + thaco_bonus[stats.Str];
1406 1323
1407 stats.dam += dam_bonus[stats.Str]; 1324 stats.dam += dam_bonus[stats.Str];
1408 1325
1409 if (stats.dam < 1) 1326 if (stats.dam < 1)
1410 stats.dam = 1; 1327 stats.dam = 1;
1411 1328
1412 speed = 1.0 + speed_bonus[stats.Dex]; 1329 speed = 1.f + speed_bonus[stats.Dex];
1413 1330
1414 if (settings.search_items && contr->search_str[0]) 1331 if (settings.search_items && contr->search_str[0])
1415 speed -= 1; 1332 speed -= 1;
1416
1417 if (attacktype == 0)
1418 attacktype = arch->clone.attacktype;
1419
1420 } /* End if player */ 1333 } /* End if player */
1421 1334
1422 if (added_speed >= 0) 1335 if (added_speed >= 0)
1423 speed += added_speed / 10.0; 1336 speed += added_speed / 10.f;
1424 else /* Something wrong here...: */ 1337 else /* Something wrong here...: */
1425 speed /= (float) (1.0 - added_speed); 1338 speed /= 1.f - added_speed;
1426 1339
1427 /* Max is determined by armour */ 1340 /* Max is determined by armour */
1428 if (speed > max) 1341 speed = min (speed, max_speed);
1429 speed = max;
1430 1342
1431 if (type == PLAYER) 1343 if (type == PLAYER)
1432 { 1344 {
1433 /* f is a number the represents the number of kg above (positive num) 1345 /* f is a number the represents the number of kg above (positive num)
1434 * or below (negative number) that the player is carrying. If above 1346 * or below (negative number) that the player is carrying. If above
1435 * weight limit, then player suffers a speed reduction based on how 1347 * weight limit, then player suffers a speed reduction based on how
1436 * much above he is, and what is max carry is 1348 * much above he is, and what is max carry is
1437 */ 1349 */
1438 f = (carrying / 1000) - max_carry[stats.Str]; 1350 float f = (carrying / 1000) - max_carry[stats.Str];
1439 if (f > 0) 1351 if (f > 0.f)
1440 speed = speed / (1.0 + f / max_carry[stats.Str]); 1352 speed = speed / (1.f + f / max_carry[stats.Str]);
1441 } 1353 }
1442 1354
1443 speed += bonus_speed / 10.0; /* Not affected by limits */ 1355 speed += bonus_speed / 10.f; /* Not affected by limits */
1356 speed *= speed_reduce_from_disease;
1444 1357
1445 /* Put a lower limit on speed. Note with this speed, you move once every 1358 /* Put a lower limit on speed. Note with this speed, you move once every
1446 * 100 ticks or so. This amounts to once every 12 seconds of realtime. 1359 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1447 */ 1360 */
1448 speed = speed * speed_reduce_from_disease;
1449
1450 if (speed < 0.01 && type == PLAYER) 1361 if (speed < 0.04f && type == PLAYER)
1451 speed = 0.01; 1362 speed = 0.04f;
1363
1364 if (speed != old_speed)
1365 set_speed (speed);
1452 1366
1453 if (type == PLAYER) 1367 if (type == PLAYER)
1454 { 1368 {
1455 float M, W, s, D, K, S, M2;
1456
1457 /* (This formula was made by vidarl@ifi.uio.no) 1369 /* (This formula was made by vidarl@ifi.uio.no)
1458 * Note that we never used these values again - basically 1370 * Note that we never used these values again - basically
1459 * all of these could be subbed into one big equation, but 1371 * all of these could be subbed into one big equation, but
1460 * that would just be a real pain to read. 1372 * that would just be a real pain to read.
1461 */ 1373 */
1462 M = (max_carry[stats.Str] - 121) / 121.0; 1374 float M = (max_carry[stats.Str] - 121) / 121.f;
1463 M2 = max_carry[stats.Str] / 100.0; 1375 float M2 = max_carry[stats.Str] / 100.f;
1464 W = weapon_weight / 20000.0; 1376 float W = weapon_weight / 20000.f;
1465 s = 2 - weapon_speed / 10.0; 1377 float s = (20 - weapon_speed) / 10.f;
1466 D = (stats.Dex - 14) / 14.0; 1378 float D = (stats.Dex - 14) / 14.f;
1467 K = 1 + M / 3.0 - W / (3 * M2) + speed / 5.0 + D / 2.0; 1379 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
1380
1468 K *= (4 + level) / (float) (6 + level) * 1.2; 1381 K *= (4 + level) * 1.2f / (6 + level);
1382
1469 if (K <= 0) 1383 if (K <= 0.01f)
1470 K = 0.01; 1384 K = 0.01f;
1471 S = speed / (K * s); 1385
1472 contr->weapon_sp = S; 1386 contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1473 } 1387 }
1474 1388
1475 /* I want to limit the power of small monsters with big weapons: */ 1389 /* I want to limit the power of small monsters with big weapons: */
1476 if (type != PLAYER && arch != NULL && stats.dam > arch->clone.stats.dam * 3) 1390 if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
1477 stats.dam = arch->clone.stats.dam * 3; 1391 stats.dam = arch->stats.dam * 3;
1478 1392
1479 /* Prevent overflows of wc - best you can get is ABS(120) - this 1393 stats.wc = clamp (wc, MIN_WC, MAX_WC);
1480 * should be more than enough - remember, AC is also in 8 bits, 1394 stats.ac = clamp (ac, MIN_AC, MAX_AC);
1481 * so its value is the same.
1482 */
1483 if (wc > 120)
1484 wc = 120;
1485 else if (wc < -120)
1486 wc = -120;
1487
1488 stats.wc = wc;
1489
1490 if (ac > 120)
1491 ac = 120;
1492 else if (ac < -120)
1493 ac = -120;
1494
1495 stats.ac = ac;
1496 1395
1497 /* if for some reason the creature doesn't have any move type, 1396 /* if for some reason the creature doesn't have any move type,
1498 * give them walking as a default. 1397 * give them walking as a default.
1499 * The second case is a special case - to more closely mimic the 1398 * The second case is a special case - to more closely mimic the
1500 * old behaviour - if your flying, your not walking - just 1399 * old behaviour - if your flying, your not walking - just
… …
1503 if (move_type == 0) 1402 if (move_type == 0)
1504 move_type = MOVE_WALK; 1403 move_type = MOVE_WALK;
1505 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1404 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1506 move_type &= ~MOVE_WALK; 1405 move_type &= ~MOVE_WALK;
1507 1406
1508 if (speed != old_speed)
1509 set_speed (speed);
1510
1511 /* It is quite possible that a player's spell costing might have changed, 1407 /* It is quite possible that a player's spell costing might have changed,
1512 * so we will check that now. 1408 * so we will check that now.
1513 */ 1409 */
1514 if (type == PLAYER) 1410 if (is_player ())
1411 contr->update_spells ();
1412
1413 // update the mapspace, if we are on a map
1414 if (!flag [FLAG_REMOVED] && map)
1415 map->at (x, y).flags_ = 0;
1416}
1417
1418void
1419object::set_glow_radius (sint8 rad)
1420{
1421 glow_radius = rad;
1422
1423 if (is_on_map ())
1424 update_all_los (map, x, y);
1425 else if (object *env = outer_env ())
1515 { 1426 {
1516 esrv_update_stats (contr); 1427 env->update_stats ();
1517 esrv_update_spells (contr); 1428
1429 if (env->is_on_map ())
1430 update_all_los (env->map, env->x, env->y);
1518 } 1431 }
1519} 1432}
1520 1433
1521/* 1434/*
1522 * Returns true if the given player is a legal class. 1435 * Returns true if the given player is a legal class.
… …
1526 * false otherwise. 1439 * false otherwise.
1527 */ 1440 */
1528int 1441int
1529allowed_class (const object *op) 1442allowed_class (const object *op)
1530{ 1443{
1531 return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 && 1444 return op->stats.Dex > 0
1532 op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0; 1445 && op->stats.Str > 0
1446 && op->stats.Con > 0
1447 && op->stats.Int > 0
1448 && op->stats.Wis > 0
1449 && op->stats.Pow > 0
1450 && op->stats.Cha > 0;
1533} 1451}
1534 1452
1535/* 1453/*
1536 * set the new dragon name after gaining levels or 1454 * set the new dragon name after gaining levels or
1537 * changing ability focus (later this can be extended to 1455 * changing ability focus (later this can be extended to
1538 * eventually change the player's face and animation) 1456 * eventually change the player's face and animation)
1539 *
1540 * Note that the title is written to 'own_title' in the
1541 * player struct. This should be changed to 'ext_title'
1542 * as soon as clients support this!
1543 * Please, anyone, write support for 'ext_title'.
1544 */ 1457 */
1545void 1458void
1546set_dragon_name (object *pl, const object *abil, const object *skin) 1459set_dragon_name (object *pl, const object *abil, const object *skin)
1547{ 1460{
1548 int atnr = -1; /* attacknumber of highest level */ 1461 int atnr = -1; /* attacknumber of highest level */
… …
1566 /* now if there are equals at highest level, pick the one with focus, 1479 /* now if there are equals at highest level, pick the one with focus,
1567 or else at random */ 1480 or else at random */
1568 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1481 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1569 atnr = abil->stats.exp; 1482 atnr = abil->stats.exp;
1570 1483
1571 level = (int) (level / 5.);
1572
1573 /* now set the new title */ 1484 /* now set the new title */
1574 if (pl->contr != NULL)
1575 {
1576 if (level == 0)
1577 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1485 if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1578 else if (level == 1)
1579 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); 1486 else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1580 else if (level == 2)
1581 sprintf (pl->contr->title, "%s wyvern", attacks[atnr]); 1487 else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1582 else if (level == 3)
1583 sprintf (pl->contr->title, "%s dragon", attacks[atnr]); 1488 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1584 else 1489 else
1585 { 1490 {
1586 /* special titles for extra high resistance! */ 1491 /* special titles for extra high resistance! */
1587 if (skin->resist[atnr] > 80)
1588 sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); 1492 if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1589 else if (skin->resist[atnr] > 50)
1590 sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]); 1493 else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1591 else
1592 sprintf (pl->contr->title, "big %s dragon", attacks[atnr]); 1494 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1593 }
1594 } 1495 }
1595 1496
1596 strcpy (pl->contr->own_title, ""); 1497 strcpy (pl->contr->own_title, "");
1597} 1498}
1598 1499
1599/* 1500/*
1600 * This function is called when a dragon-player gains 1501 * This function is called when a dragon-player gains
1601 * an overall level. Here, the dragon might gain new abilities 1502 * an overall level. Here, the dragon might gain new abilities
1602 * or change the ability-focus. 1503 * or change the ability-focus.
1603 */ 1504 */
1604void 1505static void
1605dragon_level_gain (object *who) 1506dragon_level_gain (object *who)
1606{ 1507{
1607 object *abil = NULL; /* pointer to dragon ability force */ 1508 object *abil = NULL; /* pointer to dragon ability force */
1608 object *skin = NULL; /* pointer to dragon skin force */ 1509 object *skin = NULL; /* pointer to dragon skin force */
1609 object *tmp = NULL; /* tmp. object */ 1510 object *tmp = NULL; /* tmp. object */
1610 char buf[MAX_BUF]; /* tmp. string buffer */ 1511 char buf[MAX_BUF]; /* tmp. string buffer */
1611 1512
1612 /* now grab the 'dragon_ability'-forces from the player's inventory */ 1513 /* now grab the 'dragon_ability'-forces from the player's inventory */
1613 for (tmp = who->inv; tmp != NULL; tmp = tmp->below) 1514 for (tmp = who->inv; tmp; tmp = tmp->below)
1614 {
1615 if (tmp->type == FORCE) 1515 if (tmp->type == FORCE)
1616 { 1516 if (tmp->arch->archname == shstr_dragon_ability_force)
1617 if (strcmp (tmp->arch->name, "dragon_ability_force") == 0)
1618 abil = tmp; 1517 abil = tmp;
1619 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0) 1518 else if (tmp->arch->archname == shstr_dragon_skin_force)
1620 skin = tmp; 1519 skin = tmp;
1621 } 1520
1622 }
1623 /* if the force is missing -> bail out */ 1521 /* if the force is missing -> bail out */
1624 if (abil == NULL) 1522 if (abil == NULL)
1625 return; 1523 return;
1626 1524
1627 /* The ability_force keeps track of maximum level ever achieved. 1525 /* The ability_force keeps track of maximum level ever achieved.
… …
1668 object *skill_obj; 1566 object *skill_obj;
1669 1567
1670 skill_obj = get_archetype_by_skill_name (skill_name, SKILL); 1568 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1671 if (!skill_obj) 1569 if (!skill_obj)
1672 { 1570 {
1673 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1571 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1674 return NULL; 1572 return NULL;
1675 } 1573 }
1574
1676 /* clear the flag - exp goes into this bucket, but player 1575 /* clear the flag - exp goes into this bucket, but player
1677 * still doesn't know it. 1576 * still doesn't know it.
1678 */ 1577 */
1679 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1578 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1680 skill_obj->stats.exp = 0; 1579 skill_obj->stats.exp = 0;
1681 skill_obj->level = 1; 1580 skill_obj->level = 1;
1682 insert_ob_in_ob (skill_obj, op); 1581 op->insert (skill_obj);
1683 if (op->contr) 1582
1684 { 1583 if (player *pl = op->contr)
1685 op->contr->last_skill_ob[skill_obj->subtype] = skill_obj; 1584 pl->link_skills ();
1686 op->contr->last_skill_exp[skill_obj->subtype] = -1; 1585
1687 }
1688 return skill_obj; 1586 return skill_obj;
1689} 1587}
1690
1691 1588
1692/* player_lvl_adj() - for the new exp system. we are concerned with 1589/* player_lvl_adj() - for the new exp system. we are concerned with
1693 * whether the player gets more hp, sp and new levels. 1590 * whether the player gets more hp, sp and new levels.
1694 * Note this this function should only be called for players. Monstes 1591 * Note this this function should only be called for players. Monstes
1695 * don't really gain levels 1592 * don't really gain levels
… …
1698 */ 1595 */
1699void 1596void
1700player_lvl_adj (object *who, object *op) 1597player_lvl_adj (object *who, object *op)
1701{ 1598{
1702 char buf[MAX_BUF]; 1599 char buf[MAX_BUF];
1600 bool changed = false;
1703 1601
1704 if (!op) /* when rolling stats */ 1602 if (!op) /* when rolling stats */
1705 op = who; 1603 op = who;
1706 1604
1707 if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul)) 1605 while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1708 { 1606 {
1607 changed = true;
1608
1709 op->level++; 1609 op->level++;
1710 1610
1711 if (op != NULL && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1611 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who))
1712 dragon_level_gain (who); 1612 dragon_level_gain (who);
1713 1613
1714 /* Only roll these if it is the player (who) that gained the level */ 1614 /* Only roll these if it is the player (who) that gained the level */
1715 if (op == who && (who->level < 11) && who->type == PLAYER) 1615 if (op == who && (who->level < 11) && who->type == PLAYER)
1716 { 1616 {
1717 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1; 1617 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1718 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH); 1618 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1719 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1; 1619 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1720 } 1620 }
1721 1621
1722 who->update_stats ();
1723 if (op->level > 1) 1622 if (op->level > 1)
1724 { 1623 {
1725 if (op->type != PLAYER) 1624 if (op->type != PLAYER)
1625 {
1626 who->contr->play_sound (sound_find ("skill_up"));
1726 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1627 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1628 }
1727 else 1629 else
1630 {
1631 who->contr->play_sound (sound_find ("level_up"));
1728 sprintf (buf, "You are now level %d.", op->level); 1632 sprintf (buf, "You are now level %d.", op->level);
1633 }
1634
1729 if (who) 1635 if (who)
1730 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1636 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1731 } 1637 }
1732 player_lvl_adj (who, op); /* To increase more levels */
1733 } 1638 }
1639
1734 else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul)) 1640 while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1735 { 1641 {
1642 changed = true;
1643
1736 op->level--; 1644 op->level--;
1737 who->update_stats (); 1645
1738 if (op->type != PLAYER) 1646 if (op->type != PLAYER)
1739 { 1647 {
1740 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1648 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1741 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1649 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1742 } 1650 }
1743 player_lvl_adj (who, op); /* To decrease more levels */
1744 } 1651 }
1745 1652
1746 /* check if the spell data has changed */ 1653 if (changed)
1747 esrv_update_stats (who->contr); 1654 who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1748 esrv_update_spells (who->contr);
1749} 1655}
1750 1656
1751/* 1657/*
1752 * Returns how much experience is needed for a player to become 1658 * Returns how much experience is needed for a player to become
1753 * the given level. level should really never exceed max_level 1659 * the given level. level should really never exceed max_level
… …
1756sint64 1662sint64
1757level_exp (int level, double expmul) 1663level_exp (int level, double expmul)
1758{ 1664{
1759 if (level > settings.max_level) 1665 if (level > settings.max_level)
1760 return (sint64) (expmul * levels[settings.max_level]); 1666 return (sint64) (expmul * levels[settings.max_level]);
1667
1761 return (sint64) (expmul * levels[level]); 1668 return (sint64) (expmul * levels[level]);
1762} 1669}
1763 1670
1764/* 1671/*
1765 * Ensure that the permanent experience requirements in an exp object are met. 1672 * Ensure that the permanent experience requirements in an exp object are met.
… …
1796 * flag is what to do if the player doesn't have the skill: 1703 * flag is what to do if the player doesn't have the skill:
1797 */ 1704 */
1798static void 1705static void
1799add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) 1706add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
1800{ 1707{
1801 object *skill_obj = NULL; 1708 object *skill_obj;
1802 sint64 limit, exp_to_add; 1709 sint64 limit, exp_to_add;
1803 int i; 1710 int i;
1804 1711
1805 /* prevents some forms of abuse. */ 1712 /* prevents some forms of abuse. */
1806 if (op->contr->braced) 1713 if (op->contr->braced)
1807 exp = exp / 5; 1714 exp /= 5;
1808 1715
1809 /* Try to find the matching skill. 1716 /* Try to find the matching skill.
1810 * We do a shortcut/time saving mechanism first - see if it matches 1717 * We do a shortcut/time saving mechanism first - see if it matches
1811 * chosen_skill. This means we don't need to search through 1718 * chosen_skill. This means we don't need to search through
1812 * the players inventory. 1719 * the players inventory.
1813 */ 1720 */
1721 skill_obj = 0;
1722
1814 if (skill_name) 1723 if (skill_name)
1815 { 1724 {
1816 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1725 skill_obj = op->contr->find_skill (skill_name);
1817 skill_obj = op->chosen_skill;
1818 else
1819 {
1820 for (i = 0; i < NUM_SKILLS; i++)
1821 if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1822 {
1823 skill_obj = op->contr->last_skill_ob[i];
1824 break;
1825 }
1826 1726
1827 /* Player doesn't have the skill. Check to see what to do, and give 1727 /* Player doesn't have the skill. Check to see what to do, and give
1828 * it to the player if necessary 1728 * it to the player if necessary
1829 */ 1729 */
1830 if (!skill_obj) 1730 if (!skill_obj)
1831 { 1731 {
1832 if (flag == SK_EXP_NONE) 1732 if (flag == SK_EXP_NONE)
1833 return; 1733 return;
1734
1834 else if (flag == SK_EXP_ADD_SKILL) 1735 if (flag == SK_EXP_ADD_SKILL)
1835 give_skill_by_name (op, skill_name); 1736 skill_obj = give_skill_by_name (op, skill_name);
1836 }
1837 } 1737 }
1838 } 1738 }
1839 1739
1840 if (flag != SK_EXP_SKILL_ONLY) 1740 if (flag != SK_EXP_SKILL_ONLY)
1841 { 1741 {
… …
1874 player_lvl_adj (op, skill_obj); 1774 player_lvl_adj (op, skill_obj);
1875 } 1775 }
1876} 1776}
1877 1777
1878/* This function checks to make sure that object 'op' can 1778/* This function checks to make sure that object 'op' can
1879 * lost 'exp' experience. It returns the amount of exp 1779 * lose 'exp' experience. It returns the amount of exp
1880 * object 'op' can in fact lose - it basically makes 1780 * object 'op' can in fact lose - it basically makes
1881 * adjustments based on permanent exp and the like. 1781 * adjustments based on permanent exp and the like.
1882 * This function should always be used for losing experience - 1782 * This function should always be used for losing experience -
1883 * the 'exp' value passed should be positive - this is the 1783 * the 'exp' value passed should be positive - this is the
1884 * amount that should get subtract from the player. 1784 * amount that should get subtract from the player.
1885 */ 1785 */
1886sint64 1786static sint64
1887check_exp_loss (const object *op, sint64 exp) 1787check_exp_loss (const object *op, sint64 exp)
1888{ 1788{
1889 sint64 del_exp; 1789 sint64 del_exp;
1890 1790
1891 if (exp > op->stats.exp) 1791 if (exp > op->stats.exp)
1892 exp = op->stats.exp; 1792 exp = op->stats.exp;
1793
1893 if (settings.permanent_exp_ratio) 1794 if (settings.permanent_exp_ratio)
1894 { 1795 {
1895 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1796 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1797
1896 if (del_exp < 0) 1798 if (del_exp < 0)
1897 del_exp = 0; 1799 del_exp = 0;
1800
1898 if (exp > del_exp) 1801 if (exp > del_exp)
1899 exp = del_exp; 1802 exp = del_exp;
1900 } 1803 }
1804
1901 return exp; 1805 return exp;
1902} 1806}
1903 1807
1904sint64 1808sint64
1905check_exp_adjust (const object *op, sint64 exp) 1809check_exp_adjust (const object *op, sint64 exp)
1906{ 1810{
1907 if (exp < 0) 1811 if (exp < 0)
1908 return check_exp_loss (op, exp); 1812 return check_exp_loss (op, exp);
1909 else 1813 else
1910 return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1814 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1911} 1815}
1912
1913 1816
1914/* Subtracts experience from player. 1817/* Subtracts experience from player.
1915 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1818 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1916 * only subtract from the matching skill. Otherwise, 1819 * only subtract from the matching skill. Otherwise,
1917 * this subtracts a portion from all 1820 * this subtracts a portion from all
… …
1931 sint64 del_exp; 1834 sint64 del_exp;
1932 1835
1933 for (tmp = op->inv; tmp; tmp = tmp->below) 1836 for (tmp = op->inv; tmp; tmp = tmp->below)
1934 if (tmp->type == SKILL && tmp->stats.exp) 1837 if (tmp->type == SKILL && tmp->stats.exp)
1935 { 1838 {
1936 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) 1839 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
1937 { 1840 {
1938 del_exp = check_exp_loss (tmp, exp); 1841 del_exp = check_exp_loss (tmp, exp);
1939 tmp->stats.exp -= del_exp; 1842 tmp->stats.exp -= del_exp;
1940 player_lvl_adj (op, tmp); 1843 player_lvl_adj (op, tmp);
1941 } 1844 }
… …
1947 del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction)); 1850 del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction));
1948 tmp->stats.exp -= del_exp; 1851 tmp->stats.exp -= del_exp;
1949 player_lvl_adj (op, tmp); 1852 player_lvl_adj (op, tmp);
1950 } 1853 }
1951 } 1854 }
1855
1952 if (flag != SK_SUBTRACT_SKILL_EXP) 1856 if (flag != SK_SUBTRACT_SKILL_EXP)
1953 { 1857 {
1954 del_exp = check_exp_loss (op, exp); 1858 del_exp = check_exp_loss (op, exp);
1955 op->stats.exp -= del_exp; 1859 op->stats.exp -= del_exp;
1956 player_lvl_adj (op, NULL); 1860 player_lvl_adj (op, NULL);
1957 } 1861 }
1958} 1862}
1959
1960
1961 1863
1962/* change_exp() - changes experience to a player/monster. This 1864/* change_exp() - changes experience to a player/monster. This
1963 * does bounds checking to make sure we don't overflow the max exp. 1865 * does bounds checking to make sure we don't overflow the max exp.
1964 * 1866 *
1965 * The exp passed is typically not modified much by this function - 1867 * The exp passed is typically not modified much by this function -
1966 * it is assumed the caller has modified the exp as needed. 1868 * it is assumed the caller has modified the exp as needed.
1967 * skill_name is the skill that should get the exp added. 1869 * skill_name is the skill that should get the exp added.
1968 * flag is what to do if player doesn't have the skill. 1870 * flag is what to do if player doesn't have the skill.
1969 * these last two values are only used for players. 1871 * these last two values are only used for players.
1970 */ 1872 */
1971
1972void 1873void
1973change_exp (object *op, sint64 exp, const char *skill_name, int flag) 1874change_exp (object *op, sint64 exp, const char *skill_name, int flag)
1974{ 1875{
1975
1976#ifdef EXP_DEBUG 1876#ifdef EXP_DEBUG
1977 LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp); 1877 LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
1978#endif 1878#endif
1979 1879
1980 /* safety */ 1880 /* safety */
… …
2021 else 1921 else
2022 /* note that when you lose exp, it doesn't go against 1922 /* note that when you lose exp, it doesn't go against
2023 * a particular skill, so we don't need to pass that 1923 * a particular skill, so we don't need to pass that
2024 * along. 1924 * along.
2025 */ 1925 */
2026 subtract_player_exp (op, FABS (exp), skill_name, flag); 1926 subtract_player_exp (op, abs (exp), skill_name, flag);
2027
2028 } 1927 }
2029} 1928}
2030 1929
2031/* Applies a death penalty experience, the size of this is defined by the 1930/* Applies a death penalty experience, the size of this is defined by the
2032 * settings death_penalty_percentage and death_penalty_levels, and by the 1931 * settings death_penalty_percentage and death_penalty_levels, and by the
2033 * amount of permenent experience, whichever gives the lowest loss. 1932 * amount of permenent experience, whichever gives the lowest loss.
2034 */ 1933 */
2035
2036void 1934void
2037apply_death_exp_penalty (object *op) 1935apply_death_exp_penalty (object *op)
2038{ 1936{
2039 object *tmp;
2040 sint64 loss; 1937 sint64 loss;
2041 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1938 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
2042 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1939 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
2043 1940
2044 for (tmp = op->inv; tmp; tmp = tmp->below) 1941 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2045 if (tmp->type == SKILL && tmp->stats.exp) 1942 if (tmp->type == SKILL && tmp->stats.exp)
2046 { 1943 {
2047
2048 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; 1944 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
2049 level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; 1945 level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
2050 1946
2051 /* With the revised exp system, you can get cases where 1947 /* With the revised exp system, you can get cases where
2052 * losing several levels would still require that you have more 1948 * losing several levels would still require that you have more
2053 * exp than you currently have - this is true if the levels 1949 * exp than you currently have - this is true if the levels
2054 * tables is a lot harder. 1950 * tables is a lot harder.
2055 */ 1951 */
2056 if (level_loss < 0) 1952 if (level_loss < 0)
2057 level_loss = 0; 1953 level_loss = 0;
2058 1954
2059 loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); 1955 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
2060 1956
2061 tmp->stats.exp -= loss; 1957 tmp->stats.exp -= loss;
2062 player_lvl_adj (op, tmp); 1958 player_lvl_adj (op, tmp);
2063 } 1959 }
2064 1960
2065 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1961 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
2066 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; 1962 level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
1963
2067 if (level_loss < 0) 1964 if (level_loss < 0)
2068 level_loss = 0; 1965 level_loss = 0;
1966
2069 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1967 loss = check_exp_loss (op, min (level_loss, percentage_loss));
2070 1968
2071 op->stats.exp -= loss; 1969 op->stats.exp -= loss;
2072 player_lvl_adj (op, NULL); 1970 player_lvl_adj (op, NULL);
2073} 1971}
2074 1972

Diff Legend

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