[ViewVC] Diff of: cvs/deliantra/server/common/living.C

Comparing deliantra/server/common/living.C (file contents):
Revision 1.47 by root, Mon May 7 03:05:57 2007 UTC vs.
Revision 1.118 by root, Sun Apr 11 00:34:05 2010 UTC

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

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.47 by root, Mon May 7 03:05:57 2007 UTC vs. Revision 1.118 by root, Sun Apr 11 00:34:05 2010 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.47 by root, Mon May 7 03:05:57 2007 UTC vs.
Revision 1.118 by root, Sun Apr 11 00:34:05 2010 UTC