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

Diff Legend

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