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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.9 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.20 by root, Sat Dec 23 06:30:49 2006 UTC

…		…
1
2	/*
3	* static char *rcsid_living_c =
4	* "$Id: living.C,v 1.9 2006/09/10 16:00:23 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
22		16
23	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
28	*/	22	*/
29		23
30	#include <global.h>	24	#include <global.h>
31	#include <funcpoint.h>	25	#include <funcpoint.h>
32		26
…		…
164	* -b.t.	158	* -b.t.
165	*/	159	*/
166		160
167	#define MAX_EXP_IN_OBJ levels[settings.max_level]/(MAX_EXP_CAT - 1)	161	#define MAX_EXP_IN_OBJ levels[settings.max_level]/(MAX_EXP_CAT - 1)
168		162
169	#ifndef WIN32
170	extern uint64 *levels;
171	#else
172	extern sint64 *levels;	163	extern sint64 *levels;
173	#endif
174		164
175	#define MAX_SAVE_LEVEL 110	165	#define MAX_SAVE_LEVEL 110
176		166
177	/* This no longer needs to be changed anytime the number of	167	/* This no longer needs to be changed anytime the number of
178	* levels is increased - rather, did_make_save will do the	168	* levels is increased - rather, did_make_save will do the
…		…
245		235
246	/*	236	/*
247	* sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on	237	* sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on
248	* what attr is (STR to POW).	238	* what attr is (STR to POW).
249	*/	239	*/
250
251	void	240	void
252	set_attr_value (living * stats, int attr, sint8 value)	241	set_attr_value (living *stats, int attr, sint8 value)
253	{	242	{
254	switch (attr)	243	switch (attr)
255	{	244	{
256	case STR:	245	case STR:
257	stats->Str = value;	246	stats->Str = value;
258	break;	247	break;
259	case DEX:	248	case DEX:
260	stats->Dex = value;	249	stats->Dex = value;
261	break;	250	break;
262	case CON:	251	case CON:
263	stats->Con = value;	252	stats->Con = value;
264	break;	253	break;
265	case WIS:	254	case WIS:
266	stats->Wis = value;	255	stats->Wis = value;
267	break;	256	break;
268	case POW:	257	case POW:
269	stats->Pow = value;	258	stats->Pow = value;
270	break;	259	break;
271	case CHA:	260	case CHA:
272	stats->Cha = value;	261	stats->Cha = value;
273	break;	262	break;
274	case INT:	263	case INT:
275	stats->Int = value;	264	stats->Int = value;
276	break;	265	break;
277	}	266	}
278	}	267	}
279		268
280	/*	269	/*
281	* Like set_attr_value(), but instead the value (which can be negative)	270	* Like set_attr_value(), but instead the value (which can be negative)
282	* is added to the specified stat.	271	* is added to the specified stat.
283	*/	272	*/
284
285	void	273	void
286	change_attr_value (living * stats, int attr, sint8 value)	274	change_attr_value (living *stats, int attr, sint8 value)
287	{	275	{
288	if (value == 0)	276	if (value == 0)
289	return;	277	return;
		278
290	switch (attr)	279	switch (attr)
291	{	280	{
292	case STR:	281	case STR:
293	stats->Str += value;	282	stats->Str += value;
294	break;	283	break;
295	case DEX:	284	case DEX:
296	stats->Dex += value;	285	stats->Dex += value;
297	break;	286	break;
298	case CON:	287	case CON:
299	stats->Con += value;	288	stats->Con += value;
300	break;	289	break;
301	case WIS:	290	case WIS:
302	stats->Wis += value;	291	stats->Wis += value;
303	break;	292	break;
304	case POW:	293	case POW:
305	stats->Pow += value;	294	stats->Pow += value;
306	break;	295	break;
307	case CHA:	296	case CHA:
308	stats->Cha += value;	297	stats->Cha += value;
309	break;	298	break;
310	case INT:	299	case INT:
311	stats->Int += value;	300	stats->Int += value;
312	break;	301	break;
313	default:	302	default:
314	LOG (llevError, "Invalid attribute in change_attr_value: %d\n", attr);	303	LOG (llevError, "Invalid attribute in change_attr_value: %d\n", attr);
315	}	304	}
316	}	305	}
317		306
318	/*	307	/*
319	* returns the specified stat. See also set_attr_value().	308	* returns the specified stat. See also set_attr_value().
320	*/	309	*/
321		310
322	sint8	311	sint8
323	get_attr_value (const living * stats, int attr)	312	get_attr_value (const living *stats, int attr)
324	{	313	{
325	switch (attr)	314	switch (attr)
326	{	315	{
327	case STR:
328	return (stats->Str);	316	case STR: return stats->Str;
329	case DEX:
330	return (stats->Dex);	317	case DEX: return stats->Dex;
331	case CON:
332	return (stats->Con);	318	case CON: return stats->Con;
333	case WIS:
334	return (stats->Wis);	319	case WIS: return stats->Wis;
335	case CHA:
336	return (stats->Cha);	320	case CHA: return stats->Cha;
337	case INT:
338	return (stats->Int);	321	case INT: return stats->Int;
339	case POW:
340	return (stats->Pow);	322	case POW: return stats->Pow;
341	}	323	}
		324
342	return 0;	325	return 0;
343	}	326	}
344		327
345	/*	328	/*
346	* Ensures that all stats (str/dex/con/wis/cha/int) are within the	329	* Ensures that all stats (str/dex/con/wis/cha/int) are within the
347	* 1-30 stat limit.	330	* 1-30 stat limit.
348	*/	331	*/
349		332
350	void	333	void
351	check_stat_bounds (living * stats)	334	check_stat_bounds (living *stats)
352	{	335	{
353	int i, v;	336	int i, v;
354		337
355	for (i = 0; i < NUM_STATS; i++)	338	for (i = 0; i < NUM_STATS; i++)
356	if ((v = get_attr_value (stats, i)) > MAX_STAT)	339	if ((v = get_attr_value (stats, i)) > MAX_STAT)
…		…
388	char message[MAX_BUF];	371	char message[MAX_BUF];
389	int potion_max = 0;	372	int potion_max = 0;
390		373
391	/* remember what object was like before it was changed. note that	374	/* remember what object was like before it was changed. note that
392	* refop is a local copy of op only to be used for detecting changes	375	* refop is a local copy of op only to be used for detecting changes
393	* found by fix_player. refop is not a real object	376	* found by update_stats. refop is not a real object
394	*/	377	*/
395	object_pod refop = *op;	378	object_copy refop = *op;
396		379
397	if (op->type == PLAYER)	380	if (op->type == PLAYER)
398	{	381	{
399	if (tmp->type == POTION)	382	if (tmp->type == POTION)
400	{	383	{
…		…
418	nstat = 1;	401	nstat = 1;
419	else if (nstat > 20 + get_attr_value (&(op->arch->clone.stats), j))	402	else if (nstat > 20 + get_attr_value (&(op->arch->clone.stats), j))
420	{	403	{
421	nstat = 20 + get_attr_value (&(op->arch->clone.stats), j);	404	nstat = 20 + get_attr_value (&(op->arch->clone.stats), j);
422	}	405	}
		406
423	if (nstat != ostat)	407	if (nstat != ostat)
424	{	408	{
425	set_attr_value (&(op->contr->orig_stats), j, nstat);	409	set_attr_value (&(op->contr->orig_stats), j, nstat);
426	potion_max = 0;	410	potion_max = 0;
427	}	411	}
…		…
429	{	413	{
430	/* potion is useless - player has already hit the natural maximum */	414	/* potion is useless - player has already hit the natural maximum */
431	potion_max = 1;	415	potion_max = 1;
432	}	416	}
433	}	417	}
		418
434	/* This section of code ups the characters normal stats also. I am not	419	/* This section of code ups the characters normal stats also. I am not
435	* sure if this is strictly necessary, being that fix_player probably	420	* sure if this is strictly necessary, being that fix_player probably
436	* recalculates this anyway.	421	* recalculates this anyway.
437	*/	422	*/
438	for (j = 0; j < NUM_STATS; j++)	423	for (j = 0; j < NUM_STATS; j++)
439	change_attr_value (&(op->stats), j, flag * get_attr_value (&(tmp->stats), j));	424	change_attr_value (&(op->stats), j, flag * get_attr_value (&(tmp->stats), j));
		425
440	check_stat_bounds (&(op->stats));	426	check_stat_bounds (&(op->stats));
441	} /* end of potion handling code */	427	} /* end of potion handling code */
442	}	428	}
443		429
444	/* reset attributes that fix_player doesn't reset since it doesn't search	430	/* reset attributes that fix_player doesn't reset since it doesn't search
…		…
458		444
459	/* call fix_player since op object could have whatever attribute due	445	/* call fix_player since op object could have whatever attribute due
460	* to multiple items. if fix_player always has to be called after	446	* to multiple items. if fix_player always has to be called after
461	* change_ability then might as well call it from here	447	* change_ability then might as well call it from here
462	*/	448	*/
463	fix_player (op);	449	op->update_stats ();
464		450
465	/* Fix player won't add the bows ability to the player, so don't	451	/* Fix player won't add the bows ability to the player, so don't
466	* print out message if this is a bow.	452	* print out message if this is a bow.
467	*/	453	*/
468	if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)	454	if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)
469	{	455	{
470	success = 1;	456	success = 1;
471	DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red.");	457	DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red.");
472	}	458	}
		459
473	if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE))	460	if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE))
474	{	461	{
475	success = 1;	462	success = 1;
476	DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore.");	463	DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore.");
477	}	464	}
		465
478	if (QUERY_FLAG (op, FLAG_REFL_MISSILE) != QUERY_FLAG (&refop, FLAG_REFL_MISSILE))	466	if (QUERY_FLAG (op, FLAG_REFL_MISSILE) != QUERY_FLAG (&refop, FLAG_REFL_MISSILE))
479	{	467	{
480	success = 1;	468	success = 1;
481	DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away.");	469	DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away.");
482	}	470	}
		471
483	if (QUERY_FLAG (op, FLAG_REFL_SPELL) != QUERY_FLAG (&refop, FLAG_REFL_SPELL))	472	if (QUERY_FLAG (op, FLAG_REFL_SPELL) != QUERY_FLAG (&refop, FLAG_REFL_SPELL))
484	{	473	{
485	success = 1;	474	success = 1;
486	DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow.");	475	DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow.");
487	}	476	}
		477
488	/* movement type has changed. We don't care about cases where	478	/* movement type has changed. We don't care about cases where
489	* user has multiple items giving the same type appled like we	479	* user has multiple items giving the same type appled like we
490	* used to - that is more work than what we gain, plus messages	480	* used to - that is more work than what we gain, plus messages
491	* can be misleading (a little higher could be miscontrued from	481	* can be misleading (a little higher could be miscontrued from
492	* from fly high)	482	* from fly high)
…		…
540	if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH))	530	if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH))
541	{	531	{
542	success = 1;	532	success = 1;
543	DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");	533	DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
544	}	534	}
		535
545	if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS))	536	if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS))
546	{	537	{
547	success = 1;	538	success = 1;
548	DIFF_MSG (flag, "You become transparent.", "You can see yourself.");	539	DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
549	}	540	}
		541
550	/* blinded you can tell if more blinded since blinded player has minimal	542	/* blinded you can tell if more blinded since blinded player has minimal
551	* vision	543	* vision
552	*/	544	*/
553	if (QUERY_FLAG (tmp, FLAG_BLIND))	545	if (QUERY_FLAG (tmp, FLAG_BLIND))
554	{	546	{
…		…
661		653
662	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, op, message);	654	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, op, message);
663	}	655	}
664	}	656	}
665		657
666	if (tmp->type != EXPERIENCE && !potion_max)	658	if (!potion_max)
667	{	659	{
668	for (j = 0; j < NUM_STATS; j++)	660	for (j = 0; j < NUM_STATS; j++)
669	{	661	{
670	if ((i = get_attr_value (&(tmp->stats), j)) != 0)	662	if ((i = get_attr_value (&(tmp->stats), j)) != 0)
671	{	663	{
672	success = 1;	664	success = 1;
673	DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);	665	DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
674	}	666	}
675	}	667	}
676	}	668	}
		669
677	return success;	670	return success;
678	}	671	}
679		672
680	/*	673	/*
681	* Stat draining by Vick 930307	674	* Stat draining by Vick 930307
682	* (Feeling evil, I made it work as well now. -Frank 8)	675	* (Feeling evil, I made it work as well now. -Frank 8)
683	*/	676	*/
684		677
685	void	678	void
686	drain_stat (object *op)	679	object::drain_stat ()
687	{	680	{
688	drain_specific_stat (op, RANDOM () % NUM_STATS);	681	drain_specific_stat (RANDOM () % NUM_STATS);
689	}	682	}
690		683
691	void	684	void
692	drain_specific_stat (object *op, int deplete_stats)	685	object::drain_specific_stat (int deplete_stats)
693	{	686	{
694	object *tmp;	687	object *tmp;
695	archetype *at;	688	archetype *at;
696		689
697	at = find_archetype (ARCH_DEPLETION);	690	at = archetype::find (ARCH_DEPLETION);
698	if (!at)	691	if (!at)
699	{	692	{
700	LOG (llevError, "Couldn't find archetype depletion.\n");	693	LOG (llevError, "Couldn't find archetype depletion.\n");
701	return;	694	return;
702	}	695	}
703	else	696	else
704	{	697	{
705	tmp = present_arch_in_ob (at, op);	698	tmp = present_arch_in_ob (at, this);
		699
706	if (!tmp)	700	if (!tmp)
707	{	701	{
708	tmp = arch_to_object (at);	702	tmp = arch_to_object (at);
709	tmp = insert_ob_in_ob (tmp, op);	703	tmp = insert_ob_in_ob (tmp, this);
710	SET_FLAG (tmp, FLAG_APPLIED);	704	SET_FLAG (tmp, FLAG_APPLIED);
711	}	705	}
712	}	706	}
713		707
714	new_draw_info (NDI_UNIQUE, 0, op, drain_msg[deplete_stats]);	708	new_draw_info (NDI_UNIQUE, 0, this, drain_msg[deplete_stats]);
715	change_attr_value (&tmp->stats, deplete_stats, -1);	709	change_attr_value (&tmp->stats, deplete_stats, -1);
716	fix_player (op);	710	update_stats ();
717	}	711	}
718		712
719	/*	713	/*
720	* A value of 0 indicates timeout, otherwise change the luck of the object.	714	* A value of 0 indicates timeout, otherwise change the luck of the object.
721	* via an applied bad_luck object.	715	* via an applied bad_luck object.
722	*/	716	*/
723
724	void	717	void
725	change_luck (object *op, int value)	718	object::change_luck (int value)
726	{	719	{
727	object *tmp;	720	archetype *at = archetype::find ("luck");
728	archetype *at;
729	int new_luck;
730
731	at = find_archetype ("luck");
732	if (!at)	721	if (!at)
733	LOG (llevError, "Couldn't find archetype luck.\n");	722	LOG (llevError, "Couldn't find archetype luck.\n");
734	else	723	else
735	{	724	{
736	tmp = present_arch_in_ob (at, op);	725	object *tmp = present_arch_in_ob (at, this);
		726
737	if (!tmp)	727	if (!tmp)
738	{	728	{
739	if (!value)	729	if (!value)
740	return;	730	return;
		731
741	tmp = arch_to_object (at);	732	tmp = arch_to_object (at);
742	tmp = insert_ob_in_ob (tmp, op);	733	tmp = insert_ob_in_ob (tmp, this);
743	SET_FLAG (tmp, FLAG_APPLIED);	734	SET_FLAG (tmp, FLAG_APPLIED);
744	}	735	}
		736
745	if (value)	737	if (value)
746	{	738	{
747	/* Limit the luck value of the bad luck object to +/-100. This	739	/* Limit the luck value of the bad luck object to +/-100. This
748	* (arbitrary) value prevents overflows (both in the bad luck object and	740	* (arbitrary) value prevents overflows (both in the bad luck object and
749	* in op itself).	741	* in op itself).
750	*/	742	*/
751	new_luck = tmp->stats.luck + value;	743	int new_luck = tmp->stats.luck + value;
		744
752	if (new_luck >= -100 && new_luck <= 100)	745	if (new_luck >= -100 && new_luck <= 100)
753	{	746	{
754	op->stats.luck += value;	747	stats.luck += value;
755	tmp->stats.luck = new_luck;	748	tmp->stats.luck = new_luck;
756	}	749	}
757	}	750	}
758	else	751	else
759	{	752	{
760	if (!tmp->stats.luck)	753	if (!tmp->stats.luck)
761	{
762	return;	754	return;
763	}	755
764	/* Randomly change the players luck. Basically, we move it	756	/* Randomly change the players luck. Basically, we move it
765	* back neutral (if greater>0, subtract, otherwise add)	757	* back neutral (if greater>0, subtract, otherwise add)
766	*/	758	*/
767	if (RANDOM () % (FABS (tmp->stats.luck)) >= RANDOM () % 30)	759	if (RANDOM () % (FABS (tmp->stats.luck)) >= RANDOM () % 30)
768	{	760	{
769	int diff = tmp->stats.luck > 0 ? -1 : 1;	761	int diff = tmp->stats.luck > 0 ? -1 : 1;
770		762
771	op->stats.luck += diff;	763	stats.luck += diff;
772	tmp->stats.luck += diff;	764	tmp->stats.luck += diff;
773	}	765	}
774	}	766	}
775	}	767	}
776	}	768	}
777		769
778	/*	770	/*
779	* Subtracts stat-bonuses given by the class which the player has chosen.	771	* Subtracts stat-bonuses given by the class which the player has chosen.
780	*/	772	*/
781
782	void	773	void
783	remove_statbonus (object *op)	774	object::remove_statbonus ()
784	{	775	{
785	op->stats.Str -= op->arch->clone.stats.Str;	776	stats.Str -= arch->clone.stats.Str;
786	op->stats.Dex -= op->arch->clone.stats.Dex;	777	stats.Dex -= arch->clone.stats.Dex;
787	op->stats.Con -= op->arch->clone.stats.Con;	778	stats.Con -= arch->clone.stats.Con;
788	op->stats.Wis -= op->arch->clone.stats.Wis;	779	stats.Wis -= arch->clone.stats.Wis;
789	op->stats.Pow -= op->arch->clone.stats.Pow;	780	stats.Pow -= arch->clone.stats.Pow;
790	op->stats.Cha -= op->arch->clone.stats.Cha;	781	stats.Cha -= arch->clone.stats.Cha;
791	op->stats.Int -= op->arch->clone.stats.Int;	782	stats.Int -= arch->clone.stats.Int;
		783
792	op->contr->orig_stats.Str -= op->arch->clone.stats.Str;	784	contr->orig_stats.Str -= arch->clone.stats.Str;
793	op->contr->orig_stats.Dex -= op->arch->clone.stats.Dex;	785	contr->orig_stats.Dex -= arch->clone.stats.Dex;
794	op->contr->orig_stats.Con -= op->arch->clone.stats.Con;	786	contr->orig_stats.Con -= arch->clone.stats.Con;
795	op->contr->orig_stats.Wis -= op->arch->clone.stats.Wis;	787	contr->orig_stats.Wis -= arch->clone.stats.Wis;
796	op->contr->orig_stats.Pow -= op->arch->clone.stats.Pow;	788	contr->orig_stats.Pow -= arch->clone.stats.Pow;
797	op->contr->orig_stats.Cha -= op->arch->clone.stats.Cha;	789	contr->orig_stats.Cha -= arch->clone.stats.Cha;
798	op->contr->orig_stats.Int -= op->arch->clone.stats.Int;	790	contr->orig_stats.Int -= arch->clone.stats.Int;
799	}	791	}
800		792
801	/*	793	/*
802	* Adds stat-bonuses given by the class which the player has chosen.	794	* Adds stat-bonuses given by the class which the player has chosen.
803	*/	795	*/
804
805	void	796	void
806	add_statbonus (object *op)	797	object::add_statbonus ()
807	{	798	{
808	op->stats.Str += op->arch->clone.stats.Str;	799	stats.Str += arch->clone.stats.Str;
809	op->stats.Dex += op->arch->clone.stats.Dex;	800	stats.Dex += arch->clone.stats.Dex;
810	op->stats.Con += op->arch->clone.stats.Con;	801	stats.Con += arch->clone.stats.Con;
811	op->stats.Wis += op->arch->clone.stats.Wis;	802	stats.Wis += arch->clone.stats.Wis;
812	op->stats.Pow += op->arch->clone.stats.Pow;	803	stats.Pow += arch->clone.stats.Pow;
813	op->stats.Cha += op->arch->clone.stats.Cha;	804	stats.Cha += arch->clone.stats.Cha;
814	op->stats.Int += op->arch->clone.stats.Int;	805	stats.Int += arch->clone.stats.Int;
		806
815	op->contr->orig_stats.Str += op->arch->clone.stats.Str;	807	contr->orig_stats.Str += arch->clone.stats.Str;
816	op->contr->orig_stats.Dex += op->arch->clone.stats.Dex;	808	contr->orig_stats.Dex += arch->clone.stats.Dex;
817	op->contr->orig_stats.Con += op->arch->clone.stats.Con;	809	contr->orig_stats.Con += arch->clone.stats.Con;
818	op->contr->orig_stats.Wis += op->arch->clone.stats.Wis;	810	contr->orig_stats.Wis += arch->clone.stats.Wis;
819	op->contr->orig_stats.Pow += op->arch->clone.stats.Pow;	811	contr->orig_stats.Pow += arch->clone.stats.Pow;
820	op->contr->orig_stats.Cha += op->arch->clone.stats.Cha;	812	contr->orig_stats.Cha += arch->clone.stats.Cha;
821	op->contr->orig_stats.Int += op->arch->clone.stats.Int;	813	contr->orig_stats.Int += arch->clone.stats.Int;
822	}	814	}
823		815
824	/*	816	/*
825	* Updates all abilities given by applied objects in the inventory	817	* Updates all abilities given by applied objects in the inventory
826	* of the given object. Note: This function works for both monsters	818	* of the given object. Note: This function works for both monsters
…		…
832	/* July 95 - inserted stuff to handle new skills/exp system - b.t.	824	/* July 95 - inserted stuff to handle new skills/exp system - b.t.
833	spell system split, grace points now added to system --peterm	825	spell system split, grace points now added to system --peterm
834	*/	826	*/
835		827
836	void	828	void
837	fix_player (object *op)	829	object::update_stats ()
838	{	830	{
839	int i, j;	831	int i, j;
840	float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1;	832	float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1;
841	int weapon_weight = 0, weapon_speed = 0;	833	int weapon_weight = 0, weapon_speed = 0;
842	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;	834	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
843	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];	835	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
844	object grace_obj = NULL, mana_obj = NULL, wc_obj = NULL, tmp;	836	object grace_obj = NULL, mana_obj = NULL, wc_obj = NULL, tmp;
845		837
846	/* First task is to clear all the values back to their original values */	838	/* First task is to clear all the values back to their original values */
847	if (op->type == PLAYER)	839	if (type == PLAYER)
848	{	840	{
849	for (i = 0; i < NUM_STATS; i++)	841	for (i = 0; i < NUM_STATS; i++)
850	{
851	set_attr_value (&(op->stats), i, get_attr_value (&(op->contr->orig_stats), i));	842	set_attr_value (&(stats), i, get_attr_value (&(contr->orig_stats), i));
852	}	843
853	if (settings.spell_encumbrance == TRUE)	844	if (settings.spell_encumbrance == TRUE)
854	op->contr->encumbrance = 0;	845	contr->encumbrance = 0;
855		846
856	op->attacktype = 0;	847	attacktype = 0;
857	op->contr->digestion = 0;	848	contr->digestion = 0;
858	op->contr->gen_hp = 0;	849	contr->gen_hp = 0;
859	op->contr->gen_sp = 0;	850	contr->gen_sp = 0;
860	op->contr->gen_grace = 0;	851	contr->gen_grace = 0;
861	op->contr->gen_sp_armour = 10;	852	contr->gen_sp_armour = 10;
862	op->contr->item_power = 0;	853	contr->item_power = 0;
863		854
864	/* Don't clobber all the range_ values. range_golem otherwise	855	/* Don't clobber all the range_ values. range_golem otherwise
865	* gets reset for no good reason, and we don't want to reset	856	* gets reset for no good reason, and we don't want to reset
866	* range_magic (what spell is readied). These three below	857	* range_magic (what spell is readied). These three below
867	* well get filled in based on what the player has equipped.	858	* well get filled in based on what the player has equipped.
868	*/	859	*/
869	op->contr->ranges[range_bow] = NULL;	860	contr->ranges[range_bow] = NULL;
870	op->contr->ranges[range_misc] = NULL;	861	contr->ranges[range_misc] = NULL;
871	op->contr->ranges[range_skill] = NULL;	862	contr->ranges[range_skill] = NULL;
872	}	863	}
		864
873	memcpy (op->body_used, op->body_info, sizeof (op->body_info));	865	memcpy (body_used, body_info, sizeof (body_info));
874		866
875	op->slaying = 0;	867	slaying = 0;
876		868
877	if (!QUERY_FLAG (op, FLAG_WIZ))	869	if (!QUERY_FLAG (this, FLAG_WIZ))
878	{	870	{
879	CLEAR_FLAG (op, FLAG_XRAYS);	871	CLEAR_FLAG (this, FLAG_XRAYS);
880	CLEAR_FLAG (op, FLAG_MAKE_INVIS);	872	CLEAR_FLAG (this, FLAG_MAKE_INVIS);
881	}	873	}
882		874
883	CLEAR_FLAG (op, FLAG_LIFESAVE);	875	CLEAR_FLAG (this, FLAG_LIFESAVE);
884	CLEAR_FLAG (op, FLAG_STEALTH);	876	CLEAR_FLAG (this, FLAG_STEALTH);
885	CLEAR_FLAG (op, FLAG_BLIND);	877	CLEAR_FLAG (this, FLAG_BLIND);
886	if (!QUERY_FLAG (&op->arch->clone, FLAG_REFL_SPELL))
887	CLEAR_FLAG (op, FLAG_REFL_SPELL);
888	if (!QUERY_FLAG (&op->arch->clone, FLAG_REFL_MISSILE))
889	CLEAR_FLAG (op, FLAG_REFL_MISSILE);
890	if (!QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
891	CLEAR_FLAG (op, FLAG_UNDEAD);
892	if (!QUERY_FLAG (&op->arch->clone, FLAG_SEE_IN_DARK))
893	CLEAR_FLAG (op, FLAG_SEE_IN_DARK);
894		878
		879	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
		880	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
		881	if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
		882	if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
		883
895	op->path_attuned = op->arch->clone.path_attuned;	884	path_attuned = arch->clone.path_attuned;
896	op->path_repelled = op->arch->clone.path_repelled;	885	path_repelled = arch->clone.path_repelled;
897	op->path_denied = op->arch->clone.path_denied;	886	path_denied = arch->clone.path_denied;
898	op->glow_radius = op->arch->clone.glow_radius;	887	glow_radius = arch->clone.glow_radius;
899	op->move_type = op->arch->clone.move_type;	888	move_type = arch->clone.move_type;
900	op->chosen_skill = NULL;	889	chosen_skill = NULL;
901		890
902	/* initializing resistances from the values in player/monster's	891	/* initializing resistances from the values in player/monster's
903	* archetype clone	892	* archetype clone
904	*/	893	*/
905	memcpy (&op->resist, &op->arch->clone.resist, sizeof (op->resist));	894	memcpy (&resist, &arch->clone.resist, sizeof (resist));
906		895
907	for (i = 0; i < NROFATTACKS; i++)	896	for (i = 0; i < NROFATTACKS; i++)
908	{	897	{
909	if (op->resist[i] > 0)	898	if (resist[i] > 0)
910	prot[i] = op->resist[i], vuln[i] = 0;	899	prot[i] = resist[i], vuln[i] = 0;
911	else	900	else
912	vuln[i] = -(op->resist[i]), prot[i] = 0;	901	vuln[i] = -(resist[i]), prot[i] = 0;
913	potion_resist[i] = 0;	902	potion_resist[i] = 0;
914	}	903	}
915		904
916	wc = op->arch->clone.stats.wc;	905	wc = arch->clone.stats.wc;
917	op->stats.dam = op->arch->clone.stats.dam;	906	stats.dam = arch->clone.stats.dam;
918		907
919	/* for players which cannot use armour, they gain AC -1 per 3 levels,	908	/* for players which cannot use armour, they gain AC -1 per 3 levels,
920	* plus a small amount of physical resist, those poor suckers. ;)	909	* plus a small amount of physical resist, those poor suckers. ;)
921	* the fact that maxlevel is factored in could be considered sort of bogus -	910	* the fact that maxlevel is factored in could be considered sort of bogus -
922	* we should probably give them some bonus and cap it off - otherwise,	911	* we should probably give them some bonus and cap it off - otherwise,
923	* basically, if a server updates its max level, these playes may find	912	* basically, if a server updates its max level, these playes may find
924	* that their protection from physical goes down	913	* that their protection from physical goes down
925	*/	914	*/
926	if (!QUERY_FLAG (op, FLAG_USE_ARMOUR) && op->type == PLAYER)	915	if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
927	{	916	{
928	ac = MAX (-10, op->arch->clone.stats.ac - op->level / 3);	917	ac = MAX (-10, arch->clone.stats.ac - level / 3);
929	prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * op->level / settings.max_level)) / 100;	918	prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
930	}	919	}
931	else	920	else
932	ac = op->arch->clone.stats.ac;	921	ac = arch->clone.stats.ac;
933		922
934	op->stats.luck = op->arch->clone.stats.luck;	923	stats.luck = arch->clone.stats.luck;
935	op->speed = op->arch->clone.speed;	924	speed = arch->clone.speed;
936		925
937	/* OK - we've reset most all the objects attributes to sane values.	926	/* OK - we've reset most all the objects attributes to sane values.
938	* now go through and make adjustments for what the player has equipped.	927	* now go through and make adjustments for what the player has equipped.
939	*/	928	*/
940		929
941	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	930	for (tmp = inv; tmp; tmp = tmp->below)
942	{	931	{
943	/* See note in map.c:update_position about making this additive	932	/* See note in map.c:update_position about making this additive
944	* since light sources are never applied, need to put check here.	933	* since light sources are never applied, need to put check here.
945	*/	934	*/
946	if (tmp->glow_radius > op->glow_radius)	935	if (tmp->glow_radius > glow_radius)
947	op->glow_radius = tmp->glow_radius;	936	glow_radius = tmp->glow_radius;
948		937
949	/* This happens because apply_potion calls change_abil with the potion	938	/* This happens because apply_potion calls change_abil with the potion
950	* applied so we can tell the player what chagned. But change_abil	939	* applied so we can tell the player what chagned. But change_abil
951	* then calls this function.	940	* then calls this function.
952	*/	941	*/
953	if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)	942	if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
954	{
955	continue;	943	continue;
956	}
957		944
958	/* For some things, we don't care what is equipped */	945	/* For some things, we don't care what is equipped */
959	if (tmp->type == SKILL)	946	if (tmp->type == SKILL)
960	{	947	{
961	/* Want to take the highest skill here. */	948	/* Want to take the highest skill here. */
…		…
964	if (!mana_obj)	951	if (!mana_obj)
965	mana_obj = tmp;	952	mana_obj = tmp;
966	else if (tmp->level > mana_obj->level)	953	else if (tmp->level > mana_obj->level)
967	mana_obj = tmp;	954	mana_obj = tmp;
968	}	955	}
		956
969	if (IS_GRACE_SKILL (tmp->subtype))	957	if (IS_GRACE_SKILL (tmp->subtype))
970	{	958	{
971	if (!grace_obj)	959	if (!grace_obj)
972	grace_obj = tmp;	960	grace_obj = tmp;
973	else if (tmp->level > grace_obj->level)	961	else if (tmp->level > grace_obj->level)
…		…
985	* up, etc.	973	* up, etc.
986	*/	974	*/
987	if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) \|\|	975	if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) \|\|
988	(tmp->type == SKILL && tmp->subtype == SK_PRAYING))	976	(tmp->type == SKILL && tmp->subtype == SK_PRAYING))
989	{	977	{
990	if (op->type == PLAYER)	978	if (type == PLAYER)
991	{	979	{
992	if (tmp->type == BOW)	980	if (tmp->type == BOW)
993	op->contr->ranges[range_bow] = tmp;	981	contr->ranges[range_bow] = tmp;
994		982
995	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)	983	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)
996	op->contr->ranges[range_misc] = tmp;	984	contr->ranges[range_misc] = tmp;
997		985
998	for (i = 0; i < NUM_STATS; i++)	986	for (i = 0; i < NUM_STATS; i++)
999	change_attr_value (&(op->stats), i, get_attr_value (&(tmp->stats), i));	987	change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), i));
1000		988
1001	/* these are the items that currently can change digestion, regeneration,	989	/* these are the items that currently can change digestion, regeneration,
1002	* spell point recovery and mana point recovery. Seems sort of an arbitary	990	* spell point recovery and mana point recovery. Seems sort of an arbitary
1003	* list, but other items store other info into stats array.	991	* list, but other items store other info into stats array.
1004	*/	992	*/
1005	if ((tmp->type == EXPERIENCE) \|\| (tmp->type == WEAPON) \|\|	993	if ((tmp->type == WEAPON) \|\|
1006	(tmp->type == ARMOUR) \|\| (tmp->type == HELMET) \|\|	994	(tmp->type == ARMOUR) \|\| (tmp->type == HELMET) \|\|
1007	(tmp->type == SHIELD) \|\| (tmp->type == RING) \|\|	995	(tmp->type == SHIELD) \|\| (tmp->type == RING) \|\|
1008	(tmp->type == BOOTS) \|\| (tmp->type == GLOVES) \|\|	996	(tmp->type == BOOTS) \|\| (tmp->type == GLOVES) \|\|
1009	(tmp->type == AMULET) \|\| (tmp->type == GIRDLE) \|\|	997	(tmp->type == AMULET) \|\| (tmp->type == GIRDLE) \|\|
1010	(tmp->type == BRACERS) \|\| (tmp->type == CLOAK) \|\| (tmp->type == DISEASE) \|\| (tmp->type == FORCE) \|\| (tmp->type == SKILL))	998	(tmp->type == BRACERS) \|\| (tmp->type == CLOAK) \|\|
		999	(tmp->type == DISEASE) \|\| (tmp->type == FORCE) \|\|
		1000	(tmp->type == SKILL))
1011	{	1001	{
1012	op->contr->digestion += tmp->stats.food;	1002	contr->digestion += tmp->stats.food;
1013	op->contr->gen_hp += tmp->stats.hp;	1003	contr->gen_hp += tmp->stats.hp;
1014	op->contr->gen_sp += tmp->stats.sp;	1004	contr->gen_sp += tmp->stats.sp;
1015	op->contr->gen_grace += tmp->stats.grace;	1005	contr->gen_grace += tmp->stats.grace;
1016	op->contr->gen_sp_armour += tmp->gen_sp_armour;	1006	contr->gen_sp_armour += tmp->gen_sp_armour;
1017	op->contr->item_power += tmp->item_power;	1007	contr->item_power += tmp->item_power;
1018	}	1008	}
1019	} /* if this is a player */	1009	} /* if this is a player */
1020		1010
1021	/* Update slots used for items */	1011	/* Update slots used for items */
1022	if (QUERY_FLAG (tmp, FLAG_APPLIED))	1012	if (QUERY_FLAG (tmp, FLAG_APPLIED))
1023	{
1024	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1013	for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1025	op->body_used[i] += tmp->body_info[i];	1014	body_used[i] += tmp->body_info[i];
1026	}
1027		1015
1028	if (tmp->type == SYMPTOM)	1016	if (tmp->type == SYMPTOM)
1029	{	1017	{
1030	speed_reduce_from_disease = tmp->last_sp / 100.0;	1018	speed_reduce_from_disease = tmp->last_sp / 100.0;
1031	if (speed_reduce_from_disease == 0)	1019	if (speed_reduce_from_disease == 0)
…		…
1058	}	1046	}
1059	}	1047	}
1060		1048
1061	/* There may be other things that should not adjust the attacktype */	1049	/* There may be other things that should not adjust the attacktype */
1062	if (tmp->type != BOW && tmp->type != SYMPTOM)	1050	if (tmp->type != BOW && tmp->type != SYMPTOM)
1063	op->attacktype \|= tmp->attacktype;	1051	attacktype \|= tmp->attacktype;
1064		1052
1065	op->path_attuned \|= tmp->path_attuned;	1053	path_attuned \|= tmp->path_attuned;
1066	op->path_repelled \|= tmp->path_repelled;	1054	path_repelled \|= tmp->path_repelled;
1067	op->path_denied \|= tmp->path_denied;	1055	path_denied \|= tmp->path_denied;
1068	op->stats.luck += tmp->stats.luck;	1056	stats.luck += tmp->stats.luck;
1069	op->move_type \|= tmp->move_type;	1057	move_type \|= tmp->move_type;
1070		1058
1071	if (QUERY_FLAG (tmp, FLAG_LIFESAVE))	1059	if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);
1072	SET_FLAG (op, FLAG_LIFESAVE);	1060	if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1073	if (QUERY_FLAG (tmp, FLAG_REFL_SPELL))	1061	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1074	SET_FLAG (op, FLAG_REFL_SPELL);	1062	if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
1075	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE))	1063	if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
1076	SET_FLAG (op, FLAG_REFL_MISSILE);	1064	if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
1077	if (QUERY_FLAG (tmp, FLAG_STEALTH))	1065	if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
1078	SET_FLAG (op, FLAG_STEALTH);
1079	if (QUERY_FLAG (tmp, FLAG_XRAYS))
1080	SET_FLAG (op, FLAG_XRAYS);
1081	if (QUERY_FLAG (tmp, FLAG_BLIND))
1082	SET_FLAG (op, FLAG_BLIND);
1083	if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK))
1084	SET_FLAG (op, FLAG_SEE_IN_DARK);
1085		1066
1086	if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	1067	if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD))
1087	SET_FLAG (op, FLAG_UNDEAD);	1068	SET_FLAG (this, FLAG_UNDEAD);
1088		1069
1089	if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))	1070	if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
1090	{	1071	{
1091	SET_FLAG (op, FLAG_MAKE_INVIS);	1072	SET_FLAG (this, FLAG_MAKE_INVIS);
1092	op->invisible = 1;	1073	invisible = 1;
1093	}	1074	}
1094		1075
1095	if (tmp->stats.exp && tmp->type != SKILL)	1076	if (tmp->stats.exp && tmp->type != SKILL)
1096	{	1077	{
1097	if (tmp->stats.exp > 0)	1078	if (tmp->stats.exp > 0)
…		…
1103	added_speed += (float) tmp->stats.exp;	1084	added_speed += (float) tmp->stats.exp;
1104	}	1085	}
1105		1086
1106	switch (tmp->type)	1087	switch (tmp->type)
1107	{	1088	{
1108	/* skills modifying the character -b.t. */	1089	/* skills modifying the character -b.t. */
1109	/* for all skills and skill granting objects */	1090	/* for all skills and skill granting objects */
1110	case SKILL:	1091	case SKILL:
1111	if (!QUERY_FLAG (tmp, FLAG_APPLIED))	1092	if (!QUERY_FLAG (tmp, FLAG_APPLIED))
1112	break;
1113
1114	if (IS_COMBAT_SKILL (tmp->subtype))
1115	wc_obj = tmp;
1116
1117	if (op->chosen_skill)
1118	{
1119	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &op->name);
1120	}
1121	op->chosen_skill = tmp;
1122	if (tmp->stats.dam > 0)
1123	{ /* skill is a 'weapon' */
1124	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))
1125	weapon_speed = (int) WEAPON_SPEED (tmp);
1126	if (weapon_speed < 0)
1127	weapon_speed = 0;
1128	weapon_weight = tmp->weight;
1129	op->stats.dam += tmp->stats.dam * (1 + (op->chosen_skill->level / 9));
1130	if (tmp->magic)
1131	op->stats.dam += tmp->magic;
1132	}
1133	if (tmp->stats.wc)
1134	wc -= (tmp->stats.wc + tmp->magic);
1135
1136	if (tmp->slaying != NULL)
1137	op->slaying = tmp->slaying;
1138
1139	if (tmp->stats.ac)
1140	ac -= (tmp->stats.ac + tmp->magic);
1141	if (settings.spell_encumbrance == TRUE && op->type == PLAYER)
1142	op->contr->encumbrance += (int) 3 *tmp->weight / 1000;
1143
1144	if (op->type == PLAYER)
1145	op->contr->ranges[range_skill] = op;
1146	break;	1093	break;
1147		1094
1148	case SKILL_TOOL:	1095	if (IS_COMBAT_SKILL (tmp->subtype))
		1096	wc_obj = tmp;
		1097
1149	if (op->chosen_skill)	1098	if (chosen_skill)
1150	{
1151	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &op->name);	1099	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
		1100
		1101	chosen_skill = tmp;
		1102
		1103	if (tmp->stats.dam > 0)
		1104	{ /* skill is a 'weapon' */
		1105	if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
		1106	weapon_speed = (int) WEAPON_SPEED (tmp);
		1107
		1108	if (weapon_speed < 0)
		1109	weapon_speed = 0;
		1110
		1111	weapon_weight = tmp->weight;
		1112	stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9));
		1113
		1114	if (tmp->magic)
		1115	stats.dam += tmp->magic;
1152	}	1116	}
1153	op->chosen_skill = tmp;
1154	if (op->type == PLAYER)
1155	op->contr->ranges[range_skill] = op;
1156	break;
1157		1117
1158	case SHIELD:
1159	if (settings.spell_encumbrance == TRUE && op->type == PLAYER)
1160	op->contr->encumbrance += (int) tmp->weight / 2000;
1161	case RING:
1162	case AMULET:
1163	case GIRDLE:
1164	case HELMET:
1165	case BOOTS:
1166	case GLOVES:
1167	case CLOAK:
1168	if (tmp->stats.wc)	1118	if (tmp->stats.wc)
1169	wc -= (tmp->stats.wc + tmp->magic);
1170	if (tmp->stats.dam)
1171	op->stats.dam += (tmp->stats.dam + tmp->magic);
1172	if (tmp->stats.ac)
1173	ac -= (tmp->stats.ac + tmp->magic);
1174	break;
1175
1176	case WEAPON:
1177	wc -= (tmp->stats.wc + tmp->magic);	1119	wc -= (tmp->stats.wc + tmp->magic);
		1120
		1121	if (tmp->slaying != NULL)
		1122	slaying = tmp->slaying;
		1123
		1124	if (tmp->stats.ac)
		1125	ac -= (tmp->stats.ac + tmp->magic);
		1126
		1127	if (settings.spell_encumbrance == TRUE && type == PLAYER)
		1128	contr->encumbrance += (int) 3 *tmp->weight / 1000;
		1129
		1130	if (type == PLAYER)
		1131	contr->ranges[range_skill] = this;
		1132
		1133	break;
		1134
		1135	case SKILL_TOOL:
		1136	if (chosen_skill)
		1137	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
		1138
		1139	chosen_skill = tmp;
		1140
		1141	if (type == PLAYER)
		1142	contr->ranges[range_skill] = this;
		1143	break;
		1144
		1145	case SHIELD:
		1146	if (settings.spell_encumbrance == TRUE && type == PLAYER)
		1147	contr->encumbrance += (int) tmp->weight / 2000;
		1148	case RING:
		1149	case AMULET:
		1150	case GIRDLE:
		1151	case HELMET:
		1152	case BOOTS:
		1153	case GLOVES:
		1154	case CLOAK:
		1155	if (tmp->stats.wc)
		1156	wc -= (tmp->stats.wc + tmp->magic);
		1157
		1158	if (tmp->stats.dam)
		1159	stats.dam += (tmp->stats.dam + tmp->magic);
		1160
		1161	if (tmp->stats.ac)
		1162	ac -= (tmp->stats.ac + tmp->magic);
		1163
		1164	break;
		1165
		1166	case WEAPON:
		1167	wc -= (tmp->stats.wc + tmp->magic);
		1168
1178	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)	1169	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1179	ac -= tmp->stats.ac + tmp->magic;	1170	ac -= tmp->stats.ac + tmp->magic;
		1171
1180	op->stats.dam += (tmp->stats.dam + tmp->magic);	1172	stats.dam += (tmp->stats.dam + tmp->magic);
1181	weapon_weight = tmp->weight;	1173	weapon_weight = tmp->weight;
1182	weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;	1174	weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
		1175
1183	if (weapon_speed < 0)	1176	if (weapon_speed < 0)
1184	weapon_speed = 0;	1177	weapon_speed = 0;
		1178
1185	op->slaying = tmp->slaying;	1179	slaying = tmp->slaying;
1186	/* If there is desire that two handed weapons should do	1180	/* If there is desire that two handed weapons should do
1187	* extra strength damage, this is where the code should	1181	* extra strength damage, this is where the code should
1188	* go.	1182	* go.
1189	*/	1183	*/
1190	op->current_weapon = tmp;	1184	current_weapon = tmp;
1191	if (settings.spell_encumbrance == TRUE && op->type == PLAYER)	1185	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1192	op->contr->encumbrance += (int) 3 *tmp->weight / 1000;	1186	contr->encumbrance += (int) 3 *tmp->weight / 1000;
1193		1187
1194	break;	1188	break;
1195		1189
1196	case ARMOUR: /* Only the best of these three are used: */	1190	case ARMOUR: /* Only the best of these three are used: */
1197	if (settings.spell_encumbrance == TRUE && op->type == PLAYER)	1191	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1198	op->contr->encumbrance += (int) tmp->weight / 1000;	1192	contr->encumbrance += (int) tmp->weight / 1000;
1199		1193
1200	case BRACERS:	1194	case BRACERS:
1201	case FORCE:	1195	case FORCE:
1202	if (tmp->stats.wc)	1196	if (tmp->stats.wc)
1203	{	1197	{
1204	if (best_wc < tmp->stats.wc + tmp->magic)	1198	if (best_wc < tmp->stats.wc + tmp->magic)
1205	{	1199	{
1206	wc += best_wc;	1200	wc += best_wc;
1207	best_wc = tmp->stats.wc + tmp->magic;	1201	best_wc = tmp->stats.wc + tmp->magic;
1208	}	1202	}
1209	else	1203	else
1210	wc += tmp->stats.wc + tmp->magic;	1204	wc += tmp->stats.wc + tmp->magic;
1211	}	1205	}
		1206
1212	if (tmp->stats.ac)	1207	if (tmp->stats.ac)
1213	{	1208	{
1214	if (best_ac < tmp->stats.ac + tmp->magic)	1209	if (best_ac < tmp->stats.ac + tmp->magic)
1215	{	1210	{
1216	ac += best_ac; /* Remove last bonus */	1211	ac += best_ac; /* Remove last bonus */
1217	best_ac = tmp->stats.ac + tmp->magic;	1212	best_ac = tmp->stats.ac + tmp->magic;
1218	}	1213	}
1219	else /* To nullify the below effect */	1214	else /* To nullify the below effect */
1220	ac += tmp->stats.ac + tmp->magic;	1215	ac += tmp->stats.ac + tmp->magic;
1221	}	1216	}
		1217
1222	if (tmp->stats.wc)	1218	if (tmp->stats.wc)
1223	wc -= (tmp->stats.wc + tmp->magic);	1219	wc -= (tmp->stats.wc + tmp->magic);
		1220
1224	if (tmp->stats.ac)	1221	if (tmp->stats.ac)
1225	ac -= (tmp->stats.ac + tmp->magic);	1222	ac -= (tmp->stats.ac + tmp->magic);
		1223
1226	if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max)	1224	if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max)
1227	max = ARMOUR_SPEED (tmp) / 10.0;	1225	max = ARMOUR_SPEED (tmp) / 10.0;
		1226
1228	break;	1227	break;
1229	} /* switch tmp->type */	1228	} /* switch tmp->type */
1230	} /* item is equipped */	1229	} /* item is equipped */
1231	} /* for loop of items */	1230	} /* for loop of items */
1232		1231
1233	/* We've gone through all the objects the player has equipped. For many things, we	1232	/* We've gone through all the objects the player has equipped. For many things, we
…		…
1240	* If there is a cursed (and no uncursed) potion in effect, we take	1239	* If there is a cursed (and no uncursed) potion in effect, we take
1241	* 'total resistance = vulnerability from cursed potion'.	1240	* 'total resistance = vulnerability from cursed potion'.
1242	*/	1241	*/
1243	for (i = 0; i < NROFATTACKS; i++)	1242	for (i = 0; i < NROFATTACKS; i++)
1244	{	1243	{
1245	op->resist[i] = prot[i] - vuln[i];	1244	resist[i] = prot[i] - vuln[i];
		1245
1246	if (potion_resist[i] && ((potion_resist[i] > op->resist[i]) \|\| (potion_resist[i] < 0)))	1246	if (potion_resist[i] && ((potion_resist[i] > resist[i]) \|\| (potion_resist[i] < 0)))
1247	op->resist[i] = potion_resist[i];	1247	resist[i] = potion_resist[i];
1248	}	1248	}
1249		1249
1250	/* Figure out the players sp/mana/hp totals. */	1250	/* Figure out the players sp/mana/hp totals. */
1251	if (op->type == PLAYER)	1251	if (type == PLAYER)
1252	{	1252	{
1253	int pl_level;	1253	int pl_level;
1254		1254
1255	check_stat_bounds (&(op->stats));	1255	check_stat_bounds (&(stats));
1256	pl_level = op->level;	1256	pl_level = level;
1257		1257
1258	if (pl_level < 1)	1258	if (pl_level < 1)
1259	pl_level = 1; /* safety, we should always get 1 levels worth of hp! */	1259	pl_level = 1; /* safety, we should always get 1 levels worth of hp! */
1260		1260
1261	/* You basically get half a con bonus/level. But we do take into account rounding,	1261	/* 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.	1262	* so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1263	*/	1263	*/
1264	for (i = 1, op->stats.maxhp = 0; i <= pl_level && i <= 10; i++)	1264	for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++)
1265	{	1265	{
1266	j = op->contr->levhp[i] + con_bonus[op->stats.Con] / 2;	1266	j = contr->levhp[i] + con_bonus[stats.Con] / 2;
		1267
1267	if (i % 2 && con_bonus[op->stats.Con] % 2)	1268	if (i % 2 && con_bonus[stats.Con] % 2)
1268	{	1269	{
1269	if (con_bonus[op->stats.Con] > 0)	1270	if (con_bonus[stats.Con] > 0)
1270	j++;	1271	j++;
1271	else	1272	else
1272	j--;	1273	j--;
1273	}	1274	}
		1275
1274	op->stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */	1276	stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1275	}	1277	}
1276		1278
1277	for (i = 11; i <= op->level; i++)	1279	for (i = 11; i <= level; i++)
1278	op->stats.maxhp += 2;	1280	stats.maxhp += 2;
1279		1281
1280	if (op->stats.hp > op->stats.maxhp)	1282	if (stats.hp > stats.maxhp)
1281	op->stats.hp = op->stats.maxhp;	1283	stats.hp = stats.maxhp;
1282		1284
1283	/* Sp gain is controlled by the level of the player's	1285	/* Sp gain is controlled by the level of the player's
1284	* relevant experience object (mana_obj, see above)	1286	* relevant experience object (mana_obj, see above)
1285	*/	1287	*/
1286	/* following happen when skills system is not used */	1288	/* following happen when skills system is not used */
1287	if (!mana_obj)	1289	if (!mana_obj)
1288	mana_obj = op;	1290	mana_obj = this;
		1291
1289	if (!grace_obj)	1292	if (!grace_obj)
1290	grace_obj = op;	1293	grace_obj = this;
		1294
1291	/* set maxsp */	1295	/* set maxsp */
1292	if (!mana_obj \|\| !mana_obj->level \|\| op->type != PLAYER)	1296	if (!mana_obj \|\| !mana_obj->level \|\| type != PLAYER)
1293	mana_obj = op;	1297	mana_obj = this;
1294		1298
1295	if (mana_obj == op && op->type == PLAYER)	1299	if (mana_obj == this && type == PLAYER)
1296	{
1297	op->stats.maxsp = 1;	1300	stats.maxsp = 1;
1298	}
1299	else	1301	else
1300	{	1302	{
1301	sp_tmp = 0.0;	1303	sp_tmp = 0.0;
		1304
1302	for (i = 1; i <= mana_obj->level && i <= 10; i++)	1305	for (i = 1; i <= mana_obj->level && i <= 10; i++)
1303	{	1306	{
1304	float stmp;	1307	float stmp;
1305		1308
1306	/* Got some extra bonus at first level */	1309	/* Got some extra bonus at first level */
1307	if (i < 2)	1310	if (i < 2)
1308	{
1309	stmp = op->contr->levsp[i] + ((2.0 * (float) sp_bonus[op->stats.Pow] + (float) sp_bonus[op->stats.Int]) / 6.0);	1311	stmp = contr->levsp[i] + ((2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 6.0);
1310	}
1311	else	1312	else
1312	{
1313	stmp = (float) op->contr->levsp[i] + (2.0 * (float) sp_bonus[op->stats.Pow] + (float) sp_bonus[op->stats.Int]) / 12.0;	1313	stmp = (float) contr->levsp[i] + (2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 12.0;
1314	}	1314
1315	if (stmp < 1.0)	1315	if (stmp < 1.0)
1316	stmp = 1.0;	1316	stmp = 1.0;
		1317
1317	sp_tmp += stmp;	1318	sp_tmp += stmp;
1318	}	1319	}
		1320
1319	op->stats.maxsp = (int) sp_tmp;	1321	stats.maxsp = (int) sp_tmp;
1320		1322
1321	for (i = 11; i <= mana_obj->level; i++)	1323	for (i = 11; i <= mana_obj->level; i++)
1322	op->stats.maxsp += 2;	1324	stats.maxsp += 2;
1323	}	1325	}
1324	/* Characters can get their sp supercharged via rune of transferrance */	1326	/* Characters can get their sp supercharged via rune of transferrance */
1325	if (op->stats.sp > op->stats.maxsp * 2)	1327	if (stats.sp > stats.maxsp * 2)
1326	op->stats.sp = op->stats.maxsp * 2;	1328	stats.sp = stats.maxsp * 2;
1327		1329
1328	/* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */	1330	/* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1329	if (!grace_obj \|\| !grace_obj->level \|\| op->type != PLAYER)	1331	if (!grace_obj \|\| !grace_obj->level \|\| type != PLAYER)
1330	grace_obj = op;	1332	grace_obj = this;
1331		1333
1332	if (grace_obj == op && op->type == PLAYER)	1334	if (grace_obj == this && type == PLAYER)
1333	{
1334	op->stats.maxgrace = 1;	1335	stats.maxgrace = 1;
1335	}
1336	else	1336	else
1337	{	1337	{
1338	/* store grace in a float - this way, the divisions below don't create	1338	/* 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	1339	* 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	1340	* becomes big jumps when the sums of the bonuses jump to the next
1341	* step of 8 - with floats, even fractional ones are useful.	1341	* step of 8 - with floats, even fractional ones are useful.
1342	*/	1342	*/
1343	sp_tmp = 0.0;	1343	sp_tmp = 0.0;
1344	for (i = 1, op->stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++)	1344	for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++)
1345	{	1345	{
1346	float grace_tmp = 0.0;	1346	float grace_tmp = 0.0;
1347		1347
1348	/* Got some extra bonus at first level */	1348	/* Got some extra bonus at first level */
1349	if (i < 2)	1349	if (i < 2)
1350	{
1351	grace_tmp = op->contr->levgrace[i] + (((float) grace_bonus[op->stats.Pow] +	1350	grace_tmp = contr->levgrace[i] + (((float) grace_bonus[stats.Pow] +
1352	2.0 * (float) grace_bonus[op->stats.Wis]) / 6.0);	1351	2.0 * (float) grace_bonus[stats.Wis]) / 6.0);
1353	}
1354	else	1352	else
1355	{
1356	grace_tmp = (float) op->contr->levgrace[i]	1353	grace_tmp = (float) contr->levgrace[i]
1357	+ ((float) grace_bonus[op->stats.Pow] + 2.0 * (float) grace_bonus[op->stats.Wis]) / 12.0;	1354	+ ((float) grace_bonus[stats.Pow] + 2.0 * (float) grace_bonus[stats.Wis]) / 12.0;
1358	}	1355
1359	if (grace_tmp < 1.0)	1356	if (grace_tmp < 1.0)
1360	grace_tmp = 1.0;	1357	grace_tmp = 1.0;
		1358
1361	sp_tmp += grace_tmp;	1359	sp_tmp += grace_tmp;
1362	}	1360	}
		1361
1363	op->stats.maxgrace = (int) sp_tmp;	1362	stats.maxgrace = (int) sp_tmp;
1364		1363
1365	/* two grace points per level after 11 */	1364	/* two grace points per level after 11 */
1366	for (i = 11; i <= grace_obj->level; i++)	1365	for (i = 11; i <= grace_obj->level; i++)
1367	op->stats.maxgrace += 2;	1366	stats.maxgrace += 2;
1368	}	1367	}
1369	/* No limit on grace vs maxgrace */	1368	/* No limit on grace vs maxgrace */
1370		1369
1371	if (op->contr->braced)	1370	if (contr->braced)
1372	{	1371	{
1373	ac += 2;	1372	ac += 2;
1374	wc += 4;	1373	wc += 4;
1375	}	1374	}
1376	else	1375	else
1377	ac -= dex_bonus[op->stats.Dex];	1376	ac -= dex_bonus[stats.Dex];
1378		1377
1379	/* In new exp/skills system, wc bonuses are related to	1378	/* In new exp/skills system, wc bonuses are related to
1380	* the players level in a relevant exp object (wc_obj)	1379	* the players level in a relevant exp object (wc_obj)
1381	* not the general player level -b.t.	1380	* not the general player level -b.t.
1382	* I changed this slightly so that wc bonuses are better	1381	* I changed this slightly so that wc bonuses are better
…		…
1386	* we give the player a bonus here in wc and dam	1385	* we give the player a bonus here in wc and dam
1387	* to make up for the change. Note that I left the	1386	* to make up for the change. Note that I left the
1388	* monster bonus the same as before. -b.t.	1387	* monster bonus the same as before. -b.t.
1389	*/	1388	*/
1390		1389
1391	if (op->type == PLAYER && wc_obj && wc_obj->level > 1)	1390	if (type == PLAYER && wc_obj && wc_obj->level > 1)
1392	{	1391	{
1393	wc -= (wc_obj->level + thaco_bonus[op->stats.Str]);	1392	wc -= (wc_obj->level + thaco_bonus[stats.Str]);
1394	for (i = 1; i < wc_obj->level; i++)	1393	for (i = 1; i < wc_obj->level; i++)
1395	{	1394	{
1396	/* addtional wc every 6 levels */	1395	/* addtional wc every 6 levels */
1397	if (!(i % 6))	1396	if (!(i % 6))
1398	wc--;	1397	wc--;
1399	/* addtional dam every 4 levels. */	1398	/* addtional dam every 4 levels. */
1400	if (!(i % 4) && (dam_bonus[op->stats.Str] >= 0))	1399	if (!(i % 4) && (dam_bonus[stats.Str] >= 0))
1401	op->stats.dam += (1 + (dam_bonus[op->stats.Str] / 5));	1400	stats.dam += (1 + (dam_bonus[stats.Str] / 5));
1402	}	1401	}
1403	}	1402	}
1404	else	1403	else
1405	wc -= (op->level + thaco_bonus[op->stats.Str]);	1404	wc -= (level + thaco_bonus[stats.Str]);
1406		1405
1407	op->stats.dam += dam_bonus[op->stats.Str];	1406	stats.dam += dam_bonus[stats.Str];
1408		1407
1409	if (op->stats.dam < 1)	1408	if (stats.dam < 1)
1410	op->stats.dam = 1;	1409	stats.dam = 1;
1411		1410
1412	op->speed = 1.0 + speed_bonus[op->stats.Dex];	1411	speed = 1.0 + speed_bonus[stats.Dex];
		1412
1413	if (settings.search_items && op->contr->search_str[0])	1413	if (settings.search_items && contr->search_str[0])
1414	op->speed -= 1;	1414	speed -= 1;
		1415
1415	if (op->attacktype == 0)	1416	if (attacktype == 0)
1416	op->attacktype = op->arch->clone.attacktype;	1417	attacktype = arch->clone.attacktype;
1417		1418
1418	} /* End if player */	1419	} /* End if player */
1419		1420
1420	if (added_speed >= 0)	1421	if (added_speed >= 0)
1421	op->speed += added_speed / 10.0;	1422	speed += added_speed / 10.0;
1422	else /* Something wrong here...: */	1423	else /* Something wrong here...: */
1423	op->speed /= (float) (1.0 - added_speed);	1424	speed /= (float) (1.0 - added_speed);
1424		1425
1425	/* Max is determined by armour */	1426	/* Max is determined by armour */
1426	if (op->speed > max)	1427	if (speed > max)
1427	op->speed = max;	1428	speed = max;
1428		1429
1429	if (op->type == PLAYER)	1430	if (type == PLAYER)
1430	{	1431	{
1431	/* f is a number the represents the number of kg above (positive num)	1432	/* f is a number the represents the number of kg above (positive num)
1432	* or below (negative number) that the player is carrying. If above	1433	* or below (negative number) that the player is carrying. If above
1433	* weight limit, then player suffers a speed reduction based on how	1434	* weight limit, then player suffers a speed reduction based on how
1434	* much above he is, and what is max carry is	1435	* much above he is, and what is max carry is
1435	*/	1436	*/
1436	f = (op->carrying / 1000) - max_carry[op->stats.Str];	1437	f = (carrying / 1000) - max_carry[stats.Str];
1437	if (f > 0)	1438	if (f > 0)
1438	op->speed = op->speed / (1.0 + f / max_carry[op->stats.Str]);	1439	speed = speed / (1.0 + f / max_carry[stats.Str]);
1439	}	1440	}
1440		1441
1441	op->speed += bonus_speed / 10.0; /* Not affected by limits */	1442	speed += bonus_speed / 10.0; /* Not affected by limits */
1442		1443
1443	/* Put a lower limit on speed. Note with this speed, you move once every	1444	/* Put a lower limit on speed. Note with this speed, you move once every
1444	* 100 ticks or so. This amounts to once every 12 seconds of realtime.	1445	* 100 ticks or so. This amounts to once every 12 seconds of realtime.
1445	*/	1446	*/
1446	op->speed = op->speed * speed_reduce_from_disease;	1447	speed = speed * speed_reduce_from_disease;
1447		1448
1448	if (op->speed < 0.01 && op->type == PLAYER)	1449	if (speed < 0.01 && type == PLAYER)
1449	op->speed = 0.01;	1450	speed = 0.01;
1450		1451
1451	if (op->type == PLAYER)	1452	if (type == PLAYER)
1452	{	1453	{
1453	float M, W, s, D, K, S, M2;	1454	float M, W, s, D, K, S, M2;
1454		1455
1455	/* (This formula was made by vidarl@ifi.uio.no)	1456	/* (This formula was made by vidarl@ifi.uio.no)
1456	* Note that we never used these values again - basically	1457	* Note that we never used these values again - basically
1457	* all of these could be subbed into one big equation, but	1458	* all of these could be subbed into one big equation, but
1458	* that would just be a real pain to read.	1459	* that would just be a real pain to read.
1459	*/	1460	*/
1460	M = (max_carry[op->stats.Str] - 121) / 121.0;	1461	M = (max_carry[stats.Str] - 121) / 121.0;
1461	M2 = max_carry[op->stats.Str] / 100.0;	1462	M2 = max_carry[stats.Str] / 100.0;
1462	W = weapon_weight / 20000.0;	1463	W = weapon_weight / 20000.0;
1463	s = 2 - weapon_speed / 10.0;	1464	s = 2 - weapon_speed / 10.0;
1464	D = (op->stats.Dex - 14) / 14.0;	1465	D = (stats.Dex - 14) / 14.0;
1465	K = 1 + M / 3.0 - W / (3 * M2) + op->speed / 5.0 + D / 2.0;	1466	K = 1 + M / 3.0 - W / (3 * M2) + speed / 5.0 + D / 2.0;
1466	K = (4 + op->level) / (float) (6 + op->level) 1.2;	1467	K = (4 + level) / (float) (6 + level) 1.2;
1467	if (K <= 0)	1468	if (K <= 0)
1468	K = 0.01;	1469	K = 0.01;
1469	S = op->speed / (K * s);	1470	S = speed / (K * s);
1470	op->contr->weapon_sp = S;	1471	contr->weapon_sp = S;
1471	}	1472	}
		1473
1472	/* I want to limit the power of small monsters with big weapons: */	1474	/* I want to limit the power of small monsters with big weapons: */
1473	if (op->type != PLAYER && op->arch != NULL && op->stats.dam > op->arch->clone.stats.dam * 3)	1475	if (type != PLAYER && arch != NULL && stats.dam > arch->clone.stats.dam * 3)
1474	op->stats.dam = op->arch->clone.stats.dam * 3;	1476	stats.dam = arch->clone.stats.dam * 3;
1475		1477
1476	/* Prevent overflows of wc - best you can get is ABS(120) - this	1478	/* Prevent overflows of wc - best you can get is ABS(120) - this
1477	* should be more than enough - remember, AC is also in 8 bits,	1479	* should be more than enough - remember, AC is also in 8 bits,
1478	* so its value is the same.	1480	* so its value is the same.
1479	*/	1481	*/
1480	if (wc > 120)	1482	if (wc > 120)
1481	wc = 120;	1483	wc = 120;
1482	else if (wc < -120)	1484	else if (wc < -120)
1483	wc = -120;	1485	wc = -120;
		1486
1484	op->stats.wc = wc;	1487	stats.wc = wc;
1485		1488
1486	if (ac > 120)	1489	if (ac > 120)
1487	ac = 120;	1490	ac = 120;
1488	else if (ac < -120)	1491	else if (ac < -120)
1489	ac = -120;	1492	ac = -120;
		1493
1490	op->stats.ac = ac;	1494	stats.ac = ac;
1491		1495
1492	/* if for some reason the creature doesn't have any move type,	1496	/* if for some reason the creature doesn't have any move type,
1493	* give them walking as a default.	1497	* give them walking as a default.
1494	* The second case is a special case - to more closely mimic the	1498	* The second case is a special case - to more closely mimic the
1495	* old behaviour - if your flying, your not walking - just	1499	* old behaviour - if your flying, your not walking - just
1496	* one or the other.	1500	* one or the other.
1497	*/	1501	*/
1498	if (op->move_type == 0)	1502	if (move_type == 0)
1499	op->move_type = MOVE_WALK;	1503	move_type = MOVE_WALK;
1500	else if (op->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH))	1504	else if (move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH))
1501	op->move_type &= ~MOVE_WALK;	1505	move_type &= ~MOVE_WALK;
1502		1506
1503	update_ob_speed (op);	1507	update_ob_speed (this);
1504		1508
1505	/* It is quite possible that a player's spell costing might have changed,	1509	/* It is quite possible that a player's spell costing might have changed,
1506	* so we will check that now.	1510	* so we will check that now.
1507	*/	1511	*/
1508	if (op->type == PLAYER)	1512	if (type == PLAYER)
		1513	{
		1514	esrv_update_stats (contr);
1509	esrv_update_spells (op->contr);	1515	esrv_update_spells (contr);
		1516	}
1510	}	1517	}
1511		1518
1512	/*	1519	/*
1513	* Returns true if the given player is a legal class.	1520	* Returns true if the given player is a legal class.
1514	* The function to add and remove class-bonuses to the stats doesn't	1521	* The function to add and remove class-bonuses to the stats doesn't
1515	* check if the stat becomes negative, thus this function	1522	* check if the stat becomes negative, thus this function
1516	* merely checks that all stats are 1 or more, and returns	1523	* merely checks that all stats are 1 or more, and returns
1517	* false otherwise.	1524	* false otherwise.
1518	*/	1525	*/
1519
1520	int	1526	int
1521	allowed_class (const object *op)	1527	allowed_class (const object *op)
1522	{	1528	{
1523	return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 &&	1529	return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 &&
1524	op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0;	1530	op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0;
…		…
1709	who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;	1715	who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1710	who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);	1716	who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1711	who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;	1717	who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1712	}	1718	}
1713		1719
1714	fix_player (who);	1720	who->update_stats ();
1715	if (op->level > 1)	1721	if (op->level > 1)
1716	{	1722	{
1717	if (op->type != PLAYER)	1723	if (op->type != PLAYER)
1718	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);	1724	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1719	else	1725	else
…		…
1724	player_lvl_adj (who, op); /* To increase more levels */	1730	player_lvl_adj (who, op); /* To increase more levels */
1725	}	1731	}
1726	else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))	1732	else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1727	{	1733	{
1728	op->level--;	1734	op->level--;
1729	fix_player (who);	1735	who->update_stats ();
1730	if (op->type != PLAYER)	1736	if (op->type != PLAYER)
1731	{	1737	{
1732	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);	1738	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1733	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);	1739	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);
1734	}	1740	}
1735	player_lvl_adj (who, op); /* To decrease more levels */	1741	player_lvl_adj (who, op); /* To decrease more levels */
1736	}	1742	}
		1743
1737	/* check if the spell data has changed */	1744	/* check if the spell data has changed */
		1745	esrv_update_stats (who->contr);
1738	esrv_update_spells (who->contr);	1746	esrv_update_spells (who->contr);
1739	}	1747	}
1740		1748
1741	/*	1749	/*
1742	* Returns how much experience is needed for a player to become	1750	* Returns how much experience is needed for a player to become
…		…
1776	op->perm_exp = 0;	1784	op->perm_exp = 0;
1777	else if (op->perm_exp > (sint64) MAX_EXPERIENCE)	1785	else if (op->perm_exp > (sint64) MAX_EXPERIENCE)
1778	op->perm_exp = MAX_EXPERIENCE;	1786	op->perm_exp = MAX_EXPERIENCE;
1779	}	1787	}
1780		1788
1781
1782	/* Add experience to a player - exp should only be positive.	1789	/* Add experience to a player - exp should only be positive.
1783	* Updates permanent exp for the skill we are adding to.	1790	* Updates permanent exp for the skill we are adding to.
1784	* skill_name is the skill to add exp to. Skill name can be	1791	* skill_name is the skill to add exp to. Skill name can be
1785	* NULL, in which case exp increases the players general	1792	* NULL, in which case exp increases the players general
1786	* total, but not any particular skill.	1793	* total, but not any particular skill.
1787	* flag is what to do if the player doesn't have the skill:	1794	* flag is what to do if the player doesn't have the skill:
1788	*/	1795	*/
1789
1790	static void	1796	static void
1791	add_player_exp (object op, sint64 exp, const char skill_name, int flag)	1797	add_player_exp (object op, sint64 exp, const char skill_name, int flag)
1792	{	1798	{
1793	object *skill_obj = NULL;	1799	object *skill_obj = NULL;
1794	sint64 limit, exp_to_add;	1800	sint64 limit, exp_to_add;
…		…
1964	void	1970	void
1965	change_exp (object op, sint64 exp, const char skill_name, int flag)	1971	change_exp (object op, sint64 exp, const char skill_name, int flag)
1966	{	1972	{
1967		1973
1968	#ifdef EXP_DEBUG	1974	#ifdef EXP_DEBUG
1969	# ifndef WIN32
1970	LOG (llevDebug, "change_exp() called for %s, exp = %lld\n", query_name (op), exp);
1971	# else
1972	LOG (llevDebug, "change_exp() called for %s, exp = %I64d\n", query_name (op), exp);	1975	LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
1973	# endif
1974	#endif	1976	#endif
1975		1977
1976	/* safety */	1978	/* safety */
1977	if (!op)	1979	if (!op)
1978	{	1980	{
…		…
2081	if (level > MAX_SAVE_LEVEL)	2083	if (level > MAX_SAVE_LEVEL)
2082	level = MAX_SAVE_LEVEL;	2084	level = MAX_SAVE_LEVEL;
2083		2085
2084	if ((random_roll (1, 20, op, PREFER_HIGH) + bonus) < savethrow[level])	2086	if ((random_roll (1, 20, op, PREFER_HIGH) + bonus) < savethrow[level])
2085	return 0;	2087	return 0;
		2088
2086	return 1;	2089	return 1;
2087	}	2090	}

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.9 by root, Sun Sep 10 16:00:23 2006 UTC vs. Revision 1.20 by root, Sat Dec 23 06:30:49 2006 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.9 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.20 by root, Sat Dec 23 06:30:49 2006 UTC