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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.24 by root, Thu Jan 4 16:19:31 2007 UTC vs.
Revision 1.61 by root, Fri May 18 15:05:08 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <funcpoint.h>	26	#include <funcpoint.h>
26		27
27	/* Handy little macro that adds exp and keeps it within bounds. Since	28	/* Handy little macro that adds exp and keeps it within bounds. Since
191	static const char *const drain_msg[NUM_STATS] = {	192	static const char *const drain_msg[NUM_STATS] = {
192	"Oh no! You are weakened!",	193	"Oh no! You are weakened!",
193	"You're feeling clumsy!",	194	"You're feeling clumsy!",
194	"You feel less healthy",	195	"You feel less healthy",
195	"You suddenly begin to lose your memory!",	196	"You suddenly begin to lose your memory!",
		197	"Watch out, your mind is going!",
		198	"Your spirit feels drained!",
196	"Your face gets distorted!",	199	"Your face gets distorted!",
197	"Watch out, your mind is going!",
198	"Your spirit feels drained!"
199	};	200	};
200	const char *const restore_msg[NUM_STATS] = {	201	const char *const restore_msg[NUM_STATS] = {
201	"You feel your strength return.",	202	"You feel your strength return.",
202	"You feel your agility return.",	203	"You feel your agility return.",
203	"You feel your health return.",	204	"You feel your health return.",
		205	"You feel your memory return.",
204	"You feel your wisdom return.",	206	"You feel your wisdom return.",
		207	"You feel your spirits return.",
205	"You feel your charisma return.",	208	"You feel your charisma return.",
206	"You feel your memory return.",
207	"You feel your spirits return."
208	};	209	};
209	const char *const gain_msg[NUM_STATS] = {	210	const char *const gain_msg[NUM_STATS] = {
210	"You feel stronger.",	211	"You feel stronger.",
211	"You feel more agile.",	212	"You feel more agile.",
212	"You feel healthy.",	213	"You feel healthy.",
		214	"You feel smarter.",
213	"You feel wiser.",	215	"You feel wiser.",
		216	"You feel more potent.",
214	"You seem to look better.",	217	"You seem to look better.",
215	"You feel smarter.",
216	"You feel more potent."
217	};	218	};
218	const char *const lose_msg[NUM_STATS] = {	219	const char *const lose_msg[NUM_STATS] = {
219	"You feel weaker!",	220	"You feel weaker!",
220	"You feel clumsy!",	221	"You feel clumsy!",
221	"You feel less healthy!",	222	"You feel less healthy!",
		223	"You feel stupid!",
222	"You lose some of your memory!",	224	"You lose some of your memory!",
		225	"You feel less potent!",
223	"You look ugly!",	226	"You look ugly!",
224	"You feel stupid!",
225	"You feel less potent!"
226	};	227	};
227		228
228	const char *const statname[NUM_STATS] = {	229	const char *const statname[NUM_STATS] = {
229	"strength", "dexterity", "constitution", "intelligence", "wisdom", "power", "charisma"	230	"strength", "dexterity", "constitution", "intelligence", "wisdom", "power", "charisma"
230	};	231	};
231		232
232	const char *const short_stat_name[NUM_STATS] = {	233	const char *const short_stat_name[NUM_STATS] = {
233	"Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha"	234	"Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha"
234	};	235	};
235
236	/*
237	* sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on
238	* what attr is (STR to POW).
239	*/
240	void
241	set_attr_value (living *stats, int attr, sint8 value)
242	{
243	switch (attr)
244	{
245	case STR:
246	stats->Str = value;
247	break;
248	case DEX:
249	stats->Dex = value;
250	break;
251	case CON:
252	stats->Con = value;
253	break;
254	case WIS:
255	stats->Wis = value;
256	break;
257	case POW:
258	stats->Pow = value;
259	break;
260	case CHA:
261	stats->Cha = value;
262	break;
263	case INT:
264	stats->Int = value;
265	break;
266	}
267	}
268		236
269	/*	237	/*
270	* Like set_attr_value(), but instead the value (which can be negative)	238	* Like set_attr_value(), but instead the value (which can be negative)
271	* is added to the specified stat.	239	* is added to the specified stat.
272	*/	240	*/
273	void	241	void
274	change_attr_value (living *stats, int attr, sint8 value)	242	change_attr_value (living *stats, int attr, sint8 value)
275	{	243	{
276	if (value == 0)	244	stats->stat (attr) += value;
277	return;
278
279	switch (attr)
280	{
281	case STR:
282	stats->Str += value;
283	break;
284	case DEX:
285	stats->Dex += value;
286	break;
287	case CON:
288	stats->Con += value;
289	break;
290	case WIS:
291	stats->Wis += value;
292	break;
293	case POW:
294	stats->Pow += value;
295	break;
296	case CHA:
297	stats->Cha += value;
298	break;
299	case INT:
300	stats->Int += value;
301	break;
302	default:
303	LOG (llevError, "Invalid attribute in change_attr_value: %d\n", attr);
304	}
305	}
306
307	/*
308	* returns the specified stat. See also set_attr_value().
309	*/
310
311	sint8
312	get_attr_value (const living *stats, int attr)
313	{
314	switch (attr)
315	{
316	case STR: return stats->Str;
317	case DEX: return stats->Dex;
318	case CON: return stats->Con;
319	case WIS: return stats->Wis;
320	case CHA: return stats->Cha;
321	case INT: return stats->Int;
322	case POW: return stats->Pow;
323	}
324
325	return 0;
326	}	245	}
327		246
328	/*	247	/*
329	* Ensures that all stats (str/dex/con/wis/cha/int) are within the	248	* Ensures that all stats (str/dex/con/wis/cha/int) are within the
330	* 1-30 stat limit.	249	* 1-30 stat limit.
331	*/	250	*/
332
333	void	251	void
334	check_stat_bounds (living *stats)	252	check_stat_bounds (living *stats)
335	{	253	{
336	int i, v;
337
338	for (i = 0; i < NUM_STATS; i++)	254	for (int i = 0; i < NUM_STATS; i++)
339	if ((v = get_attr_value (stats, i)) > MAX_STAT)	255	{
340	set_attr_value (stats, i, MAX_STAT);	256	sint8 &v = stats->stat (i);
341	else if (v < MIN_STAT)	257	v = clamp (v, MIN_STAT, MAX_STAT);
342	set_attr_value (stats, i, MIN_STAT);	258	}
343	}	259	}
344		260
345	#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc)	261	#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc)
346		262
347	/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,	263	/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,
…		…
356	/* flag is set to 1 if we are applying the object, -1 if we are removing	272	/* flag is set to 1 if we are applying the object, -1 if we are removing
357	* the object.	273	* the object.
358	* It is the calling functions responsibilty to check to see if the object	274	* It is the calling functions responsibilty to check to see if the object
359	* can be applied or not.	275	* can be applied or not.
360	* The main purpose of calling this function is the messages that are	276	* The main purpose of calling this function is the messages that are
361	* displayed - fix_player should really always be called after this when	277	* displayed - update_stats should really always be called after this when
362	* removing an object - that is because it is impossible to know if some object	278	* removing an object - that is because it is impossible to know if some object
363	* is the only source of an attacktype or spell attunement, so this function	279	* is the only source of an attacktype or spell attunement, so this function
364	* will clear the bits, but the player may still have some other object	280	* will clear the bits, but the player may still have some other object
365	* that gives them that ability.	281	* that gives them that ability.
366	*/	282	*/
367	int	283	int
368	change_abil (object op, object tmp)	284	change_abil (object op, object tmp)
369	{	285	{
370	int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, i, j, success = 0;	286	int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, success = 0;
371	char message[MAX_BUF];	287	char message[MAX_BUF];
372	int potion_max = 0;	288	int potion_max = 0;
373		289
374	/* remember what object was like before it was changed. note that	290	/* remember what object was like before it was changed. note that
375	* refop is a local copy of op only to be used for detecting changes	291	* refop is a local copy of op only to be used for detecting changes
…		…
380	if (op->type == PLAYER)	296	if (op->type == PLAYER)
381	{	297	{
382	if (tmp->type == POTION)	298	if (tmp->type == POTION)
383	{	299	{
384	potion_max = 1;	300	potion_max = 1;
385	for (j = 0; j < NUM_STATS; j++)	301	for (int j = 0; j < NUM_STATS; j++)
386	{	302	{
387	int nstat, ostat;	303	int ostat = op->contr->orig_stats.stat (j);
388		304	int i = tmp->stats.stat (j);
389	ostat = get_attr_value (&(op->contr->orig_stats), j);
390	i = get_attr_value (&(tmp->stats), j);
391		305
392	/* nstat is what the stat will be after use of the potion */	306	/* nstat is what the stat will be after use of the potion */
393	nstat = flag * i + ostat;	307	int nstat = flag * i + ostat;
394		308
395	/* Do some bounds checking. While I don't think any	309	/* Do some bounds checking. While I don't think any
396	* potions do so right now, there is the potential for potions	310	* potions do so right now, there is the potential for potions
397	* that adjust that stat by more than one point, so we need	311	* that adjust that stat by more than one point, so we need
398	* to allow for that.	312	* to allow for that.
399	*/	313	*/
400	if (nstat < 1 && i * flag < 0)	314	if (nstat < 1 && i * flag < 0)
401	nstat = 1;	315	nstat = 1;
402	else if (nstat > 20 + get_attr_value (&(op->arch->clone.stats), j))	316	else if (nstat > 20 + op->arch->clone.stats.stat (j))
403	{
404	nstat = 20 + get_attr_value (&(op->arch->clone.stats), j);	317	nstat = 20 + op->arch->clone.stats.stat (j);
405	}
406		318
407	if (nstat != ostat)	319	if (nstat != ostat)
408	{	320	{
409	set_attr_value (&(op->contr->orig_stats), j, nstat);	321	op->contr->orig_stats.stat (j) = nstat;
410	potion_max = 0;	322	potion_max = 0;
411	}	323	}
412	else if (i)	324	else if (i)
413	{	325	{
414	/* potion is useless - player has already hit the natural maximum */	326	/* potion is useless - player has already hit the natural maximum */
…		…
418		330
419	/* This section of code ups the characters normal stats also. I am not	331	/* This section of code ups the characters normal stats also. I am not
420	* sure if this is strictly necessary, being that fix_player probably	332	* sure if this is strictly necessary, being that fix_player probably
421	* recalculates this anyway.	333	* recalculates this anyway.
422	*/	334	*/
423	for (j = 0; j < NUM_STATS; j++)	335	for (int j = 0; j < NUM_STATS; j++)
424	change_attr_value (&(op->stats), j, flag * get_attr_value (&(tmp->stats), j));	336	change_attr_value (&op->stats, j, flag * tmp->stats.stat (j));
425		337
426	check_stat_bounds (&(op->stats));	338	check_stat_bounds (&op->stats);
427	} /* end of potion handling code */	339	} /* end of potion handling code */
428	}	340	}
429		341
430	/* reset attributes that fix_player doesn't reset since it doesn't search	342	/* reset attributes that update_stats doesn't reset since it doesn't search
431	* everything to set	343	* everything to set
432	*/	344	*/
433	if (flag == -1)	345	if (flag == -1)
434	{	346	{
435	op->attacktype &= ~tmp->attacktype;	347	op->attacktype &= ~tmp->attacktype;
436	op->path_attuned &= ~tmp->path_attuned;	348	op->path_attuned &= ~tmp->path_attuned;
437	op->path_repelled &= ~tmp->path_repelled;	349	op->path_repelled &= ~tmp->path_repelled;
438	op->path_denied &= ~tmp->path_denied;	350	op->path_denied &= ~tmp->path_denied;
439	/* Presuming here that creatures only have move_type,	351	/* Presuming here that creatures only have move_type,
440	* and not the other move_ fields.	352	* and not the other move_ fields.
441	*/	353	*/
442	op->move_type &= ~tmp->move_type;	354	op->move_type &= ~tmp->move_type;
443	}	355	}
444		356
445	/* call fix_player since op object could have whatever attribute due	357	/* call fix_player since op object could have whatever attribute due
446	* to multiple items. if fix_player always has to be called after	358	* to multiple items. if update_stats always has to be called after
447	* change_ability then might as well call it from here	359	* change_ability then might as well call it from here
448	*/	360	*/
449	op->update_stats ();	361	op->update_stats ();
450		362
451	/* Fix player won't add the bows ability to the player, so don't	363	/* update_stats won't add the bows ability to the player, so don't
452	* print out message if this is a bow.	364	* print out message if this is a bow.
453	*/	365	*/
454	if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)	366	if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)
455	{	367	{
456	success = 1;	368	success = 1;
…		…
496	if (tmp->move_type & MOVE_FLY_HIGH)	408	if (tmp->move_type & MOVE_FLY_HIGH)
497	{	409	{
498	/* double conditional - second case covers if you have move_fly_low -	410	/* double conditional - second case covers if you have move_fly_low -
499	* in that case, you don't actually land	411	* in that case, you don't actually land
500	*/	412	*/
501	DIFF_MSG (flag, "You soar into the air air!.",	413	DIFF_MSG (flag, "You soar into the air!",
502	(op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));	414	(op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
503	}	415	}
		416
504	if (tmp->move_type & MOVE_SWIM)	417	if (tmp->move_type & MOVE_SWIM)
505	DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");	418	DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
506		419
507	/* Changing move status may mean you are affected by things you weren't before */	420	/* Changing move status may mean you are affected by things you weren't before */
508	check_move_on (op, op);	421	check_move_on (op, op);
…		…
636	success = 1;	549	success = 1;
637	DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");	550	DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
638	}	551	}
639		552
640	/* Messages for changed resistance */	553	/* Messages for changed resistance */
641	for (i = 0; i < NROFATTACKS; i++)	554	for (int i = 0; i < NROFATTACKS; i++)
642	{	555	{
643	if (i == ATNR_PHYSICAL)	556	if (i == ATNR_PHYSICAL)
644	continue; /* Don't display about armour */	557	continue; /* Don't display about armour */
645		558
646	if (op->resist[i] != refop.resist[i])	559	if (op->resist[i] != refop.resist[i])
…		…
655	}	568	}
656	}	569	}
657		570
658	if (!potion_max)	571	if (!potion_max)
659	{	572	{
660	for (j = 0; j < NUM_STATS; j++)	573	for (int j = 0; j < NUM_STATS; j++)
661	{	574	{
662	if ((i = get_attr_value (&(tmp->stats), j)) != 0)	575	if (int i = tmp->stats.stat (j))
663	{	576	{
664	success = 1;	577	success = 1;
665	DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);	578	DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
666	}	579	}
667	}	580	}
…		…
672		585
673	/*	586	/*
674	* Stat draining by Vick 930307	587	* Stat draining by Vick 930307
675	* (Feeling evil, I made it work as well now. -Frank 8)	588	* (Feeling evil, I made it work as well now. -Frank 8)
676	*/	589	*/
677
678	void	590	void
679	object::drain_stat ()	591	object::drain_stat ()
680	{	592	{
681	drain_specific_stat (RANDOM () % NUM_STATS);	593	drain_specific_stat (rndm (NUM_STATS));
682	}	594	}
683		595
684	void	596	void
685	object::drain_specific_stat (int deplete_stats)	597	object::drain_specific_stat (int deplete_stats)
686	{	598	{
…		…
754	return;	666	return;
755		667
756	/* Randomly change the players luck. Basically, we move it	668	/* Randomly change the players luck. Basically, we move it
757	* back neutral (if greater>0, subtract, otherwise add)	669	* back neutral (if greater>0, subtract, otherwise add)
758	*/	670	*/
759	if (RANDOM () % (FABS (tmp->stats.luck)) >= RANDOM () % 30)	671	if (rndm (abs (tmp->stats.luck)) >= rndm (30))
760	{	672	{
761	int diff = tmp->stats.luck > 0 ? -1 : 1;	673	int diff = tmp->stats.luck > 0 ? -1 : 1;
762		674
763	stats.luck += diff;	675	stats.luck += diff;
764	tmp->stats.luck += diff;	676	tmp->stats.luck += diff;
…		…
771	* Subtracts stat-bonuses given by the class which the player has chosen.	683	* Subtracts stat-bonuses given by the class which the player has chosen.
772	*/	684	*/
773	void	685	void
774	object::remove_statbonus ()	686	object::remove_statbonus ()
775	{	687	{
776	stats.Str -= arch->clone.stats.Str;	688	for (int i = 0; i < NUM_STATS; ++i)
777	stats.Dex -= arch->clone.stats.Dex;	689	{
778	stats.Con -= arch->clone.stats.Con;	690	sint8 v = arch->clone.stats.stat (i);
779	stats.Wis -= arch->clone.stats.Wis;	691	stats.stat (i) -= v;
780	stats.Pow -= arch->clone.stats.Pow;	692	contr->orig_stats.stat (i) -= v;
781	stats.Cha -= arch->clone.stats.Cha;	693	}
782	stats.Int -= arch->clone.stats.Int;
783
784	contr->orig_stats.Str -= arch->clone.stats.Str;
785	contr->orig_stats.Dex -= arch->clone.stats.Dex;
786	contr->orig_stats.Con -= arch->clone.stats.Con;
787	contr->orig_stats.Wis -= arch->clone.stats.Wis;
788	contr->orig_stats.Pow -= arch->clone.stats.Pow;
789	contr->orig_stats.Cha -= arch->clone.stats.Cha;
790	contr->orig_stats.Int -= arch->clone.stats.Int;
791	}	694	}
792		695
793	/*	696	/*
794	* Adds stat-bonuses given by the class which the player has chosen.	697	* Adds stat-bonuses given by the class which the player has chosen.
795	*/	698	*/
796	void	699	void
797	object::add_statbonus ()	700	object::add_statbonus ()
798	{	701	{
799	stats.Str += arch->clone.stats.Str;	702	for (int i = 0; i < NUM_STATS; ++i)
800	stats.Dex += arch->clone.stats.Dex;	703	{
801	stats.Con += arch->clone.stats.Con;	704	sint8 v = arch->clone.stats.stat (i);
802	stats.Wis += arch->clone.stats.Wis;	705	stats.stat (i) += v;
803	stats.Pow += arch->clone.stats.Pow;	706	contr->orig_stats.stat (i) += v;
804	stats.Cha += arch->clone.stats.Cha;	707	}
805	stats.Int += arch->clone.stats.Int;
806
807	contr->orig_stats.Str += arch->clone.stats.Str;
808	contr->orig_stats.Dex += arch->clone.stats.Dex;
809	contr->orig_stats.Con += arch->clone.stats.Con;
810	contr->orig_stats.Wis += arch->clone.stats.Wis;
811	contr->orig_stats.Pow += arch->clone.stats.Pow;
812	contr->orig_stats.Cha += arch->clone.stats.Cha;
813	contr->orig_stats.Int += arch->clone.stats.Int;
814	}	708	}
815		709
816	/*	710	/*
817	* Updates all abilities given by applied objects in the inventory	711	* Updates all abilities given by applied objects in the inventory
818	* of the given object. Note: This function works for both monsters	712	* of the given object. Note: This function works for both monsters
819	* and players; the "player" in the name is purely an archaic inheritance.	713	* and players; the "player" in the name is purely an archaic inheritance.
820	* This functions starts from base values (archetype or player object)	714	* This functions starts from base values (archetype or player object)
821	* and then adjusts them according to what the player has equipped.	715	* and then adjusts them according to what the player has equipped.
822	*/	716	*
823
824	/* July 95 - inserted stuff to handle new skills/exp system - b.t.	717	* July 95 - inserted stuff to handle new skills/exp system - b.t.
825	spell system split, grace points now added to system --peterm	718	* spell system split, grace points now added to system --peterm
826	*/	719	*/
827
828	void	720	void
829	object::update_stats ()	721	object::update_stats ()
830	{	722	{
831	int i, j;	723	int i, j;
832	float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1;	724	float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1;
833	int weapon_weight = 0, weapon_speed = 0;	725	int weapon_weight = 0, weapon_speed = 0;
834	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;	726	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
835	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];	727	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
836	object grace_obj = NULL, mana_obj = NULL, wc_obj = NULL, tmp;	728	object grace_obj = NULL, mana_obj = NULL, *tmp;
837	float old_speed = speed;	729	float old_speed = speed;
838		730
839	/* First task is to clear all the values back to their original values */	731	/* First task is to clear all the values back to their original values */
840	if (type == PLAYER)	732	if (type == PLAYER)
841	{	733	{
842	for (i = 0; i < NUM_STATS; i++)	734	for (i = 0; i < NUM_STATS; i++)
843	set_attr_value (&(stats), i, get_attr_value (&(contr->orig_stats), i));	735	stats.stat (i) = contr->orig_stats.stat (i);
844		736
845	if (settings.spell_encumbrance == TRUE)	737	if (settings.spell_encumbrance == TRUE)
846	contr->encumbrance = 0;	738	contr->encumbrance = 0;
847		739
848	attacktype = 0;	740	attacktype = 0;
		741
849	contr->digestion = 0;	742	contr->digestion = 0;
850	contr->gen_hp = 0;	743	contr->gen_hp = 0;
851	contr->gen_sp = 0;	744	contr->gen_sp = 0;
852	contr->gen_grace = 0;	745	contr->gen_grace = 0;
853	contr->gen_sp_armour = 10;	746	contr->gen_sp_armour = 10;
854	contr->item_power = 0;	747	contr->item_power = 0;
855
856	/* Don't clobber all the range_ values. range_golem otherwise
857	* gets reset for no good reason, and we don't want to reset
858	* range_magic (what spell is readied). These three below
859	* well get filled in based on what the player has equipped.
860	*/
861	contr->ranges[range_bow] = NULL;
862	contr->ranges[range_misc] = NULL;
863	contr->ranges[range_skill] = NULL;
864	}	748	}
865		749
866	memcpy (body_used, body_info, sizeof (body_info));	750	for (int i = NUM_BODY_LOCATIONS; i--; )
		751	slot[i].used = slot[i].info;
867		752
868	slaying = 0;	753	slaying = 0;
869		754
870	if (!QUERY_FLAG (this, FLAG_WIZ))	755	if (!QUERY_FLAG (this, FLAG_WIZ))
871	{	756	{
…		…
880	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);	765	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
881	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);	766	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
882	if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);	767	if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
883	if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);	768	if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
884		769
885	path_attuned = arch->clone.path_attuned;	770	path_attuned = arch->clone.path_attuned;
886	path_repelled = arch->clone.path_repelled;	771	path_repelled = arch->clone.path_repelled;
887	path_denied = arch->clone.path_denied;	772	path_denied = arch->clone.path_denied;
888	glow_radius = arch->clone.glow_radius;	773	glow_radius = arch->clone.glow_radius;
889	move_type = arch->clone.move_type;	774	move_type = arch->clone.move_type;
		775
890	chosen_skill = NULL;	776	chosen_skill = 0;
891		777
892	/* initializing resistances from the values in player/monster's	778	/* initializing resistances from the values in player/monster's
893	* archetype clone	779	* archetype clone
894	*/	780	*/
895	memcpy (&resist, &arch->clone.resist, sizeof (resist));	781	memcpy (&resist, &arch->clone.resist, sizeof (resist));
…		…
898	{	784	{
899	if (resist[i] > 0)	785	if (resist[i] > 0)
900	prot[i] = resist[i], vuln[i] = 0;	786	prot[i] = resist[i], vuln[i] = 0;
901	else	787	else
902	vuln[i] = -(resist[i]), prot[i] = 0;	788	vuln[i] = -(resist[i]), prot[i] = 0;
		789
903	potion_resist[i] = 0;	790	potion_resist[i] = 0;
904	}	791	}
905		792
906	wc = arch->clone.stats.wc;	793	wc = arch->clone.stats.wc;
907	stats.dam = arch->clone.stats.dam;	794	stats.dam = arch->clone.stats.dam;
…		…
925	speed = arch->clone.speed;	812	speed = arch->clone.speed;
926		813
927	/* OK - we've reset most all the objects attributes to sane values.	814	/* OK - we've reset most all the objects attributes to sane values.
928	* now go through and make adjustments for what the player has equipped.	815	* now go through and make adjustments for what the player has equipped.
929	*/	816	*/
930
931	for (tmp = inv; tmp; tmp = tmp->below)	817	for (tmp = inv; tmp; tmp = tmp->below)
932	{	818	{
933	/* See note in map.c:update_position about making this additive	819	/* See note in map.c:update_position about making this additive
934	* since light sources are never applied, need to put check here.	820	* since light sources are never applied, need to put check here.
935	*/	821	*/
936	if (tmp->glow_radius > glow_radius)	822	if (tmp->glow_radius > glow_radius)
937	glow_radius = tmp->glow_radius;	823	glow_radius = tmp->glow_radius;
938		824
939	/* This happens because apply_potion calls change_abil with the potion	825	/* This happens because apply_potion calls change_abil with the potion
940	* applied so we can tell the player what chagned. But change_abil	826	* applied so we can tell the player what changed. But change_abil
941	* then calls this function.	827	* then calls this function.
942	*/	828	*/
943	if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)	829	if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
944	continue;	830	continue;
945		831
…		…
971	* in the praying skill, and the player should always get those.	857	* in the praying skill, and the player should always get those.
972	* It also means we need to put in additional checks for applied below,	858	* It also means we need to put in additional checks for applied below,
973	* because the skill shouldn't count against body positions being used	859	* because the skill shouldn't count against body positions being used
974	* up, etc.	860	* up, etc.
975	*/	861	*/
976	if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) \|\|	862	if ((tmp->flag [FLAG_APPLIED]
		863	&& tmp->type != CONTAINER
		864	&& tmp->type != CLOSE_CON)
		865	\|\| (tmp->type == SKILL
977	(tmp->type == SKILL && tmp->subtype == SK_PRAYING))	866	&& tmp->subtype == SK_PRAYING))
978	{	867	{
979	if (type == PLAYER)	868	if (type == PLAYER)
980	{	869	{
981	if (tmp->type == BOW)	870	if (tmp == contr->combat_ob \|\| tmp == contr->ranged_ob)
982	contr->ranges[range_bow] = tmp;	871	if (tmp != current_weapon
983		872	&& (tmp->type != SKILL \|\| tmp->subtype != SK_PRAYING)
984	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)	873	&& !tmp->flag [FLAG_CURSED]
985	contr->ranges[range_misc] = tmp;	874	&& !tmp->flag [FLAG_DAMNED])
		875	continue;
986		876
987	for (i = 0; i < NUM_STATS; i++)	877	for (i = 0; i < NUM_STATS; i++)
988	change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), i));	878	change_attr_value (&stats, i, tmp->stats.stat (i));
989		879
990	/* these are the items that currently can change digestion, regeneration,	880	/* These are the items that currently can change digestion, regeneration,
991	* spell point recovery and mana point recovery. Seems sort of an arbitary	881	* spell point recovery and mana point recovery. Seems sort of an arbitary
992	* list, but other items store other info into stats array.	882	* list, but other items store other info into stats array.
993	*/	883	*/
994	if ((tmp->type == WEAPON) \|\|	884	if (tmp->type == WEAPON \|\| tmp->type == BOW \|\|
995	(tmp->type == ARMOUR) \|\| (tmp->type == HELMET) \|\|	885	tmp->type == ARMOUR \|\| tmp->type == HELMET \|\|
996	(tmp->type == SHIELD) \|\| (tmp->type == RING) \|\|	886	tmp->type == SHIELD \|\| tmp->type == RING \|\|
997	(tmp->type == BOOTS) \|\| (tmp->type == GLOVES) \|\|	887	tmp->type == BOOTS \|\| tmp->type == GLOVES \|\|
998	(tmp->type == AMULET) \|\| (tmp->type == GIRDLE) \|\|	888	tmp->type == AMULET \|\| tmp->type == GIRDLE \|\|
999	(tmp->type == BRACERS) \|\| (tmp->type == CLOAK) \|\|	889	tmp->type == BRACERS \|\| tmp->type == CLOAK \|\|
1000	(tmp->type == DISEASE) \|\| (tmp->type == FORCE) \|\|	890	tmp->type == DISEASE \|\| tmp->type == FORCE \|\|
1001	(tmp->type == SKILL))	891	tmp->type == SKILL)
1002	{	892	{
1003	contr->digestion += tmp->stats.food;	893	contr->digestion += tmp->stats.food;
1004	contr->gen_hp += tmp->stats.hp;	894	contr->gen_hp += tmp->stats.hp;
1005	contr->gen_sp += tmp->stats.sp;	895	contr->gen_sp += tmp->stats.sp;
1006	contr->gen_grace += tmp->stats.grace;	896	contr->gen_grace += tmp->stats.grace;
1007	contr->gen_sp_armour += tmp->gen_sp_armour;	897	contr->gen_sp_armour += tmp->gen_sp_armour;
1008	contr->item_power += tmp->item_power;	898	contr->item_power += tmp->item_power;
1009	}	899	}
1010	} /* if this is a player */	900	} /* if this is a player */
		901	else
		902	{
		903	if (tmp->type == WEAPON)
		904	current_weapon = tmp;
		905	}
1011		906
1012	/* Update slots used for items */	907	/* Update slots used for items */
1013	if (QUERY_FLAG (tmp, FLAG_APPLIED))	908	if (QUERY_FLAG (tmp, FLAG_APPLIED))
1014	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	909	for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1015	body_used[i] += tmp->body_info[i];	910	slot[i].used += tmp->slot[i].info;
1016		911
1017	if (tmp->type == SYMPTOM)	912	if (tmp->type == SYMPTOM)
1018	{	913	{
1019	speed_reduce_from_disease = tmp->last_sp / 100.0;	914	speed_reduce_from_disease = tmp->last_sp / 100.f;
		915
1020	if (speed_reduce_from_disease == 0)	916	if (speed_reduce_from_disease == 0)
1021	speed_reduce_from_disease = 1;	917	speed_reduce_from_disease = 1;
1022	}	918	}
1023		919
1024	/* Pos. and neg. protections are counted seperate (-> pro/vuln).	920	/* Pos. and neg. protections are counted seperate (-> pro/vuln).
1025	* (Negative protections are calculated extactly like positive.)	921	* (Negative protections are calculated exactly like positive.)
1026	* Resistance from potions are treated special as well. If there's	922	* Resistance from potions are treated special as well. If there's
1027	* more than one potion-effect, the bigger prot.-value is taken.	923	* more than one potion-effect, the bigger prot.-value is taken.
1028	*/	924	*/
1029	if (tmp->type != POTION)	925	if (tmp->type != POTION)
1030	{	926	{
…		…
1039	potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]);	935	potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]);
1040	else	936	else
1041	potion_resist[i] = tmp->resist[i];	937	potion_resist[i] = tmp->resist[i];
1042	}	938	}
1043	else if (tmp->resist[i] > 0)	939	else if (tmp->resist[i] > 0)
1044	prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;	940	prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
1045	else if (tmp->resist[i] < 0)	941	else if (tmp->resist[i] < 0)
1046	vuln[i] += ((100 - vuln[i]) * (-tmp->resist[i])) / 100;	942	vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
1047	}	943	}
1048	}	944	}
1049		945
1050	/* There may be other things that should not adjust the attacktype */	946	/* There may be other things that should not adjust the attacktype */
1051	if (tmp->type != BOW && tmp->type != SYMPTOM)	947	if (tmp->type != SYMPTOM)
		948	{
1052	attacktype \|= tmp->attacktype;	949	attacktype \|= tmp->attacktype;
1053
1054	path_attuned \|= tmp->path_attuned;	950	path_attuned \|= tmp->path_attuned;
1055	path_repelled \|= tmp->path_repelled;	951	path_repelled \|= tmp->path_repelled;
1056	path_denied \|= tmp->path_denied;	952	path_denied \|= tmp->path_denied;
		953	move_type \|= tmp->move_type;
1057	stats.luck += tmp->stats.luck;	954	stats.luck += tmp->stats.luck;
1058	move_type \|= tmp->move_type;	955	}
1059		956
1060	if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);	957	if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);
1061	if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);	958	if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1062	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);	959	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1063	if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);	960	if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
…		…
1076		973
1077	if (tmp->stats.exp && tmp->type != SKILL)	974	if (tmp->stats.exp && tmp->type != SKILL)
1078	{	975	{
1079	if (tmp->stats.exp > 0)	976	if (tmp->stats.exp > 0)
1080	{	977	{
1081	added_speed += (float) tmp->stats.exp / 3.0;	978	added_speed += tmp->stats.exp / 3.f;
1082	bonus_speed += 1.0 + (float) tmp->stats.exp / 3.0;	979	bonus_speed += tmp->stats.exp / 3.f + 1.f;
1083	}	980	}
1084	else	981	else
1085	added_speed += (float) tmp->stats.exp;	982	added_speed += tmp->stats.exp;
1086	}	983	}
1087		984
1088	switch (tmp->type)	985	switch (tmp->type)
1089	{	986	{
		987	#if 0
		988	case WAND:
		989	case ROD:
		990	case HORN:
		991	if (type != PLAYER \|\| current_weapon == tmp)
		992	chosen_skill = tmp;
		993	break;
		994	#endif
		995
1090	/* skills modifying the character -b.t. */	996	/* skills modifying the character -b.t. */
1091	/* for all skills and skill granting objects */	997	/* for all skills and skill granting objects */
1092	case SKILL:	998	case SKILL:
1093	if (!QUERY_FLAG (tmp, FLAG_APPLIED))	999	if (!QUERY_FLAG (tmp, FLAG_APPLIED))
1094	break;	1000	break;
1095		1001
1096	if (IS_COMBAT_SKILL (tmp->subtype))
1097	wc_obj = tmp;
1098
1099	if (chosen_skill)	1002	if (chosen_skill)
1100	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);	1003	LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
		1004	&name, &chosen_skill->name, &tmp->name);
1101		1005
1102	chosen_skill = tmp;	1006	chosen_skill = tmp;
1103		1007
1104	if (tmp->stats.dam > 0)	1008	if (tmp->stats.dam > 0)
1105	{ /* skill is a 'weapon' */	1009	{ /* skill is a 'weapon' */
1106	if (!QUERY_FLAG (this, FLAG_READY_WEAPON))	1010	if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1107	weapon_speed = (int) WEAPON_SPEED (tmp);	1011	weapon_speed = WEAPON_SPEED (tmp);
1108		1012
1109	if (weapon_speed < 0)	1013	if (weapon_speed < 0)
1110	weapon_speed = 0;	1014	weapon_speed = 0;
1111		1015
1112	weapon_weight = tmp->weight;	1016	weapon_weight = tmp->weight;
1113	stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9));	1017	stats.dam += 1 + (chosen_skill->level * tmp->stats.dam / 9);
1114		1018
1115	if (tmp->magic)	1019	if (tmp->magic)
1116	stats.dam += tmp->magic;	1020	stats.dam += tmp->magic;
1117	}	1021	}
1118		1022
1119	if (tmp->stats.wc)	1023	if (tmp->stats.wc)
1120	wc -= (tmp->stats.wc + tmp->magic);	1024	wc -= tmp->stats.wc + tmp->magic;
1121		1025
1122	if (tmp->slaying != NULL)	1026	if (tmp->slaying)
1123	slaying = tmp->slaying;	1027	slaying = tmp->slaying;
1124		1028
1125	if (tmp->stats.ac)	1029	if (tmp->stats.ac)
1126	ac -= (tmp->stats.ac + tmp->magic);	1030	ac -= tmp->stats.ac + tmp->magic;
1127		1031
1128	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1032	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1129	contr->encumbrance += (int) 3 *tmp->weight / 1000;	1033	contr->encumbrance += (int) 3 *tmp->weight / 1000;
1130		1034
1131	if (type == PLAYER)
1132	contr->ranges[range_skill] = this;
1133
1134	break;
1135
1136	case SKILL_TOOL:
1137	if (chosen_skill)
1138	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1139
1140	chosen_skill = tmp;
1141
1142	if (type == PLAYER)
1143	contr->ranges[range_skill] = this;
1144	break;	1035	break;
1145		1036
1146	case SHIELD:	1037	case SHIELD:
1147	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1038	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1148	contr->encumbrance += (int) tmp->weight / 2000;	1039	contr->encumbrance += (int) tmp->weight / 2000;
…		…
1152	case HELMET:	1043	case HELMET:
1153	case BOOTS:	1044	case BOOTS:
1154	case GLOVES:	1045	case GLOVES:
1155	case CLOAK:	1046	case CLOAK:
1156	if (tmp->stats.wc)	1047	if (tmp->stats.wc)
1157	wc -= (tmp->stats.wc + tmp->magic);	1048	wc -= tmp->stats.wc + tmp->magic;
1158		1049
1159	if (tmp->stats.dam)	1050	if (tmp->stats.dam)
1160	stats.dam += (tmp->stats.dam + tmp->magic);	1051	stats.dam += tmp->stats.dam + tmp->magic;
1161		1052
1162	if (tmp->stats.ac)	1053	if (tmp->stats.ac)
1163	ac -= (tmp->stats.ac + tmp->magic);	1054	ac -= tmp->stats.ac + tmp->magic;
1164		1055
1165	break;	1056	break;
1166		1057
		1058	case BOW:
1167	case WEAPON:	1059	case WEAPON:
		1060	if (type != PLAYER \|\| current_weapon == tmp)
		1061	{
1168	wc -= (tmp->stats.wc + tmp->magic);	1062	wc -= tmp->stats.wc + tmp->magic;
1169		1063
1170	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)	1064	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1171	ac -= tmp->stats.ac + tmp->magic;	1065	ac -= tmp->stats.ac + tmp->magic;
1172		1066
1173	stats.dam += (tmp->stats.dam + tmp->magic);	1067	stats.dam += tmp->stats.dam + tmp->magic;
1174	weapon_weight = tmp->weight;	1068	weapon_weight = tmp->weight;
1175	weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;	1069	weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1176		1070
1177	if (weapon_speed < 0)	1071	if (weapon_speed < 0)
1178	weapon_speed = 0;	1072	weapon_speed = 0;
1179		1073
1180	slaying = tmp->slaying;	1074	slaying = tmp->slaying;
		1075
1181	/* If there is desire that two handed weapons should do	1076	/* If there is desire that two handed weapons should do
1182	* extra strength damage, this is where the code should	1077	* extra strength damage, this is where the code should
1183	* go.	1078	* go.
1184	*/	1079	*/
1185	current_weapon = tmp;	1080
1186	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1081	if (type == PLAYER)
		1082	if (settings.spell_encumbrance)
1187	contr->encumbrance += (int) 3 *tmp->weight / 1000;	1083	contr->encumbrance += tmp->weight * 3 / 1000;
		1084	}
1188		1085
1189	break;	1086	break;
1190		1087
1191	case ARMOUR: /* Only the best of these three are used: */	1088	case ARMOUR: /* Only the best of these three are used: */
1192	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1089	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1193	contr->encumbrance += (int) tmp->weight / 1000;	1090	contr->encumbrance += tmp->weight / 1000;
1194		1091
1195	case BRACERS:	1092	case BRACERS:
1196	case FORCE:	1093	case FORCE:
1197	if (tmp->stats.wc)	1094	if (tmp->stats.wc)
1198	{	1095	{
…		…
1220	wc -= (tmp->stats.wc + tmp->magic);	1117	wc -= (tmp->stats.wc + tmp->magic);
1221		1118
1222	if (tmp->stats.ac)	1119	if (tmp->stats.ac)
1223	ac -= (tmp->stats.ac + tmp->magic);	1120	ac -= (tmp->stats.ac + tmp->magic);
1224		1121
1225	if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max)	1122	if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max)
1226	max = ARMOUR_SPEED (tmp) / 10.0;	1123	max = ARMOUR_SPEED (tmp) / 10.f;
1227		1124
1228	break;	1125	break;
1229	} /* switch tmp->type */	1126	} /* switch tmp->type */
1230	} /* item is equipped */	1127	} /* item is equipped */
1231	} /* for loop of items */	1128	} /* for loop of items */
…		…
1299		1196
1300	if (mana_obj == this && type == PLAYER)	1197	if (mana_obj == this && type == PLAYER)
1301	stats.maxsp = 1;	1198	stats.maxsp = 1;
1302	else	1199	else
1303	{	1200	{
1304	sp_tmp = 0.0;	1201	sp_tmp = 0.f;
1305		1202
1306	for (i = 1; i <= mana_obj->level && i <= 10; i++)	1203	for (i = 1; i <= mana_obj->level && i <= 10; i++)
1307	{	1204	{
1308	float stmp;	1205	float stmp;
1309		1206
1310	/* Got some extra bonus at first level */	1207	/* Got some extra bonus at first level */
1311	if (i < 2)	1208	if (i < 2)
1312	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;
1313	else	1210	else
1314	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;
1315		1212
1316	if (stmp < 1.0)	1213	if (stmp < 1.f)
1317	stmp = 1.0;	1214	stmp = 1.f;
1318		1215
1319	sp_tmp += stmp;	1216	sp_tmp += stmp;
1320	}	1217	}
1321		1218
1322	stats.maxsp = (int) sp_tmp;	1219	stats.maxsp = (sint16)sp_tmp;
1323		1220
1324	for (i = 11; i <= mana_obj->level; i++)	1221	for (i = 11; i <= mana_obj->level; i++)
1325	stats.maxsp += 2;	1222	stats.maxsp += 2;
1326	}	1223	}
		1224
1327	/* Characters can get their sp supercharged via rune of transferrance */	1225	/* Characters can get their sp supercharged via rune of transferrance */
1328	if (stats.sp > stats.maxsp * 2)	1226	if (stats.sp > stats.maxsp * 2)
1329	stats.sp = stats.maxsp * 2;	1227	stats.sp = stats.maxsp * 2;
1330		1228
1331	/* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */	1229	/* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
…		…
1339	/* store grace in a float - this way, the divisions below don't create	1237	/* store grace in a float - this way, the divisions below don't create
1340	* big jumps when you go from level to level - with int's, it then	1238	* big jumps when you go from level to level - with int's, it then
1341	* becomes big jumps when the sums of the bonuses jump to the next	1239	* becomes big jumps when the sums of the bonuses jump to the next
1342	* step of 8 - with floats, even fractional ones are useful.	1240	* step of 8 - with floats, even fractional ones are useful.
1343	*/	1241	*/
1344	sp_tmp = 0.0;	1242	sp_tmp = 0.f;
1345	for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++)	1243	for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++)
1346	{	1244	{
1347	float grace_tmp = 0.0;	1245	float grace_tmp = 0.f;
1348		1246
1349	/* Got some extra bonus at first level */	1247	/* Got some extra bonus at first level */
1350	if (i < 2)	1248	if (i < 2)
1351	grace_tmp = contr->levgrace[i] + (((float) grace_bonus[stats.Pow] +	1249	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1352	2.0 * (float) grace_bonus[stats.Wis]) / 6.0);
1353	else	1250	else
1354	grace_tmp = (float) contr->levgrace[i]
1355	+ ((float) grace_bonus[stats.Pow] + 2.0 * (float) grace_bonus[stats.Wis]) / 12.0;	1251	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1356		1252
1357	if (grace_tmp < 1.0)	1253	if (grace_tmp < 1.f)
1358	grace_tmp = 1.0;	1254	grace_tmp = 1.f;
1359		1255
1360	sp_tmp += grace_tmp;	1256	sp_tmp += grace_tmp;
1361	}	1257	}
1362		1258
1363	stats.maxgrace = (int) sp_tmp;	1259	stats.maxgrace = (sint16)sp_tmp;
1364		1260
1365	/* two grace points per level after 11 */	1261	/* two grace points per level after 11 */
1366	for (i = 11; i <= grace_obj->level; i++)	1262	for (i = 11; i <= grace_obj->level; i++)
1367	stats.maxgrace += 2;	1263	stats.maxgrace += 2;
1368	}	1264	}
		1265
1369	/* No limit on grace vs maxgrace */	1266	/* No limit on grace vs maxgrace */
1370		1267
1371	if (contr->braced)	1268	if (contr->braced)
1372	{	1269	{
1373	ac += 2;	1270	ac += 2;
…		…
1385	* improvement every level, now its fighterlevel/5. So	1282	* improvement every level, now its fighterlevel/5. So
1386	* we give the player a bonus here in wc and dam	1283	* we give the player a bonus here in wc and dam
1387	* to make up for the change. Note that I left the	1284	* to make up for the change. Note that I left the
1388	* monster bonus the same as before. -b.t.	1285	* monster bonus the same as before. -b.t.
1389	*/	1286	*/
		1287	object *wc_obj = chosen_skill;
1390		1288
1391	if (type == PLAYER && wc_obj && wc_obj->level > 1)	1289	if (contr && wc_obj && wc_obj->level > 1)
1392	{	1290	{
1393	wc -= (wc_obj->level + thaco_bonus[stats.Str]);	1291	wc -= wc_obj->level + thaco_bonus[stats.Str];
		1292
1394	for (i = 1; i < wc_obj->level; i++)	1293	for (i = 1; i < wc_obj->level; i++)
1395	{	1294	{
1396	/* addtional wc every 6 levels */	1295	/* additional wc every 6 levels */
1397	if (!(i % 6))	1296	if (!(i % 6))
1398	wc--;	1297	wc--;
		1298
1399	/* addtional dam every 4 levels. */	1299	/* additional dam every 4 levels. */
1400	if (!(i % 4) && (dam_bonus[stats.Str] >= 0))	1300	if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1401	stats.dam += (1 + (dam_bonus[stats.Str] / 5));	1301	stats.dam += 1 + dam_bonus[stats.Str] / 5;
1402	}	1302	}
1403	}	1303	}
1404	else	1304	else
1405	wc -= (level + thaco_bonus[stats.Str]);	1305	wc -= level + thaco_bonus[stats.Str];
1406		1306
1407	stats.dam += dam_bonus[stats.Str];	1307	stats.dam += dam_bonus[stats.Str];
1408		1308
1409	if (stats.dam < 1)	1309	if (stats.dam < 1)
1410	stats.dam = 1;	1310	stats.dam = 1;
1411		1311
1412	speed = 1.0 + speed_bonus[stats.Dex];	1312	speed = 1.f + speed_bonus[stats.Dex];
1413		1313
1414	if (settings.search_items && contr->search_str[0])	1314	if (settings.search_items && contr->search_str[0])
1415	speed -= 1;	1315	speed -= 1;
1416		1316
1417	if (attacktype == 0)	1317	if (attacktype == 0)
1418	attacktype = arch->clone.attacktype;	1318	attacktype = arch->clone.attacktype;
1419
1420	} /* End if player */	1319	} /* End if player */
1421		1320
1422	if (added_speed >= 0)	1321	if (added_speed >= 0)
1423	speed += added_speed / 10.0;	1322	speed += added_speed / 10.f;
1424	else /* Something wrong here...: */	1323	else /* Something wrong here...: */
1425	speed /= (float) (1.0 - added_speed);	1324	speed /= 1.f - added_speed;
1426		1325
1427	/* Max is determined by armour */	1326	/* Max is determined by armour */
1428	if (speed > max)	1327	if (speed > max)
1429	speed = max;	1328	speed = max;
1430		1329
…		…
1435	* weight limit, then player suffers a speed reduction based on how	1334	* weight limit, then player suffers a speed reduction based on how
1436	* much above he is, and what is max carry is	1335	* much above he is, and what is max carry is
1437	*/	1336	*/
1438	f = (carrying / 1000) - max_carry[stats.Str];	1337	f = (carrying / 1000) - max_carry[stats.Str];
1439	if (f > 0)	1338	if (f > 0)
1440	speed = speed / (1.0 + f / max_carry[stats.Str]);	1339	speed = speed / (1.f + f / max_carry[stats.Str]);
1441	}	1340	}
1442		1341
1443	speed += bonus_speed / 10.0; /* Not affected by limits */	1342	speed += bonus_speed / 10.f; /* Not affected by limits */
1444		1343
1445	/* Put a lower limit on speed. Note with this speed, you move once every	1344	/* Put a lower limit on speed. Note with this speed, you move once every
1446	* 100 ticks or so. This amounts to once every 12 seconds of realtime.	1345	* 100 ticks or so. This amounts to once every 12 seconds of realtime.
1447	*/	1346	*/
1448	speed = speed * speed_reduce_from_disease;	1347	speed = speed * speed_reduce_from_disease;
1449		1348
1450	if (speed < 0.01 && type == PLAYER)	1349	if (speed < 0.01f && type == PLAYER)
1451	speed = 0.01;	1350	speed = 0.01f;
1452		1351
1453	if (type == PLAYER)	1352	if (type == PLAYER)
1454	{	1353	{
1455	float M, W, s, D, K, S, M2;
1456
1457	/* (This formula was made by vidarl@ifi.uio.no)	1354	/* (This formula was made by vidarl@ifi.uio.no)
1458	* Note that we never used these values again - basically	1355	* Note that we never used these values again - basically
1459	* all of these could be subbed into one big equation, but	1356	* all of these could be subbed into one big equation, but
1460	* that would just be a real pain to read.	1357	* that would just be a real pain to read.
1461	*/	1358	*/
1462	M = (max_carry[stats.Str] - 121) / 121.0;	1359	float M = (max_carry[stats.Str] - 121) / 121.f;
1463	M2 = max_carry[stats.Str] / 100.0;	1360	float M2 = max_carry[stats.Str] / 100.f;
1464	W = weapon_weight / 20000.0;	1361	float W = weapon_weight / 20000.f;
1465	s = 2 - weapon_speed / 10.0;	1362	float s = (20 - weapon_speed) / 10.f;
1466	D = (stats.Dex - 14) / 14.0;	1363	float D = (stats.Dex - 14) / 14.f;
1467	K = 1 + M / 3.0 - W / (3 * M2) + speed / 5.0 + D / 2.0;	1364	float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
		1365
1468	K = (4 + level) / (float) (6 + level) 1.2;	1366	K = (4 + level) 1.2f / (6 + level);
		1367
1469	if (K <= 0)	1368	if (K <= 0.01f)
1470	K = 0.01;	1369	K = 0.01f;
1471	S = speed / (K * s);	1370
1472	contr->weapon_sp = S;	1371	contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1473	}	1372	}
1474		1373
1475	/* I want to limit the power of small monsters with big weapons: */	1374	/* I want to limit the power of small monsters with big weapons: */
1476	if (type != PLAYER && arch != NULL && stats.dam > arch->clone.stats.dam * 3)	1375	if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3)
1477	stats.dam = arch->clone.stats.dam * 3;	1376	stats.dam = arch->clone.stats.dam * 3;
1478		1377
1479	/* Prevent overflows of wc - best you can get is ABS(120) - this	1378	stats.wc = clamp (wc, MIN_WC, MAX_WC);
1480	* should be more than enough - remember, AC is also in 8 bits,	1379	stats.ac = clamp (ac, MIN_AC, MAX_AC);
1481	* so its value is the same.
1482	*/
1483	if (wc > 120)
1484	wc = 120;
1485	else if (wc < -120)
1486	wc = -120;
1487
1488	stats.wc = wc;
1489
1490	if (ac > 120)
1491	ac = 120;
1492	else if (ac < -120)
1493	ac = -120;
1494
1495	stats.ac = ac;
1496		1380
1497	/* if for some reason the creature doesn't have any move type,	1381	/* if for some reason the creature doesn't have any move type,
1498	* give them walking as a default.	1382	* give them walking as a default.
1499	* The second case is a special case - to more closely mimic the	1383	* The second case is a special case - to more closely mimic the
1500	* old behaviour - if your flying, your not walking - just	1384	* old behaviour - if your flying, your not walking - just
…		…
1514	if (type == PLAYER)	1398	if (type == PLAYER)
1515	{	1399	{
1516	esrv_update_stats (contr);	1400	esrv_update_stats (contr);
1517	esrv_update_spells (contr);	1401	esrv_update_spells (contr);
1518	}	1402	}
		1403
		1404	// update the mapspace, if we are on a map
		1405	if (!flag [FLAG_REMOVED] && map)
		1406	map->at (x, y).flags_ = 0;
1519	}	1407	}
1520		1408
1521	/*	1409	/*
1522	* Returns true if the given player is a legal class.	1410	* Returns true if the given player is a legal class.
1523	* The function to add and remove class-bonuses to the stats doesn't	1411	* The function to add and remove class-bonuses to the stats doesn't
…		…
1526	* false otherwise.	1414	* false otherwise.
1527	*/	1415	*/
1528	int	1416	int
1529	allowed_class (const object *op)	1417	allowed_class (const object *op)
1530	{	1418	{
1531	return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 &&	1419	return op->stats.Dex > 0
1532	op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0;	1420	&& op->stats.Str > 0
		1421	&& op->stats.Con > 0
		1422	&& op->stats.Int > 0
		1423	&& op->stats.Wis > 0
		1424	&& op->stats.Pow > 0
		1425	&& op->stats.Cha > 0;
1533	}	1426	}
1534		1427
1535	/*	1428	/*
1536	* set the new dragon name after gaining levels or	1429	* set the new dragon name after gaining levels or
1537	* changing ability focus (later this can be extended to	1430	* changing ability focus (later this can be extended to
…		…
1608	object skin = NULL; / pointer to dragon skin force */	1501	object skin = NULL; / pointer to dragon skin force */
1609	object tmp = NULL; / tmp. object */	1502	object tmp = NULL; / tmp. object */
1610	char buf[MAX_BUF]; /* tmp. string buffer */	1503	char buf[MAX_BUF]; /* tmp. string buffer */
1611		1504
1612	/* now grab the 'dragon_ability'-forces from the player's inventory */	1505	/* now grab the 'dragon_ability'-forces from the player's inventory */
		1506	shstr_cmp dragon_ability_force ("dragon_ability_force");
		1507	shstr_cmp dragon_skin_force ("dragon_skin_force");
		1508
1613	for (tmp = who->inv; tmp != NULL; tmp = tmp->below)	1509	for (tmp = who->inv; tmp; tmp = tmp->below)
1614	{
1615	if (tmp->type == FORCE)	1510	if (tmp->type == FORCE)
1616	{
1617	if (strcmp (tmp->arch->name, "dragon_ability_force") == 0)	1511	if (tmp->arch->name == dragon_ability_force)
1618	abil = tmp;	1512	abil = tmp;
1619	if (strcmp (tmp->arch->name, "dragon_skin_force") == 0)	1513	else if (tmp->arch->name == dragon_skin_force)
1620	skin = tmp;	1514	skin = tmp;
1621	}	1515
1622	}
1623	/* if the force is missing -> bail out */	1516	/* if the force is missing -> bail out */
1624	if (abil == NULL)	1517	if (abil == NULL)
1625	return;	1518	return;
1626		1519
1627	/* The ability_force keeps track of maximum level ever achieved.	1520	/* The ability_force keeps track of maximum level ever achieved.
…		…
1671	if (!skill_obj)	1564	if (!skill_obj)
1672	{	1565	{
1673	LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name);	1566	LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name);
1674	return NULL;	1567	return NULL;
1675	}	1568	}
		1569
1676	/* clear the flag - exp goes into this bucket, but player	1570	/* clear the flag - exp goes into this bucket, but player
1677	* still doesn't know it.	1571	* still doesn't know it.
1678	*/	1572	*/
1679	CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);	1573	CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1680	skill_obj->stats.exp = 0;	1574	skill_obj->stats.exp = 0;
1681	skill_obj->level = 1;	1575	skill_obj->level = 1;
1682	insert_ob_in_ob (skill_obj, op);	1576	insert_ob_in_ob (skill_obj, op);
1683	if (op->contr)	1577
		1578	if (player *pl = op->contr)
1684	{	1579	{
1685	op->contr->last_skill_ob[skill_obj->subtype] = skill_obj;	1580	pl->last_skill_ob [skill_obj->subtype] = skill_obj;
1686	op->contr->last_skill_exp[skill_obj->subtype] = -1;	1581	if (pl->ns)
		1582	pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1687	}	1583	}
		1584
1688	return skill_obj;	1585	return skill_obj;
1689	}	1586	}
1690
1691		1587
1692	/* player_lvl_adj() - for the new exp system. we are concerned with	1588	/* player_lvl_adj() - for the new exp system. we are concerned with
1693	* whether the player gets more hp, sp and new levels.	1589	* whether the player gets more hp, sp and new levels.
1694	* Note this this function should only be called for players. Monstes	1590	* Note this this function should only be called for players. Monstes
1695	* don't really gain levels	1591	* don't really gain levels
…		…
1706		1602
1707	if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))	1603	if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1708	{	1604	{
1709	op->level++;	1605	op->level++;
1710		1606
1711	if (op != NULL && op == who && op->stats.exp > 1 && is_dragon_pl (who))	1607	if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who))
1712	dragon_level_gain (who);	1608	dragon_level_gain (who);
1713		1609
1714	/* Only roll these if it is the player (who) that gained the level */	1610	/* Only roll these if it is the player (who) that gained the level */
1715	if (op == who && (who->level < 11) && who->type == PLAYER)	1611	if (op == who && (who->level < 11) && who->type == PLAYER)
1716	{	1612	{
…		…
1724	{	1620	{
1725	if (op->type != PLAYER)	1621	if (op->type != PLAYER)
1726	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);
1727	else	1623	else
1728	sprintf (buf, "You are now level %d.", op->level);	1624	sprintf (buf, "You are now level %d.", op->level);
		1625
1729	if (who)	1626	if (who)
1730	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);	1627	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);
1731	}	1628	}
		1629
1732	player_lvl_adj (who, op); /* To increase more levels */	1630	player_lvl_adj (who, op); /* To increase more levels */
1733	}	1631	}
1734	else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))	1632	else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1735	{	1633	{
1736	op->level--;	1634	op->level--;
1737	who->update_stats ();	1635	who->update_stats ();
		1636
1738	if (op->type != PLAYER)	1637	if (op->type != PLAYER)
1739	{	1638	{
1740	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);	1639	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1741	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);	1640	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);
1742	}	1641	}
		1642
1743	player_lvl_adj (who, op); /* To decrease more levels */	1643	player_lvl_adj (who, op); /* To decrease more levels */
1744	}	1644	}
1745		1645
1746	/* check if the spell data has changed */	1646	/* check if the spell data has changed */
1747	esrv_update_stats (who->contr);	1647	esrv_update_stats (who->contr);
…		…
1756	sint64	1656	sint64
1757	level_exp (int level, double expmul)	1657	level_exp (int level, double expmul)
1758	{	1658	{
1759	if (level > settings.max_level)	1659	if (level > settings.max_level)
1760	return (sint64) (expmul * levels[settings.max_level]);	1660	return (sint64) (expmul * levels[settings.max_level]);
		1661
1761	return (sint64) (expmul * levels[level]);	1662	return (sint64) (expmul * levels[level]);
1762	}	1663	}
1763		1664
1764	/*	1665	/*
1765	* Ensure that the permanent experience requirements in an exp object are met.	1666	* Ensure that the permanent experience requirements in an exp object are met.
…		…
1802	sint64 limit, exp_to_add;	1703	sint64 limit, exp_to_add;
1803	int i;	1704	int i;
1804		1705
1805	/* prevents some forms of abuse. */	1706	/* prevents some forms of abuse. */
1806	if (op->contr->braced)	1707	if (op->contr->braced)
1807	exp = exp / 5;	1708	exp /= 5;
1808		1709
1809	/* Try to find the matching skill.	1710	/* Try to find the matching skill.
1810	* We do a shortcut/time saving mechanism first - see if it matches	1711	* We do a shortcut/time saving mechanism first - see if it matches
1811	* chosen_skill. This means we don't need to search through	1712	* chosen_skill. This means we don't need to search through
1812	* the players inventory.	1713	* the players inventory.
1813	*/	1714	*/
1814	if (skill_name)	1715	if (skill_name)
1815	{	1716	{
1816	if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill))	1717	if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill))
…		…
1947	del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction));	1848	del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction));
1948	tmp->stats.exp -= del_exp;	1849	tmp->stats.exp -= del_exp;
1949	player_lvl_adj (op, tmp);	1850	player_lvl_adj (op, tmp);
1950	}	1851	}
1951	}	1852	}
		1853
1952	if (flag != SK_SUBTRACT_SKILL_EXP)	1854	if (flag != SK_SUBTRACT_SKILL_EXP)
1953	{	1855	{
1954	del_exp = check_exp_loss (op, exp);	1856	del_exp = check_exp_loss (op, exp);
1955	op->stats.exp -= del_exp;	1857	op->stats.exp -= del_exp;
1956	player_lvl_adj (op, NULL);	1858	player_lvl_adj (op, NULL);
1957	}	1859	}
1958	}	1860	}
1959
1960
1961		1861
1962	/* change_exp() - changes experience to a player/monster. This	1862	/* change_exp() - changes experience to a player/monster. This
1963	* does bounds checking to make sure we don't overflow the max exp.	1863	* does bounds checking to make sure we don't overflow the max exp.
1964	*	1864	*
1965	* The exp passed is typically not modified much by this function -	1865	* The exp passed is typically not modified much by this function -
1966	* it is assumed the caller has modified the exp as needed.	1866	* it is assumed the caller has modified the exp as needed.
1967	* skill_name is the skill that should get the exp added.	1867	* skill_name is the skill that should get the exp added.
1968	* flag is what to do if player doesn't have the skill.	1868	* flag is what to do if player doesn't have the skill.
1969	* these last two values are only used for players.	1869	* these last two values are only used for players.
1970	*/	1870	*/
1971
1972	void	1871	void
1973	change_exp (object op, sint64 exp, const char skill_name, int flag)	1872	change_exp (object op, sint64 exp, const char skill_name, int flag)
1974	{	1873	{
1975
1976	#ifdef EXP_DEBUG	1874	#ifdef EXP_DEBUG
1977	LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);	1875	LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
1978	#endif	1876	#endif
1979		1877
1980	/* safety */	1878	/* safety */
…		…
2021	else	1919	else
2022	/* note that when you lose exp, it doesn't go against	1920	/* note that when you lose exp, it doesn't go against
2023	* a particular skill, so we don't need to pass that	1921	* a particular skill, so we don't need to pass that
2024	* along.	1922	* along.
2025	*/	1923	*/
2026	subtract_player_exp (op, FABS (exp), skill_name, flag);	1924	subtract_player_exp (op, abs (exp), skill_name, flag);
2027
2028	}	1925	}
2029	}	1926	}
2030		1927
2031	/* Applies a death penalty experience, the size of this is defined by the	1928	/* Applies a death penalty experience, the size of this is defined by the
2032	* settings death_penalty_percentage and death_penalty_levels, and by the	1929	* settings death_penalty_percentage and death_penalty_levels, and by the
2033	* amount of permenent experience, whichever gives the lowest loss.	1930	* amount of permenent experience, whichever gives the lowest loss.
2034	*/	1931	*/
2035
2036	void	1932	void
2037	apply_death_exp_penalty (object *op)	1933	apply_death_exp_penalty (object *op)
2038	{	1934	{
2039	object *tmp;	1935	object *tmp;
2040	sint64 loss;	1936	sint64 loss;
…		…
2062	player_lvl_adj (op, tmp);	1958	player_lvl_adj (op, tmp);
2063	}	1959	}
2064		1960
2065	percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;	1961	percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
2066	level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)];	1962	level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)];
		1963
2067	if (level_loss < 0)	1964	if (level_loss < 0)
2068	level_loss = 0;	1965	level_loss = 0;
2069	loss = check_exp_loss (op, MIN (level_loss, percentage_loss));	1966	loss = check_exp_loss (op, MIN (level_loss, percentage_loss));
2070		1967
2071	op->stats.exp -= loss;	1968	op->stats.exp -= loss;

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.24 by root, Thu Jan 4 16:19:31 2007 UTC vs. Revision 1.61 by root, Fri May 18 15:05:08 2007 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.24 by root, Thu Jan 4 16:19:31 2007 UTC vs.
Revision 1.61 by root, Fri May 18 15:05:08 2007 UTC