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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.38 by root, Sun Apr 29 04:14:57 2007 UTC vs.
Revision 1.115 by root, Fri Apr 2 03:41:24 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	SET_FLAG (op, FLAG_BLIND);
…		…
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	CLEAR_FLAG (op, FLAG_BLIND);
…		…
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)
…		…
637	success = 1;	547	success = 1;
638	DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");	548	DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
639	}	549	}
640		550
641	/* Messages for changed resistance */	551	/* Messages for changed resistance */
642	for (i = 0; i < NROFATTACKS; i++)	552	for (int i = 0; i < NROFATTACKS; i++)
643	{	553	{
644	if (i == ATNR_PHYSICAL)	554	if (i == ATNR_PHYSICAL)
645	continue; /* Don't display about armour */	555	continue; /* Don't display about armour */
646		556
647	if (op->resist[i] != refop.resist[i])	557	if (op->resist [i] != prev_resist [i])
648	{	558	{
649	success = 1;	559	success = 1;
		560
650	if (op->resist[i] > refop.resist[i])	561	if (op->resist [i] > prev_resist [i])
651	sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]);	562	sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
652	else	563	else
653	sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]);	564	sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
654		565
655	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, op, message);	566	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, op, message);
656	}	567	}
657	}	568	}
658		569
659	if (!potion_max)	570	if (!potion_max)
660	{
661	for (j = 0; j < NUM_STATS; j++)	571	for (int j = 0; j < NUM_STATS; j++)
662	{	572	if (int i = tmp->stats.stat (j))
663	if ((i = get_attr_value (&(tmp->stats), j)) != 0)
664	{	573	{
665	success = 1;	574	success = 1;
666	DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);	575	DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
667	}	576	}
668	}
669	}
670		577
671	return success;	578	return success;
672	}	579	}
673		580
674	/*	581	/*
675	* Stat draining by Vick 930307	582	* Stat draining by Vick 930307
676	* (Feeling evil, I made it work as well now. -Frank 8)	583	* (Feeling evil, I made it work as well now. -Frank 8)
677	*/	584	*/
678
679	void	585	void
680	object::drain_stat ()	586	object::drain_stat ()
681	{	587	{
682	drain_specific_stat (rndm (NUM_STATS));	588	drain_specific_stat (rndm (NUM_STATS));
683	}	589	}
…		…
686	object::drain_specific_stat (int deplete_stats)	592	object::drain_specific_stat (int deplete_stats)
687	{	593	{
688	object *tmp;	594	object *tmp;
689	archetype *at;	595	archetype *at;
690		596
691	at = archetype::find (ARCH_DEPLETION);	597	at = archetype::find (shstr_depletion);
692	if (!at)	598	if (!at)
693	{	599	{
694	LOG (llevError, "Couldn't find archetype depletion.\n");	600	LOG (llevError, "Couldn't find archetype depletion.\n");
695	return;	601	return;
696	}	602	}
…		…
698	{	604	{
699	tmp = present_arch_in_ob (at, this);	605	tmp = present_arch_in_ob (at, this);
700		606
701	if (!tmp)	607	if (!tmp)
702	{	608	{
703	tmp = arch_to_object (at);	609	tmp = at->instance ();
704	tmp = insert_ob_in_ob (tmp, this);	610	tmp = insert_ob_in_ob (tmp, this);
705	SET_FLAG (tmp, FLAG_APPLIED);	611	SET_FLAG (tmp, FLAG_APPLIED);
706	}	612	}
707	}	613	}
708		614
…		…
716	* via an applied bad_luck object.	622	* via an applied bad_luck object.
717	*/	623	*/
718	void	624	void
719	object::change_luck (int value)	625	object::change_luck (int value)
720	{	626	{
721	archetype *at = archetype::find ("luck");	627	archetype *at = archetype::find (shstr_luck);
722	if (!at)	628	if (!at)
723	LOG (llevError, "Couldn't find archetype luck.\n");	629	LOG (llevError, "Couldn't find archetype luck.\n");
724	else	630	else
725	{	631	{
726	object *tmp = present_arch_in_ob (at, this);	632	object *tmp = present_arch_in_ob (at, this);
…		…
728	if (!tmp)	634	if (!tmp)
729	{	635	{
730	if (!value)	636	if (!value)
731	return;	637	return;
732		638
733	tmp = arch_to_object (at);	639	tmp = at->instance ();
734	tmp = insert_ob_in_ob (tmp, this);	640	tmp = insert_ob_in_ob (tmp, this);
735	SET_FLAG (tmp, FLAG_APPLIED);	641	SET_FLAG (tmp, FLAG_APPLIED);
736	}	642	}
737		643
738	if (value)	644	if (value)
…		…
772	* Subtracts stat-bonuses given by the class which the player has chosen.	678	* Subtracts stat-bonuses given by the class which the player has chosen.
773	*/	679	*/
774	void	680	void
775	object::remove_statbonus ()	681	object::remove_statbonus ()
776	{	682	{
777	stats.Str -= arch->clone.stats.Str;	683	for (int i = 0; i < NUM_STATS; ++i)
778	stats.Dex -= arch->clone.stats.Dex;	684	{
779	stats.Con -= arch->clone.stats.Con;	685	sint8 v = arch->stats.stat (i);
780	stats.Wis -= arch->clone.stats.Wis;	686	stats.stat (i) -= v;
781	stats.Pow -= arch->clone.stats.Pow;	687	contr->orig_stats.stat (i) -= v;
782	stats.Cha -= arch->clone.stats.Cha;	688	}
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	}	689	}
793		690
794	/*	691	/*
795	* Adds stat-bonuses given by the class which the player has chosen.	692	* Adds stat-bonuses given by the class which the player has chosen.
796	*/	693	*/
797	void	694	void
798	object::add_statbonus ()	695	object::add_statbonus ()
799	{	696	{
800	stats.Str += arch->clone.stats.Str;	697	for (int i = 0; i < NUM_STATS; ++i)
801	stats.Dex += arch->clone.stats.Dex;	698	{
802	stats.Con += arch->clone.stats.Con;	699	sint8 v = arch->stats.stat (i);
803	stats.Wis += arch->clone.stats.Wis;	700	stats.stat (i) += v;
804	stats.Pow += arch->clone.stats.Pow;	701	contr->orig_stats.stat (i) += v;
805	stats.Cha += arch->clone.stats.Cha;	702	}
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	}	703	}
		704
		705	/* These are the items that currently can change digestion, regeneration,
		706	* spell point recovery and mana point recovery. Seems sort of an arbitary
		707	* list, but other items store other info into stats array.
		708	*/
		709	static struct digest_types : std::bitset<NUM_TYPES>
		710	{
		711	digest_types ()
		712	{
		713	set (WEAPON);
		714	set (BOW);
		715	set (ARMOUR);
		716	set (HELMET);
		717	set (SHIELD);
		718	set (RING);
		719	set (BOOTS);
		720	set (GLOVES);
		721	set (AMULET);
		722	set (GIRDLE);
		723	set (BRACERS);
		724	set (CLOAK);
		725	set (DISEASE);
		726	set (FORCE);
		727	set (SKILL);
		728	}
		729	} digest_types;
		730
		731	static struct copy_flags : object::flags_t
		732	{
		733	copy_flags ()
		734	{
		735	set (FLAG_LIFESAVE);
		736	set (FLAG_REFL_SPELL);
		737	set (FLAG_REFL_MISSILE);
		738	set (FLAG_STEALTH);
		739	set (FLAG_XRAYS);
		740	set (FLAG_BLIND);
		741	set (FLAG_SEE_IN_DARK);
		742	}
		743	} copy_flags;
816		744
817	/*	745	/*
818	* Updates all abilities given by applied objects in the inventory	746	* Updates all abilities given by applied objects in the inventory
819	* of the given object. Note: This function works for both monsters	747	* of the given object. Note: This function works for both monsters
820	* and players; the "player" in the name is purely an archaic inheritance.	748	* and players; the "player" in the name is purely an archaic inheritance.
…		…
825	* spell system split, grace points now added to system --peterm	753	* spell system split, grace points now added to system --peterm
826	*/	754	*/
827	void	755	void
828	object::update_stats ()	756	object::update_stats ()
829	{	757	{
830	int i, j;
831	float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1;	758	float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
832	int weapon_weight = 0, weapon_speed = 0;	759	int weapon_weight = 0, weapon_speed = 0;
833	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;	760	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
834	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];	761	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
835	object grace_obj = NULL, mana_obj = NULL, wc_obj = NULL, tmp;	762	object grace_obj = NULL, mana_obj = NULL, *tmp;
836	float old_speed = speed;	763	float old_speed = speed;
		764	int stat_sum [NUM_STATS];
		765
		766	MoveType move_type; // we use change_move_type to change it, so use a local copy
837		767
838	/* First task is to clear all the values back to their original values */	768	/* First task is to clear all the values back to their original values */
839	if (type == PLAYER)	769	if (type == PLAYER)
840	{	770	{
		771	contr->delayed_update = false;
		772
841	for (i = 0; i < NUM_STATS; i++)	773	for (int i = 0; i < NUM_STATS; i++)
842	set_attr_value (&(stats), i, get_attr_value (&(contr->orig_stats), i));	774	stat_sum [i] = contr->orig_stats.stat (i);
843		775
844	if (settings.spell_encumbrance == TRUE)	776	if (settings.spell_encumbrance == TRUE)
845	contr->encumbrance = 0;	777	contr->encumbrance = 0;
846		778
847	attacktype = 0;	779	attacktype = 0;
		780
848	contr->digestion = 0;	781	contr->digestion = 0;
849	contr->gen_hp = 0;	782	contr->gen_hp = 0;
850	contr->gen_sp = 0;	783	contr->gen_sp = 0;
851	contr->gen_grace = 0;	784	contr->gen_grace = 0;
852	contr->gen_sp_armour = 10;	785	contr->gen_sp_armour = 10;
853	contr->item_power = 0;	786	contr->item_power = 0;
854
855	/* Don't clobber all the range_ values. range_golem otherwise
856	* gets reset for no good reason, and we don't want to reset
857	* range_magic (what spell is readied). These three below
858	* well get filled in based on what the player has equipped.
859	*/
860	contr->ranges[range_bow] = 0;
861	contr->ranges[range_misc] = 0;
862	contr->ranges[range_skill] = 0;
863	}	787	}
864		788
865	memcpy (body_used, body_info, sizeof (body_info));	789	for (int i = NUM_BODY_LOCATIONS; i--; )
		790	slot[i].used = slot[i].info;
866		791
867	slaying = 0;	792	slaying = 0;
868		793
869	if (!QUERY_FLAG (this, FLAG_WIZ))	794	if (!QUERY_FLAG (this, FLAG_WIZ))
870	{	795	{
…		…
874		799
875	CLEAR_FLAG (this, FLAG_LIFESAVE);	800	CLEAR_FLAG (this, FLAG_LIFESAVE);
876	CLEAR_FLAG (this, FLAG_STEALTH);	801	CLEAR_FLAG (this, FLAG_STEALTH);
877	CLEAR_FLAG (this, FLAG_BLIND);	802	CLEAR_FLAG (this, FLAG_BLIND);
878		803
879	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);	804	if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
880	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);	805	if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
881	if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);	806	if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
882	if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);	807	if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
883		808
884	path_attuned = arch->clone.path_attuned;	809	path_attuned = arch->path_attuned;
885	path_repelled = arch->clone.path_repelled;	810	path_repelled = arch->path_repelled;
886	path_denied = arch->clone.path_denied;	811	path_denied = arch->path_denied;
887	glow_radius = arch->clone.glow_radius;	812	glow_radius = arch->glow_radius;
888	move_type = arch->clone.move_type;	813	move_type = arch->move_type;
889	chosen_skill = NULL;
890		814
891	/* initializing resistances from the values in player/monster's	815	/* initializing resistances from the values in player/monster's
892	* archetype clone	816	* archetype clone
893	*/	817	*/
894	memcpy (&resist, &arch->clone.resist, sizeof (resist));	818	memcpy (&resist, &arch->resist, sizeof (resist));
895		819
896	for (i = 0; i < NROFATTACKS; i++)	820	for (int i = 0; i < NROFATTACKS; i++)
897	{	821	{
898	if (resist[i] > 0)	822	if (resist[i] > 0)
899	prot[i] = resist[i], vuln[i] = 0;	823	prot[i] = resist[i], vuln[i] = 0;
900	else	824	else
901	vuln[i] = -(resist[i]), prot[i] = 0;	825	vuln[i] = -resist[i], prot[i] = 0;
		826
902	potion_resist[i] = 0;	827	potion_resist[i] = -1000;
903	}	828	}
904		829
905	wc = arch->clone.stats.wc;	830	wc = arch->stats.wc;
906	stats.dam = arch->clone.stats.dam;	831	stats.dam = arch->stats.dam;
907		832
908	/* for players which cannot use armour, they gain AC -1 per 3 levels,	833	/* for players which cannot use armour, they gain AC -1 per 3 levels,
909	* plus a small amount of physical resist, those poor suckers. ;)	834	* plus a small amount of physical resist, those poor suckers. ;)
910	* the fact that maxlevel is factored in could be considered sort of bogus -	835	* the fact that maxlevel is factored in could be considered sort of bogus -
911	* we should probably give them some bonus and cap it off - otherwise,	836	* we should probably give them some bonus and cap it off - otherwise,
912	* basically, if a server updates its max level, these playes may find	837	* basically, if a server updates its max level, these playes may find
913	* that their protection from physical goes down	838	* that their protection from physical goes down
914	*/	839	*/
915	if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)	840	if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
916	{	841	{
917	ac = MAX (-10, arch->clone.stats.ac - level / 3);	842	ac = max (-10, arch->stats.ac - level / 3);
918	prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;	843	prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
919	}	844	}
920	else	845	else
921	ac = arch->clone.stats.ac;	846	ac = arch->stats.ac;
922		847
923	stats.luck = arch->clone.stats.luck;	848	stats.luck = arch->stats.luck;
924	speed = arch->clone.speed;	849	speed = arch->speed;
		850
		851	chosen_skill = 0;
925		852
926	/* OK - we've reset most all the objects attributes to sane values.	853	/* OK - we've reset most all the objects attributes to sane values.
927	* now go through and make adjustments for what the player has equipped.	854	* now go through and make adjustments for what the player has equipped.
928	*/	855	*/
929	for (tmp = inv; tmp; tmp = tmp->below)	856	for (tmp = inv; tmp; tmp = tmp->below)
930	{	857	{
931	/* See note in map.c:update_position about making this additive
932	* since light sources are never applied, need to put check here.
933	*/
934	if (tmp->glow_radius > glow_radius)
935	glow_radius = tmp->glow_radius;
936
937	/* This happens because apply_potion calls change_abil with the potion	858	/* This happens because apply_potion calls change_abil with the potion
938	* applied so we can tell the player what chagned. But change_abil	859	* applied so we can tell the player what changed. But change_abil
939	* then calls this function.	860	* then calls this function.
940	*/	861	*/
941	if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)	862	if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
942	continue;	863	continue;
		864
		865	glow_radius += tmp->glow_radius;
943		866
944	/* For some things, we don't care what is equipped */	867	/* For some things, we don't care what is equipped */
945	if (tmp->type == SKILL)	868	if (tmp->type == SKILL)
946	{	869	{
947	/* Want to take the highest skill here. */	870	/* Want to take the highest skill here. */
…		…
960	else if (tmp->level > grace_obj->level)	883	else if (tmp->level > grace_obj->level)
961	grace_obj = tmp;	884	grace_obj = tmp;
962	}	885	}
963	}	886	}
964		887
965	/* Container objects are not meant to adjust a players, but other applied	888	/* Container objects are not meant to adjust players, but other applied
966	* objects need to make adjustments.	889	* objects need to make adjustments.
967	* This block should handle all player specific changes	890	* This block should handle all player specific changes
968	* The check for Praying is a bit of a hack - god given bonuses are put	891	* The check for Praying is a bit of a hack - god given bonuses are put
969	* in the praying skill, and the player should always get those.	892	* in the praying skill, and the player should always get those.
970	* It also means we need to put in additional checks for applied below,	893	* It also means we need to put in additional checks for applied below,
971	* because the skill shouldn't count against body positions being used	894	* because the skill shouldn't count against body positions being used
972	* up, etc.	895	* up, etc.
973	*/	896	*/
974	if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) \|\|	897	if ((tmp->flag [FLAG_APPLIED]
		898	&& tmp->type != CONTAINER
		899	&& tmp->type != CLOSE_CON)
975	(tmp->type == SKILL && tmp->subtype == SK_PRAYING))	900	\|\| (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
976	{	901	{
977	if (type == PLAYER)	902	if (type == PLAYER)
978	{	903	{
979	if (tmp->type == BOW)	904	contr->item_power += tmp->item_power;
980	contr->ranges[range_bow] = tmp;
981		905
982	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)
983	contr->ranges[range_misc] = tmp;
984
985	for (i = 0; i < NUM_STATS; i++)	906	for (int i = 0; i < NUM_STATS; i++)
986	change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), i));	907	stat_sum [i] += tmp->stats.stat (i);
987		908
988	/* these are the items that currently can change digestion, regeneration,	909	if (digest_types [tmp->type])
989	* spell point recovery and mana point recovery. Seems sort of an arbitary
990	* list, but other items store other info into stats array.
991	*/
992	if ((tmp->type == WEAPON) \|\| (tmp->type == BOW) \|\|
993	(tmp->type == ARMOUR) \|\| (tmp->type == HELMET) \|\|
994	(tmp->type == SHIELD) \|\| (tmp->type == RING) \|\|
995	(tmp->type == BOOTS) \|\| (tmp->type == GLOVES) \|\|
996	(tmp->type == AMULET) \|\| (tmp->type == GIRDLE) \|\|
997	(tmp->type == BRACERS) \|\| (tmp->type == CLOAK) \|\|
998	(tmp->type == DISEASE) \|\| (tmp->type == FORCE) \|\|
999	(tmp->type == SKILL))
1000	{	910	{
1001	contr->digestion += tmp->stats.food;	911	contr->digestion += tmp->stats.food;
1002	contr->gen_hp += tmp->stats.hp;	912	contr->gen_hp += tmp->stats.hp;
		913	if (tmp->type != BOW) // ugly exception for bows
1003	contr->gen_sp += tmp->stats.sp;	914	contr->gen_sp += tmp->stats.sp;
1004	contr->gen_grace += tmp->stats.grace;	915	contr->gen_grace += tmp->stats.grace;
1005	contr->gen_sp_armour += tmp->gen_sp_armour;	916	contr->gen_sp_armour += tmp->gen_sp_armour;
1006	contr->item_power += tmp->item_power;
1007	}	917	}
1008	} /* if this is a player */	918	} /* if this is a player */
		919	else
		920	{
		921	if (tmp->type == WEAPON)
		922	current_weapon = tmp;
		923	}
1009		924
1010	/* Update slots used for items */	925	/* Update slots used for items */
1011	if (QUERY_FLAG (tmp, FLAG_APPLIED))	926	if (tmp->flag [FLAG_APPLIED]) // exclude praying...
1012	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	927	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1013	body_used[i] += tmp->body_info[i];	928	slot[i].used += tmp->slot[i].info;
1014		929
1015	if (tmp->type == SYMPTOM)	930	if (tmp->type == SYMPTOM)
1016	{
1017	speed_reduce_from_disease = tmp->last_sp / 100.0;	931	min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
1018	if (speed_reduce_from_disease == 0)
1019	speed_reduce_from_disease = 1;
1020	}
1021		932
1022	/* Pos. and neg. protections are counted seperate (-> pro/vuln).	933	/* Pos. and neg. protections are counted separate (-> pro/vuln).
1023	* (Negative protections are calculated exactly like positive.)	934	* (Negative protections are calculated exactly like positive.)
1024	* Resistance from potions are treated special as well. If there's	935	* Resistance from potions are treated special as well. If there's
1025	* more than one potion-effect, the bigger prot.-value is taken.	936	* more than one potion-effect, the bigger prot.-value is taken.
1026	*/	937	*/
		938	if (tmp->type == POTION_EFFECT)
		939	for (int i = 0; i < NROFATTACKS; i++)
		940	max_it (potion_resist[i], tmp->resist[i]);
1027	if (tmp->type != POTION)	941	else if (tmp->type != POTION)
		942	for (int i = 0; i < NROFATTACKS; i++)
		943	if (tmp->resist[i] > 0)
		944	prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
		945	else if (tmp->resist[i] < 0)
		946	vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
		947
		948	/* There may be other things that should not adjust the attacktype */
		949	if (tmp->type != SYMPTOM)
1028	{	950	{
1029	for (i = 0; i < NROFATTACKS; i++)	951	attacktype \|= tmp->attacktype;
1030	{	952	path_attuned \|= tmp->path_attuned;
1031	/* Potential for cursed potions, in which case we just can use	953	path_repelled \|= tmp->path_repelled;
1032	* a straight MAX, as potion_resist is initialised to zero.	954	path_denied \|= tmp->path_denied;
1033	*/	955	move_type \|= tmp->move_type;
1034	if (tmp->type == POTION_EFFECT)	956	stats.luck += tmp->stats.luck;
1035	{
1036	if (potion_resist[i])
1037	potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]);
1038	else
1039	potion_resist[i] = tmp->resist[i];
1040	}
1041	else if (tmp->resist[i] > 0)
1042	prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
1043	else if (tmp->resist[i] < 0)
1044	vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
1045	}
1046	}	957	}
1047		958
1048	/* There may be other things that should not adjust the attacktype */	959	flag \|= tmp->flag & copy_flags;
1049	if (tmp->type != BOW && tmp->type != SYMPTOM)
1050	attacktype \|= tmp->attacktype;
1051		960
1052	path_attuned \|= tmp->path_attuned;
1053	path_repelled \|= tmp->path_repelled;
1054	path_denied \|= tmp->path_denied;
1055	stats.luck += tmp->stats.luck;
1056	move_type \|= tmp->move_type;
1057
1058	if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);
1059	if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1060	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1061	if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
1062	if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
1063	if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
1064	if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
1065
1066	if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD))	961	if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
1067	SET_FLAG (this, FLAG_UNDEAD);	962	SET_FLAG (this, FLAG_UNDEAD);
1068		963
		964	//TODO: copy_flags?
1069	if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))	965	if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
1070	{	966	{
1071	SET_FLAG (this, FLAG_MAKE_INVIS);	967	SET_FLAG (this, FLAG_MAKE_INVIS);
1072	invisible = 1;	968	invisible = 1;
1073	}	969	}
1074		970
1075	if (tmp->stats.exp && tmp->type != SKILL)	971	if (tmp->stats.exp && tmp->type != SKILL)
1076	{	972	{
1077	if (tmp->stats.exp > 0)	973	if (tmp->stats.exp > 0)
1078	{	974	{
1079	added_speed += (float) tmp->stats.exp / 3.0;	975	added_speed += tmp->stats.exp / 3.f;
1080	bonus_speed += 1.0 + (float) tmp->stats.exp / 3.0;	976	bonus_speed += tmp->stats.exp / 3.f + 1.f;
1081	}	977	}
1082	else	978	else
1083	added_speed += (float) tmp->stats.exp;	979	added_speed += tmp->stats.exp;
1084	}	980	}
1085		981
1086	switch (tmp->type)	982	switch (tmp->type)
1087	{	983	{
1088	/* skills modifying the character -b.t. */
1089	/* for all skills and skill granting objects */
1090	case SKILL:	984	case SKILL:
1091	if (!QUERY_FLAG (tmp, FLAG_APPLIED))	985	{
		986	// some skills will end up here without counting as "applied"
		987	if (!tmp->flag [FLAG_APPLIED] \|\| skill_flags [tmp->subtype] & SF_APPLY)
1092	break;	988	break;
1093		989
1094	if (IS_COMBAT_SKILL (tmp->subtype))
1095	wc_obj = tmp;
1096
1097	if (chosen_skill)	990	if (chosen_skill)
		991	{
1098	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);	992	LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
		993	&name, &chosen_skill->name, &tmp->name);
1099		994
		995	tmp->flag [FLAG_APPLIED] = false;
		996	update_stats ();
		997	return;
		998	}
		999
1100	chosen_skill = tmp;	1000	chosen_skill = tmp;
1101		1001
1102	if (tmp->stats.dam > 0)	1002	if (tmp->stats.dam > 0)
1103	{ /* skill is a 'weapon' */	1003	{ /* skill is a 'weapon' */
1104	if (!QUERY_FLAG (this, FLAG_READY_WEAPON))	1004	if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1105	weapon_speed = (int) WEAPON_SPEED (tmp);	1005	weapon_speed = max (0, WEAPON_SPEED (tmp));
1106		1006
1107	if (weapon_speed < 0)
1108	weapon_speed = 0;
1109
1110	weapon_weight = tmp->weight;	1007	weapon_weight = tmp->weight;
1111	stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9));	1008	stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1112		1009
1113	if (tmp->magic)	1010	if (tmp->magic)
1114	stats.dam += tmp->magic;	1011	stats.dam += tmp->magic;
1115	}	1012	}
1116		1013
1117	if (tmp->stats.wc)	1014	if (tmp->stats.wc)
1118	wc -= (tmp->stats.wc + tmp->magic);	1015	wc -= tmp->stats.wc + tmp->magic;
1119		1016
1120	if (tmp->slaying != NULL)	1017	if (tmp->slaying)
1121	slaying = tmp->slaying;	1018	slaying = tmp->slaying;
1122		1019
1123	if (tmp->stats.ac)	1020	if (tmp->stats.ac)
1124	ac -= (tmp->stats.ac + tmp->magic);	1021	ac -= tmp->stats.ac + tmp->magic;
1125		1022
1126	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1023	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1127	contr->encumbrance += (int) 3 *tmp->weight / 1000;	1024	contr->encumbrance += 3 * tmp->weight / 1000;
1128
1129	if (type == PLAYER)
1130	contr->ranges[range_skill] = this;
1131
1132	break;	1025	}
1133		1026
1134	case SKILL_TOOL:
1135	if (chosen_skill)
1136	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1137
1138	chosen_skill = tmp;
1139
1140	if (type == PLAYER)
1141	contr->ranges[range_skill] = this;
1142	break;	1027	break;
1143		1028
1144	case SHIELD:	1029	case SHIELD:
1145	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1030	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1146	contr->encumbrance += (int) tmp->weight / 2000;	1031	contr->encumbrance += tmp->weight / 2000;
		1032	//FALLTHROUGH
1147	case RING:	1033	case RING:
1148	case AMULET:	1034	case AMULET:
1149	case GIRDLE:	1035	case GIRDLE:
1150	case HELMET:	1036	case HELMET:
1151	case BOOTS:	1037	case BOOTS:
…		…
1160	if (tmp->stats.ac)	1046	if (tmp->stats.ac)
1161	ac -= tmp->stats.ac + tmp->magic;	1047	ac -= tmp->stats.ac + tmp->magic;
1162		1048
1163	break;	1049	break;
1164		1050
		1051	case WAND:
		1052	case ROD:
		1053	case HORN:
		1054	break;
		1055
1165	case BOW:	1056	case BOW:
1166	case WEAPON:	1057	case WEAPON:
1167	wc -= tmp->stats.wc + tmp->magic;	1058	wc -= tmp->stats.wc + tmp->magic;
1168		1059
1169	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)	1060	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1170	ac -= tmp->stats.ac + tmp->magic;	1061	ac -= tmp->stats.ac + tmp->magic;
1171		1062
1172	stats.dam += tmp->stats.dam + tmp->magic;	1063	stats.dam += tmp->stats.dam + tmp->magic;
1173	weapon_weight = tmp->weight;	1064	weapon_weight = tmp->weight;
1174	weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;	1065	weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1175		1066
1176	if (weapon_speed < 0)	1067	if (weapon_speed < 0)
1177	weapon_speed = 0;	1068	weapon_speed = 0;
1178		1069
1179	slaying = tmp->slaying;	1070	slaying = tmp->slaying;
		1071
1180	/* If there is desire that two handed weapons should do	1072	/* If there is desire that two handed weapons should do
1181	* extra strength damage, this is where the code should	1073	* extra strength damage, this is where the code should
1182	* go.	1074	* go.
1183	*/	1075	*/
1184	current_weapon = tmp;	1076
		1077	if (type == PLAYER)
1185	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1078	if (settings.spell_encumbrance)
1186	contr->encumbrance += (int) 3 *tmp->weight / 1000;	1079	contr->encumbrance += tmp->weight * 3 / 1000;
1187		1080
1188	break;	1081	break;
1189		1082
1190	case ARMOUR: /* Only the best of these three are used: */	1083	case ARMOUR: /* Only the best of these three are used: */
1191	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1084	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1192	contr->encumbrance += (int) tmp->weight / 1000;	1085	contr->encumbrance += tmp->weight / 1000;
1193		1086
1194	case BRACERS:	1087	case BRACERS:
1195	case FORCE:	1088	case FORCE:
1196	if (tmp->stats.wc)	1089	if (tmp->stats.wc)
1197	{	1090	{
…		…
1214	else /* To nullify the below effect */	1107	else /* To nullify the below effect */
1215	ac += tmp->stats.ac + tmp->magic;	1108	ac += tmp->stats.ac + tmp->magic;
1216	}	1109	}
1217		1110
1218	if (tmp->stats.wc)	1111	if (tmp->stats.wc)
1219	wc -= (tmp->stats.wc + tmp->magic);	1112	wc -= tmp->stats.wc + tmp->magic;
1220		1113
1221	if (tmp->stats.ac)	1114	if (tmp->stats.ac)
1222	ac -= (tmp->stats.ac + tmp->magic);	1115	ac -= tmp->stats.ac + tmp->magic;
1223		1116
1224	if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max)	1117	if (ARMOUR_SPEED (tmp))
1225	max = ARMOUR_SPEED (tmp) / 10.0;	1118	max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1226		1119
1227	break;	1120	break;
1228	} /* switch tmp->type */	1121	} /* switch tmp->type */
1229	} /* item is equipped */	1122	} /* item is equipped */
1230	} /* for loop of items */	1123	} /* for loop of items */
		1124
		1125	min_it (glow_radius, MAX_LIGHT_RADIUS);
1231		1126
1232	/* We've gone through all the objects the player has equipped. For many things, we	1127	/* We've gone through all the objects the player has equipped. For many things, we
1233	* have generated intermediate values which we now need to assign.	1128	* have generated intermediate values which we now need to assign.
1234	*/	1129	*/
1235		1130
…		…
1237	* If there is an uncursed potion in effect, granting more protection	1132	* If there is an uncursed potion in effect, granting more protection
1238	* than that, we take: 'total resistance = resistance from potion'.	1133	* than that, we take: 'total resistance = resistance from potion'.
1239	* If there is a cursed (and no uncursed) potion in effect, we take	1134	* If there is a cursed (and no uncursed) potion in effect, we take
1240	* 'total resistance = vulnerability from cursed potion'.	1135	* 'total resistance = vulnerability from cursed potion'.
1241	*/	1136	*/
1242	for (i = 0; i < NROFATTACKS; i++)	1137	for (int i = 0; i < NROFATTACKS; i++)
1243	{	1138	{
1244	resist[i] = prot[i] - vuln[i];	1139	resist[i] = prot[i] - vuln[i];
1245		1140
1246	if (potion_resist[i] && ((potion_resist[i] > resist[i]) \|\| (potion_resist[i] < 0)))	1141	if (potion_resist[i] != -1000
		1142	&& (potion_resist[i] < 0 \|\| potion_resist[i] > resist[i]))
1247	resist[i] = potion_resist[i];	1143	resist[i] = potion_resist[i];
1248	}	1144	}
1249		1145
1250	/* Figure out the players sp/mana/hp totals. */
1251	if (type == PLAYER)	1146	if (type == PLAYER)
1252	{	1147	{
		1148	// clamp various player stats
		1149	for (int i = 0; i < NUM_STATS; ++i)
		1150	stats.stat (i) = stat_sum [i];
		1151
		1152	check_stat_bounds (&stats);
		1153
		1154	contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
		1155
		1156	/* Figure out the players sp/mana/hp totals. */
1253	int pl_level;	1157	int pl_level;
1254		1158
1255	check_stat_bounds (&(stats));
1256	pl_level = level;
1257
1258	if (pl_level < 1)
1259	pl_level = 1; /* safety, we should always get 1 levels worth of hp! */	1159	pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1260		1160
1261	/* You basically get half a con bonus/level. But we do take into account rounding,	1161	/* You basically get half a con bonus/level. But we do take into account rounding,
1262	* so if your bonus is 7, you still get 7 worth of bonus every 2 levels.	1162	* so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1263	*/	1163	*/
1264	for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++)	1164	stats.maxhp = 0;
		1165	for (int i = 1; i <= min (10, pl_level); i++)
1265	{	1166	{
1266	j = contr->levhp[i] + con_bonus[stats.Con] / 2;	1167	int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1267		1168
1268	if (i % 2 && con_bonus[stats.Con] % 2)	1169	if (i % 2 && con_bonus[stats.Con] % 2)
1269	{
1270	if (con_bonus[stats.Con] > 0)	1170	if (con_bonus[stats.Con] > 0)
1271	j++;	1171	j++;
1272	else	1172	else
1273	j--;	1173	j--;
1274	}
1275		1174
1276	stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */	1175	stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1277	}	1176	}
1278		1177
1279	for (i = 11; i <= level; i++)	1178	stats.maxhp += 2 * max (0, level - 10);
1280	stats.maxhp += 2;
1281		1179
1282	if (stats.hp > stats.maxhp)	1180	if (stats.hp > stats.maxhp)
1283	stats.hp = stats.maxhp;	1181	stats.hp = stats.maxhp;
1284		1182
1285	/* Sp gain is controlled by the level of the player's	1183	/* Sp gain is controlled by the level of the player's
…		…
1298		1196
1299	if (mana_obj == this && type == PLAYER)	1197	if (mana_obj == this && type == PLAYER)
1300	stats.maxsp = 1;	1198	stats.maxsp = 1;
1301	else	1199	else
1302	{	1200	{
1303	sp_tmp = 0.0;	1201	float sp_tmp = 0.f;
1304		1202
1305	for (i = 1; i <= mana_obj->level && i <= 10; i++)	1203	for (int i = 1; i <= min (10, mana_obj->level); i++)
1306	{	1204	{
1307	float stmp;	1205	float stmp;
1308		1206
1309	/* Got some extra bonus at first level */	1207	/* Got some extra bonus at first level */
1310	if (i < 2)	1208	if (i < 2)
1311	stmp = contr->levsp[i] + ((2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 6.0);	1209	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1312	else	1210	else
1313	stmp = (float) contr->levsp[i] + (2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 12.0;	1211	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1314		1212
1315	if (stmp < 1.0)
1316	stmp = 1.0;
1317
1318	sp_tmp += stmp;	1213	sp_tmp += max (1.f, stmp);
1319	}	1214	}
1320		1215
1321	stats.maxsp = (int) sp_tmp;	1216	stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1322
1323	for (i = 11; i <= mana_obj->level; i++)
1324	stats.maxsp += 2;
1325	}	1217	}
		1218
1326	/* Characters can get their sp supercharged via rune of transferrance */	1219	/* Characters can get their sp supercharged via rune of transferrance */
1327	if (stats.sp > stats.maxsp * 2)	1220	stats.sp = min (stats.sp, stats.maxsp * 2);
1328	stats.sp = stats.maxsp * 2;
1329		1221
1330	/* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */	1222	/* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1331	if (!grace_obj \|\| !grace_obj->level \|\| type != PLAYER)	1223	if (!grace_obj \|\| !grace_obj->level \|\| type != PLAYER)
1332	grace_obj = this;	1224	grace_obj = this;
1333		1225
…		…
1338	/* store grace in a float - this way, the divisions below don't create	1230	/* store grace in a float - this way, the divisions below don't create
1339	* big jumps when you go from level to level - with int's, it then	1231	* big jumps when you go from level to level - with int's, it then
1340	* becomes big jumps when the sums of the bonuses jump to the next	1232	* becomes big jumps when the sums of the bonuses jump to the next
1341	* step of 8 - with floats, even fractional ones are useful.	1233	* step of 8 - with floats, even fractional ones are useful.
1342	*/	1234	*/
1343	sp_tmp = 0.0;	1235	float sp_tmp = 0.f;
1344	for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++)	1236
		1237	for (int i = 1; i <= min (10, grace_obj->level); i++)
1345	{	1238	{
1346	float grace_tmp = 0.0;	1239	float grace_tmp = 0.f;
1347		1240
1348	/* Got some extra bonus at first level */	1241	/* Got some extra bonus at first level */
1349	if (i < 2)	1242	if (i < 2)
1350	grace_tmp = contr->levgrace[i] + (((float) grace_bonus[stats.Pow] +	1243	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1351	2.0 * (float) grace_bonus[stats.Wis]) / 6.0);
1352	else	1244	else
1353	grace_tmp = (float) contr->levgrace[i]
1354	+ ((float) grace_bonus[stats.Pow] + 2.0 * (float) grace_bonus[stats.Wis]) / 12.0;	1245	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1355		1246
1356	if (grace_tmp < 1.0)
1357	grace_tmp = 1.0;
1358
1359	sp_tmp += grace_tmp;	1247	sp_tmp += max (1.f, grace_tmp);
1360	}	1248	}
1361		1249
1362	stats.maxgrace = (int) sp_tmp;
1363
1364	/* two grace points per level after 11 */	1250	/* two grace points per level after 10 */
1365	for (i = 11; i <= grace_obj->level; i++)	1251	stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1366	stats.maxgrace += 2;
1367	}	1252	}
		1253
1368	/* No limit on grace vs maxgrace */	1254	/* No limit on grace vs maxgrace */
1369		1255
1370	if (contr->braced)	1256	if (contr->braced)
1371	{	1257	{
1372	ac += 2;	1258	ac += 2;
…		…
1384	* improvement every level, now its fighterlevel/5. So	1270	* improvement every level, now its fighterlevel/5. So
1385	* we give the player a bonus here in wc and dam	1271	* we give the player a bonus here in wc and dam
1386	* to make up for the change. Note that I left the	1272	* to make up for the change. Note that I left the
1387	* monster bonus the same as before. -b.t.	1273	* monster bonus the same as before. -b.t.
1388	*/	1274	*/
		1275	object *wc_obj = chosen_skill;
1389		1276
1390	if (type == PLAYER && wc_obj && wc_obj->level > 1)	1277	if (contr && wc_obj && wc_obj->level > 1)
1391	{	1278	{
1392	wc -= wc_obj->level + thaco_bonus[stats.Str];	1279	wc -= wc_obj->level + thaco_bonus[stats.Str];
1393		1280
1394	for (i = 1; i < wc_obj->level; i++)	1281	for (int i = 1; i < wc_obj->level; i++)
1395	{	1282	{
1396	/* addtional wc every 6 levels */	1283	/* additional wc every 6 levels */
1397	if (!(i % 6))	1284	if (!(i % 6))
1398	wc--;	1285	wc--;
1399		1286
1400	/* addtional dam every 4 levels. */	1287	/* additional dam every 4 levels. */
1401	if (!(i % 4) && dam_bonus[stats.Str] >= 0)	1288	if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1402	stats.dam += 1 + dam_bonus[stats.Str] / 5;	1289	stats.dam += 1 + dam_bonus[stats.Str] / 5;
1403	}	1290	}
1404	}	1291	}
1405	else	1292	else
…		…
1408	stats.dam += dam_bonus[stats.Str];	1295	stats.dam += dam_bonus[stats.Str];
1409		1296
1410	if (stats.dam < 1)	1297	if (stats.dam < 1)
1411	stats.dam = 1;	1298	stats.dam = 1;
1412		1299
1413	speed = 1.0 + speed_bonus[stats.Dex];	1300	speed = 1.f + speed_bonus[stats.Dex];
1414		1301
1415	if (settings.search_items && contr->search_str[0])	1302	if (settings.search_items && contr->search_str[0])
1416	speed -= 1;	1303	speed -= 1;
1417
1418	if (attacktype == 0)
1419	attacktype = arch->clone.attacktype;
1420
1421	} /* End if player */	1304	} /* End if player */
1422		1305
1423	if (added_speed >= 0)	1306	if (added_speed >= 0)
1424	speed += added_speed / 10.0;	1307	speed += added_speed / 10.f;
1425	else /* Something wrong here...: */	1308	else /* Something wrong here...: */
1426	speed /= (float) (1.0 - added_speed);	1309	speed /= 1.f - added_speed;
1427		1310
1428	/* Max is determined by armour */	1311	/* Max is determined by armour */
1429	if (speed > max)	1312	speed = min (speed, max_speed);
1430	speed = max;
1431		1313
1432	if (type == PLAYER)	1314	if (type == PLAYER)
1433	{	1315	{
1434	/* f is a number the represents the number of kg above (positive num)	1316	/* f is a number the represents the number of kg above (positive num)
1435	* or below (negative number) that the player is carrying. If above	1317	* or below (negative number) that the player is carrying. If above
1436	* weight limit, then player suffers a speed reduction based on how	1318	* weight limit, then player suffers a speed reduction based on how
1437	* much above he is, and what is max carry is	1319	* much above he is, and what is max carry is
1438	*/	1320	*/
1439	f = (carrying / 1000) - max_carry[stats.Str];	1321	float f = (carrying / 1000) - max_carry[stats.Str];
1440	if (f > 0)	1322	if (f > 0.f)
1441	speed = speed / (1.0 + f / max_carry[stats.Str]);	1323	speed = speed / (1.f + f / max_carry[stats.Str]);
1442	}	1324	}
1443		1325
1444	speed += bonus_speed / 10.0; /* Not affected by limits */	1326	speed += bonus_speed / 10.f; /* Not affected by limits */
		1327	speed *= speed_reduce_from_disease;
1445		1328
1446	/* Put a lower limit on speed. Note with this speed, you move once every	1329	/* Put a lower limit on speed. Note with this speed, you move once every
1447	* 100 ticks or so. This amounts to once every 12 seconds of realtime.	1330	* 25 ticks or so. This amounts to once every 3 seconds of realtime.
1448	*/	1331	*/
1449	speed = speed * speed_reduce_from_disease;	1332	max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1450		1333
1451	if (speed < 0.01 && type == PLAYER)	1334	if (speed != old_speed)
1452	speed = 0.01;	1335	set_speed (speed);
1453		1336
1454	if (type == PLAYER)	1337	if (type == PLAYER)
1455	{	1338	{
1456	float M, W, s, D, K, S, M2;
1457
1458	/* (This formula was made by vidarl@ifi.uio.no)	1339	/* (This formula was made by vidarl@ifi.uio.no)
1459	* Note that we never used these values again - basically	1340	* Note that we never used these values again - basically
1460	* all of these could be subbed into one big equation, but	1341	* all of these could be subbed into one big equation, but
1461	* that would just be a real pain to read.	1342	* that would just be a real pain to read.
1462	*/	1343	*/
1463	M = (max_carry[stats.Str] - 121) / 121.0;	1344	float M = (max_carry[stats.Str] - 121) / 121.f;
1464	M2 = max_carry[stats.Str] / 100.0;	1345	float M2 = max_carry[stats.Str] / 100.f;
1465	W = weapon_weight / 20000.0;	1346	float W = weapon_weight / 20000.f;
1466	s = 2 - weapon_speed / 10.0;	1347	float s = (20 - weapon_speed) / 10.f;
1467	D = (stats.Dex - 14) / 14.0;	1348	float D = (stats.Dex - 14) / 14.f;
1468	K = 1 + M / 3.0 - W / (3 * M2) + speed / 5.0 + D / 2.0;	1349	float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
		1350
1469	K = (4 + level) / (float) (6 + level) 1.2;	1351	K = (4 + level) 1.2f / (6 + level);
		1352
1470	if (K <= 0)	1353	if (K <= 0.01f)
1471	K = 0.01;	1354	K = 0.01f;
1472	S = speed / (K * s);	1355
1473	contr->weapon_sp = S;	1356	contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1474	}	1357	}
1475		1358
1476	/* I want to limit the power of small monsters with big weapons: */	1359	/* I want to limit the power of small monsters with big weapons: */
1477	if (type != PLAYER && arch != NULL && stats.dam > arch->clone.stats.dam * 3)	1360	if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
1478	stats.dam = arch->clone.stats.dam * 3;	1361	stats.dam = arch->stats.dam * 3;
1479		1362
1480	/* Prevent overflows of wc - best you can get is ABS(120) - this	1363	stats.wc = clamp (wc, MIN_WC, MAX_WC);
1481	* should be more than enough - remember, AC is also in 8 bits,	1364	stats.ac = clamp (ac, MIN_AC, MAX_AC);
1482	* so its value is the same.
1483	*/
1484	if (wc > 120)
1485	wc = 120;
1486	else if (wc < -120)
1487	wc = -120;
1488
1489	stats.wc = wc;
1490
1491	if (ac > 120)
1492	ac = 120;
1493	else if (ac < -120)
1494	ac = -120;
1495
1496	stats.ac = ac;
1497		1365
1498	/* if for some reason the creature doesn't have any move type,	1366	/* if for some reason the creature doesn't have any move type,
1499	* give them walking as a default.	1367	* give them walking as a default.
1500	* The second case is a special case - to more closely mimic the	1368	* The second case is a special case - to more closely mimic the
1501	* old behaviour - if your flying, your not walking - just	1369	* old behaviour - if your flying, your not walking - just
…		…
1504	if (move_type == 0)	1372	if (move_type == 0)
1505	move_type = MOVE_WALK;	1373	move_type = MOVE_WALK;
1506	else if (move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH))	1374	else if (move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH))
1507	move_type &= ~MOVE_WALK;	1375	move_type &= ~MOVE_WALK;
1508		1376
1509	if (speed != old_speed)	1377	// now apply the new move_type
1510	set_speed (speed);	1378	if (this->move_type != move_type)
		1379	change_move_type (move_type);
1511		1380
1512	/* It is quite possible that a player's spell costing might have changed,	1381	/* It is quite possible that a player's spell costing might have changed,
1513	* so we will check that now.	1382	* so we will check that now.
1514	*/	1383	*/
1515	if (type == PLAYER)	1384	if (is_player ())
1516	{	1385	contr->update_spells ();
1517	esrv_update_stats (contr);
1518	esrv_update_spells (contr);
1519	}
1520		1386
1521	// update the mapspace, if we are on a map	1387	// update the mapspace, if we are on a map
1522	if (!flag [FLAG_REMOVED] && map)	1388	if (!flag [FLAG_REMOVED] && map)
1523	map->at (x, y).flags_ = 0;	1389	map->at (x, y).flags_ = 0;
		1390	}
		1391
		1392	void
		1393	object::set_glow_radius (sint8 rad)
		1394	{
		1395	glow_radius = rad;
		1396
		1397	if (is_on_map ())
		1398	update_all_los (map, x, y);
		1399	else if (object *env = outer_env ())
		1400	{
		1401	env->update_stats ();
		1402
		1403	if (env->is_on_map ())
		1404	update_all_los (env->map, env->x, env->y);
		1405	}
1524	}	1406	}
1525		1407
1526	/*	1408	/*
1527	* Returns true if the given player is a legal class.	1409	* Returns true if the given player is a legal class.
1528	* The function to add and remove class-bonuses to the stats doesn't	1410	* The function to add and remove class-bonuses to the stats doesn't
…		…
1531	* false otherwise.	1413	* false otherwise.
1532	*/	1414	*/
1533	int	1415	int
1534	allowed_class (const object *op)	1416	allowed_class (const object *op)
1535	{	1417	{
1536	return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 &&	1418	return op->stats.Dex > 0
1537	op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0;	1419	&& op->stats.Str > 0
		1420	&& op->stats.Con > 0
		1421	&& op->stats.Int > 0
		1422	&& op->stats.Wis > 0
		1423	&& op->stats.Pow > 0
		1424	&& op->stats.Cha > 0;
1538	}	1425	}
1539		1426
1540	/*	1427	/*
1541	* set the new dragon name after gaining levels or	1428	* set the new dragon name after gaining levels or
1542	* changing ability focus (later this can be extended to	1429	* changing ability focus (later this can be extended to
1543	* eventually change the player's face and animation)	1430	* eventually change the player's face and animation)
1544	*
1545	* Note that the title is written to 'own_title' in the
1546	* player struct. This should be changed to 'ext_title'
1547	* as soon as clients support this!
1548	* Please, anyone, write support for 'ext_title'.
1549	*/	1431	*/
1550	void	1432	void
1551	set_dragon_name (object pl, const object abil, const object *skin)	1433	set_dragon_name (object pl, const object abil, const object *skin)
1552	{	1434	{
1553	int atnr = -1; /* attacknumber of highest level */	1435	int atnr = -1; /* attacknumber of highest level */
…		…
1571	/* now if there are equals at highest level, pick the one with focus,	1453	/* now if there are equals at highest level, pick the one with focus,
1572	or else at random */	1454	or else at random */
1573	if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)	1455	if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1574	atnr = abil->stats.exp;	1456	atnr = abil->stats.exp;
1575		1457
1576	level = (int) (level / 5.);
1577
1578	/* now set the new title */	1458	/* now set the new title */
1579	if (pl->contr != NULL)
1580	{
1581	if (level == 0)
1582	sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);	1459	if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1583	else if (level == 1)
1584	sprintf (pl->contr->title, "%s wyrm", attacks[atnr]);	1460	else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1585	else if (level == 2)
1586	sprintf (pl->contr->title, "%s wyvern", attacks[atnr]);	1461	else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1587	else if (level == 3)
1588	sprintf (pl->contr->title, "%s dragon", attacks[atnr]);	1462	else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1589	else	1463	else
1590	{	1464	{
1591	/* special titles for extra high resistance! */	1465	/* special titles for extra high resistance! */
1592	if (skin->resist[atnr] > 80)
1593	sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);	1466	if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1594	else if (skin->resist[atnr] > 50)
1595	sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]);	1467	else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1596	else
1597	sprintf (pl->contr->title, "big %s dragon", attacks[atnr]);	1468	else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1598	}
1599	}	1469	}
1600		1470
1601	strcpy (pl->contr->own_title, "");	1471	strcpy (pl->contr->own_title, "");
1602	}	1472	}
1603		1473
1604	/*	1474	/*
1605	* This function is called when a dragon-player gains	1475	* This function is called when a dragon-player gains
1606	* an overall level. Here, the dragon might gain new abilities	1476	* an overall level. Here, the dragon might gain new abilities
1607	* or change the ability-focus.	1477	* or change the ability-focus.
1608	*/	1478	*/
1609	void	1479	static void
1610	dragon_level_gain (object *who)	1480	dragon_level_gain (object *who)
1611	{	1481	{
1612	object abil = NULL; / pointer to dragon ability force */	1482	object abil = NULL; / pointer to dragon ability force */
1613	object skin = NULL; / pointer to dragon skin force */	1483	object skin = NULL; / pointer to dragon skin force */
1614	object tmp = NULL; / tmp. object */	1484	object tmp = NULL; / tmp. object */
1615	char buf[MAX_BUF]; /* tmp. string buffer */	1485	char buf[MAX_BUF]; /* tmp. string buffer */
1616		1486
1617	/* now grab the 'dragon_ability'-forces from the player's inventory */	1487	/* now grab the 'dragon_ability'-forces from the player's inventory */
1618	shstr_cmp dragon_ability_force ("dragon_ability_force");
1619	shstr_cmp dragon_skin_force ("dragon_skin_force");
1620
1621	for (tmp = who->inv; tmp; tmp = tmp->below)	1488	for (tmp = who->inv; tmp; tmp = tmp->below)
1622	if (tmp->type == FORCE)	1489	if (tmp->type == FORCE)
1623	if (tmp->arch->name == dragon_ability_force)	1490	if (tmp->arch->archname == shstr_dragon_ability_force)
1624	abil = tmp;	1491	abil = tmp;
1625	else if (tmp->arch->name == dragon_skin_force)	1492	else if (tmp->arch->archname == shstr_dragon_skin_force)
1626	skin = tmp;	1493	skin = tmp;
1627		1494
1628	/* if the force is missing -> bail out */	1495	/* if the force is missing -> bail out */
1629	if (abil == NULL)	1496	if (abil == NULL)
1630	return;	1497	return;
…		…
1673	object *skill_obj;	1540	object *skill_obj;
1674		1541
1675	skill_obj = get_archetype_by_skill_name (skill_name, SKILL);	1542	skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1676	if (!skill_obj)	1543	if (!skill_obj)
1677	{	1544	{
1678	LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name);	1545	LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1679	return NULL;	1546	return NULL;
1680	}	1547	}
		1548
1681	/* clear the flag - exp goes into this bucket, but player	1549	/* clear the flag - exp goes into this bucket, but player
1682	* still doesn't know it.	1550	* still doesn't know it.
1683	*/	1551	*/
1684	CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);	1552	CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1685	skill_obj->stats.exp = 0;	1553	skill_obj->stats.exp = 0;
1686	skill_obj->level = 1;	1554	skill_obj->level = 1;
1687	insert_ob_in_ob (skill_obj, op);	1555	op->insert (skill_obj);
1688		1556
1689	if (op->contr)	1557	if (player *pl = op->contr)
1690	{	1558	pl->link_skills ();
1691	op->contr->last_skill_ob [skill_obj->subtype] = skill_obj;
1692	if (op->contr->ns)
1693	op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1694	}
1695		1559
1696	return skill_obj;	1560	return skill_obj;
1697	}	1561	}
1698
1699		1562
1700	/* player_lvl_adj() - for the new exp system. we are concerned with	1563	/* player_lvl_adj() - for the new exp system. we are concerned with
1701	* whether the player gets more hp, sp and new levels.	1564	* whether the player gets more hp, sp and new levels.
1702	* Note this this function should only be called for players. Monstes	1565	* Note this this function should only be called for players. Monstes
1703	* don't really gain levels	1566	* don't really gain levels
…		…
1706	*/	1569	*/
1707	void	1570	void
1708	player_lvl_adj (object who, object op)	1571	player_lvl_adj (object who, object op)
1709	{	1572	{
1710	char buf[MAX_BUF];	1573	char buf[MAX_BUF];
		1574	bool changed = false;
1711		1575
1712	if (!op) /* when rolling stats */	1576	if (!op) /* when rolling stats */
1713	op = who;	1577	op = who;
1714		1578
1715	if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))	1579	while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1716	{	1580	{
		1581	changed = true;
		1582
1717	op->level++;	1583	op->level++;
1718		1584
1719	if (op != NULL && op == who && op->stats.exp > 1 && is_dragon_pl (who))	1585	if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1720	dragon_level_gain (who);	1586	dragon_level_gain (who);
1721		1587
1722	/* Only roll these if it is the player (who) that gained the level */	1588	/* Only roll these if it is the player (who) that gained the level */
1723	if (op == who && (who->level < 11) && who->type == PLAYER)	1589	if (op == who && (who->level < 11) && who->type == PLAYER)
1724	{	1590	{
1725	who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;	1591	who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1726	who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);	1592	who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1727	who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;	1593	who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1728	}	1594	}
1729		1595
1730	who->update_stats ();
1731	if (op->level > 1)	1596	if (op->level > 1)
1732	{	1597	{
1733	if (op->type != PLAYER)	1598	if (op->type != PLAYER)
		1599	{
		1600	who->contr->play_sound (sound_find ("skill_up"));
1734	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);	1601	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
		1602	}
1735	else	1603	else
		1604	{
		1605	who->contr->play_sound (sound_find ("level_up"));
1736	sprintf (buf, "You are now level %d.", op->level);	1606	sprintf (buf, "You are now level %d.", op->level);
		1607	}
		1608
1737	if (who)	1609	if (who)
1738	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);	1610	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);
1739	}	1611	}
1740	player_lvl_adj (who, op); /* To increase more levels */
1741	}	1612	}
		1613
1742	else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))	1614	while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1743	{	1615	{
		1616	changed = true;
		1617
1744	op->level--;	1618	op->level--;
1745	who->update_stats ();	1619
1746	if (op->type != PLAYER)	1620	if (op->type != PLAYER)
1747	{	1621	{
1748	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);	1622	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1749	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);	1623	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);
1750	}	1624	}
1751	player_lvl_adj (who, op); /* To decrease more levels */
1752	}	1625	}
1753		1626
1754	/* check if the spell data has changed */	1627	if (changed)
1755	esrv_update_stats (who->contr);	1628	who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1756	esrv_update_spells (who->contr);
1757	}	1629	}
1758		1630
1759	/*	1631	/*
1760	* Returns how much experience is needed for a player to become	1632	* Returns how much experience is needed for a player to become
1761	* the given level. level should really never exceed max_level	1633	* the given level. level should really never exceed max_level
…		…
1764	sint64	1636	sint64
1765	level_exp (int level, double expmul)	1637	level_exp (int level, double expmul)
1766	{	1638	{
1767	if (level > settings.max_level)	1639	if (level > settings.max_level)
1768	return (sint64) (expmul * levels[settings.max_level]);	1640	return (sint64) (expmul * levels[settings.max_level]);
		1641
1769	return (sint64) (expmul * levels[level]);	1642	return (sint64) (expmul * levels[level]);
1770	}	1643	}
1771		1644
1772	/*	1645	/*
1773	* Ensure that the permanent experience requirements in an exp object are met.	1646	* Ensure that the permanent experience requirements in an exp object are met.
…		…
1804	* flag is what to do if the player doesn't have the skill:	1677	* flag is what to do if the player doesn't have the skill:
1805	*/	1678	*/
1806	static void	1679	static void
1807	add_player_exp (object op, sint64 exp, const char skill_name, int flag)	1680	add_player_exp (object op, sint64 exp, const char skill_name, int flag)
1808	{	1681	{
1809	object *skill_obj = NULL;	1682	object *skill_obj;
1810	sint64 limit, exp_to_add;	1683	sint64 limit, exp_to_add;
1811	int i;	1684	int i;
1812		1685
1813	/* prevents some forms of abuse. */	1686	/* prevents some forms of abuse. */
1814	if (op->contr->braced)	1687	if (op->contr->braced)
1815	exp = exp / 5;	1688	exp /= 5;
1816		1689
1817	/* Try to find the matching skill.	1690	/* Try to find the matching skill.
1818	* We do a shortcut/time saving mechanism first - see if it matches	1691	* We do a shortcut/time saving mechanism first - see if it matches
1819	* chosen_skill. This means we don't need to search through	1692	* chosen_skill. This means we don't need to search through
1820	* the players inventory.	1693	* the players inventory.
1821	*/	1694	*/
		1695	skill_obj = 0;
		1696
1822	if (skill_name)	1697	if (skill_name)
1823	{	1698	{
1824	if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill))	1699	skill_obj = op->contr->find_skill (skill_name);
1825	skill_obj = op->chosen_skill;
1826	else
1827	{
1828	for (i = 0; i < NUM_SKILLS; i++)
1829	if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1830	{
1831	skill_obj = op->contr->last_skill_ob[i];
1832	break;
1833	}
1834		1700
1835	/* Player doesn't have the skill. Check to see what to do, and give	1701	/* Player doesn't have the skill. Check to see what to do, and give
1836	* it to the player if necessary	1702	* it to the player if necessary
1837	*/	1703	*/
1838	if (!skill_obj)	1704	if (!skill_obj)
1839	{	1705	{
1840	if (flag == SK_EXP_NONE)	1706	if (flag == SK_EXP_NONE)
1841	return;	1707	return;
		1708
1842	else if (flag == SK_EXP_ADD_SKILL)	1709	if (flag == SK_EXP_ADD_SKILL)
1843	give_skill_by_name (op, skill_name);	1710	skill_obj = give_skill_by_name (op, skill_name);
1844	}
1845	}	1711	}
1846	}	1712	}
1847		1713
1848	if (flag != SK_EXP_SKILL_ONLY)	1714	if (flag != SK_EXP_SKILL_ONLY)
1849	{	1715	{
…		…
1882	player_lvl_adj (op, skill_obj);	1748	player_lvl_adj (op, skill_obj);
1883	}	1749	}
1884	}	1750	}
1885		1751
1886	/* This function checks to make sure that object 'op' can	1752	/* This function checks to make sure that object 'op' can
1887	* lost 'exp' experience. It returns the amount of exp	1753	* lose 'exp' experience. It returns the amount of exp
1888	* object 'op' can in fact lose - it basically makes	1754	* object 'op' can in fact lose - it basically makes
1889	* adjustments based on permanent exp and the like.	1755	* adjustments based on permanent exp and the like.
1890	* This function should always be used for losing experience -	1756	* This function should always be used for losing experience -
1891	* the 'exp' value passed should be positive - this is the	1757	* the 'exp' value passed should be positive - this is the
1892	* amount that should get subtract from the player.	1758	* amount that should get subtract from the player.
1893	*/	1759	*/
1894	sint64	1760	static sint64
1895	check_exp_loss (const object *op, sint64 exp)	1761	check_exp_loss (const object *op, sint64 exp)
1896	{	1762	{
1897	sint64 del_exp;	1763	sint64 del_exp;
1898		1764
1899	if (exp > op->stats.exp)	1765	if (exp > op->stats.exp)
1900	exp = op->stats.exp;	1766	exp = op->stats.exp;
		1767
1901	if (settings.permanent_exp_ratio)	1768	if (settings.permanent_exp_ratio)
1902	{	1769	{
1903	del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);	1770	del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
		1771
1904	if (del_exp < 0)	1772	if (del_exp < 0)
1905	del_exp = 0;	1773	del_exp = 0;
		1774
1906	if (exp > del_exp)	1775	if (exp > del_exp)
1907	exp = del_exp;	1776	exp = del_exp;
1908	}	1777	}
		1778
1909	return exp;	1779	return exp;
1910	}	1780	}
1911		1781
1912	sint64	1782	sint64
1913	check_exp_adjust (const object *op, sint64 exp)	1783	check_exp_adjust (const object *op, sint64 exp)
1914	{	1784	{
1915	if (exp < 0)	1785	if (exp < 0)
1916	return check_exp_loss (op, exp);	1786	return check_exp_loss (op, exp);
1917	else	1787	else
1918	return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp);	1788	return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1919	}	1789	}
1920
1921		1790
1922	/* Subtracts experience from player.	1791	/* Subtracts experience from player.
1923	* if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we	1792	* if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1924	* only subtract from the matching skill. Otherwise,	1793	* only subtract from the matching skill. Otherwise,
1925	* this subtracts a portion from all	1794	* this subtracts a portion from all
…		…
1939	sint64 del_exp;	1808	sint64 del_exp;
1940		1809
1941	for (tmp = op->inv; tmp; tmp = tmp->below)	1810	for (tmp = op->inv; tmp; tmp = tmp->below)
1942	if (tmp->type == SKILL && tmp->stats.exp)	1811	if (tmp->type == SKILL && tmp->stats.exp)
1943	{	1812	{
1944	if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill))	1813	if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
1945	{	1814	{
1946	del_exp = check_exp_loss (tmp, exp);	1815	del_exp = check_exp_loss (tmp, exp);
1947	tmp->stats.exp -= del_exp;	1816	tmp->stats.exp -= del_exp;
1948	player_lvl_adj (op, tmp);	1817	player_lvl_adj (op, tmp);
1949	}	1818	}
…		…
2037	* amount of permenent experience, whichever gives the lowest loss.	1906	* amount of permenent experience, whichever gives the lowest loss.
2038	*/	1907	*/
2039	void	1908	void
2040	apply_death_exp_penalty (object *op)	1909	apply_death_exp_penalty (object *op)
2041	{	1910	{
2042	object *tmp;
2043	sint64 loss;	1911	sint64 loss;
2044	sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */	1912	sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
2045	sint64 level_loss; /* defined by the setting 'death_penalty_levels */	1913	sint64 level_loss; /* defined by the setting 'death_penalty_levels */
2046		1914
2047	for (tmp = op->inv; tmp; tmp = tmp->below)	1915	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2048	if (tmp->type == SKILL && tmp->stats.exp)	1916	if (tmp->type == SKILL && tmp->stats.exp)
2049	{	1917	{
2050
2051	percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;	1918	percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
2052	level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)];	1919	level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
2053		1920
2054	/* With the revised exp system, you can get cases where	1921	/* With the revised exp system, you can get cases where
2055	* losing several levels would still require that you have more	1922	* losing several levels would still require that you have more
2056	* exp than you currently have - this is true if the levels	1923	* exp than you currently have - this is true if the levels
2057	* tables is a lot harder.	1924	* tables is a lot harder.
2058	*/	1925	*/
2059	if (level_loss < 0)	1926	if (level_loss < 0)
2060	level_loss = 0;	1927	level_loss = 0;
2061		1928
2062	loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss));	1929	loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
2063		1930
2064	tmp->stats.exp -= loss;	1931	tmp->stats.exp -= loss;
2065	player_lvl_adj (op, tmp);	1932	player_lvl_adj (op, tmp);
2066	}	1933	}
2067		1934
2068	percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;	1935	percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
2069	level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)];	1936	level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
		1937
2070	if (level_loss < 0)	1938	if (level_loss < 0)
2071	level_loss = 0;	1939	level_loss = 0;
		1940
2072	loss = check_exp_loss (op, MIN (level_loss, percentage_loss));	1941	loss = check_exp_loss (op, min (level_loss, percentage_loss));
2073		1942
2074	op->stats.exp -= loss;	1943	op->stats.exp -= loss;
2075	player_lvl_adj (op, NULL);	1944	player_lvl_adj (op, NULL);
2076	}	1945	}
2077		1946

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.38 by root, Sun Apr 29 04:14:57 2007 UTC vs. Revision 1.115 by root, Fri Apr 2 03:41:24 2010 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.38 by root, Sun Apr 29 04:14:57 2007 UTC vs.
Revision 1.115 by root, Fri Apr 2 03:41:24 2010 UTC