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.21 by root, Mon Dec 25 06:53:39 2006 UTC vs.
Revision 1.100 by root, Sat Nov 7 18:30:05 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;
766 float old_speed = speed;
767 int stat_sum [NUM_STATS];
837 768
838 /* 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 */
839 if (type == PLAYER) 770 if (type == PLAYER)
840 { 771 {
841 for (i = 0; i < NUM_STATS; i++) 772 for (int i = 0; i < NUM_STATS; i++)
842 set_attr_value (&(stats), i, get_attr_value (&(contr->orig_stats), i)); 773 stat_sum [i] = contr->orig_stats.stat (i);
843 774
844 if (settings.spell_encumbrance == TRUE) 775 if (settings.spell_encumbrance == TRUE)
845 contr->encumbrance = 0; 776 contr->encumbrance = 0;
846 777
847 attacktype = 0; 778 attacktype = 0;
779
848 contr->digestion = 0; 780 contr->digestion = 0;
849 contr->gen_hp = 0; 781 contr->gen_hp = 0;
850 contr->gen_sp = 0; 782 contr->gen_sp = 0;
851 contr->gen_grace = 0; 783 contr->gen_grace = 0;
852 contr->gen_sp_armour = 10; 784 contr->gen_sp_armour = 10;
853 contr->item_power = 0; 785 contr->item_power = 0;
854
855 /* Don't clobber all the range_ values. range_golem otherwise
856 * gets reset for no good reason, and we don't want to reset
857 * range_magic (what spell is readied). These three below
858 * well get filled in based on what the player has equipped.
859 */
860 contr->ranges[range_bow] = NULL;
861 contr->ranges[range_misc] = NULL;
862 contr->ranges[range_skill] = NULL;
863 } 786 }
864 787
865 memcpy (body_used, body_info, sizeof (body_info)); 788 for (int i = NUM_BODY_LOCATIONS; i--; )
789 slot[i].used = slot[i].info;
866 790
867 slaying = 0; 791 slaying = 0;
868 792
869 if (!QUERY_FLAG (this, FLAG_WIZ)) 793 if (!QUERY_FLAG (this, FLAG_WIZ))
870 { 794 {
… …
874 798
875 CLEAR_FLAG (this, FLAG_LIFESAVE); 799 CLEAR_FLAG (this, FLAG_LIFESAVE);
876 CLEAR_FLAG (this, FLAG_STEALTH); 800 CLEAR_FLAG (this, FLAG_STEALTH);
877 CLEAR_FLAG (this, FLAG_BLIND); 801 CLEAR_FLAG (this, FLAG_BLIND);
878 802
879 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); 803 if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
880 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); 804 if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
881 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 805 if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
882 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); 806 if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
883 807
884 path_attuned = arch->clone.path_attuned; 808 path_attuned = arch->path_attuned;
885 path_repelled = arch->clone.path_repelled; 809 path_repelled = arch->path_repelled;
886 path_denied = arch->clone.path_denied; 810 path_denied = arch->path_denied;
887 glow_radius = arch->clone.glow_radius; 811 glow_radius = arch->glow_radius;
888 move_type = arch->clone.move_type; 812 move_type = arch->move_type;
813
889 chosen_skill = NULL; 814 chosen_skill = 0;
890 815
891 /* initializing resistances from the values in player/monster's 816 /* initializing resistances from the values in player/monster's
892 * archetype clone 817 * archetype clone
893 */ 818 */
894 memcpy (&resist, &arch->clone.resist, sizeof (resist)); 819 memcpy (&resist, &arch->resist, sizeof (resist));
895 820
896 for (i = 0; i < NROFATTACKS; i++) 821 for (int i = 0; i < NROFATTACKS; i++)
897 { 822 {
898 if (resist[i] > 0) 823 if (resist[i] > 0)
899 prot[i] = resist[i], vuln[i] = 0; 824 prot[i] = resist[i], vuln[i] = 0;
900 else 825 else
901 vuln[i] = -(resist[i]), prot[i] = 0; 826 vuln[i] = -(resist[i]), prot[i] = 0;
827
902 potion_resist[i] = 0; 828 potion_resist[i] = 0;
903 } 829 }
904 830
905 wc = arch->clone.stats.wc; 831 wc = arch->stats.wc;
906 stats.dam = arch->clone.stats.dam; 832 stats.dam = arch->stats.dam;
907 833
908 /* for players which cannot use armour, they gain AC -1 per 3 levels, 834 /* for players which cannot use armour, they gain AC -1 per 3 levels,
909 * plus a small amount of physical resist, those poor suckers. ;) 835 * plus a small amount of physical resist, those poor suckers. ;)
910 * the fact that maxlevel is factored in could be considered sort of bogus - 836 * the fact that maxlevel is factored in could be considered sort of bogus -
911 * we should probably give them some bonus and cap it off - otherwise, 837 * we should probably give them some bonus and cap it off - otherwise,
912 * basically, if a server updates its max level, these playes may find 838 * basically, if a server updates its max level, these playes may find
913 * that their protection from physical goes down 839 * that their protection from physical goes down
914 */ 840 */
915 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER) 841 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
916 { 842 {
917 ac = MAX (-10, arch->clone.stats.ac - level / 3); 843 ac = max (-10, arch->stats.ac - level / 3);
918 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100; 844 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
919 } 845 }
920 else 846 else
921 ac = arch->clone.stats.ac; 847 ac = arch->stats.ac;
922 848
923 stats.luck = arch->clone.stats.luck; 849 stats.luck = arch->stats.luck;
924 speed = arch->clone.speed; 850 speed = arch->speed;
925 851
926 /* OK - we've reset most all the objects attributes to sane values. 852 /* OK - we've reset most all the objects attributes to sane values.
927 * now go through and make adjustments for what the player has equipped. 853 * now go through and make adjustments for what the player has equipped.
928 */ 854 */
929
930 for (tmp = inv; tmp; tmp = tmp->below) 855 for (tmp = inv; tmp; tmp = tmp->below)
931 { 856 {
932 /* See note in map.c:update_position about making this additive
933 * since light sources are never applied, need to put check here.
934 */
935 if (tmp->glow_radius > glow_radius)
936 glow_radius = tmp->glow_radius;
937
938 /* This happens because apply_potion calls change_abil with the potion 857 /* This happens because apply_potion calls change_abil with the potion
939 * applied so we can tell the player what chagned. But change_abil 858 * applied so we can tell the player what changed. But change_abil
940 * then calls this function. 859 * then calls this function.
941 */ 860 */
942 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 861 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
943 continue; 862 continue;
863
864 glow_radius += tmp->glow_radius;
944 865
945 /* For some things, we don't care what is equipped */ 866 /* For some things, we don't care what is equipped */
946 if (tmp->type == SKILL) 867 if (tmp->type == SKILL)
947 { 868 {
948 /* Want to take the highest skill here. */ 869 /* Want to take the highest skill here. */
… …
961 else if (tmp->level > grace_obj->level) 882 else if (tmp->level > grace_obj->level)
962 grace_obj = tmp; 883 grace_obj = tmp;
963 } 884 }
964 } 885 }
965 886
966 /* Container objects are not meant to adjust a players, but other applied 887 /* Container objects are not meant to adjust players, but other applied
967 * objects need to make adjustments. 888 * objects need to make adjustments.
968 * This block should handle all player specific changes 889 * This block should handle all player specific changes
969 * The check for Praying is a bit of a hack - god given bonuses are put 890 * The check for Praying is a bit of a hack - god given bonuses are put
970 * in the praying skill, and the player should always get those. 891 * in the praying skill, and the player should always get those.
971 * It also means we need to put in additional checks for applied below, 892 * It also means we need to put in additional checks for applied below,
972 * because the skill shouldn't count against body positions being used 893 * because the skill shouldn't count against body positions being used
973 * up, etc. 894 * up, etc.
974 */ 895 */
975 if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) || 896 if ((tmp->flag [FLAG_APPLIED]
897 && tmp->type != CONTAINER
898 && tmp->type != CLOSE_CON)
899 || (tmp->type == SKILL
976 (tmp->type == SKILL && tmp->subtype == SK_PRAYING)) 900 && tmp->subtype == SK_PRAYING))
977 { 901 {
978 if (type == PLAYER) 902 if (type == PLAYER)
979 { 903 {
980 if (tmp->type == BOW) 904 contr->item_power += tmp->item_power;
981 contr->ranges[range_bow] = tmp;
982 905
983 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 906 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
984 contr->ranges[range_misc] = tmp; 907 if (tmp != current_weapon
908 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
909 && !tmp->flag [FLAG_CURSED]
910 && !tmp->flag [FLAG_DAMNED])
911 continue;
985 912
986 for (i = 0; i < NUM_STATS; i++) 913 for (int i = 0; i < NUM_STATS; i++)
987 change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), i)); 914 stat_sum [i] = stat_sum [i] + tmp->stats.stat (i);
988 915
989 /* these are the items that currently can change digestion, regeneration, 916 if (digest_types [tmp->type])
990 * spell point recovery and mana point recovery. Seems sort of an arbitary
991 * list, but other items store other info into stats array.
992 */
993 if ((tmp->type == WEAPON) ||
994 (tmp->type == ARMOUR) || (tmp->type == HELMET) ||
995 (tmp->type == SHIELD) || (tmp->type == RING) ||
996 (tmp->type == BOOTS) || (tmp->type == GLOVES) ||
997 (tmp->type == AMULET) || (tmp->type == GIRDLE) ||
998 (tmp->type == BRACERS) || (tmp->type == CLOAK) ||
999 (tmp->type == DISEASE) || (tmp->type == FORCE) ||
1000 (tmp->type == SKILL))
1001 { 917 {
1002 contr->digestion += tmp->stats.food; 918 contr->digestion += tmp->stats.food;
1003 contr->gen_hp += tmp->stats.hp; 919 contr->gen_hp += tmp->stats.hp;
920 if (tmp->type != BOW) // ugly exception for bows
1004 contr->gen_sp += tmp->stats.sp; 921 contr->gen_sp += tmp->stats.sp;
1005 contr->gen_grace += tmp->stats.grace; 922 contr->gen_grace += tmp->stats.grace;
1006 contr->gen_sp_armour += tmp->gen_sp_armour; 923 contr->gen_sp_armour += tmp->gen_sp_armour;
1007 contr->item_power += tmp->item_power;
1008 } 924 }
1009 } /* if this is a player */ 925 } /* if this is a player */
926 else
927 {
928 if (tmp->type == WEAPON)
929 current_weapon = tmp;
930 }
1010 931
1011 /* Update slots used for items */ 932 /* Update slots used for items */
1012 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 933 if (QUERY_FLAG (tmp, FLAG_APPLIED))
1013 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 934 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1014 body_used[i] += tmp->body_info[i]; 935 slot[i].used += tmp->slot[i].info;
1015 936
1016 if (tmp->type == SYMPTOM) 937 if (tmp->type == SYMPTOM)
1017 {
1018 speed_reduce_from_disease = tmp->last_sp / 100.0;
1019 if (speed_reduce_from_disease == 0)
1020 speed_reduce_from_disease = 1; 938 speed_reduce_from_disease =
1021 } 939 min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
1022 940
1023 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 941 /* Pos. and neg. protections are counted separate (-> pro/vuln).
1024 * (Negative protections are calculated extactly like positive.) 942 * (Negative protections are calculated exactly like positive.)
1025 * Resistance from potions are treated special as well. If there's 943 * Resistance from potions are treated special as well. If there's
1026 * more than one potion-effect, the bigger prot.-value is taken. 944 * more than one potion-effect, the bigger prot.-value is taken.
1027 */ 945 */
1028 if (tmp->type != POTION) 946 if (tmp->type != POTION)
1029 { 947 {
1030 for (i = 0; i < NROFATTACKS; i++) 948 for (int i = 0; i < NROFATTACKS; i++)
1031 { 949 {
1032 /* Potential for cursed potions, in which case we just can use 950 /* Potential for cursed potions, in which case we just can use
1033 * a straight MAX, as potion_resist is initialized to zero. 951 * a straight MAX, as potion_resist is initialised to zero.
1034 */ 952 */
1035 if (tmp->type == POTION_EFFECT) 953 if (tmp->type == POTION_EFFECT)
1036 { 954 {
1037 if (potion_resist[i]) 955 if (potion_resist[i])
1038 potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]); 956 potion_resist[i] = max (potion_resist[i], tmp->resist[i]);
1039 else 957 else
1040 potion_resist[i] = tmp->resist[i]; 958 potion_resist[i] = tmp->resist[i];
1041 } 959 }
1042 else if (tmp->resist[i] > 0) 960 else if (tmp->resist[i] > 0)
1043 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; 961 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
1044 else if (tmp->resist[i] < 0) 962 else if (tmp->resist[i] < 0)
1045 vuln[i] += ((100 - vuln[i]) * (-tmp->resist[i])) / 100; 963 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
1046 } 964 }
1047 } 965 }
1048 966
1049 /* There may be other things that should not adjust the attacktype */ 967 /* There may be other things that should not adjust the attacktype */
1050 if (tmp->type != BOW && tmp->type != SYMPTOM) 968 if (tmp->type != SYMPTOM)
969 {
1051 attacktype |= tmp->attacktype; 970 attacktype |= tmp->attacktype;
1052
1053 path_attuned |= tmp->path_attuned; 971 path_attuned |= tmp->path_attuned;
1054 path_repelled |= tmp->path_repelled; 972 path_repelled |= tmp->path_repelled;
1055 path_denied |= tmp->path_denied; 973 path_denied |= tmp->path_denied;
974 move_type |= tmp->move_type;
1056 stats.luck += tmp->stats.luck; 975 stats.luck += tmp->stats.luck;
1057 move_type |= tmp->move_type; 976 }
1058 977
1059 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 978 flag |= tmp->flag & copy_flags;
1060 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1061 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1062 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
1063 if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
1064 if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
1065 if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
1066 979
1067 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD)) 980 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
1068 SET_FLAG (this, FLAG_UNDEAD); 981 SET_FLAG (this, FLAG_UNDEAD);
1069 982
1070 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) 983 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
1071 { 984 {
1072 SET_FLAG (this, FLAG_MAKE_INVIS); 985 SET_FLAG (this, FLAG_MAKE_INVIS);
… …
1075 988
1076 if (tmp->stats.exp && tmp->type != SKILL) 989 if (tmp->stats.exp && tmp->type != SKILL)
1077 { 990 {
1078 if (tmp->stats.exp > 0) 991 if (tmp->stats.exp > 0)
1079 { 992 {
1080 added_speed += (float) tmp->stats.exp / 3.0; 993 added_speed += tmp->stats.exp / 3.f;
1081 bonus_speed += 1.0 + (float) tmp->stats.exp / 3.0; 994 bonus_speed += tmp->stats.exp / 3.f + 1.f;
1082 } 995 }
1083 else 996 else
1084 added_speed += (float) tmp->stats.exp; 997 added_speed += tmp->stats.exp;
1085 } 998 }
1086 999
1087 switch (tmp->type) 1000 switch (tmp->type)
1088 { 1001 {
1002#if 0
1003 case WAND:
1004 case ROD:
1005 case HORN:
1006 if (type != PLAYER || current_weapon == tmp)
1007 chosen_skill = tmp;
1008 break;
1009#endif
1010
1089 /* skills modifying the character -b.t. */ 1011 /* skills modifying the character -b.t. */
1090 /* for all skills and skill granting objects */ 1012 /* for all skills and skill granting objects */
1091 case SKILL: 1013 case SKILL:
1092 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 1014 {
1015 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)
1093 break; 1016 break;
1094 1017
1095 if (IS_COMBAT_SKILL (tmp->subtype))
1096 wc_obj = tmp;
1097
1098 if (chosen_skill) 1018 if (chosen_skill)
1019 {
1099 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 1020 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
1021 &name, &chosen_skill->name, &tmp->name);
1100 1022
1023 tmp->flag [FLAG_APPLIED] = false;
1024 update_stats ();
1025 return;
1026 }
1027 else
1101 chosen_skill = tmp; 1028 chosen_skill = tmp;
1102 1029
1103 if (tmp->stats.dam > 0) 1030 if (tmp->stats.dam > 0)
1104 { /* skill is a 'weapon' */ 1031 { /* skill is a 'weapon' */
1105 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1032 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1106 weapon_speed = (int) WEAPON_SPEED (tmp); 1033 weapon_speed = WEAPON_SPEED (tmp);
1107 1034
1108 if (weapon_speed < 0) 1035 if (weapon_speed < 0)
1109 weapon_speed = 0; 1036 weapon_speed = 0;
1110 1037
1111 weapon_weight = tmp->weight; 1038 weapon_weight = tmp->weight;
1112 stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9)); 1039 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1113 1040
1114 if (tmp->magic) 1041 if (tmp->magic)
1115 stats.dam += tmp->magic; 1042 stats.dam += tmp->magic;
1116 } 1043 }
1117 1044
1118 if (tmp->stats.wc) 1045 if (tmp->stats.wc)
1119 wc -= (tmp->stats.wc + tmp->magic); 1046 wc -= tmp->stats.wc + tmp->magic;
1120 1047
1121 if (tmp->slaying != NULL) 1048 if (tmp->slaying)
1122 slaying = tmp->slaying; 1049 slaying = tmp->slaying;
1123 1050
1124 if (tmp->stats.ac) 1051 if (tmp->stats.ac)
1125 ac -= (tmp->stats.ac + tmp->magic); 1052 ac -= tmp->stats.ac + tmp->magic;
1126 1053
1127 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1054 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1128 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1055 contr->encumbrance += (int) 3 *tmp->weight / 1000;
1129
1130 if (type == PLAYER)
1131 contr->ranges[range_skill] = this;
1132
1133 break; 1056 }
1134 1057
1135 case SKILL_TOOL:
1136 if (chosen_skill)
1137 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1138
1139 chosen_skill = tmp;
1140
1141 if (type == PLAYER)
1142 contr->ranges[range_skill] = this;
1143 break; 1058 break;
1144 1059
1145 case SHIELD: 1060 case SHIELD:
1146 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1061 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1147 contr->encumbrance += (int) tmp->weight / 2000; 1062 contr->encumbrance += (int) tmp->weight / 2000;
… …
1151 case HELMET: 1066 case HELMET:
1152 case BOOTS: 1067 case BOOTS:
1153 case GLOVES: 1068 case GLOVES:
1154 case CLOAK: 1069 case CLOAK:
1155 if (tmp->stats.wc) 1070 if (tmp->stats.wc)
1156 wc -= (tmp->stats.wc + tmp->magic); 1071 wc -= tmp->stats.wc + tmp->magic;
1157 1072
1158 if (tmp->stats.dam) 1073 if (tmp->stats.dam)
1159 stats.dam += (tmp->stats.dam + tmp->magic); 1074 stats.dam += tmp->stats.dam + tmp->magic;
1160 1075
1161 if (tmp->stats.ac) 1076 if (tmp->stats.ac)
1162 ac -= (tmp->stats.ac + tmp->magic); 1077 ac -= tmp->stats.ac + tmp->magic;
1163 1078
1164 break; 1079 break;
1165 1080
1081 case BOW:
1166 case WEAPON: 1082 case WEAPON:
1083 if (type != PLAYER || current_weapon == tmp)
1084 {
1167 wc -= (tmp->stats.wc + tmp->magic); 1085 wc -= tmp->stats.wc + tmp->magic;
1168 1086
1169 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1087 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1170 ac -= tmp->stats.ac + tmp->magic; 1088 ac -= tmp->stats.ac + tmp->magic;
1171 1089
1172 stats.dam += (tmp->stats.dam + tmp->magic); 1090 stats.dam += tmp->stats.dam + tmp->magic;
1173 weapon_weight = tmp->weight; 1091 weapon_weight = tmp->weight;
1174 weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; 1092 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1175 1093
1176 if (weapon_speed < 0) 1094 if (weapon_speed < 0)
1177 weapon_speed = 0; 1095 weapon_speed = 0;
1178 1096
1179 slaying = tmp->slaying; 1097 slaying = tmp->slaying;
1098
1180 /* If there is desire that two handed weapons should do 1099 /* If there is desire that two handed weapons should do
1181 * extra strength damage, this is where the code should 1100 * extra strength damage, this is where the code should
1182 * go. 1101 * go.
1183 */ 1102 */
1184 current_weapon = tmp; 1103
1185 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1104 if (type == PLAYER)
1105 if (settings.spell_encumbrance)
1186 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1106 contr->encumbrance += tmp->weight * 3 / 1000;
1107 }
1187 1108
1188 break; 1109 break;
1189 1110
1190 case ARMOUR: /* Only the best of these three are used: */ 1111 case ARMOUR: /* Only the best of these three are used: */
1191 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1112 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1192 contr->encumbrance += (int) tmp->weight / 1000; 1113 contr->encumbrance += tmp->weight / 1000;
1193 1114
1194 case BRACERS: 1115 case BRACERS:
1195 case FORCE: 1116 case FORCE:
1196 if (tmp->stats.wc) 1117 if (tmp->stats.wc)
1197 { 1118 {
… …
1214 else /* To nullify the below effect */ 1135 else /* To nullify the below effect */
1215 ac += tmp->stats.ac + tmp->magic; 1136 ac += tmp->stats.ac + tmp->magic;
1216 } 1137 }
1217 1138
1218 if (tmp->stats.wc) 1139 if (tmp->stats.wc)
1219 wc -= (tmp->stats.wc + tmp->magic); 1140 wc -= tmp->stats.wc + tmp->magic;
1220 1141
1221 if (tmp->stats.ac) 1142 if (tmp->stats.ac)
1222 ac -= (tmp->stats.ac + tmp->magic); 1143 ac -= tmp->stats.ac + tmp->magic;
1223 1144
1224 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max) 1145 if (ARMOUR_SPEED (tmp))
1225 max = ARMOUR_SPEED (tmp) / 10.0; 1146 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1226 1147
1227 break; 1148 break;
1228 } /* switch tmp->type */ 1149 } /* switch tmp->type */
1229 } /* item is equipped */ 1150 } /* item is equipped */
1230 } /* for loop of items */ 1151 } /* for loop of items */
1152
1153 glow_radius = min (glow_radius, MAX_LIGHT_RADIUS);
1231 1154
1232 /* We've gone through all the objects the player has equipped. For many things, we 1155 /* We've gone through all the objects the player has equipped. For many things, we
1233 * have generated intermediate values which we now need to assign. 1156 * have generated intermediate values which we now need to assign.
1234 */ 1157 */
1235 1158
… …
1237 * If there is an uncursed potion in effect, granting more protection 1160 * If there is an uncursed potion in effect, granting more protection
1238 * than that, we take: 'total resistance = resistance from potion'. 1161 * than that, we take: 'total resistance = resistance from potion'.
1239 * If there is a cursed (and no uncursed) potion in effect, we take 1162 * If there is a cursed (and no uncursed) potion in effect, we take
1240 * 'total resistance = vulnerability from cursed potion'. 1163 * 'total resistance = vulnerability from cursed potion'.
1241 */ 1164 */
1242 for (i = 0; i < NROFATTACKS; i++) 1165 for (int i = 0; i < NROFATTACKS; i++)
1243 { 1166 {
1244 resist[i] = prot[i] - vuln[i]; 1167 resist[i] = prot[i] - vuln[i];
1245 1168
1246 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) 1169 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0)))
1247 resist[i] = potion_resist[i]; 1170 resist[i] = potion_resist[i];
1248 } 1171 }
1249 1172
1250 /* Figure out the players sp/mana/hp totals. */
1251 if (type == PLAYER) 1173 if (type == PLAYER)
1252 { 1174 {
1175 // clamp various player stats
1176 for (int i = 0; i < NUM_STATS; ++i)
1177 stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT);
1178
1179 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1180
1181 /* Figure out the players sp/mana/hp totals. */
1253 int pl_level; 1182 int pl_level;
1254 1183
1255 check_stat_bounds (&(stats)); 1184 check_stat_bounds (&(stats));
1256 pl_level = level; 1185 pl_level = level;
1257 1186
… …
1259 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1188 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */
1260 1189
1261 /* 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,
1262 * 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.
1263 */ 1192 */
1264 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++)
1265 { 1195 {
1266 j = contr->levhp[i] + con_bonus[stats.Con] / 2; 1196 int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1267 1197
1268 if (i % 2 && con_bonus[stats.Con] % 2) 1198 if (i % 2 && con_bonus[stats.Con] % 2)
1269 {
1270 if (con_bonus[stats.Con] > 0) 1199 if (con_bonus[stats.Con] > 0)
1271 j++; 1200 j++;
1272 else 1201 else
1273 j--; 1202 j--;
1274 }
1275 1203
1276 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 */
1277 } 1205 }
1278 1206
1279 for (i = 11; i <= level; i++) 1207 stats.maxhp += 2 * max (0, level - 10);
1280 stats.maxhp += 2;
1281 1208
1282 if (stats.hp > stats.maxhp) 1209 if (stats.hp > stats.maxhp)
1283 stats.hp = stats.maxhp; 1210 stats.hp = stats.maxhp;
1284 1211
1285 /* Sp gain is controlled by the level of the player's 1212 /* Sp gain is controlled by the level of the player's
… …
1298 1225
1299 if (mana_obj == this && type == PLAYER) 1226 if (mana_obj == this && type == PLAYER)
1300 stats.maxsp = 1; 1227 stats.maxsp = 1;
1301 else 1228 else
1302 { 1229 {
1303 sp_tmp = 0.0; 1230 float sp_tmp = 0.f;
1304 1231
1305 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1232 for (int i = 1; i <= min (10, mana_obj->level); i++)
1306 { 1233 {
1307 float stmp; 1234 float stmp;
1308 1235
1309 /* Got some extra bonus at first level */ 1236 /* Got some extra bonus at first level */
1310 if (i < 2) 1237 if (i < 2)
1311 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;
1312 else 1239 else
1313 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;
1314 1241
1315 if (stmp < 1.0)
1316 stmp = 1.0;
1317
1318 sp_tmp += stmp; 1242 sp_tmp += max (1.f, stmp);
1319 } 1243 }
1320 1244
1321 stats.maxsp = (int) sp_tmp; 1245 stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1322
1323 for (i = 11; i <= mana_obj->level; i++)
1324 stats.maxsp += 2;
1325 } 1246 }
1247
1326 /* Characters can get their sp supercharged via rune of transferrance */ 1248 /* Characters can get their sp supercharged via rune of transferrance */
1327 if (stats.sp > stats.maxsp * 2) 1249 stats.sp = min (stats.sp, stats.maxsp * 2);
1328 stats.sp = stats.maxsp * 2;
1329 1250
1330 /* 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 */
1331 if (!grace_obj || !grace_obj->level || type != PLAYER) 1252 if (!grace_obj || !grace_obj->level || type != PLAYER)
1332 grace_obj = this; 1253 grace_obj = this;
1333 1254
… …
1338 /* 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
1339 * 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
1340 * 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
1341 * step of 8 - with floats, even fractional ones are useful. 1262 * step of 8 - with floats, even fractional ones are useful.
1342 */ 1263 */
1343 sp_tmp = 0.0; 1264 float sp_tmp = 0.f;
1344 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++)
1345 { 1267 {
1346 float grace_tmp = 0.0; 1268 float grace_tmp = 0.f;
1347 1269
1348 /* Got some extra bonus at first level */ 1270 /* Got some extra bonus at first level */
1349 if (i < 2) 1271 if (i < 2)
1350 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;
1351 2.0 * (float) grace_bonus[stats.Wis]) / 6.0);
1352 else 1273 else
1353 grace_tmp = (float) contr->levgrace[i]
1354 + ((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;
1355 1275
1356 if (grace_tmp < 1.0)
1357 grace_tmp = 1.0;
1358
1359 sp_tmp += grace_tmp; 1276 sp_tmp += max (1.f, grace_tmp);
1360 } 1277 }
1361 1278
1362 stats.maxgrace = (int) sp_tmp;
1363
1364 /* two grace points per level after 11 */ 1279 /* two grace points per level after 10 */
1365 for (i = 11; i <= grace_obj->level; i++) 1280 stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1366 stats.maxgrace += 2;
1367 } 1281 }
1282
1368 /* No limit on grace vs maxgrace */ 1283 /* No limit on grace vs maxgrace */
1369 1284
1370 if (contr->braced) 1285 if (contr->braced)
1371 { 1286 {
1372 ac += 2; 1287 ac += 2;
… …
1384 * improvement every level, now its fighterlevel/5. So 1299 * improvement every level, now its fighterlevel/5. So
1385 * we give the player a bonus here in wc and dam 1300 * we give the player a bonus here in wc and dam
1386 * to make up for the change. Note that I left the 1301 * to make up for the change. Note that I left the
1387 * monster bonus the same as before. -b.t. 1302 * monster bonus the same as before. -b.t.
1388 */ 1303 */
1304 object *wc_obj = chosen_skill;
1389 1305
1390 if (type == PLAYER && wc_obj && wc_obj->level > 1) 1306 if (contr && wc_obj && wc_obj->level > 1)
1391 { 1307 {
1392 wc -= (wc_obj->level + thaco_bonus[stats.Str]); 1308 wc -= wc_obj->level + thaco_bonus[stats.Str];
1309
1393 for (i = 1; i < wc_obj->level; i++) 1310 for (int i = 1; i < wc_obj->level; i++)
1394 { 1311 {
1395 /* addtional wc every 6 levels */ 1312 /* additional wc every 6 levels */
1396 if (!(i % 6)) 1313 if (!(i % 6))
1397 wc--; 1314 wc--;
1315
1398 /* addtional dam every 4 levels. */ 1316 /* additional dam every 4 levels. */
1399 if (!(i % 4) && (dam_bonus[stats.Str] >= 0)) 1317 if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1400 stats.dam += (1 + (dam_bonus[stats.Str] / 5)); 1318 stats.dam += 1 + dam_bonus[stats.Str] / 5;
1401 } 1319 }
1402 } 1320 }
1403 else 1321 else
1404 wc -= (level + thaco_bonus[stats.Str]); 1322 wc -= level + thaco_bonus[stats.Str];
1405 1323
1406 stats.dam += dam_bonus[stats.Str]; 1324 stats.dam += dam_bonus[stats.Str];
1407 1325
1408 if (stats.dam < 1) 1326 if (stats.dam < 1)
1409 stats.dam = 1; 1327 stats.dam = 1;
1410 1328
1411 speed = 1.0 + speed_bonus[stats.Dex]; 1329 speed = 1.f + speed_bonus[stats.Dex];
1412 1330
1413 if (settings.search_items && contr->search_str[0]) 1331 if (settings.search_items && contr->search_str[0])
1414 speed -= 1; 1332 speed -= 1;
1415
1416 if (attacktype == 0)
1417 attacktype = arch->clone.attacktype;
1418
1419 } /* End if player */ 1333 } /* End if player */
1420 1334
1421 if (added_speed >= 0) 1335 if (added_speed >= 0)
1422 speed += added_speed / 10.0; 1336 speed += added_speed / 10.f;
1423 else /* Something wrong here...: */ 1337 else /* Something wrong here...: */
1424 speed /= (float) (1.0 - added_speed); 1338 speed /= 1.f - added_speed;
1425 1339
1426 /* Max is determined by armour */ 1340 /* Max is determined by armour */
1427 if (speed > max) 1341 speed = min (speed, max_speed);
1428 speed = max;
1429 1342
1430 if (type == PLAYER) 1343 if (type == PLAYER)
1431 { 1344 {
1432 /* 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)
1433 * or below (negative number) that the player is carrying. If above 1346 * or below (negative number) that the player is carrying. If above
1434 * weight limit, then player suffers a speed reduction based on how 1347 * weight limit, then player suffers a speed reduction based on how
1435 * much above he is, and what is max carry is 1348 * much above he is, and what is max carry is
1436 */ 1349 */
1437 f = (carrying / 1000) - max_carry[stats.Str]; 1350 float f = (carrying / 1000) - max_carry[stats.Str];
1438 if (f > 0) 1351 if (f > 0.f)
1439 speed = speed / (1.0 + f / max_carry[stats.Str]); 1352 speed = speed / (1.f + f / max_carry[stats.Str]);
1440 } 1353 }
1441 1354
1442 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;
1443 1357
1444 /* 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
1445 * 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.
1446 */ 1360 */
1447 speed = speed * speed_reduce_from_disease;
1448
1449 if (speed < 0.01 && type == PLAYER) 1361 if (speed < 0.04f && type == PLAYER)
1450 speed = 0.01; 1362 speed = 0.04f;
1363
1364 if (speed != old_speed)
1365 set_speed (speed);
1451 1366
1452 if (type == PLAYER) 1367 if (type == PLAYER)
1453 { 1368 {
1454 float M, W, s, D, K, S, M2;
1455
1456 /* (This formula was made by vidarl@ifi.uio.no) 1369 /* (This formula was made by vidarl@ifi.uio.no)
1457 * Note that we never used these values again - basically 1370 * Note that we never used these values again - basically
1458 * all of these could be subbed into one big equation, but 1371 * all of these could be subbed into one big equation, but
1459 * that would just be a real pain to read. 1372 * that would just be a real pain to read.
1460 */ 1373 */
1461 M = (max_carry[stats.Str] - 121) / 121.0; 1374 float M = (max_carry[stats.Str] - 121) / 121.f;
1462 M2 = max_carry[stats.Str] / 100.0; 1375 float M2 = max_carry[stats.Str] / 100.f;
1463 W = weapon_weight / 20000.0; 1376 float W = weapon_weight / 20000.f;
1464 s = 2 - weapon_speed / 10.0; 1377 float s = (20 - weapon_speed) / 10.f;
1465 D = (stats.Dex - 14) / 14.0; 1378 float D = (stats.Dex - 14) / 14.f;
1466 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
1467 K *= (4 + level) / (float) (6 + level) * 1.2; 1381 K *= (4 + level) * 1.2f / (6 + level);
1382
1468 if (K <= 0) 1383 if (K <= 0.01f)
1469 K = 0.01; 1384 K = 0.01f;
1470 S = speed / (K * s); 1385
1471 contr->weapon_sp = S; 1386 contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1472 } 1387 }
1473 1388
1474 /* 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: */
1475 if (type != PLAYER && arch != NULL && stats.dam > arch->clone.stats.dam * 3) 1390 if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
1476 stats.dam = arch->clone.stats.dam * 3; 1391 stats.dam = arch->stats.dam * 3;
1477 1392
1478 /* Prevent overflows of wc - best you can get is ABS(120) - this 1393 stats.wc = clamp (wc, MIN_WC, MAX_WC);
1479 * should be more than enough - remember, AC is also in 8 bits, 1394 stats.ac = clamp (ac, MIN_AC, MAX_AC);
1480 * so its value is the same.
1481 */
1482 if (wc > 120)
1483 wc = 120;
1484 else if (wc < -120)
1485 wc = -120;
1486
1487 stats.wc = wc;
1488
1489 if (ac > 120)
1490 ac = 120;
1491 else if (ac < -120)
1492 ac = -120;
1493
1494 stats.ac = ac;
1495 1395
1496 /* 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,
1497 * give them walking as a default. 1397 * give them walking as a default.
1498 * 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
1499 * old behaviour - if your flying, your not walking - just 1399 * old behaviour - if your flying, your not walking - just
… …
1502 if (move_type == 0) 1402 if (move_type == 0)
1503 move_type = MOVE_WALK; 1403 move_type = MOVE_WALK;
1504 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1404 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1505 move_type &= ~MOVE_WALK; 1405 move_type &= ~MOVE_WALK;
1506 1406
1507 update_ob_speed (this);
1508
1509 /* 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,
1510 * so we will check that now. 1408 * so we will check that now.
1511 */ 1409 */
1512 if (type == PLAYER) 1410 if (type == PLAYER)
1513 { 1411 {
1514 esrv_update_stats (contr); 1412 esrv_update_stats (contr);
1515 esrv_update_spells (contr); 1413 esrv_update_spells (contr);
1414 }
1415
1416 // update the mapspace, if we are on a map
1417 if (!flag [FLAG_REMOVED] && map)
1418 map->at (x, y).flags_ = 0;
1419}
1420
1421void
1422object::set_glow_radius (sint8 rad)
1423{
1424 glow_radius = rad;
1425
1426 if (is_on_map ())
1427 update_all_los (map, x, y);
1428 else if (object *env = outer_env ())
1429 {
1430 env->update_stats ();
1431
1432 if (env->is_on_map ())
1433 update_all_los (env->map, env->x, env->y);
1516 } 1434 }
1517} 1435}
1518 1436
1519/* 1437/*
1520 * Returns true if the given player is a legal class. 1438 * Returns true if the given player is a legal class.
… …
1524 * false otherwise. 1442 * false otherwise.
1525 */ 1443 */
1526int 1444int
1527allowed_class (const object *op) 1445allowed_class (const object *op)
1528{ 1446{
1529 return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 && 1447 return op->stats.Dex > 0
1530 op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0; 1448 && op->stats.Str > 0
1449 && op->stats.Con > 0
1450 && op->stats.Int > 0
1451 && op->stats.Wis > 0
1452 && op->stats.Pow > 0
1453 && op->stats.Cha > 0;
1531} 1454}
1532 1455
1533/* 1456/*
1534 * set the new dragon name after gaining levels or 1457 * set the new dragon name after gaining levels or
1535 * changing ability focus (later this can be extended to 1458 * changing ability focus (later this can be extended to
1536 * eventually change the player's face and animation) 1459 * eventually change the player's face and animation)
1537 *
1538 * Note that the title is written to 'own_title' in the
1539 * player struct. This should be changed to 'ext_title'
1540 * as soon as clients support this!
1541 * Please, anyone, write support for 'ext_title'.
1542 */ 1460 */
1543void 1461void
1544set_dragon_name (object *pl, const object *abil, const object *skin) 1462set_dragon_name (object *pl, const object *abil, const object *skin)
1545{ 1463{
1546 int atnr = -1; /* attacknumber of highest level */ 1464 int atnr = -1; /* attacknumber of highest level */
… …
1564 /* now if there are equals at highest level, pick the one with focus, 1482 /* now if there are equals at highest level, pick the one with focus,
1565 or else at random */ 1483 or else at random */
1566 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1484 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1567 atnr = abil->stats.exp; 1485 atnr = abil->stats.exp;
1568 1486
1569 level = (int) (level / 5.);
1570
1571 /* now set the new title */ 1487 /* now set the new title */
1572 if (pl->contr != NULL)
1573 {
1574 if (level == 0)
1575 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1488 if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1576 else if (level == 1)
1577 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); 1489 else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1578 else if (level == 2)
1579 sprintf (pl->contr->title, "%s wyvern", attacks[atnr]); 1490 else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1580 else if (level == 3)
1581 sprintf (pl->contr->title, "%s dragon", attacks[atnr]); 1491 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1582 else 1492 else
1583 { 1493 {
1584 /* special titles for extra high resistance! */ 1494 /* special titles for extra high resistance! */
1585 if (skin->resist[atnr] > 80)
1586 sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); 1495 if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1587 else if (skin->resist[atnr] > 50)
1588 sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]); 1496 else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1589 else
1590 sprintf (pl->contr->title, "big %s dragon", attacks[atnr]); 1497 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1591 }
1592 } 1498 }
1593 1499
1594 strcpy (pl->contr->own_title, ""); 1500 strcpy (pl->contr->own_title, "");
1595} 1501}
1596 1502
1597/* 1503/*
1598 * This function is called when a dragon-player gains 1504 * This function is called when a dragon-player gains
1599 * an overall level. Here, the dragon might gain new abilities 1505 * an overall level. Here, the dragon might gain new abilities
1600 * or change the ability-focus. 1506 * or change the ability-focus.
1601 */ 1507 */
1602void 1508static void
1603dragon_level_gain (object *who) 1509dragon_level_gain (object *who)
1604{ 1510{
1605 object *abil = NULL; /* pointer to dragon ability force */ 1511 object *abil = NULL; /* pointer to dragon ability force */
1606 object *skin = NULL; /* pointer to dragon skin force */ 1512 object *skin = NULL; /* pointer to dragon skin force */
1607 object *tmp = NULL; /* tmp. object */ 1513 object *tmp = NULL; /* tmp. object */
1608 char buf[MAX_BUF]; /* tmp. string buffer */ 1514 char buf[MAX_BUF]; /* tmp. string buffer */
1609 1515
1610 /* now grab the 'dragon_ability'-forces from the player's inventory */ 1516 /* now grab the 'dragon_ability'-forces from the player's inventory */
1611 for (tmp = who->inv; tmp != NULL; tmp = tmp->below) 1517 for (tmp = who->inv; tmp; tmp = tmp->below)
1612 {
1613 if (tmp->type == FORCE) 1518 if (tmp->type == FORCE)
1614 { 1519 if (tmp->arch->archname == shstr_dragon_ability_force)
1615 if (strcmp (tmp->arch->name, "dragon_ability_force") == 0)
1616 abil = tmp; 1520 abil = tmp;
1617 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0) 1521 else if (tmp->arch->archname == shstr_dragon_skin_force)
1618 skin = tmp; 1522 skin = tmp;
1619 } 1523
1620 }
1621 /* if the force is missing -> bail out */ 1524 /* if the force is missing -> bail out */
1622 if (abil == NULL) 1525 if (abil == NULL)
1623 return; 1526 return;
1624 1527
1625 /* The ability_force keeps track of maximum level ever achieved. 1528 /* The ability_force keeps track of maximum level ever achieved.
… …
1666 object *skill_obj; 1569 object *skill_obj;
1667 1570
1668 skill_obj = get_archetype_by_skill_name (skill_name, SKILL); 1571 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1669 if (!skill_obj) 1572 if (!skill_obj)
1670 { 1573 {
1671 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1574 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1672 return NULL; 1575 return NULL;
1673 } 1576 }
1577
1674 /* clear the flag - exp goes into this bucket, but player 1578 /* clear the flag - exp goes into this bucket, but player
1675 * still doesn't know it. 1579 * still doesn't know it.
1676 */ 1580 */
1677 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1581 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1678 skill_obj->stats.exp = 0; 1582 skill_obj->stats.exp = 0;
1679 skill_obj->level = 1; 1583 skill_obj->level = 1;
1680 insert_ob_in_ob (skill_obj, op); 1584 op->insert (skill_obj);
1681 if (op->contr) 1585
1682 { 1586 if (player *pl = op->contr)
1683 op->contr->last_skill_ob[skill_obj->subtype] = skill_obj; 1587 pl->link_skills ();
1684 op->contr->last_skill_exp[skill_obj->subtype] = -1; 1588
1685 }
1686 return skill_obj; 1589 return skill_obj;
1687} 1590}
1688
1689 1591
1690/* player_lvl_adj() - for the new exp system. we are concerned with 1592/* player_lvl_adj() - for the new exp system. we are concerned with
1691 * whether the player gets more hp, sp and new levels. 1593 * whether the player gets more hp, sp and new levels.
1692 * Note this this function should only be called for players. Monstes 1594 * Note this this function should only be called for players. Monstes
1693 * don't really gain levels 1595 * don't really gain levels
… …
1696 */ 1598 */
1697void 1599void
1698player_lvl_adj (object *who, object *op) 1600player_lvl_adj (object *who, object *op)
1699{ 1601{
1700 char buf[MAX_BUF]; 1602 char buf[MAX_BUF];
1603 bool changed = false;
1701 1604
1702 if (!op) /* when rolling stats */ 1605 if (!op) /* when rolling stats */
1703 op = who; 1606 op = who;
1704 1607
1705 if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul)) 1608 while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1706 { 1609 {
1610 changed = true;
1611
1707 op->level++; 1612 op->level++;
1708 1613
1709 if (op != NULL && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1614 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who))
1710 dragon_level_gain (who); 1615 dragon_level_gain (who);
1711 1616
1712 /* Only roll these if it is the player (who) that gained the level */ 1617 /* Only roll these if it is the player (who) that gained the level */
1713 if (op == who && (who->level < 11) && who->type == PLAYER) 1618 if (op == who && (who->level < 11) && who->type == PLAYER)
1714 { 1619 {
1715 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1; 1620 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1716 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH); 1621 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1717 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1; 1622 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1718 } 1623 }
1719 1624
1720 who->update_stats ();
1721 if (op->level > 1) 1625 if (op->level > 1)
1722 { 1626 {
1723 if (op->type != PLAYER) 1627 if (op->type != PLAYER)
1628 {
1629 who->contr->play_sound (sound_find ("skill_up"));
1724 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1630 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1631 }
1725 else 1632 else
1633 {
1634 who->contr->play_sound (sound_find ("level_up"));
1726 sprintf (buf, "You are now level %d.", op->level); 1635 sprintf (buf, "You are now level %d.", op->level);
1636 }
1637
1727 if (who) 1638 if (who)
1728 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1639 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1729 } 1640 }
1730 player_lvl_adj (who, op); /* To increase more levels */
1731 } 1641 }
1642
1732 else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul)) 1643 while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1733 { 1644 {
1645 changed = true;
1646
1734 op->level--; 1647 op->level--;
1735 who->update_stats (); 1648
1736 if (op->type != PLAYER) 1649 if (op->type != PLAYER)
1737 { 1650 {
1738 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1651 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1739 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1652 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1740 } 1653 }
1741 player_lvl_adj (who, op); /* To decrease more levels */ 1654 }
1655
1656 if (changed)
1742 } 1657 {
1743 1658 who->update_stats ();
1659 esrv_update_stats (who->contr);
1744 /* check if the spell data has changed */ 1660 /* check if the spell data has changed */
1745 esrv_update_stats (who->contr);
1746 esrv_update_spells (who->contr); 1661 esrv_update_spells (who->contr);
1662 }
1747} 1663}
1748 1664
1749/* 1665/*
1750 * Returns how much experience is needed for a player to become 1666 * Returns how much experience is needed for a player to become
1751 * the given level. level should really never exceed max_level 1667 * the given level. level should really never exceed max_level
… …
1754sint64 1670sint64
1755level_exp (int level, double expmul) 1671level_exp (int level, double expmul)
1756{ 1672{
1757 if (level > settings.max_level) 1673 if (level > settings.max_level)
1758 return (sint64) (expmul * levels[settings.max_level]); 1674 return (sint64) (expmul * levels[settings.max_level]);
1675
1759 return (sint64) (expmul * levels[level]); 1676 return (sint64) (expmul * levels[level]);
1760} 1677}
1761 1678
1762/* 1679/*
1763 * Ensure that the permanent experience requirements in an exp object are met. 1680 * Ensure that the permanent experience requirements in an exp object are met.
… …
1794 * flag is what to do if the player doesn't have the skill: 1711 * flag is what to do if the player doesn't have the skill:
1795 */ 1712 */
1796static void 1713static void
1797add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) 1714add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
1798{ 1715{
1799 object *skill_obj = NULL; 1716 object *skill_obj;
1800 sint64 limit, exp_to_add; 1717 sint64 limit, exp_to_add;
1801 int i; 1718 int i;
1802 1719
1803 /* prevents some forms of abuse. */ 1720 /* prevents some forms of abuse. */
1804 if (op->contr->braced) 1721 if (op->contr->braced)
1805 exp = exp / 5; 1722 exp /= 5;
1806 1723
1807 /* Try to find the matching skill. 1724 /* Try to find the matching skill.
1808 * We do a shortcut/time saving mechanism first - see if it matches 1725 * We do a shortcut/time saving mechanism first - see if it matches
1809 * chosen_skill. This means we don't need to search through 1726 * chosen_skill. This means we don't need to search through
1810 * the players inventory. 1727 * the players inventory.
1811 */ 1728 */
1729 skill_obj = 0;
1730
1812 if (skill_name) 1731 if (skill_name)
1813 { 1732 {
1814 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1733 skill_obj = op->contr->find_skill (skill_name);
1815 skill_obj = op->chosen_skill;
1816 else
1817 {
1818 for (i = 0; i < NUM_SKILLS; i++)
1819 if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1820 {
1821 skill_obj = op->contr->last_skill_ob[i];
1822 break;
1823 }
1824 1734
1825 /* Player doesn't have the skill. Check to see what to do, and give 1735 /* Player doesn't have the skill. Check to see what to do, and give
1826 * it to the player if necessary 1736 * it to the player if necessary
1827 */ 1737 */
1828 if (!skill_obj) 1738 if (!skill_obj)
1829 { 1739 {
1830 if (flag == SK_EXP_NONE) 1740 if (flag == SK_EXP_NONE)
1831 return; 1741 return;
1742
1832 else if (flag == SK_EXP_ADD_SKILL) 1743 if (flag == SK_EXP_ADD_SKILL)
1833 give_skill_by_name (op, skill_name); 1744 skill_obj = give_skill_by_name (op, skill_name);
1834 }
1835 } 1745 }
1836 } 1746 }
1837 1747
1838 if (flag != SK_EXP_SKILL_ONLY) 1748 if (flag != SK_EXP_SKILL_ONLY)
1839 { 1749 {
… …
1872 player_lvl_adj (op, skill_obj); 1782 player_lvl_adj (op, skill_obj);
1873 } 1783 }
1874} 1784}
1875 1785
1876/* This function checks to make sure that object 'op' can 1786/* This function checks to make sure that object 'op' can
1877 * lost 'exp' experience. It returns the amount of exp 1787 * lose 'exp' experience. It returns the amount of exp
1878 * object 'op' can in fact lose - it basically makes 1788 * object 'op' can in fact lose - it basically makes
1879 * adjustments based on permanent exp and the like. 1789 * adjustments based on permanent exp and the like.
1880 * This function should always be used for losing experience - 1790 * This function should always be used for losing experience -
1881 * the 'exp' value passed should be positive - this is the 1791 * the 'exp' value passed should be positive - this is the
1882 * amount that should get subtract from the player. 1792 * amount that should get subtract from the player.
1883 */ 1793 */
1884sint64 1794static sint64
1885check_exp_loss (const object *op, sint64 exp) 1795check_exp_loss (const object *op, sint64 exp)
1886{ 1796{
1887 sint64 del_exp; 1797 sint64 del_exp;
1888 1798
1889 if (exp > op->stats.exp) 1799 if (exp > op->stats.exp)
1890 exp = op->stats.exp; 1800 exp = op->stats.exp;
1801
1891 if (settings.permanent_exp_ratio) 1802 if (settings.permanent_exp_ratio)
1892 { 1803 {
1893 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1804 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1805
1894 if (del_exp < 0) 1806 if (del_exp < 0)
1895 del_exp = 0; 1807 del_exp = 0;
1808
1896 if (exp > del_exp) 1809 if (exp > del_exp)
1897 exp = del_exp; 1810 exp = del_exp;
1898 } 1811 }
1812
1899 return exp; 1813 return exp;
1900} 1814}
1901 1815
1902sint64 1816sint64
1903check_exp_adjust (const object *op, sint64 exp) 1817check_exp_adjust (const object *op, sint64 exp)
1904{ 1818{
1905 if (exp < 0) 1819 if (exp < 0)
1906 return check_exp_loss (op, exp); 1820 return check_exp_loss (op, exp);
1907 else 1821 else
1908 return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1822 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1909} 1823}
1910
1911 1824
1912/* Subtracts experience from player. 1825/* Subtracts experience from player.
1913 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1826 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1914 * only subtract from the matching skill. Otherwise, 1827 * only subtract from the matching skill. Otherwise,
1915 * this subtracts a portion from all 1828 * this subtracts a portion from all
… …
1929 sint64 del_exp; 1842 sint64 del_exp;
1930 1843
1931 for (tmp = op->inv; tmp; tmp = tmp->below) 1844 for (tmp = op->inv; tmp; tmp = tmp->below)
1932 if (tmp->type == SKILL && tmp->stats.exp) 1845 if (tmp->type == SKILL && tmp->stats.exp)
1933 { 1846 {
1934 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) 1847 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
1935 { 1848 {
1936 del_exp = check_exp_loss (tmp, exp); 1849 del_exp = check_exp_loss (tmp, exp);
1937 tmp->stats.exp -= del_exp; 1850 tmp->stats.exp -= del_exp;
1938 player_lvl_adj (op, tmp); 1851 player_lvl_adj (op, tmp);
1939 } 1852 }
… …
1945 del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction)); 1858 del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction));
1946 tmp->stats.exp -= del_exp; 1859 tmp->stats.exp -= del_exp;
1947 player_lvl_adj (op, tmp); 1860 player_lvl_adj (op, tmp);
1948 } 1861 }
1949 } 1862 }
1863
1950 if (flag != SK_SUBTRACT_SKILL_EXP) 1864 if (flag != SK_SUBTRACT_SKILL_EXP)
1951 { 1865 {
1952 del_exp = check_exp_loss (op, exp); 1866 del_exp = check_exp_loss (op, exp);
1953 op->stats.exp -= del_exp; 1867 op->stats.exp -= del_exp;
1954 player_lvl_adj (op, NULL); 1868 player_lvl_adj (op, NULL);
1955 } 1869 }
1956} 1870}
1957
1958
1959 1871
1960/* change_exp() - changes experience to a player/monster. This 1872/* change_exp() - changes experience to a player/monster. This
1961 * does bounds checking to make sure we don't overflow the max exp. 1873 * does bounds checking to make sure we don't overflow the max exp.
1962 * 1874 *
1963 * The exp passed is typically not modified much by this function - 1875 * The exp passed is typically not modified much by this function -
1964 * it is assumed the caller has modified the exp as needed. 1876 * it is assumed the caller has modified the exp as needed.
1965 * skill_name is the skill that should get the exp added. 1877 * skill_name is the skill that should get the exp added.
1966 * flag is what to do if player doesn't have the skill. 1878 * flag is what to do if player doesn't have the skill.
1967 * these last two values are only used for players. 1879 * these last two values are only used for players.
1968 */ 1880 */
1969
1970void 1881void
1971change_exp (object *op, sint64 exp, const char *skill_name, int flag) 1882change_exp (object *op, sint64 exp, const char *skill_name, int flag)
1972{ 1883{
1973
1974#ifdef EXP_DEBUG 1884#ifdef EXP_DEBUG
1975 LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp); 1885 LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
1976#endif 1886#endif
1977 1887
1978 /* safety */ 1888 /* safety */
… …
2019 else 1929 else
2020 /* note that when you lose exp, it doesn't go against 1930 /* note that when you lose exp, it doesn't go against
2021 * a particular skill, so we don't need to pass that 1931 * a particular skill, so we don't need to pass that
2022 * along. 1932 * along.
2023 */ 1933 */
2024 subtract_player_exp (op, FABS (exp), skill_name, flag); 1934 subtract_player_exp (op, abs (exp), skill_name, flag);
2025
2026 } 1935 }
2027} 1936}
2028 1937
2029/* Applies a death penalty experience, the size of this is defined by the 1938/* Applies a death penalty experience, the size of this is defined by the
2030 * settings death_penalty_percentage and death_penalty_levels, and by the 1939 * settings death_penalty_percentage and death_penalty_levels, and by the
2031 * amount of permenent experience, whichever gives the lowest loss. 1940 * amount of permenent experience, whichever gives the lowest loss.
2032 */ 1941 */
2033
2034void 1942void
2035apply_death_exp_penalty (object *op) 1943apply_death_exp_penalty (object *op)
2036{ 1944{
2037 object *tmp;
2038 sint64 loss; 1945 sint64 loss;
2039 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1946 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
2040 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1947 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
2041 1948
2042 for (tmp = op->inv; tmp; tmp = tmp->below) 1949 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2043 if (tmp->type == SKILL && tmp->stats.exp) 1950 if (tmp->type == SKILL && tmp->stats.exp)
2044 { 1951 {
2045
2046 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; 1952 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
2047 level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; 1953 level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
2048 1954
2049 /* With the revised exp system, you can get cases where 1955 /* With the revised exp system, you can get cases where
2050 * losing several levels would still require that you have more 1956 * losing several levels would still require that you have more
2051 * exp than you currently have - this is true if the levels 1957 * exp than you currently have - this is true if the levels
2052 * tables is a lot harder. 1958 * tables is a lot harder.
2053 */ 1959 */
2054 if (level_loss < 0) 1960 if (level_loss < 0)
2055 level_loss = 0; 1961 level_loss = 0;
2056 1962
2057 loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); 1963 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
2058 1964
2059 tmp->stats.exp -= loss; 1965 tmp->stats.exp -= loss;
2060 player_lvl_adj (op, tmp); 1966 player_lvl_adj (op, tmp);
2061 } 1967 }
2062 1968
2063 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1969 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
2064 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; 1970 level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
1971
2065 if (level_loss < 0) 1972 if (level_loss < 0)
2066 level_loss = 0; 1973 level_loss = 0;
1974
2067 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1975 loss = check_exp_loss (op, min (level_loss, percentage_loss));
2068 1976
2069 op->stats.exp -= loss; 1977 op->stats.exp -= loss;
2070 player_lvl_adj (op, NULL); 1978 player_lvl_adj (op, NULL);
2071} 1979}
2072 1980

Diff Legend

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