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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.51 by root, Sat May 12 18:23:51 2007 UTC vs.
Revision 1.75 by root, Tue Aug 7 22:36:18 2007 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <funcpoint.h>	25	#include <funcpoint.h>
27		26
242	change_attr_value (living *stats, int attr, sint8 value)	241	change_attr_value (living *stats, int attr, sint8 value)
243	{	242	{
244	stats->stat (attr) += value;	243	stats->stat (attr) += value;
245	}	244	}
246		245
247	sint8 &
248	living::stat (int index)
249	{
250	switch (index)
251	{
252	case STR: return Str;
253	case DEX: return Dex;
254	case CON: return Con;
255	case INT: return Int;
256	case WIS: return Wis;
257	case POW: return Pow;
258	case CHA: return Cha;
259	}
260
261	LOG (llevError \| logBacktrace, "living.stat() called with out-of-range stat index");
262	static sint8 dummy;
263	return dummy;
264	}
265
266	sint8
267	living::stat (int index) const
268	{
269	switch (index)
270	{
271	case STR: return Str;
272	case DEX: return Dex;
273	case CON: return Con;
274	case INT: return Int;
275	case WIS: return Wis;
276	case POW: return Pow;
277	case CHA: return Cha;
278	}
279
280	LOG (llevError \| logBacktrace, "living.stat() called with out-of-range stat index");
281	static sint8 dummy;
282	return dummy;
283	}
284
285	/*	246	/*
286	* Ensures that all stats (str/dex/con/wis/cha/int) are within the	247	* Ensures that all stats (str/dex/con/wis/cha/int) are within the
287	* 1-30 stat limit.	248	* 1-30 stat limit.
288	*/	249	*/
289	void	250	void
…		…
349	* that adjust that stat by more than one point, so we need	310	* that adjust that stat by more than one point, so we need
350	* to allow for that.	311	* to allow for that.
351	*/	312	*/
352	if (nstat < 1 && i * flag < 0)	313	if (nstat < 1 && i * flag < 0)
353	nstat = 1;	314	nstat = 1;
354	else if (nstat > 20 + op->arch->clone.stats.stat (j))	315	else if (nstat > 20 + op->arch->stats.stat (j))
355	nstat = 20 + op->arch->clone.stats.stat (j);	316	nstat = 20 + op->arch->stats.stat (j);
356		317
357	if (nstat != ostat)	318	if (nstat != ostat)
358	{	319	{
359	op->contr->orig_stats.stat (j) = nstat;	320	op->contr->orig_stats.stat (j) = nstat;
360	potion_max = 0;	321	potion_max = 0;
…		…
460	}	421	}
461		422
462	/* becoming UNDEAD... a special treatment for this flag. Only those not	423	/* becoming UNDEAD... a special treatment for this flag. Only those not
463	* originally undead may change their status	424	* originally undead may change their status
464	*/	425	*/
465	if (!QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	426	if (!QUERY_FLAG (op->arch, FLAG_UNDEAD))
466	if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD))	427	if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD))
467	{	428	{
468	success = 1;	429	success = 1;
469	if (flag > 0)	430	if (flag > 0)
470	{	431	{
471	op->race = "undead";	432	op->race = "undead";
472	new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");	433	new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");
473	}	434	}
474	else	435	else
475	{	436	{
476	op->race = op->arch->clone.race;	437	op->race = op->arch->race;
477	new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");	438	new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
478	}	439	}
479	}	440	}
480		441
481	if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH))	442	if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH))
…		…
723	void	684	void
724	object::remove_statbonus ()	685	object::remove_statbonus ()
725	{	686	{
726	for (int i = 0; i < NUM_STATS; ++i)	687	for (int i = 0; i < NUM_STATS; ++i)
727	{	688	{
728	sint8 v = arch->clone.stats.stat (i);	689	sint8 v = arch->stats.stat (i);
729	stats.stat (i) -= v;	690	stats.stat (i) -= v;
730	contr->orig_stats.stat (i) -= v;	691	contr->orig_stats.stat (i) -= v;
731	}	692	}
732	}	693	}
733		694
…		…
737	void	698	void
738	object::add_statbonus ()	699	object::add_statbonus ()
739	{	700	{
740	for (int i = 0; i < NUM_STATS; ++i)	701	for (int i = 0; i < NUM_STATS; ++i)
741	{	702	{
742	sint8 v = arch->clone.stats.stat (i);	703	sint8 v = arch->stats.stat (i);
743	stats.stat (i) += v;	704	stats.stat (i) += v;
744	contr->orig_stats.stat (i) += v;	705	contr->orig_stats.stat (i) += v;
745	}	706	}
746	}	707	}
		708
		709	/* These are the items that currently can change digestion, regeneration,
		710	* spell point recovery and mana point recovery. Seems sort of an arbitary
		711	* list, but other items store other info into stats array.
		712	*/
		713	static struct digest_types : std::bitset<NUM_TYPES>
		714	{
		715	digest_types ()
		716	{
		717	set (WEAPON);
		718	set (BOW);
		719	set (ARMOUR);
		720	set (HELMET);
		721	set (SHIELD);
		722	set (RING);
		723	set (BOOTS);
		724	set (GLOVES);
		725	set (AMULET);
		726	set (GIRDLE);
		727	set (BRACERS);
		728	set (CLOAK);
		729	set (DISEASE);
		730	set (FORCE);
		731	set (SKILL);
		732	}
		733	} digest_types;
		734
		735	static struct copy_flags : object::flags_t
		736	{
		737	copy_flags ()
		738	{
		739	set (FLAG_LIFESAVE);
		740	set (FLAG_REFL_SPELL);
		741	set (FLAG_REFL_MISSILE);
		742	set (FLAG_STEALTH);
		743	set (FLAG_XRAYS);
		744	set (FLAG_BLIND);
		745	set (FLAG_SEE_IN_DARK);
		746	}
		747	} copy_flags;
747		748
748	/*	749	/*
749	* Updates all abilities given by applied objects in the inventory	750	* Updates all abilities given by applied objects in the inventory
750	* of the given object. Note: This function works for both monsters	751	* of the given object. Note: This function works for both monsters
751	* and players; the "player" in the name is purely an archaic inheritance.	752	* and players; the "player" in the name is purely an archaic inheritance.
…		…
756	* spell system split, grace points now added to system --peterm	757	* spell system split, grace points now added to system --peterm
757	*/	758	*/
758	void	759	void
759	object::update_stats ()	760	object::update_stats ()
760	{	761	{
761	int i, j;
762	float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1;	762	float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
763	int weapon_weight = 0, weapon_speed = 0;	763	int weapon_weight = 0, weapon_speed = 0;
764	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;	764	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
765	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];	765	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
766	object grace_obj = NULL, mana_obj = NULL, wc_obj = NULL, tmp;	766	object grace_obj = NULL, mana_obj = NULL, *tmp;
767	float old_speed = speed;	767	float old_speed = speed;
		768	int stat_sum [NUM_STATS];
768		769
769	/* First task is to clear all the values back to their original values */	770	/* First task is to clear all the values back to their original values */
770	if (type == PLAYER)	771	if (type == PLAYER)
771	{	772	{
772	for (i = 0; i < NUM_STATS; i++)	773	for (int i = 0; i < NUM_STATS; i++)
773	stats.stat (i) = contr->orig_stats.stat (i);	774	stat_sum [i] = contr->orig_stats.stat (i);
774		775
775	if (settings.spell_encumbrance == TRUE)	776	if (settings.spell_encumbrance == TRUE)
776	contr->encumbrance = 0;	777	contr->encumbrance = 0;
777		778
778	attacktype = 0;	779	attacktype = 0;
…		…
798		799
799	CLEAR_FLAG (this, FLAG_LIFESAVE);	800	CLEAR_FLAG (this, FLAG_LIFESAVE);
800	CLEAR_FLAG (this, FLAG_STEALTH);	801	CLEAR_FLAG (this, FLAG_STEALTH);
801	CLEAR_FLAG (this, FLAG_BLIND);	802	CLEAR_FLAG (this, FLAG_BLIND);
802		803
803	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);	804	if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
804	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);	805	if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
805	if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);	806	if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
806	if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);	807	if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
807		808
808	path_attuned = arch->clone.path_attuned;	809	path_attuned = arch->path_attuned;
809	path_repelled = arch->clone.path_repelled;	810	path_repelled = arch->path_repelled;
810	path_denied = arch->clone.path_denied;	811	path_denied = arch->path_denied;
811	glow_radius = arch->clone.glow_radius;	812	glow_radius = arch->glow_radius;
812	move_type = arch->clone.move_type;	813	move_type = arch->move_type;
813		814
814	chosen_skill = 0;	815	chosen_skill = 0;
815		816
816	/* initializing resistances from the values in player/monster's	817	/* initializing resistances from the values in player/monster's
817	* archetype clone	818	* archetype clone
818	*/	819	*/
819	memcpy (&resist, &arch->clone.resist, sizeof (resist));	820	memcpy (&resist, &arch->resist, sizeof (resist));
820		821
821	for (i = 0; i < NROFATTACKS; i++)	822	for (int i = 0; i < NROFATTACKS; i++)
822	{	823	{
823	if (resist[i] > 0)	824	if (resist[i] > 0)
824	prot[i] = resist[i], vuln[i] = 0;	825	prot[i] = resist[i], vuln[i] = 0;
825	else	826	else
826	vuln[i] = -(resist[i]), prot[i] = 0;	827	vuln[i] = -(resist[i]), prot[i] = 0;
827		828
828	potion_resist[i] = 0;	829	potion_resist[i] = 0;
829	}	830	}
830		831
831	wc = arch->clone.stats.wc;	832	wc = arch->stats.wc;
832	stats.dam = arch->clone.stats.dam;	833	stats.dam = arch->stats.dam;
833		834
834	/* for players which cannot use armour, they gain AC -1 per 3 levels,	835	/* for players which cannot use armour, they gain AC -1 per 3 levels,
835	* plus a small amount of physical resist, those poor suckers. ;)	836	* plus a small amount of physical resist, those poor suckers. ;)
836	* the fact that maxlevel is factored in could be considered sort of bogus -	837	* the fact that maxlevel is factored in could be considered sort of bogus -
837	* we should probably give them some bonus and cap it off - otherwise,	838	* we should probably give them some bonus and cap it off - otherwise,
838	* basically, if a server updates its max level, these playes may find	839	* basically, if a server updates its max level, these playes may find
839	* that their protection from physical goes down	840	* that their protection from physical goes down
840	*/	841	*/
841	if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)	842	if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
842	{	843	{
843	ac = MAX (-10, arch->clone.stats.ac - level / 3);	844	ac = max (-10, arch->stats.ac - level / 3);
844	prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;	845	prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
845	}	846	}
846	else	847	else
847	ac = arch->clone.stats.ac;	848	ac = arch->stats.ac;
848		849
849	stats.luck = arch->clone.stats.luck;	850	stats.luck = arch->stats.luck;
850	speed = arch->clone.speed;	851	speed = arch->speed;
851		852
852	/* OK - we've reset most all the objects attributes to sane values.	853	/* OK - we've reset most all the objects attributes to sane values.
853	* now go through and make adjustments for what the player has equipped.	854	* now go through and make adjustments for what the player has equipped.
854	*/	855	*/
855	for (tmp = inv; tmp; tmp = tmp->below)	856	for (tmp = inv; tmp; tmp = tmp->below)
856	{	857	{
857	/* See note in map.c:update_position about making this additive
858	* since light sources are never applied, need to put check here.
859	*/
860	if (tmp->glow_radius > glow_radius)
861	glow_radius = tmp->glow_radius;
862
863	/* This happens because apply_potion calls change_abil with the potion	858	/* This happens because apply_potion calls change_abil with the potion
864	* applied so we can tell the player what changed. But change_abil	859	* applied so we can tell the player what changed. But change_abil
865	* then calls this function.	860	* then calls this function.
866	*/	861	*/
867	if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)	862	if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
868	continue;	863	continue;
		864
		865	/* See note in map.c:update_position about making this additive
		866	* since light sources are never applied, need to put check here.
		867	*/
		868	if (tmp->glow_radius > glow_radius)
		869	glow_radius = tmp->glow_radius;
869		870
870	/* For some things, we don't care what is equipped */	871	/* For some things, we don't care what is equipped */
871	if (tmp->type == SKILL)	872	if (tmp->type == SKILL)
872	{	873	{
873	/* Want to take the highest skill here. */	874	/* Want to take the highest skill here. */
…		…
903	\|\| (tmp->type == SKILL	904	\|\| (tmp->type == SKILL
904	&& tmp->subtype == SK_PRAYING))	905	&& tmp->subtype == SK_PRAYING))
905	{	906	{
906	if (type == PLAYER)	907	if (type == PLAYER)
907	{	908	{
		909	contr->item_power += tmp->item_power;
		910
908	if (tmp == contr->combat_ob \|\| tmp == contr->ranged_ob)	911	if (tmp == contr->combat_ob \|\| tmp == contr->ranged_ob)
		912	if (tmp != current_weapon
909	if (tmp != current_weapon && (tmp->type != SKILL \|\| tmp->subtype != SK_PRAYING))	913	&& (tmp->type != SKILL \|\| tmp->subtype != SK_PRAYING)
		914	&& !tmp->flag [FLAG_CURSED]
		915	&& !tmp->flag [FLAG_DAMNED])
910	continue;	916	continue;
911		917
912	for (i = 0; i < NUM_STATS; i++)	918	for (int i = 0; i < NUM_STATS; i++)
913	change_attr_value (&stats, i, tmp->stats.stat (i));	919	if (expect_false (tmp->stats.stat (i)))
		920	stat_sum [i] = clamp (stat_sum [i] + tmp->stats.stat (i), MIN_STAT, MAX_STAT);
914		921
915	/* these are the items that currently can change digestion, regeneration,	922	if (digest_types [tmp->type])
916	* spell point recovery and mana point recovery. Seems sort of an arbitary
917	* list, but other items store other info into stats array.
918	*/
919	if (tmp->type == WEAPON \|\| tmp->type == BOW \|\|
920	tmp->type == ARMOUR \|\| tmp->type == HELMET \|\|
921	tmp->type == SHIELD \|\| tmp->type == RING \|\|
922	tmp->type == BOOTS \|\| tmp->type == GLOVES \|\|
923	tmp->type == AMULET \|\| tmp->type == GIRDLE \|\|
924	tmp->type == BRACERS \|\| tmp->type == CLOAK \|\|
925	tmp->type == DISEASE \|\| tmp->type == FORCE \|\|
926	tmp->type == SKILL)
927	{	923	{
928	contr->digestion += tmp->stats.food;	924	contr->digestion += tmp->stats.food;
929	contr->gen_hp += tmp->stats.hp;	925	contr->gen_hp += tmp->stats.hp;
930	contr->gen_sp += tmp->stats.sp;	926	contr->gen_sp += tmp->stats.sp;
931	contr->gen_grace += tmp->stats.grace;	927	contr->gen_grace += tmp->stats.grace;
932	contr->gen_sp_armour += tmp->gen_sp_armour;	928	contr->gen_sp_armour += tmp->gen_sp_armour;
933	contr->item_power += tmp->item_power;
934	}	929	}
935	} /* if this is a player */	930	} /* if this is a player */
936	else	931	else
937	{	932	{
938	if (tmp->type == WEAPON)	933	if (tmp->type == WEAPON)
939	current_weapon = tmp;	934	current_weapon = tmp;
940	}	935	}
941		936
942	/* Update slots used for items */	937	/* Update slots used for items */
943	if (QUERY_FLAG (tmp, FLAG_APPLIED))	938	if (QUERY_FLAG (tmp, FLAG_APPLIED))
944	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	939	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
945	slot[i].used += tmp->slot[i].info;	940	slot[i].used += tmp->slot[i].info;
946		941
947	if (tmp->type == SYMPTOM)	942	if (tmp->type == SYMPTOM)
948	{	943	{
949	speed_reduce_from_disease = tmp->last_sp / 100.f;	944	speed_reduce_from_disease = tmp->last_sp / 100.f;
…		…
957	* Resistance from potions are treated special as well. If there's	952	* Resistance from potions are treated special as well. If there's
958	* more than one potion-effect, the bigger prot.-value is taken.	953	* more than one potion-effect, the bigger prot.-value is taken.
959	*/	954	*/
960	if (tmp->type != POTION)	955	if (tmp->type != POTION)
961	{	956	{
962	for (i = 0; i < NROFATTACKS; i++)	957	for (int i = 0; i < NROFATTACKS; i++)
963	{	958	{
964	/* Potential for cursed potions, in which case we just can use	959	/* Potential for cursed potions, in which case we just can use
965	* a straight MAX, as potion_resist is initialised to zero.	960	* a straight MAX, as potion_resist is initialised to zero.
966	*/	961	*/
967	if (tmp->type == POTION_EFFECT)	962	if (tmp->type == POTION_EFFECT)
968	{	963	{
969	if (potion_resist[i])	964	if (potion_resist[i])
970	potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]);	965	potion_resist[i] = max (potion_resist[i], tmp->resist[i]);
971	else	966	else
972	potion_resist[i] = tmp->resist[i];	967	potion_resist[i] = tmp->resist[i];
973	}	968	}
974	else if (tmp->resist[i] > 0)	969	else if (tmp->resist[i] > 0)
975	prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;	970	prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
…		…
977	vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;	972	vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
978	}	973	}
979	}	974	}
980		975
981	/* There may be other things that should not adjust the attacktype */	976	/* There may be other things that should not adjust the attacktype */
982	if ((tmp->type != WEAPON && tmp->type != BOW && tmp->type != SYMPTOM)	977	if (tmp->type != SYMPTOM)
983	\|\| current_weapon == tmp)
984	{	978	{
985	attacktype \|= tmp->attacktype;	979	attacktype \|= tmp->attacktype;
986	path_attuned \|= tmp->path_attuned;	980	path_attuned \|= tmp->path_attuned;
987	path_repelled \|= tmp->path_repelled;	981	path_repelled \|= tmp->path_repelled;
988	path_denied \|= tmp->path_denied;	982	path_denied \|= tmp->path_denied;
989	move_type \|= tmp->move_type;	983	move_type \|= tmp->move_type;
990	stats.luck += tmp->stats.luck;	984	stats.luck += tmp->stats.luck;
991	}	985	}
992		986
993	if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);	987	flag \|= tmp->flag & copy_flags;
994	if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
995	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
996	if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
997	if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
998	if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
999	if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
1000		988
1001	if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD))	989	if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
1002	SET_FLAG (this, FLAG_UNDEAD);	990	SET_FLAG (this, FLAG_UNDEAD);
1003		991
1004	if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))	992	if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
1005	{	993	{
1006	SET_FLAG (this, FLAG_MAKE_INVIS);	994	SET_FLAG (this, FLAG_MAKE_INVIS);
…		…
1030	#endif	1018	#endif
1031		1019
1032	/* skills modifying the character -b.t. */	1020	/* skills modifying the character -b.t. */
1033	/* for all skills and skill granting objects */	1021	/* for all skills and skill granting objects */
1034	case SKILL:	1022	case SKILL:
1035	if (!QUERY_FLAG (tmp, FLAG_APPLIED))	1023	{
		1024	if (!QUERY_FLAG (tmp, FLAG_APPLIED) \|\| skill_flags [tmp->subtype] & SF_APPLY)
1036	break;	1025	break;
1037		1026
1038	if (IS_COMBAT_SKILL (tmp->subtype))
1039	wc_obj = tmp;
1040
1041	if (chosen_skill)	1027	if (chosen_skill)
		1028	{
1042	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);	1029	LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
		1030	&name, &chosen_skill->name, &tmp->name);
1043		1031
		1032	tmp->flag [FLAG_APPLIED] = false;
		1033	update_stats ();
		1034	return;
		1035	}
		1036	else
1044	chosen_skill = tmp;	1037	chosen_skill = tmp;
1045		1038
1046	if (tmp->stats.dam > 0)	1039	if (tmp->stats.dam > 0)
1047	{ /* skill is a 'weapon' */	1040	{ /* skill is a 'weapon' */
1048	if (!QUERY_FLAG (this, FLAG_READY_WEAPON))	1041	if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1049	weapon_speed = WEAPON_SPEED (tmp);	1042	weapon_speed = WEAPON_SPEED (tmp);
1050		1043
1051	if (weapon_speed < 0)	1044	if (weapon_speed < 0)
1052	weapon_speed = 0;	1045	weapon_speed = 0;
1053		1046
1054	weapon_weight = tmp->weight;	1047	weapon_weight = tmp->weight;
1055	stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9));	1048	stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1056		1049
1057	if (tmp->magic)	1050	if (tmp->magic)
1058	stats.dam += tmp->magic;	1051	stats.dam += tmp->magic;
1059	}	1052	}
1060		1053
1061	if (tmp->stats.wc)	1054	if (tmp->stats.wc)
1062	wc -= tmp->stats.wc + tmp->magic;	1055	wc -= tmp->stats.wc + tmp->magic;
1063		1056
1064	if (tmp->slaying)	1057	if (tmp->slaying)
1065	slaying = tmp->slaying;	1058	slaying = tmp->slaying;
1066		1059
1067	if (tmp->stats.ac)	1060	if (tmp->stats.ac)
1068	ac -= tmp->stats.ac + tmp->magic;	1061	ac -= tmp->stats.ac + tmp->magic;
1069		1062
1070	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1063	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1071	contr->encumbrance += (int) 3 *tmp->weight / 1000;	1064	contr->encumbrance += (int) 3 *tmp->weight / 1000;
1072
1073	break;	1065	}
1074		1066
1075	case SKILL_TOOL:
1076	if (chosen_skill)
1077	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1078
1079	chosen_skill = tmp;
1080	break;	1067	break;
1081		1068
1082	case SHIELD:	1069	case SHIELD:
1083	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1070	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1084	contr->encumbrance += (int) tmp->weight / 2000;	1071	contr->encumbrance += (int) tmp->weight / 2000;
…		…
1162	wc -= (tmp->stats.wc + tmp->magic);	1149	wc -= (tmp->stats.wc + tmp->magic);
1163		1150
1164	if (tmp->stats.ac)	1151	if (tmp->stats.ac)
1165	ac -= (tmp->stats.ac + tmp->magic);	1152	ac -= (tmp->stats.ac + tmp->magic);
1166		1153
1167	if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max)	1154	if (ARMOUR_SPEED (tmp))
1168	max = ARMOUR_SPEED (tmp) / 10.f;	1155	max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1169		1156
1170	break;	1157	break;
1171	} /* switch tmp->type */	1158	} /* switch tmp->type */
1172	} /* item is equipped */	1159	} /* item is equipped */
1173	} /* for loop of items */	1160	} /* for loop of items */
…		…
1180	* If there is an uncursed potion in effect, granting more protection	1167	* If there is an uncursed potion in effect, granting more protection
1181	* than that, we take: 'total resistance = resistance from potion'.	1168	* than that, we take: 'total resistance = resistance from potion'.
1182	* If there is a cursed (and no uncursed) potion in effect, we take	1169	* If there is a cursed (and no uncursed) potion in effect, we take
1183	* 'total resistance = vulnerability from cursed potion'.	1170	* 'total resistance = vulnerability from cursed potion'.
1184	*/	1171	*/
1185	for (i = 0; i < NROFATTACKS; i++)	1172	for (int i = 0; i < NROFATTACKS; i++)
1186	{	1173	{
1187	resist[i] = prot[i] - vuln[i];	1174	resist[i] = prot[i] - vuln[i];
1188		1175
1189	if (potion_resist[i] && ((potion_resist[i] > resist[i]) \|\| (potion_resist[i] < 0)))	1176	if (potion_resist[i] && ((potion_resist[i] > resist[i]) \|\| (potion_resist[i] < 0)))
1190	resist[i] = potion_resist[i];	1177	resist[i] = potion_resist[i];
1191	}	1178	}
1192		1179
1193	/* Figure out the players sp/mana/hp totals. */
1194	if (type == PLAYER)	1180	if (type == PLAYER)
1195	{	1181	{
		1182	// clamp various player stats
		1183	for (int i = 0; i < NUM_STATS; ++i)
		1184	stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT);
		1185
		1186	contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
		1187
		1188	/* Figure out the players sp/mana/hp totals. */
1196	int pl_level;	1189	int pl_level;
1197		1190
1198	check_stat_bounds (&(stats));	1191	check_stat_bounds (&(stats));
1199	pl_level = level;	1192	pl_level = level;
1200		1193
…		…
1202	pl_level = 1; /* safety, we should always get 1 levels worth of hp! */	1195	pl_level = 1; /* safety, we should always get 1 levels worth of hp! */
1203		1196
1204	/* You basically get half a con bonus/level. But we do take into account rounding,	1197	/* You basically get half a con bonus/level. But we do take into account rounding,
1205	* so if your bonus is 7, you still get 7 worth of bonus every 2 levels.	1198	* so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1206	*/	1199	*/
1207	for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++)	1200	stats.maxhp = 0;
		1201	for (int i = 1; i <= min (10, pl_level); i++)
1208	{	1202	{
1209	j = contr->levhp[i] + con_bonus[stats.Con] / 2;	1203	int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1210		1204
1211	if (i % 2 && con_bonus[stats.Con] % 2)	1205	if (i % 2 && con_bonus[stats.Con] % 2)
1212	{
1213	if (con_bonus[stats.Con] > 0)	1206	if (con_bonus[stats.Con] > 0)
1214	j++;	1207	j++;
1215	else	1208	else
1216	j--;	1209	j--;
1217	}
1218		1210
1219	stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */	1211	stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1220	}	1212	}
1221		1213
1222	for (i = 11; i <= level; i++)	1214	stats.maxhp += 2 * max (0, level - 10);
1223	stats.maxhp += 2;
1224		1215
1225	if (stats.hp > stats.maxhp)	1216	if (stats.hp > stats.maxhp)
1226	stats.hp = stats.maxhp;	1217	stats.hp = stats.maxhp;
1227		1218
1228	/* Sp gain is controlled by the level of the player's	1219	/* Sp gain is controlled by the level of the player's
…		…
1241		1232
1242	if (mana_obj == this && type == PLAYER)	1233	if (mana_obj == this && type == PLAYER)
1243	stats.maxsp = 1;	1234	stats.maxsp = 1;
1244	else	1235	else
1245	{	1236	{
1246	sp_tmp = 0.f;	1237	float sp_tmp = 0.f;
1247		1238
1248	for (i = 1; i <= mana_obj->level && i <= 10; i++)	1239	for (int i = 1; i <= min (10, mana_obj->level); i++)
1249	{	1240	{
1250	float stmp;	1241	float stmp;
1251		1242
1252	/* Got some extra bonus at first level */	1243	/* Got some extra bonus at first level */
1253	if (i < 2)	1244	if (i < 2)
1254	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;	1245	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1255	else	1246	else
1256	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;	1247	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1257		1248
1258	if (stmp < 1.f)
1259	stmp = 1.f;
1260
1261	sp_tmp += stmp;	1249	sp_tmp += max (1.f, stmp);
1262	}
1263
1264	stats.maxsp = (sint16)sp_tmp;
1265
1266	for (i = 11; i <= mana_obj->level; i++)
1267	stats.maxsp += 2;
1268	}	1250	}
		1251
		1252	stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
		1253	}
		1254
1269	/* Characters can get their sp supercharged via rune of transferrance */	1255	/* Characters can get their sp supercharged via rune of transferrance */
1270	if (stats.sp > stats.maxsp * 2)	1256	stats.sp = min (stats.sp, stats.maxsp * 2);
1271	stats.sp = stats.maxsp * 2;
1272		1257
1273	/* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */	1258	/* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1274	if (!grace_obj \|\| !grace_obj->level \|\| type != PLAYER)	1259	if (!grace_obj \|\| !grace_obj->level \|\| type != PLAYER)
1275	grace_obj = this;	1260	grace_obj = this;
1276		1261
…		…
1281	/* store grace in a float - this way, the divisions below don't create	1266	/* store grace in a float - this way, the divisions below don't create
1282	* big jumps when you go from level to level - with int's, it then	1267	* big jumps when you go from level to level - with int's, it then
1283	* becomes big jumps when the sums of the bonuses jump to the next	1268	* becomes big jumps when the sums of the bonuses jump to the next
1284	* step of 8 - with floats, even fractional ones are useful.	1269	* step of 8 - with floats, even fractional ones are useful.
1285	*/	1270	*/
1286	sp_tmp = 0.f;	1271	float sp_tmp = 0.f;
1287	for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++)	1272
		1273	for (int i = 1; i <= min (10, grace_obj->level); i++)
1288	{	1274	{
1289	float grace_tmp = 0.f;	1275	float grace_tmp = 0.f;
1290		1276
1291	/* Got some extra bonus at first level */	1277	/* Got some extra bonus at first level */
1292	if (i < 2)	1278	if (i < 2)
1293	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;	1279	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1294	else	1280	else
1295	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;	1281	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1296		1282
1297	if (grace_tmp < 1.f)
1298	grace_tmp = 1.f;
1299
1300	sp_tmp += grace_tmp;	1283	sp_tmp += max (1.f, grace_tmp);
1301	}	1284	}
1302		1285
1303	stats.maxgrace = (sint16)sp_tmp;
1304
1305	/* two grace points per level after 11 */	1286	/* two grace points per level after 10 */
1306	for (i = 11; i <= grace_obj->level; i++)	1287	stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1307	stats.maxgrace += 2;
1308	}	1288	}
		1289
1309	/* No limit on grace vs maxgrace */	1290	/* No limit on grace vs maxgrace */
1310		1291
1311	if (contr->braced)	1292	if (contr->braced)
1312	{	1293	{
1313	ac += 2;	1294	ac += 2;
…		…
1325	* improvement every level, now its fighterlevel/5. So	1306	* improvement every level, now its fighterlevel/5. So
1326	* we give the player a bonus here in wc and dam	1307	* we give the player a bonus here in wc and dam
1327	* to make up for the change. Note that I left the	1308	* to make up for the change. Note that I left the
1328	* monster bonus the same as before. -b.t.	1309	* monster bonus the same as before. -b.t.
1329	*/	1310	*/
		1311	object *wc_obj = chosen_skill;
1330		1312
1331	if (type == PLAYER && wc_obj && wc_obj->level > 1)	1313	if (contr && wc_obj && wc_obj->level > 1)
1332	{	1314	{
1333	wc -= wc_obj->level + thaco_bonus[stats.Str];	1315	wc -= wc_obj->level + thaco_bonus[stats.Str];
1334		1316
1335	for (i = 1; i < wc_obj->level; i++)	1317	for (int i = 1; i < wc_obj->level; i++)
1336	{	1318	{
1337	/* addtional wc every 6 levels */	1319	/* additional wc every 6 levels */
1338	if (!(i % 6))	1320	if (!(i % 6))
1339	wc--;	1321	wc--;
1340		1322
1341	/* addtional dam every 4 levels. */	1323	/* additional dam every 4 levels. */
1342	if (!(i % 4) && dam_bonus[stats.Str] >= 0)	1324	if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1343	stats.dam += 1 + dam_bonus[stats.Str] / 5;	1325	stats.dam += 1 + dam_bonus[stats.Str] / 5;
1344	}	1326	}
1345	}	1327	}
1346	else	1328	else
…		…
1355		1337
1356	if (settings.search_items && contr->search_str[0])	1338	if (settings.search_items && contr->search_str[0])
1357	speed -= 1;	1339	speed -= 1;
1358		1340
1359	if (attacktype == 0)	1341	if (attacktype == 0)
1360	attacktype = arch->clone.attacktype;	1342	attacktype = arch->attacktype;
1361
1362	} /* End if player */	1343	} /* End if player */
1363		1344
1364	if (added_speed >= 0)	1345	if (added_speed >= 0)
1365	speed += added_speed / 10.f;	1346	speed += added_speed / 10.f;
1366	else /* Something wrong here...: */	1347	else /* Something wrong here...: */
1367	speed /= 1.f - added_speed;	1348	speed /= 1.f - added_speed;
1368		1349
1369	/* Max is determined by armour */	1350	/* Max is determined by armour */
1370	if (speed > max)	1351	speed = min (speed, max_speed);
1371	speed = max;
1372		1352
1373	if (type == PLAYER)	1353	if (type == PLAYER)
1374	{	1354	{
1375	/* f is a number the represents the number of kg above (positive num)	1355	/* f is a number the represents the number of kg above (positive num)
1376	* or below (negative number) that the player is carrying. If above	1356	* or below (negative number) that the player is carrying. If above
…		…
1400	* that would just be a real pain to read.	1380	* that would just be a real pain to read.
1401	*/	1381	*/
1402	float M = (max_carry[stats.Str] - 121) / 121.f;	1382	float M = (max_carry[stats.Str] - 121) / 121.f;
1403	float M2 = max_carry[stats.Str] / 100.f;	1383	float M2 = max_carry[stats.Str] / 100.f;
1404	float W = weapon_weight / 20000.f;	1384	float W = weapon_weight / 20000.f;
1405	float s = 2 - weapon_speed / 10.f;	1385	float s = (20 - weapon_speed) / 10.f;
1406	float D = (stats.Dex - 14) / 14.f;	1386	float D = (stats.Dex - 14) / 14.f;
1407	float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;	1387	float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
1408		1388
1409	K = (4 + level) 1.2f / (6 + level);	1389	K = (4 + level) 1.2f / (6 + level);
1410		1390
1411	if (K <= 0.f)	1391	if (K <= 0.01f)
1412	K = 0.01f;	1392	K = 0.01f;
1413		1393
1414	float S = speed / (K * s);	1394	contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1415
1416	contr->weapon_sp = S;
1417	}	1395	}
1418		1396
1419	/* I want to limit the power of small monsters with big weapons: */	1397	/* I want to limit the power of small monsters with big weapons: */
1420	if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3)	1398	if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
1421	stats.dam = arch->clone.stats.dam * 3;	1399	stats.dam = arch->stats.dam * 3;
1422		1400
1423	/* Prevent overflows of wc - best you can get is ABS(120) - this	1401	stats.wc = clamp (wc, MIN_WC, MAX_WC);
1424	* should be more than enough - remember, AC is also in 8 bits,	1402	stats.ac = clamp (ac, MIN_AC, MAX_AC);
1425	* so its value is the same.
1426	*/
1427	if (wc > 120)
1428	wc = 120;
1429	else if (wc < -120)
1430	wc = -120;
1431
1432	stats.wc = wc;
1433
1434	if (ac > 120)
1435	ac = 120;
1436	else if (ac < -120)
1437	ac = -120;
1438
1439	stats.ac = ac;
1440		1403
1441	/* if for some reason the creature doesn't have any move type,	1404	/* if for some reason the creature doesn't have any move type,
1442	* give them walking as a default.	1405	* give them walking as a default.
1443	* The second case is a special case - to more closely mimic the	1406	* The second case is a special case - to more closely mimic the
1444	* old behaviour - if your flying, your not walking - just	1407	* old behaviour - if your flying, your not walking - just
…		…
1561	object skin = NULL; / pointer to dragon skin force */	1524	object skin = NULL; / pointer to dragon skin force */
1562	object tmp = NULL; / tmp. object */	1525	object tmp = NULL; / tmp. object */
1563	char buf[MAX_BUF]; /* tmp. string buffer */	1526	char buf[MAX_BUF]; /* tmp. string buffer */
1564		1527
1565	/* now grab the 'dragon_ability'-forces from the player's inventory */	1528	/* now grab the 'dragon_ability'-forces from the player's inventory */
1566	shstr_cmp dragon_ability_force ("dragon_ability_force");
1567	shstr_cmp dragon_skin_force ("dragon_skin_force");
1568
1569	for (tmp = who->inv; tmp; tmp = tmp->below)	1529	for (tmp = who->inv; tmp; tmp = tmp->below)
1570	if (tmp->type == FORCE)	1530	if (tmp->type == FORCE)
1571	if (tmp->arch->name == dragon_ability_force)	1531	if (tmp->arch->archname == shstr_dragon_ability_force)
1572	abil = tmp;	1532	abil = tmp;
1573	else if (tmp->arch->name == dragon_skin_force)	1533	else if (tmp->arch->archname == shstr_dragon_skin_force)
1574	skin = tmp;	1534	skin = tmp;
1575		1535
1576	/* if the force is missing -> bail out */	1536	/* if the force is missing -> bail out */
1577	if (abil == NULL)	1537	if (abil == NULL)
1578	return;	1538	return;
…		…
1624	if (!skill_obj)	1584	if (!skill_obj)
1625	{	1585	{
1626	LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name);	1586	LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name);
1627	return NULL;	1587	return NULL;
1628	}	1588	}
		1589
1629	/* clear the flag - exp goes into this bucket, but player	1590	/* clear the flag - exp goes into this bucket, but player
1630	* still doesn't know it.	1591	* still doesn't know it.
1631	*/	1592	*/
1632	CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);	1593	CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1633	skill_obj->stats.exp = 0;	1594	skill_obj->stats.exp = 0;
1634	skill_obj->level = 1;	1595	skill_obj->level = 1;
1635	insert_ob_in_ob (skill_obj, op);	1596	insert_ob_in_ob (skill_obj, op);
1636		1597
1637	if (op->contr)	1598	if (player *pl = op->contr)
1638	{	1599	{
1639	op->contr->last_skill_ob [skill_obj->subtype] = skill_obj;	1600	pl->last_skill_ob [skill_obj->subtype] = skill_obj;
1640	if (op->contr->ns)	1601	if (pl->ns)
1641	op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous	1602	pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1642	}	1603	}
1643		1604
1644	return skill_obj;	1605	return skill_obj;
1645	}	1606	}
1646
1647		1607
1648	/* player_lvl_adj() - for the new exp system. we are concerned with	1608	/* player_lvl_adj() - for the new exp system. we are concerned with
1649	* whether the player gets more hp, sp and new levels.	1609	* whether the player gets more hp, sp and new levels.
1650	* Note this this function should only be called for players. Monstes	1610	* Note this this function should only be called for players. Monstes
1651	* don't really gain levels	1611	* don't really gain levels
…		…
1654	*/	1614	*/
1655	void	1615	void
1656	player_lvl_adj (object who, object op)	1616	player_lvl_adj (object who, object op)
1657	{	1617	{
1658	char buf[MAX_BUF];	1618	char buf[MAX_BUF];
		1619	bool changed = false;
1659		1620
1660	if (!op) /* when rolling stats */	1621	if (!op) /* when rolling stats */
1661	op = who;	1622	op = who;
1662		1623
1663	if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))	1624	while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1664	{	1625	{
		1626	changed = true;
		1627
1665	op->level++;	1628	op->level++;
1666		1629
1667	if (op != NULL && op == who && op->stats.exp > 1 && is_dragon_pl (who))	1630	if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who))
1668	dragon_level_gain (who);	1631	dragon_level_gain (who);
1669		1632
1670	/* Only roll these if it is the player (who) that gained the level */	1633	/* Only roll these if it is the player (who) that gained the level */
1671	if (op == who && (who->level < 11) && who->type == PLAYER)	1634	if (op == who && (who->level < 11) && who->type == PLAYER)
1672	{	1635	{
1673	who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;	1636	who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1674	who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);	1637	who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1675	who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;	1638	who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1676	}	1639	}
1677		1640
1678	who->update_stats ();
1679	if (op->level > 1)	1641	if (op->level > 1)
1680	{	1642	{
1681	if (op->type != PLAYER)	1643	if (op->type != PLAYER)
		1644	{
		1645	who->contr->play_sound (sound_find ("skill_up"));
1682	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);	1646	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
		1647	}
1683	else	1648	else
		1649	{
		1650	who->contr->play_sound (sound_find ("level_up"));
1684	sprintf (buf, "You are now level %d.", op->level);	1651	sprintf (buf, "You are now level %d.", op->level);
		1652	}
		1653
1685	if (who)	1654	if (who)
1686	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);	1655	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);
1687	}	1656	}
1688	player_lvl_adj (who, op); /* To increase more levels */
1689	}	1657	}
		1658
1690	else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))	1659	while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1691	{	1660	{
		1661	changed = true;
		1662
1692	op->level--;	1663	op->level--;
1693	who->update_stats ();	1664
1694	if (op->type != PLAYER)	1665	if (op->type != PLAYER)
1695	{	1666	{
1696	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);	1667	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1697	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);	1668	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);
1698	}	1669	}
1699	player_lvl_adj (who, op); /* To decrease more levels */	1670	}
		1671
		1672	if (changed)
1700	}	1673	{
1701		1674	who->update_stats ();
		1675	esrv_update_stats (who->contr);
1702	/* check if the spell data has changed */	1676	/* check if the spell data has changed */
1703	esrv_update_stats (who->contr);
1704	esrv_update_spells (who->contr);	1677	esrv_update_spells (who->contr);
		1678	}
1705	}	1679	}
1706		1680
1707	/*	1681	/*
1708	* Returns how much experience is needed for a player to become	1682	* Returns how much experience is needed for a player to become
1709	* the given level. level should really never exceed max_level	1683	* the given level. level should really never exceed max_level
…		…
2014	player_lvl_adj (op, tmp);	1988	player_lvl_adj (op, tmp);
2015	}	1989	}
2016		1990
2017	percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;	1991	percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
2018	level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)];	1992	level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)];
		1993
2019	if (level_loss < 0)	1994	if (level_loss < 0)
2020	level_loss = 0;	1995	level_loss = 0;
2021	loss = check_exp_loss (op, MIN (level_loss, percentage_loss));	1996	loss = check_exp_loss (op, MIN (level_loss, percentage_loss));
2022		1997
2023	op->stats.exp -= loss;	1998	op->stats.exp -= loss;

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.51 by root, Sat May 12 18:23:51 2007 UTC vs. Revision 1.75 by root, Tue Aug 7 22:36:18 2007 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.51 by root, Sat May 12 18:23:51 2007 UTC vs.
Revision 1.75 by root, Tue Aug 7 22:36:18 2007 UTC