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

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

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.27 by root, Mon Jan 8 20:39:48 2007 UTC vs. Revision 1.52 by root, Sat May 12 18:34:19 2007 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.27 by root, Mon Jan 8 20:39:48 2007 UTC vs.
Revision 1.52 by root, Sat May 12 18:34:19 2007 UTC