ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/living.C

Comparing deliantra/server/common/living.C (file contents):
Revision 1.72 by root, Sun Jul 22 14:17:56 2007 UTC vs.
Revision 1.129 by root, Mon Nov 12 03:14:32 2012 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <funcpoint.h>
26		26
27	/* Handy little macro that adds exp and keeps it within bounds. Since	27	/* Handy little macro that adds exp and keeps it within bounds. Since
28	* we are now using 64 bit values, I'm not all concerned about overflow issues	28	* we are now using 64 bit values, I'm not all concerned about overflow issues
29	* with exptotal wrapping. exptotal is typically op->exp, or op->perm_exp	29	* with exptotal wrapping. exptotal is typically op->exp, or op->perm_exp
30	*/	30	*/
…		…
108	* These limits are probably overly generous, but being there were no values	108	* These limits are probably overly generous, but being there were no values
109	* before, you need to start someplace.	109	* before, you need to start someplace.
110	*/	110	*/
111		111
112	const uint32 weight_limit[MAX_STAT + 1] = {	112	const uint32 weight_limit[MAX_STAT + 1] = {
113	200000, /* 0 */	113	200000, /* 0 */
114	250000, 300000, 350000, 400000, 500000, /* 5 */	114	250000, 300000, 350000, 400000, 500000, /* 5 */
115	600000, 700000, 800000, 900000, 1000000, /* 10 */	115	600000, 700000, 800000, 900000, 1000000, /* 10 */
116	1100000, 1200000, 1300000, 1400000, 1500000, /* 15 */	116	1100000, 1200000, 1300000, 1400000, 1500000, /* 15 */
117	1650000, 1800000, 1950000, 2100000, 2250000, /* 20 */	117	1650000, 1800000, 1950000, 2100000, 2250000, /* 20 */
118	2400000, 2550000, 2700000, 2850000, 3000000, /* 25 */	118	2400000, 2550000, 2700000, 2850000, 3000000, /* 25 */
119	3250000, 3500000, 3750000, 4000000, 4500000 /*30 */	119	3250000, 3500000, 3750000, 4000000, 4500000 /* 30 */
120	};	120	};
121		121
122	const int learn_spell[MAX_STAT + 1] = {	122	const int learn_spell[MAX_STAT + 1] = {
123	0, 0, 0, 1, 2, 4, 8, 12, 16, 25, 36, 45, 55, 65, 70, 75, 80, 85, 90, 95, 100, 100, 100, 100, 100,	123	0, 0, 0, 1, 2, 4, 8, 12, 16, 25, 36, 45, 55, 65, 70, 75, 80, 85, 90, 95, 100, 100, 100, 100, 100,
124	100, 100, 100, 100, 100, 100	124	100, 100, 100, 100, 100, 100
…		…
139	/*	139	/*
140	Since this is nowhere defined ...	140	Since this is nowhere defined ...
141	Both come in handy at least in function add_exp()	141	Both come in handy at least in function add_exp()
142	*/	142	*/
143		143
144	#define MAX_EXPERIENCE levels[settings.max_level]	144	#define MAX_EXPERIENCE levels [settings.max_level]
145		145
146	/* because exp_obj sum to make the total score,	146	/* because exp_obj sum to make the total score,
147	* we cannot allow that sum to exceed the maximum	147	* we cannot allow that sum to exceed the maximum
148	* amount of experience a player can gain. Thus	148	* amount of experience a player can gain. Thus
149	* we define MAX_EXP_IN_OBJ. It is important to try	149	* we define MAX_EXP_IN_OBJ. It is important to try
…		…
156	* line with progression of previous levels, so	156	* line with progression of previous levels, so
157	* if more levels are desired, this should be fixed.	157	* if more levels are desired, this should be fixed.
158	* -b.t.	158	* -b.t.
159	*/	159	*/
160		160
161	#define MAX_EXP_IN_OBJ levels[settings.max_level]/(MAX_EXP_CAT - 1)	161	#define MAX_EXP_IN_OBJ MAX_EXP_IN_OBJ / (MAX_EXP_CAT - 1)
162
163	extern sint64 *levels;
164		162
165	#define MAX_SAVE_LEVEL 110	163	#define MAX_SAVE_LEVEL 110
166		164
167	/* This no longer needs to be changed anytime the number of	165	/* This no longer needs to be changed anytime the number of
168	* levels is increased - rather, did_make_save will do the	166	* levels is increased - rather, did_make_save will do the
…		…
262	/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,	260	/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,
263	* make this macro to clean those up. Not usuable outside change_abil	261	* make this macro to clean those up. Not usuable outside change_abil
264	* function since some of the values passed to new_draw_info are hardcoded.	262	* function since some of the values passed to new_draw_info are hardcoded.
265	*/	263	*/
266	#define DIFF_MSG(flag, msg1, msg2) \	264	#define DIFF_MSG(flag, msg1, msg2) \
267	new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2);	265	new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
268		266
269	/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */	267	/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */
270		268
271	/* flag is set to 1 if we are applying the object, -1 if we are removing	269	/* flag is set to 1 if we are applying the object, -1 if we are removing
272	* the object.	270	* the object.
…		…
280	* that gives them that ability.	278	* that gives them that ability.
281	*/	279	*/
282	int	280	int
283	change_abil (object *op, object *tmp)	281	change_abil (object *op, object *tmp)
284	{	282	{
285	int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, success = 0;	283	int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1;
		284	int success = 0;
286	char message[MAX_BUF];	285	char message[MAX_BUF];
287	int potion_max = 0;	286	int potion_max = 0;
288		287
289	/* remember what object was like before it was changed. note that	288	// keep some stats for comparison purposes
290	* refop is a local copy of op only to be used for detecting changes	289	object::flags_t prev_flag = op->flag;
291	* found by update_stats. refop is not a real object	290	MoveType prev_move_type = op->move_type;
292	*/	291	sint16 prev_resist [NROFATTACKS]; // clumsy
293	object_copy refop = *op;	292	assert (sizeof (prev_resist) == sizeof (op->resist));
		293	memcpy (prev_resist, op->resist, sizeof (prev_resist));
294		294
295	if (op->type == PLAYER)	295	if (op->type == PLAYER)
296	{	296	{
297	if (tmp->type == POTION)	297	if (tmp->type == POTION)
298	{	298	{
299	potion_max = 1;	299	potion_max = 1;
		300
300	for (int j = 0; j < NUM_STATS; j++)	301	for (int j = 0; j < NUM_STATS; j++)
301	{	302	{
302	int ostat = op->contr->orig_stats.stat (j);	303	int ostat = op->contr->orig_stats.stat (j);
303	int i = tmp->stats.stat (j);	304	int i = tmp->stats.stat (j);
304		305
305	/* 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 */
306	int nstat = flag * i + ostat;	307	int nstat = flag * i + ostat;
307		308
308	/* Do some bounds checking. While I don't think any	309	/* Do some bounds checking. There is the potential for potions
309	* potions do so right now, there is the potential for potions
310	* 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
311	* to allow for that.	311	* to allow for that.
312	*/	312	*/
313	if (nstat < 1 && i * flag < 0)	313	if (nstat < 1 && i * flag < 0)
314	nstat = 1;	314	nstat = 1;
…		…
366	{	366	{
367	success = 1;	367	success = 1;
368	DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red.");	368	DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red.");
369	}	369	}
370		370
371	if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE))	371	if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
372	{	372	{
373	success = 1;	373	success = 1;
374	DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore.");	374	DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore.");
375	}	375	}
376		376
377	if (QUERY_FLAG (op, FLAG_REFL_MISSILE) != QUERY_FLAG (&refop, FLAG_REFL_MISSILE))	377	if (op->flag [FLAG_REFL_MISSILE] != prev_flag [FLAG_REFL_MISSILE])
378	{	378	{
379	success = 1;	379	success = 1;
380	DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away.");	380	DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away.");
381	}	381	}
382		382
383	if (QUERY_FLAG (op, FLAG_REFL_SPELL) != QUERY_FLAG (&refop, FLAG_REFL_SPELL))	383	if (op->flag [FLAG_REFL_SPELL] != prev_flag [FLAG_REFL_SPELL])
384	{	384	{
385	success = 1;	385	success = 1;
386	DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow.");	386	DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow.");
387	}	387	}
388		388
…		…
390	* user has multiple items giving the same type appled like we	390	* user has multiple items giving the same type appled like we
391	* used to - that is more work than what we gain, plus messages	391	* used to - that is more work than what we gain, plus messages
392	* can be misleading (a little higher could be miscontrued from	392	* can be misleading (a little higher could be miscontrued from
393	* from fly high)	393	* from fly high)
394	*/	394	*/
395	if (tmp->move_type && op->move_type != refop.move_type)	395	if (tmp->move_type && op->move_type != prev_move_type)
396	{	396	{
397	success = 1;	397	success = 1;
398		398
399	/* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low	399	/* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low
400	* status doesn't make a difference if you are flying high	400	* status doesn't make a difference if you are flying high
401	*/	401	*/
402	if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH))	402	if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH))
403	{	403	{
404	DIFF_MSG (flag, "You start to float in the air!.", "You float down to the ground.");	404	DIFF_MSG (flag, "You start to float in the air!", "You float down to the ground.");
405	}	405	}
406		406
407	if (tmp->move_type & MOVE_FLY_HIGH)	407	if (tmp->move_type & MOVE_FLY_HIGH)
408	{	408	{
409	/* double conditional - second case covers if you have move_fly_low -	409	/* double conditional - second case covers if you have move_fly_low -
…		…
413	(op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));	413	(op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
414	}	414	}
415		415
416	if (tmp->move_type & MOVE_SWIM)	416	if (tmp->move_type & MOVE_SWIM)
417	DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");	417	DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
418
419	/* Changing move status may mean you are affected by things you weren't before */
420	check_move_on (op, op);
421	}	418	}
422		419
423	/* becoming UNDEAD... a special treatment for this flag. Only those not	420	/* becoming UNDEAD... a special treatment for this flag. Only those not
424	* originally undead may change their status	421	* originally undead may change their status
425	*/	422	*/
426	if (!QUERY_FLAG (op->arch, FLAG_UNDEAD))	423	if (!op->arch->flag [FLAG_UNDEAD])
427	if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD))	424	if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
428	{	425	{
429	success = 1;	426	success = 1;
430	if (flag > 0)	427	if (flag > 0)
431	{	428	{
432	op->race = "undead";	429	op->race = "undead";
…		…
437	op->race = op->arch->race;	434	op->race = op->arch->race;
438	new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");	435	new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
439	}	436	}
440	}	437	}
441		438
442	if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH))	439	if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
443	{	440	{
444	success = 1;	441	success = 1;
445	DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");	442	DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
446	}	443	}
447		444
448	if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS))	445	if (op->flag [FLAG_MAKE_INVIS] != prev_flag [FLAG_MAKE_INVIS])
449	{	446	{
450	success = 1;	447	success = 1;
451	DIFF_MSG (flag, "You become transparent.", "You can see yourself.");	448	DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
452	}	449	}
453		450
454	/* blinded you can tell if more blinded since blinded player has minimal	451	/* blinded you can tell if more blinded since blinded player has minimal
455	* vision	452	* vision
456	*/	453	*/
457	if (QUERY_FLAG (tmp, FLAG_BLIND))	454	if (tmp->flag [FLAG_BLIND])
458	{	455	{
459	success = 1;	456	success = 1;
460	if (flag > 0)	457	if (flag > 0)
461	{	458	{
462	if (QUERY_FLAG (op, FLAG_WIZ))	459	if (op->flag [FLAG_WIZ])
463	new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");	460	new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");
464	else	461	else
465	{	462	{
466	new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");	463	new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
467	SET_FLAG (op, FLAG_BLIND);	464	op->set_flag (FLAG_BLIND);
468	if (op->type == PLAYER)	465	if (op->type == PLAYER)
469	op->contr->do_los = 1;	466	op->contr->do_los = 1;
470	}	467	}
471	}	468	}
472	else	469	else
473	{	470	{
474	if (QUERY_FLAG (op, FLAG_WIZ))	471	if (op->flag [FLAG_WIZ])
475	new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");	472	new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");
476	else	473	else
477	{	474	{
478	new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");	475	new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
479	CLEAR_FLAG (op, FLAG_BLIND);	476	op->clr_flag (FLAG_BLIND);
480	if (op->type == PLAYER)	477	if (op->type == PLAYER)
481	op->contr->do_los = 1;	478	op->contr->do_los = 1;
482	}	479	}
483	}	480	}
484	}	481	}
485		482
486	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) != QUERY_FLAG (&refop, FLAG_SEE_IN_DARK))	483	if (op->flag [FLAG_SEE_IN_DARK] != prev_flag [FLAG_SEE_IN_DARK])
487	{	484	{
488	success = 1;	485	success = 1;
489	if (op->type == PLAYER)	486	if (op->type == PLAYER)
490	op->contr->do_los = 1;	487	op->contr->do_los = 1;
491	DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark.");	488	DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark.");
492	}	489	}
493		490
494	if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS))	491	if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
495	{	492	{
496	success = 1;	493	success = 1;
497	if (flag > 0)	494	if (flag > 0)
498	{	495	{
499	if (QUERY_FLAG (op, FLAG_WIZ))	496	if (op->flag [FLAG_WIZ])
500	new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer.");	497	new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer.");
501	else	498	else
502	{	499	{
503	new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");	500	new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
504	if (op->type == PLAYER)	501	if (op->type == PLAYER)
505	op->contr->do_los = 1;	502	op->contr->do_los = 1;
506	}	503	}
507	}	504	}
508	else	505	else
509	{	506	{
510	if (QUERY_FLAG (op, FLAG_WIZ))	507	if (op->flag [FLAG_WIZ])
511	new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus.");	508	new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus.");
512	else	509	else
513	{	510	{
514	new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid.");	511	new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid.");
515	if (op->type == PLAYER)	512	if (op->type == PLAYER)
…		…
522	{	519	{
523	success = 1;	520	success = 1;
524	DIFF_MSG (flag * tmp->stats.luck, "You feel more lucky.", "You feel less lucky.");	521	DIFF_MSG (flag * tmp->stats.luck, "You feel more lucky.", "You feel less lucky.");
525	}	522	}
526		523
		524	if (digest_types [tmp->type])
		525	{
527	if (tmp->stats.hp && op->type == PLAYER)	526	if (tmp->stats.hp && op->type == PLAYER)
528	{	527	{
529	success = 1;	528	success = 1;
530	DIFF_MSG (flag * tmp->stats.hp, "You feel much more healthy!", "You feel much less healthy!");	529	DIFF_MSG (flag * tmp->stats.hp, "You feel much more healthy!", "You feel much less healthy!");
531	}	530	}
532		531
533	if (tmp->stats.sp && op->type == PLAYER && tmp->type != SKILL)	532	if (tmp->stats.sp && op->type == PLAYER
534	{	533	&& tmp->type != SKILL && tmp->type != BOW)
		534	{
535	success = 1;	535	success = 1;
536	DIFF_MSG (flag * tmp->stats.sp, "You feel one with the powers of magic!", "You suddenly feel very mundane.");	536	DIFF_MSG (flag * tmp->stats.sp, "You feel one with the powers of magic!", "You suddenly feel very mundane.");
537	}	537	}
538		538
539	/* for the future when artifacts set this -b.t. */	539	/* for the future when artifacts set this -b.t. */
540	if (tmp->stats.grace && op->type == PLAYER)	540	if (tmp->stats.grace && op->type == PLAYER)
541	{	541	{
542	success = 1;	542	success = 1;
543	DIFF_MSG (flag * tmp->stats.grace, "You feel closer to your god!", "You suddenly feel less holy.");	543	DIFF_MSG (flag * tmp->stats.grace, "You feel closer to your god!", "You suddenly feel less holy.");
544	}	544	}
545		545
546	if (tmp->stats.food && op->type == PLAYER)	546	if (tmp->stats.food && op->type == PLAYER)
547	{	547	{
548	success = 1;	548	success = 1;
549	DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");	549	DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
		550	}
550	}	551	}
551		552
552	/* Messages for changed resistance */	553	/* Messages for changed resistance */
553	for (int i = 0; i < NROFATTACKS; i++)	554	for (int i = 0; i < NROFATTACKS; i++)
554	{	555	{
555	if (i == ATNR_PHYSICAL)	556	if (i == ATNR_PHYSICAL)
556	continue; /* Don't display about armour */	557	continue; /* Don't display about armour */
557		558
558	if (op->resist[i] != refop.resist[i])	559	if (op->resist [i] != prev_resist [i])
559	{	560	{
560	success = 1;	561	success = 1;
		562
561	if (op->resist[i] > refop.resist[i])	563	if (op->resist [i] > prev_resist [i])
562	sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]);	564	sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
563	else	565	else
564	sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]);	566	sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
565		567
566	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);	568	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
567	}	569	}
568	}	570	}
569		571
570	if (!potion_max)	572	if (!potion_max)
571	{
572	for (int j = 0; j < NUM_STATS; j++)	573	for (int j = 0; j < NUM_STATS; j++)
573	{
574	if (int i = tmp->stats.stat (j))	574	if (int i = tmp->stats.stat (j))
575	{	575	{
576	success = 1;	576	success = 1;
577	DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);	577	DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
578	}	578	}
579	}
580	}
581		579
582	return success;	580	return success;
583	}	581	}
584		582
585	/*	583	/*
…		…
596	object::drain_specific_stat (int deplete_stats)	594	object::drain_specific_stat (int deplete_stats)
597	{	595	{
598	object *tmp;	596	object *tmp;
599	archetype *at;	597	archetype *at;
600		598
601	at = archetype::find (ARCH_DEPLETION);	599	at = archetype::find (shstr_depletion);
602	if (!at)	600	if (!at)
603	{	601	{
604	LOG (llevError, "Couldn't find archetype depletion.\n");	602	LOG (llevError, "Couldn't find archetype depletion.\n");
605	return;	603	return;
606	}	604	}
…		…
608	{	606	{
609	tmp = present_arch_in_ob (at, this);	607	tmp = present_arch_in_ob (at, this);
610		608
611	if (!tmp)	609	if (!tmp)
612	{	610	{
613	tmp = arch_to_object (at);	611	tmp = at->instance ();
614	tmp = insert_ob_in_ob (tmp, this);	612	tmp = insert_ob_in_ob (tmp, this);
615	SET_FLAG (tmp, FLAG_APPLIED);	613	tmp->set_flag (FLAG_APPLIED);
616	}	614	}
617	}	615	}
618		616
619	new_draw_info (NDI_UNIQUE, 0, this, drain_msg[deplete_stats]);	617	new_draw_info (NDI_UNIQUE, 0, this, drain_msg[deplete_stats]);
620	change_attr_value (&tmp->stats, deplete_stats, -1);	618	change_attr_value (&tmp->stats, deplete_stats, -1);
…		…
626	* via an applied bad_luck object.	624	* via an applied bad_luck object.
627	*/	625	*/
628	void	626	void
629	object::change_luck (int value)	627	object::change_luck (int value)
630	{	628	{
631	archetype *at = archetype::find ("luck");	629	archetype *at = archetype::find (shstr_luck);
632	if (!at)	630	if (!at)
633	LOG (llevError, "Couldn't find archetype luck.\n");	631	LOG (llevError, "Couldn't find archetype luck.\n");
634	else	632	else
635	{	633	{
636	object *tmp = present_arch_in_ob (at, this);	634	object *tmp = present_arch_in_ob (at, this);
…		…
638	if (!tmp)	636	if (!tmp)
639	{	637	{
640	if (!value)	638	if (!value)
641	return;	639	return;
642		640
643	tmp = arch_to_object (at);	641	tmp = at->instance ();
644	tmp = insert_ob_in_ob (tmp, this);	642	tmp = insert_ob_in_ob (tmp, this);
645	SET_FLAG (tmp, FLAG_APPLIED);	643	tmp->set_flag (FLAG_APPLIED);
646	}	644	}
647		645
648	if (value)	646	if (value)
649	{	647	{
650	/* Limit the luck value of the bad luck object to +/-100. This	648	/* Limit the luck value of the bad luck object to +/-100. This
…		…
703	sint8 v = arch->stats.stat (i);	701	sint8 v = arch->stats.stat (i);
704	stats.stat (i) += v;	702	stats.stat (i) += v;
705	contr->orig_stats.stat (i) += v;	703	contr->orig_stats.stat (i) += v;
706	}	704	}
707	}	705	}
		706
		707	static struct copy_flags : object::flags_t
		708	{
		709	copy_flags ()
		710	{
		711	set (FLAG_LIFESAVE);
		712	set (FLAG_REFL_SPELL);
		713	set (FLAG_REFL_MISSILE);
		714	set (FLAG_STEALTH);
		715	set (FLAG_XRAYS);
		716	set (FLAG_BLIND);
		717	set (FLAG_SEE_IN_DARK);
		718	}
		719	} copy_flags;
708		720
709	/*	721	/*
710	* Updates all abilities given by applied objects in the inventory	722	* Updates all abilities given by applied objects in the inventory
711	* of the given object. Note: This function works for both monsters	723	* of the given object. Note: This function works for both monsters
712	* and players; the "player" in the name is purely an archaic inheritance.	724	* and players; the "player" in the name is purely an archaic inheritance.
…		…
717	* spell system split, grace points now added to system --peterm	729	* spell system split, grace points now added to system --peterm
718	*/	730	*/
719	void	731	void
720	object::update_stats ()	732	object::update_stats ()
721	{	733	{
722	int i, j;
723	float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1;	734	float max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
724	int weapon_weight = 0, weapon_speed = 0;	735	int weapon_weight = 0, weapon_speed = 0;
725	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;	736	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
726	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];	737	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
727	object *grace_obj = NULL, *mana_obj = NULL, *tmp;	738	object *grace_obj = NULL, *mana_obj = NULL, *tmp;
728	float old_speed = speed;	739	float old_speed = speed;
		740	int stat_sum [NUM_STATS];
		741
		742	MoveType move_type; // we use change_move_type to change it, so use a local copy
729		743
730	/* First task is to clear all the values back to their original values */	744	/* First task is to clear all the values back to their original values */
731	if (type == PLAYER)	745	if (type == PLAYER)
732	{	746	{
		747	contr->delayed_update = false;
		748
733	for (i = 0; i < NUM_STATS; i++)	749	for (int i = 0; i < NUM_STATS; i++)
734	stats.stat (i) = contr->orig_stats.stat (i);	750	stat_sum [i] = contr->orig_stats.stat (i);
735		751
736	if (settings.spell_encumbrance == TRUE)	752	if (settings.spell_encumbrance == TRUE)
737	contr->encumbrance = 0;	753	contr->encumbrance = 0;
738		754
739	attacktype = 0;	755	attacktype = 0;
…		…
749	for (int i = NUM_BODY_LOCATIONS; i--; )	765	for (int i = NUM_BODY_LOCATIONS; i--; )
750	slot[i].used = slot[i].info;	766	slot[i].used = slot[i].info;
751		767
752	slaying = 0;	768	slaying = 0;
753		769
754	if (!QUERY_FLAG (this, FLAG_WIZ))	770	if (!this->flag [FLAG_WIZ])
755	{
756	CLEAR_FLAG (this, FLAG_XRAYS);
757	CLEAR_FLAG (this, FLAG_MAKE_INVIS);
758	}	771	{
		772	this->clr_flag (FLAG_XRAYS);
		773	this->clr_flag (FLAG_MAKE_INVIS);
		774	}
759		775
760	CLEAR_FLAG (this, FLAG_LIFESAVE);	776	this->clr_flag (FLAG_LIFESAVE);
761	CLEAR_FLAG (this, FLAG_STEALTH);	777	this->clr_flag (FLAG_STEALTH);
762	CLEAR_FLAG (this, FLAG_BLIND);	778	this->clr_flag (FLAG_BLIND);
763		779
764	if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);	780	if (!arch->flag [FLAG_REFL_SPELL ]) this->clr_flag (FLAG_REFL_SPELL);
765	if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);	781	if (!arch->flag [FLAG_REFL_MISSILE]) this->clr_flag (FLAG_REFL_MISSILE);
766	if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);	782	if (!arch->flag [FLAG_UNDEAD ]) this->clr_flag (FLAG_UNDEAD);
767	if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);	783	if (!arch->flag [FLAG_SEE_IN_DARK ]) this->clr_flag (FLAG_SEE_IN_DARK);
768		784
769	path_attuned = arch->path_attuned;	785	path_attuned = arch->path_attuned;
770	path_repelled = arch->path_repelled;	786	path_repelled = arch->path_repelled;
771	path_denied = arch->path_denied;	787	path_denied = arch->path_denied;
772	glow_radius = arch->glow_radius;	788	glow_radius = arch->glow_radius;
773	move_type = arch->move_type;	789	move_type = arch->move_type;
774		790
775	chosen_skill = 0;
776
777	/* initializing resistances from the values in player/monster's	791	/* initializing resistances from the values in player/monster's
778	* archetype clone	792	* archetype clone
779	*/	793	*/
780	memcpy (&resist, &arch->resist, sizeof (resist));	794	memcpy (&resist, &arch->resist, sizeof (resist));
781		795
782	for (i = 0; i < NROFATTACKS; i++)	796	for (int i = 0; i < NROFATTACKS; i++)
783	{	797	{
784	if (resist[i] > 0)	798	if (resist[i] > 0)
785	prot[i] = resist[i], vuln[i] = 0;	799	prot[i] = resist[i], vuln[i] = 0;
786	else	800	else
787	vuln[i] = -(resist[i]), prot[i] = 0;	801	vuln[i] = -resist[i], prot[i] = 0;
788		802
789	potion_resist[i] = 0;	803	potion_resist[i] = -1000;
790	}	804	}
791		805
792	wc = arch->stats.wc;	806	wc = arch->stats.wc;
793	stats.dam = arch->stats.dam;	807	stats.dam = arch->stats.dam;
794		808
…		…
797	* the fact that maxlevel is factored in could be considered sort of bogus -	811	* the fact that maxlevel is factored in could be considered sort of bogus -
798	* we should probably give them some bonus and cap it off - otherwise,	812	* we should probably give them some bonus and cap it off - otherwise,
799	* basically, if a server updates its max level, these playes may find	813	* basically, if a server updates its max level, these playes may find
800	* that their protection from physical goes down	814	* that their protection from physical goes down
801	*/	815	*/
802	if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)	816	if (!this->flag [FLAG_USE_ARMOUR] && type == PLAYER)
803	{	817	{
804	ac = MAX (-10, arch->stats.ac - level / 3);	818	ac = max (-10, arch->stats.ac - level / 3);
805	prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;	819	prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
806	}	820	}
807	else	821	else
808	ac = arch->stats.ac;	822	ac = arch->stats.ac;
809		823
810	stats.luck = arch->stats.luck;	824	stats.luck = arch->stats.luck;
811	speed = arch->speed;	825	speed = arch->speed;
		826
		827	chosen_skill = 0;
812		828
813	/* OK - we've reset most all the objects attributes to sane values.	829	/* OK - we've reset most all the objects attributes to sane values.
814	* now go through and make adjustments for what the player has equipped.	830	* now go through and make adjustments for what the player has equipped.
815	*/	831	*/
816	for (tmp = inv; tmp; tmp = tmp->below)	832	for (tmp = inv; tmp; tmp = tmp->below)
817	{	833	{
818	/* This happens because apply_potion calls change_abil with the potion	834	/* This happens because apply_potion calls change_abil with the potion
819	* applied so we can tell the player what changed. But change_abil	835	* applied so we can tell the player what changed. But change_abil
820	* then calls this function.	836	* then calls this function.
821	*/	837	*/
822	if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)	838	if (tmp->flag [FLAG_APPLIED] && tmp->type == POTION)
823	continue;	839	continue;
824		840
825	/* See note in map.c:update_position about making this additive
826	* since light sources are never applied, need to put check here.
827	*/
828	if (tmp->glow_radius > glow_radius)
829	glow_radius = tmp->glow_radius;	841	glow_radius += tmp->glow_radius;
830		842
831	/* For some things, we don't care what is equipped */	843	/* For some things, we don't care what is equipped */
832	if (tmp->type == SKILL)	844	if (tmp->type == SKILL)
833	{	845	{
834	/* Want to take the highest skill here. */	846	/* Want to take the highest skill here. */
…		…
847	else if (tmp->level > grace_obj->level)	859	else if (tmp->level > grace_obj->level)
848	grace_obj = tmp;	860	grace_obj = tmp;
849	}	861	}
850	}	862	}
851		863
852	/* Container objects are not meant to adjust a players, but other applied	864	/* Container objects are not meant to adjust players, but other applied
853	* objects need to make adjustments.	865	* objects need to make adjustments.
854	* This block should handle all player specific changes	866	* This block should handle all player specific changes
855	* The check for Praying is a bit of a hack - god given bonuses are put	867	* The check for Praying is a bit of a hack - god given bonuses are put
856	* in the praying skill, and the player should always get those.	868	* in the praying skill, and the player should always get those.
857	* It also means we need to put in additional checks for applied below,	869	* It also means we need to put in additional checks for applied below,
858	* because the skill shouldn't count against body positions being used	870	* because the skill shouldn't count against body positions being used
859	* up, etc.	871	* up, etc.
860	*/	872	*/
861	if ((tmp->flag [FLAG_APPLIED]	873	if ((tmp->flag [FLAG_APPLIED]
862	&& tmp->type != CONTAINER	874	&& tmp->type != CONTAINER
863	&& tmp->type != CLOSE_CON)	875	&& tmp->type != CLOSE_CON
864	|| (tmp->type == SKILL	876	&& tmp->type != SPELL)
865	&& tmp->subtype == SK_PRAYING))	877	|| (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
866	{	878	{
867	if (type == PLAYER)	879	if (type == PLAYER)
868	{	880	{
869	contr->item_power += tmp->item_power;	881	contr->item_power += tmp->item_power;
870		882
871	if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
872	if (tmp != current_weapon
873	&& (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
874	&& !tmp->flag [FLAG_CURSED]
875	&& !tmp->flag [FLAG_DAMNED])
876	continue;
877
878	for (i = 0; i < NUM_STATS; i++)	883	for (int i = 0; i < NUM_STATS; i++)
879	change_attr_value (&stats, i, tmp->stats.stat (i));	884	stat_sum [i] += tmp->stats.stat (i);
880		885
881	/* These are the items that currently can change digestion, regeneration,	886	if (digest_types [tmp->type])
882	* spell point recovery and mana point recovery. Seems sort of an arbitary
883	* list, but other items store other info into stats array.
884	*/
885	if (tmp->type == WEAPON || tmp->type == BOW ||
886	tmp->type == ARMOUR || tmp->type == HELMET ||
887	tmp->type == SHIELD || tmp->type == RING ||
888	tmp->type == BOOTS || tmp->type == GLOVES ||
889	tmp->type == AMULET || tmp->type == GIRDLE ||
890	tmp->type == BRACERS || tmp->type == CLOAK ||
891	tmp->type == DISEASE || tmp->type == FORCE ||
892	tmp->type == SKILL)
893	{	887	{
894	contr->digestion = clamp (int (contr->digestion) + tmp->stats.food, MIN_DIGESTION, MAX_DIGESTION);	888	contr->digestion += tmp->stats.food;
895	contr->gen_hp += tmp->stats.hp;	889	contr->gen_hp += tmp->stats.hp;
		890	if (tmp->type != BOW) // ugly exception for bows
896	contr->gen_sp += tmp->stats.sp;	891	contr->gen_sp += tmp->stats.sp;
897	contr->gen_grace += tmp->stats.grace;	892	contr->gen_grace += tmp->stats.grace;
898	contr->gen_sp_armour += tmp->gen_sp_armour;	893	contr->gen_sp_armour += tmp->gen_sp_armour;
899	}	894	}
900	} /* if this is a player */	895	} /* if this is a player */
901	else	896	else
…		…
903	if (tmp->type == WEAPON)	898	if (tmp->type == WEAPON)
904	current_weapon = tmp;	899	current_weapon = tmp;
905	}	900	}
906		901
907	/* Update slots used for items */	902	/* Update slots used for items */
908	if (QUERY_FLAG (tmp, FLAG_APPLIED))	903	if (tmp->flag [FLAG_APPLIED]) // exclude praying...
909	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	904	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
910	slot[i].used += tmp->slot[i].info;	905	slot[i].used += tmp->slot[i].info;
911		906
912	if (tmp->type == SYMPTOM)	907	if (tmp->type == SYMPTOM)
913	{
914	speed_reduce_from_disease = tmp->last_sp / 100.f;	908	min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
915		909
916	if (speed_reduce_from_disease == 0)
917	speed_reduce_from_disease = 1;
918	}
919
920	/* Pos. and neg. protections are counted seperate (-> pro/vuln).	910	/* Pos. and neg. protections are counted separate (-> pro/vuln).
921	* (Negative protections are calculated exactly like positive.)	911	* (Negative protections are calculated exactly like positive.)
922	* Resistance from potions are treated special as well. If there's	912	* Resistance from potions are treated special as well. If there's
923	* more than one potion-effect, the bigger prot.-value is taken.	913	* more than one potion-effect, the bigger prot.-value is taken.
924	*/	914	*/
925	if (tmp->type != POTION)	915	if (tmp->type == POTION_EFFECT)
926	{
927	for (i = 0; i < NROFATTACKS; i++)	916	for (int i = 0; i < NROFATTACKS; i++)
928	{
929	/* Potential for cursed potions, in which case we just can use
930	* a straight MAX, as potion_resist is initialised to zero.
931	*/
932	if (tmp->type == POTION_EFFECT)
933	{
934	if (potion_resist[i])
935	potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]);
936	else
937	potion_resist[i] = tmp->resist[i];	917	max_it (potion_resist[i], tmp->resist[i]);
938	}	918	else if (tmp->type != POTION)
		919	for (int i = 0; i < NROFATTACKS; i++)
939	else if (tmp->resist[i] > 0)	920	if (tmp->resist[i] > 0)
940	prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;	921	prot[i] += (100 - prot[i]) * tmp->resist[i] / 100;
941	else if (tmp->resist[i] < 0)	922	else if (tmp->resist[i] < 0)
942	vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;	923	vuln[i] += (100 - vuln[i]) * -tmp->resist[i] / 100;
943	}
944	}
945		924
946	/* There may be other things that should not adjust the attacktype */	925	/* There may be other things that should not adjust the attacktype */
947	if (tmp->type != SYMPTOM)	926	if (tmp->type != SYMPTOM)
948	{	927	{
949	attacktype |= tmp->attacktype;	928	attacktype |= tmp->attacktype;
…		…
952	path_denied |= tmp->path_denied;	931	path_denied |= tmp->path_denied;
953	move_type |= tmp->move_type;	932	move_type |= tmp->move_type;
954	stats.luck += tmp->stats.luck;	933	stats.luck += tmp->stats.luck;
955	}	934	}
956		935
957	if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);	936	flag |= tmp->flag & copy_flags;
958	if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
959	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
960	if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
961	if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
962	if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
963	if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
964		937
965	if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))	938	if (tmp->flag [FLAG_UNDEAD] && !arch->flag [FLAG_UNDEAD])
966	SET_FLAG (this, FLAG_UNDEAD);	939	this->set_flag (FLAG_UNDEAD);
967		940
968	if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))	941	//TODO: copy_flags?
		942	if (tmp->flag [FLAG_MAKE_INVIS])
969	{	943	{
970	SET_FLAG (this, FLAG_MAKE_INVIS);	944	set_flag (FLAG_MAKE_INVIS);
971	invisible = 1;	945	invisible = 1;
972	}	946	}
973		947
974	if (tmp->stats.exp && tmp->type != SKILL)	948	if (tmp->stats.exp && tmp->type != SKILL)
975	{	949	{
…		…
982	added_speed += tmp->stats.exp;	956	added_speed += tmp->stats.exp;
983	}	957	}
984		958
985	switch (tmp->type)	959	switch (tmp->type)
986	{	960	{
987	#if 0
988	case WAND:
989	case ROD:
990	case HORN:
991	if (type != PLAYER || current_weapon == tmp)
992	chosen_skill = tmp;
993	break;
994	#endif
995
996	/* skills modifying the character -b.t. */
997	/* for all skills and skill granting objects */
998	case SKILL:	961	case SKILL:
999	{	962	{
		963	// some skills will end up here without counting as "applied"
1000	if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)	964	if (!tmp->flag [FLAG_APPLIED] || skill_flags [tmp->subtype] & SF_AUTARK)
1001	break;	965	break;
1002		966
1003	if (chosen_skill)	967	if (chosen_skill)
1004	{	968	{
1005	LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",	969	LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
…		…
1007		971
1008	tmp->flag [FLAG_APPLIED] = false;	972	tmp->flag [FLAG_APPLIED] = false;
1009	update_stats ();	973	update_stats ();
1010	return;	974	return;
1011	}	975	}
1012	else	976
1013	chosen_skill = tmp;	977	chosen_skill = tmp;
1014		978
1015	if (tmp->stats.dam > 0)	979	if (tmp->stats.dam > 0)
1016	{ /* skill is a 'weapon' */	980	{ /* skill is a 'weapon' */
1017	if (!QUERY_FLAG (this, FLAG_READY_WEAPON))	981	if (!this->flag [FLAG_READY_WEAPON])
1018	weapon_speed = WEAPON_SPEED (tmp);	982	weapon_speed = max (0, WEAPON_SPEED (tmp));
1019
1020	if (weapon_speed < 0)
1021	weapon_speed = 0;
1022		983
1023	weapon_weight = tmp->weight;	984	weapon_weight = tmp->weight;
1024	stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;	985	stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1025		986
1026	if (tmp->magic)	987	if (tmp->magic)
…		…
1035		996
1036	if (tmp->stats.ac)	997	if (tmp->stats.ac)
1037	ac -= tmp->stats.ac + tmp->magic;	998	ac -= tmp->stats.ac + tmp->magic;
1038		999
1039	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1000	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1040	contr->encumbrance += (int) 3 *tmp->weight / 1000;	1001	contr->encumbrance += weight_to_kg_approx (3 * tmp->weight);
1041	}	1002	}
1042		1003
1043	break;	1004	break;
1044		1005
1045	case SHIELD:	1006	case SHIELD:
1046	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1007	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1047	contr->encumbrance += (int) tmp->weight / 2000;	1008	contr->encumbrance += weight_to_kg_approx (tmp->weight) >> 1;
		1009	//FALLTHROUGH
1048	case RING:	1010	case RING:
1049	case AMULET:	1011	case AMULET:
1050	case GIRDLE:	1012	case GIRDLE:
1051	case HELMET:	1013	case HELMET:
1052	case BOOTS:	1014	case BOOTS:
…		…
1061	if (tmp->stats.ac)	1023	if (tmp->stats.ac)
1062	ac -= tmp->stats.ac + tmp->magic;	1024	ac -= tmp->stats.ac + tmp->magic;
1063		1025
1064	break;	1026	break;
1065		1027
		1028	case RANGED:
1066	case BOW:	1029	case BOW:
1067	case WEAPON:	1030	case WEAPON:
1068	if (type != PLAYER || current_weapon == tmp)
1069	{
1070	wc -= tmp->stats.wc + tmp->magic;	1031	wc -= tmp->stats.wc + tmp->magic;
1071		1032
1072	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)	1033	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1073	ac -= tmp->stats.ac + tmp->magic;	1034	ac -= tmp->stats.ac + tmp->magic;
1074		1035
1075	stats.dam += tmp->stats.dam + tmp->magic;	1036	stats.dam += tmp->stats.dam + tmp->magic;
1076	weapon_weight = tmp->weight;	1037	weapon_weight = tmp->weight;
1077	weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;	1038	weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1078		1039
1079	if (weapon_speed < 0)	1040	if (weapon_speed < 0)
1080	weapon_speed = 0;	1041	weapon_speed = 0;
1081		1042
1082	slaying = tmp->slaying;	1043	slaying = tmp->slaying;
1083		1044
1084	/* If there is desire that two handed weapons should do	1045	/* If there is desire that two handed weapons should do
1085	* extra strength damage, this is where the code should	1046	* extra strength damage, this is where the code should
1086	* go.	1047	* go.
1087	*/	1048	*/
1088		1049
1089	if (type == PLAYER)	1050	if (type == PLAYER)
1090	if (settings.spell_encumbrance)	1051	if (settings.spell_encumbrance)
1091	contr->encumbrance += tmp->weight * 3 / 1000;	1052	contr->encumbrance += weight_to_kg_approx (3 * tmp->weight);
1092	}
1093		1053
1094	break;	1054	break;
1095		1055
1096	case ARMOUR: /* Only the best of these three are used: */	1056	case ARMOUR: /* Only the best of these three are used: */
1097	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1057	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1098	contr->encumbrance += tmp->weight / 1000;	1058	contr->encumbrance += weight_to_kg_approx (tmp->weight);
1099		1059
1100	case BRACERS:	1060	case BRACERS:
1101	case FORCE:	1061	case FORCE:
1102	if (tmp->stats.wc)	1062	if (tmp->stats.wc)
1103	{	1063	{
…		…
1120	else /* To nullify the below effect */	1080	else /* To nullify the below effect */
1121	ac += tmp->stats.ac + tmp->magic;	1081	ac += tmp->stats.ac + tmp->magic;
1122	}	1082	}
1123		1083
1124	if (tmp->stats.wc)	1084	if (tmp->stats.wc)
1125	wc -= (tmp->stats.wc + tmp->magic);	1085	wc -= tmp->stats.wc + tmp->magic;
1126		1086
1127	if (tmp->stats.ac)	1087	if (tmp->stats.ac)
1128	ac -= (tmp->stats.ac + tmp->magic);	1088	ac -= tmp->stats.ac + tmp->magic;
1129		1089
1130	if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max)	1090	if (ARMOUR_SPEED (tmp))
1131	max = ARMOUR_SPEED (tmp) / 10.f;	1091	min_it (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1132		1092
1133	break;	1093	break;
1134	} /* switch tmp->type */	1094	} /* switch tmp->type */
1135	} /* item is equipped */	1095	} /* item is equipped */
1136	} /* for loop of items */	1096	} /* for loop of items */
		1097
		1098	min_it (glow_radius, MAX_LIGHT_RADIUS);
1137		1099
1138	/* We've gone through all the objects the player has equipped. For many things, we	1100	/* We've gone through all the objects the player has equipped. For many things, we
1139	* have generated intermediate values which we now need to assign.	1101	* have generated intermediate values which we now need to assign.
1140	*/	1102	*/
1141		1103
…		…
1143	* If there is an uncursed potion in effect, granting more protection	1105	* If there is an uncursed potion in effect, granting more protection
1144	* than that, we take: 'total resistance = resistance from potion'.	1106	* than that, we take: 'total resistance = resistance from potion'.
1145	* If there is a cursed (and no uncursed) potion in effect, we take	1107	* If there is a cursed (and no uncursed) potion in effect, we take
1146	* 'total resistance = vulnerability from cursed potion'.	1108	* 'total resistance = vulnerability from cursed potion'.
1147	*/	1109	*/
1148	for (i = 0; i < NROFATTACKS; i++)	1110	for (int i = 0; i < NROFATTACKS; i++)
1149	{	1111	{
1150	resist[i] = prot[i] - vuln[i];	1112	resist[i] = prot[i] - vuln[i];
1151		1113
1152	if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0)))	1114	if (potion_resist[i] != -1000
		1115	&& (potion_resist[i] < 0 || potion_resist[i] > resist[i]))
1153	resist[i] = potion_resist[i];	1116	resist[i] = potion_resist[i];
1154	}	1117	}
1155		1118
1156	/* Figure out the players sp/mana/hp totals. */
1157	if (type == PLAYER)	1119	if (type == PLAYER)
1158	{	1120	{
		1121	// clamp various player stats
		1122	for (int i = 0; i < NUM_STATS; ++i)
		1123	stats.stat (i) = stat_sum [i];
		1124
		1125	check_stat_bounds (&stats);
		1126
		1127	contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
		1128
		1129	/* Figure out the players sp/mana/hp totals. */
1159	int pl_level;	1130	int pl_level;
1160		1131
1161	check_stat_bounds (&(stats));
1162	pl_level = level;
1163
1164	if (pl_level < 1)
1165	pl_level = 1; /* safety, we should always get 1 levels worth of hp! */	1132	pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1166		1133
1167	/* You basically get half a con bonus/level. But we do take into account rounding,	1134	/* You basically get half a con bonus/level. But we do take into account rounding,
1168	* so if your bonus is 7, you still get 7 worth of bonus every 2 levels.	1135	* so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1169	*/	1136	*/
1170	for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++)	1137	stats.maxhp = 0;
		1138	for (int i = 1; i <= min (10, pl_level); i++)
1171	{	1139	{
1172	j = contr->levhp[i] + con_bonus[stats.Con] / 2;	1140	int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1173		1141
1174	if (i % 2 && con_bonus[stats.Con] % 2)	1142	if (i % 2 && con_bonus[stats.Con] % 2)
1175	{
1176	if (con_bonus[stats.Con] > 0)	1143	if (con_bonus[stats.Con] > 0)
1177	j++;	1144	j++;
1178	else	1145	else
1179	j--;	1146	j--;
1180	}
1181		1147
1182	stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */	1148	stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1183	}	1149	}
1184		1150
1185	for (i = 11; i <= level; i++)	1151	stats.maxhp += 2 * max (0, level - 10);
1186	stats.maxhp += 2;
1187		1152
1188	if (stats.hp > stats.maxhp)	1153	if (stats.hp > stats.maxhp)
1189	stats.hp = stats.maxhp;	1154	stats.hp = stats.maxhp;
1190		1155
1191	/* Sp gain is controlled by the level of the player's	1156	/* Sp gain is controlled by the level of the player's
…		…
1204		1169
1205	if (mana_obj == this && type == PLAYER)	1170	if (mana_obj == this && type == PLAYER)
1206	stats.maxsp = 1;	1171	stats.maxsp = 1;
1207	else	1172	else
1208	{	1173	{
1209	sp_tmp = 0.f;	1174	float sp_tmp = 0.f;
1210		1175
1211	for (i = 1; i <= mana_obj->level && i <= 10; i++)	1176	for (int i = 1; i <= min (10, mana_obj->level); i++)
1212	{	1177	{
1213	float stmp;	1178	float stmp;
1214		1179
1215	/* Got some extra bonus at first level */	1180	/* Got some extra bonus at first level */
1216	if (i < 2)	1181	if (i < 2)
1217	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;	1182	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1218	else	1183	else
1219	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;	1184	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1220		1185
1221	if (stmp < 1.f)
1222	stmp = 1.f;
1223
1224	sp_tmp += stmp;	1186	sp_tmp += max (1.f, stmp);
1225	}	1187	}
1226		1188
1227	stats.maxsp = (sint16)sp_tmp;	1189	stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1228
1229	for (i = 11; i <= mana_obj->level; i++)
1230	stats.maxsp += 2;
1231	}	1190	}
1232		1191
1233	/* Characters can get their sp supercharged via rune of transferrance */	1192	/* Characters can get their sp supercharged via rune of transferrance */
1234	if (stats.sp > stats.maxsp * 2)	1193	stats.sp = min (stats.sp, stats.maxsp * 2);
1235	stats.sp = stats.maxsp * 2;
1236		1194
1237	/* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */	1195	/* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1238	if (!grace_obj || !grace_obj->level || type != PLAYER)	1196	if (!grace_obj || !grace_obj->level || type != PLAYER)
1239	grace_obj = this;	1197	grace_obj = this;
1240		1198
…		…
1245	/* store grace in a float - this way, the divisions below don't create	1203	/* store grace in a float - this way, the divisions below don't create
1246	* big jumps when you go from level to level - with int's, it then	1204	* big jumps when you go from level to level - with int's, it then
1247	* becomes big jumps when the sums of the bonuses jump to the next	1205	* becomes big jumps when the sums of the bonuses jump to the next
1248	* step of 8 - with floats, even fractional ones are useful.	1206	* step of 8 - with floats, even fractional ones are useful.
1249	*/	1207	*/
1250	sp_tmp = 0.f;	1208	float sp_tmp = 0.f;
1251	for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++)	1209
		1210	for (int i = 1; i <= min (10, grace_obj->level); i++)
1252	{	1211	{
1253	float grace_tmp = 0.f;	1212	float grace_tmp = 0.f;
1254		1213
1255	/* Got some extra bonus at first level */	1214	/* Got some extra bonus at first level */
1256	if (i < 2)	1215	if (i < 2)
1257	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;	1216	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1258	else	1217	else
1259	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;	1218	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1260		1219
1261	if (grace_tmp < 1.f)
1262	grace_tmp = 1.f;
1263
1264	sp_tmp += grace_tmp;	1220	sp_tmp += max (1.f, grace_tmp);
1265	}	1221	}
1266		1222
1267	stats.maxgrace = (sint16)sp_tmp;
1268
1269	/* two grace points per level after 11 */	1223	/* two grace points per level after 10 */
1270	for (i = 11; i <= grace_obj->level; i++)	1224	stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1271	stats.maxgrace += 2;
1272	}	1225	}
1273		1226
1274	/* No limit on grace vs maxgrace */	1227	/* No limit on grace vs maxgrace */
1275		1228
1276	if (contr->braced)	1229	if (contr->braced)
…		…
1296		1249
1297	if (contr && wc_obj && wc_obj->level > 1)	1250	if (contr && wc_obj && wc_obj->level > 1)
1298	{	1251	{
1299	wc -= wc_obj->level + thaco_bonus[stats.Str];	1252	wc -= wc_obj->level + thaco_bonus[stats.Str];
1300		1253
1301	for (i = 1; i < wc_obj->level; i++)	1254	for (int i = 1; i < wc_obj->level; i++)
1302	{	1255	{
1303	/* additional wc every 6 levels */	1256	/* additional wc every 6 levels */
1304	if (!(i % 6))	1257	if (!(i % 6))
1305	wc--;	1258	wc--;
1306		1259
…		…
1319		1272
1320	speed = 1.f + speed_bonus[stats.Dex];	1273	speed = 1.f + speed_bonus[stats.Dex];
1321		1274
1322	if (settings.search_items && contr->search_str[0])	1275	if (settings.search_items && contr->search_str[0])
1323	speed -= 1;	1276	speed -= 1;
1324
1325	if (attacktype == 0)
1326	attacktype = arch->attacktype;
1327	} /* End if player */	1277	} /* End if player */
1328		1278
1329	if (added_speed >= 0)	1279	if (added_speed >= 0)
1330	speed += added_speed / 10.f;	1280	speed += added_speed / 10.f;
1331	else /* Something wrong here...: */	1281	else /* Something wrong here...: */
1332	speed /= 1.f - added_speed;	1282	speed /= 1.f - added_speed;
1333		1283
1334	/* Max is determined by armour */	1284	/* Max is determined by armour */
1335	if (speed > max)	1285	speed = min (speed, max_speed);
1336	speed = max;
1337		1286
1338	if (type == PLAYER)	1287	if (type == PLAYER)
1339	{	1288	{
1340	/* f is a number the represents the number of kg above (positive num)	1289	/* f is a number the represents the number of kg above (positive num)
1341	* or below (negative number) that the player is carrying. If above	1290	* or below (negative number) that the player is carrying. If above
1342	* weight limit, then player suffers a speed reduction based on how	1291	* weight limit, then player suffers a speed reduction based on how
1343	* much above he is, and what is max carry is	1292	* much above he is, and what is max carry is
1344	*/	1293	*/
1345	f = (carrying / 1000) - max_carry[stats.Str];	1294	double f = weight_to_kg_approx (carrying) - max_carry[stats.Str];
1346	if (f > 0)	1295	if (f > 0.f)
1347	speed = speed / (1.f + f / max_carry[stats.Str]);	1296	speed /= (1.f + f / max_carry[stats.Str]);
1348	}	1297	}
1349		1298
1350	speed += bonus_speed / 10.f; /* Not affected by limits */	1299	speed += bonus_speed / 10.f; /* Not affected by limits */
		1300	speed *= speed_reduce_from_disease;
1351		1301
1352	/* Put a lower limit on speed. Note with this speed, you move once every	1302	/* Put a lower limit on speed. Note with this speed, you move once every
1353	* 100 ticks or so. This amounts to once every 12 seconds of realtime.	1303	* 25 ticks or so. This amounts to once every 3 seconds of realtime.
1354	*/	1304	*/
1355	speed = speed * speed_reduce_from_disease;	1305	max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1356		1306
1357	if (speed < 0.01f && type == PLAYER)	1307	if (speed != old_speed)
1358	speed = 0.01f;	1308	set_speed (speed);
1359		1309
1360	if (type == PLAYER)	1310	if (type == PLAYER)
1361	{	1311	{
1362	/* (This formula was made by vidarl@ifi.uio.no)	1312	/* (This formula was made by vidarl@ifi.uio.no)
1363	* Note that we never used these values again - basically	1313	* Note that we never used these values again - basically
…		…
1395	if (move_type == 0)	1345	if (move_type == 0)
1396	move_type = MOVE_WALK;	1346	move_type = MOVE_WALK;
1397	else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))	1347	else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1398	move_type &= ~MOVE_WALK;	1348	move_type &= ~MOVE_WALK;
1399		1349
1400	if (speed != old_speed)	1350	// now apply the new move_type
1401	set_speed (speed);	1351	if (this->move_type != move_type)
		1352	change_move_type (move_type);
1402		1353
1403	/* It is quite possible that a player's spell costing might have changed,	1354	/* It is quite possible that a player's spell costing might have changed,
1404	* so we will check that now.	1355	* so we will check that now.
1405	*/	1356	*/
1406	if (type == PLAYER)	1357	if (is_player ())
1407	{	1358	contr->update_spells ();
1408	esrv_update_stats (contr);
1409	esrv_update_spells (contr);
1410	}
1411		1359
1412	// update the mapspace, if we are on a map	1360	// update the mapspace, if we are on a map
1413	if (!flag [FLAG_REMOVED] && map)	1361	if (!flag [FLAG_REMOVED] && map)
1414	map->at (x, y).flags_ = 0;	1362	map->at (x, y).flags_ = 0;
		1363	}
		1364
		1365	void
		1366	object::set_glow_radius (sint8 rad)
		1367	{
		1368	glow_radius = rad;
		1369
		1370	if (is_on_map ())
		1371	update_all_los (map, x, y);
		1372	else if (object *env = outer_env ())
		1373	{
		1374	env->update_stats ();
		1375
		1376	if (env->is_on_map ())
		1377	update_all_los (env->map, env->x, env->y);
		1378	}
1415	}	1379	}
1416		1380
1417	/*	1381	/*
1418	* Returns true if the given player is a legal class.	1382	* Returns true if the given player is a legal class.
1419	* The function to add and remove class-bonuses to the stats doesn't	1383	* The function to add and remove class-bonuses to the stats doesn't
…		…
1435		1399
1436	/*	1400	/*
1437	* set the new dragon name after gaining levels or	1401	* set the new dragon name after gaining levels or
1438	* changing ability focus (later this can be extended to	1402	* changing ability focus (later this can be extended to
1439	* eventually change the player's face and animation)	1403	* eventually change the player's face and animation)
1440	*
1441	* Note that the title is written to 'own_title' in the
1442	* player struct. This should be changed to 'ext_title'
1443	* as soon as clients support this!
1444	* Please, anyone, write support for 'ext_title'.
1445	*/	1404	*/
1446	void	1405	void
1447	set_dragon_name (object *pl, const object *abil, const object *skin)	1406	set_dragon_name (object *pl, const object *abil, const object *skin)
1448	{	1407	{
1449	int atnr = -1; /* attacknumber of highest level */	1408	int atnr = -1; /* attacknumber of highest level */
…		…
1467	/* now if there are equals at highest level, pick the one with focus,	1426	/* now if there are equals at highest level, pick the one with focus,
1468	or else at random */	1427	or else at random */
1469	if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)	1428	if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1470	atnr = abil->stats.exp;	1429	atnr = abil->stats.exp;
1471		1430
1472	level = (int) (level / 5.);
1473
1474	/* now set the new title */	1431	/* now set the new title */
1475	if (pl->contr != NULL)
1476	{
1477	if (level == 0)
1478	sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);	1432	if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1479	else if (level == 1)
1480	sprintf (pl->contr->title, "%s wyrm", attacks[atnr]);	1433	else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1481	else if (level == 2)
1482	sprintf (pl->contr->title, "%s wyvern", attacks[atnr]);	1434	else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1483	else if (level == 3)
1484	sprintf (pl->contr->title, "%s dragon", attacks[atnr]);	1435	else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1485	else	1436	else
1486	{	1437	{
1487	/* special titles for extra high resistance! */	1438	/* special titles for extra high resistance! */
1488	if (skin->resist[atnr] > 80)
1489	sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);	1439	if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1490	else if (skin->resist[atnr] > 50)
1491	sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]);	1440	else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1492	else
1493	sprintf (pl->contr->title, "big %s dragon", attacks[atnr]);	1441	else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1494	}
1495	}	1442	}
1496		1443
1497	strcpy (pl->contr->own_title, "");	1444	strcpy (pl->contr->own_title, "");
1498	}	1445	}
1499		1446
1500	/*	1447	/*
1501	* This function is called when a dragon-player gains	1448	* This function is called when a dragon-player gains
1502	* an overall level. Here, the dragon might gain new abilities	1449	* an overall level. Here, the dragon might gain new abilities
1503	* or change the ability-focus.	1450	* or change the ability-focus.
1504	*/	1451	*/
1505	void	1452	static void
1506	dragon_level_gain (object *who)	1453	dragon_level_gain (object *who)
1507	{	1454	{
1508	object *abil = NULL; /* pointer to dragon ability force */	1455	object *abil = NULL; /* pointer to dragon ability force */
1509	object *skin = NULL; /* pointer to dragon skin force */	1456	object *skin = NULL; /* pointer to dragon skin force */
1510	object *tmp = NULL; /* tmp. object */	1457	object *tmp = NULL; /* tmp. object */
…		…
1566	object *skill_obj;	1513	object *skill_obj;
1567		1514
1568	skill_obj = get_archetype_by_skill_name (skill_name, SKILL);	1515	skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1569	if (!skill_obj)	1516	if (!skill_obj)
1570	{	1517	{
1571	LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name);	1518	LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1572	return NULL;	1519	return NULL;
1573	}	1520	}
1574		1521
1575	/* clear the flag - exp goes into this bucket, but player	1522	/* clear the flag - exp goes into this bucket, but player
1576	* still doesn't know it.	1523	* still doesn't know it.
1577	*/	1524	*/
1578	CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);	1525	skill_obj->clr_flag (FLAG_CAN_USE_SKILL);
1579	skill_obj->stats.exp = 0;	1526	skill_obj->stats.exp = 0;
1580	skill_obj->level = 1;	1527	skill_obj->level = 1;
1581	insert_ob_in_ob (skill_obj, op);	1528	op->insert (skill_obj);
1582		1529
1583	if (player *pl = op->contr)	1530	if (player *pl = op->contr)
1584	{	1531	pl->link_skills ();
1585	pl->last_skill_ob [skill_obj->subtype] = skill_obj;
1586	if (pl->ns)
1587	pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1588	}
1589		1532
1590	return skill_obj;	1533	return skill_obj;
1591	}	1534	}
1592		1535
1593	/* player_lvl_adj() - for the new exp system. we are concerned with	1536	/* player_lvl_adj() - for the new exp system. we are concerned with
…		…
1599	*/	1542	*/
1600	void	1543	void
1601	player_lvl_adj (object *who, object *op)	1544	player_lvl_adj (object *who, object *op)
1602	{	1545	{
1603	char buf[MAX_BUF];	1546	char buf[MAX_BUF];
		1547	bool changed = false;
1604		1548
1605	if (!op) /* when rolling stats */	1549	if (!op) /* when rolling stats */
1606	op = who;	1550	op = who;
1607		1551
1608	if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))	1552	while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1609	{	1553	{
		1554	changed = true;
		1555
1610	op->level++;	1556	op->level++;
1611		1557
1612	if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who))	1558	if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1613	dragon_level_gain (who);	1559	dragon_level_gain (who);
1614		1560
1615	/* Only roll these if it is the player (who) that gained the level */	1561	/* Only roll these if it is the player (who) that gained the level */
1616	if (op == who && (who->level < 11) && who->type == PLAYER)	1562	if (op == who && (who->level < 11) && who->type == PLAYER)
1617	{	1563	{
1618	who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;	1564	who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1619	who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);	1565	who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1620	who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;	1566	who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1621	}	1567	}
1622		1568
1623	who->update_stats ();
1624	if (op->level > 1)	1569	if (op->level > 1)
1625	{	1570	{
1626	if (op->type != PLAYER)	1571	if (op->type != PLAYER)
		1572	{
		1573	who->contr->play_sound (sound_find ("skill_up"));
1627	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);	1574	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
		1575	}
1628	else	1576	else
		1577	{
		1578	who->contr->play_sound (sound_find ("level_up"));
1629	sprintf (buf, "You are now level %d.", op->level);	1579	sprintf (buf, "You are now level %d.", op->level);
		1580	}
1630		1581
1631	if (who)	1582	if (who)
1632	new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);	1583	new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1633	}	1584	}
1634
1635	player_lvl_adj (who, op); /* To increase more levels */
1636	}	1585	}
		1586
1637	else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))	1587	while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1638	{	1588	{
		1589	changed = true;
		1590
1639	op->level--;	1591	op->level--;
1640	who->update_stats ();
1641		1592
1642	if (op->type != PLAYER)	1593	if (op->type != PLAYER)
1643	{	1594	{
1644	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);	1595	sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1645	new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);	1596	new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1646	}	1597	}
1647
1648	player_lvl_adj (who, op); /* To decrease more levels */
1649	}	1598	}
1650		1599
1651	/* check if the spell data has changed */	1600	if (changed)
1652	esrv_update_stats (who->contr);	1601	who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1653	esrv_update_spells (who->contr);
1654	}	1602	}
1655		1603
1656	/*	1604	/*
1657	* Returns how much experience is needed for a player to become	1605	* Returns how much experience is needed for a player to become
1658	* the given level. level should really never exceed max_level	1606	* the given level. level should really never exceed max_level
1659	*/	1607	*/
1660		1608
1661	sint64	1609	sint64
1662	level_exp (int level, double expmul)	1610	level_exp (int level, double expmul)
1663	{	1611	{
1664	if (level > settings.max_level)	1612	return expmul * level_to_min_exp (level);
1665	return (sint64) (expmul * levels[settings.max_level]);
1666
1667	return (sint64) (expmul * levels[level]);
1668	}	1613	}
1669		1614
1670	/*	1615	/*
1671	* Ensure that the permanent experience requirements in an exp object are met.	1616	* Ensure that the permanent experience requirements in an exp object are met.
1672	* This really just checks 'op to make sure the perm_exp value is within	1617	* This really just checks 'op to make sure the perm_exp value is within
…		…
1700	* NULL, in which case exp increases the players general	1645	* NULL, in which case exp increases the players general
1701	* total, but not any particular skill.	1646	* total, but not any particular skill.
1702	* flag is what to do if the player doesn't have the skill:	1647	* flag is what to do if the player doesn't have the skill:
1703	*/	1648	*/
1704	static void	1649	static void
1705	add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)	1650	add_player_exp (object *op, sint64 exp, shstr_tmp skill_name, int flag)
1706	{	1651	{
1707	object *skill_obj = NULL;	1652	object *skill_obj;
1708	sint64 limit, exp_to_add;	1653	sint64 limit, exp_to_add;
1709	int i;
1710		1654
1711	/* prevents some forms of abuse. */	1655	/* prevents some forms of abuse. */
1712	if (op->contr->braced)	1656	if (op->contr->braced)
1713	exp /= 5;	1657	exp /= 5;
1714		1658
1715	/* Try to find the matching skill.	1659	/* Try to find the matching skill.
1716	* We do a shortcut/time saving mechanism first - see if it matches	1660	* We do a shortcut/time saving mechanism first - see if it matches
1717	* chosen_skill. This means we don't need to search through	1661	* chosen_skill. This means we don't need to search through
1718	* the players inventory.	1662	* the players inventory.
1719	*/	1663	*/
		1664	skill_obj = 0;
		1665
1720	if (skill_name)	1666	if (skill_name)
1721	{	1667	{
1722	if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill))	1668	skill_obj = op->contr->find_skill (skill_name);
1723	skill_obj = op->chosen_skill;
1724	else
1725	{
1726	for (i = 0; i < NUM_SKILLS; i++)
1727	if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1728	{
1729	skill_obj = op->contr->last_skill_ob[i];
1730	break;
1731	}
1732		1669
1733	/* Player doesn't have the skill. Check to see what to do, and give	1670	/* Player doesn't have the skill. Check to see what to do, and give
1734	* it to the player if necessary	1671	* it to the player if necessary
1735	*/	1672	*/
1736	if (!skill_obj)	1673	if (!skill_obj)
1737	{	1674	{
1738	if (flag == SK_EXP_NONE)	1675	if (flag == SK_EXP_NONE)
1739	return;	1676	return;
		1677
1740	else if (flag == SK_EXP_ADD_SKILL)	1678	if (flag == SK_EXP_ADD_SKILL)
1741	give_skill_by_name (op, skill_name);	1679	skill_obj = give_skill_by_name (op, skill_name);
1742	}
1743	}	1680	}
1744	}	1681	}
1745		1682
1746	if (flag != SK_EXP_SKILL_ONLY)	1683	if (flag != SK_EXP_SKILL_ONLY)
1747	{	1684	{
1748	/* Basically, you can never gain more experience in one shot	1685	/* Basically, you can never gain more experience in one shot
1749	* than half what you need to gain for next level.	1686	* than half what you need to gain for next level.
1750	*/	1687	*/
1751	exp_to_add = exp;	1688	exp_to_add = exp;
1752	limit = (levels[op->level + 1] - levels[op->level]) / 2;	1689	limit = (levels [op->level + 1] - levels [op->level]) / 2;
1753	if (exp_to_add > limit)	1690	if (exp_to_add > limit)
1754	exp_to_add = limit;	1691	exp_to_add = limit;
1755		1692
1756	ADD_EXP (op->stats.exp, (sint64) ((float) exp_to_add * (skill_obj ? skill_obj->expmul : 1)));	1693	ADD_EXP (op->stats.exp, (sint64) ((float) exp_to_add * (skill_obj ? skill_obj->expmul : 1)));
1757	if (settings.permanent_exp_ratio)	1694	if (settings.permanent_exp_ratio)
…		…
1764	}	1701	}
1765		1702
1766	if (skill_obj)	1703	if (skill_obj)
1767	{	1704	{
1768	exp_to_add = exp;	1705	exp_to_add = exp;
1769	limit = (levels[skill_obj->level + 1] - levels[skill_obj->level]) / 2;	1706	limit = (levels [skill_obj->level + 1] - levels [skill_obj->level]) / 2;
1770	if (exp_to_add > limit)	1707	if (exp_to_add > limit)
1771	exp_to_add = limit;	1708	exp_to_add = limit;
1772		1709
1773	ADD_EXP (skill_obj->stats.exp, exp_to_add);	1710	ADD_EXP (skill_obj->stats.exp, exp_to_add);
1774	if (settings.permanent_exp_ratio)	1711	if (settings.permanent_exp_ratio)
…		…
1780	player_lvl_adj (op, skill_obj);	1717	player_lvl_adj (op, skill_obj);
1781	}	1718	}
1782	}	1719	}
1783		1720
1784	/* This function checks to make sure that object 'op' can	1721	/* This function checks to make sure that object 'op' can
1785	* lost 'exp' experience. It returns the amount of exp	1722	* lose 'exp' experience. It returns the amount of exp
1786	* object 'op' can in fact lose - it basically makes	1723	* object 'op' can in fact lose - it basically makes
1787	* adjustments based on permanent exp and the like.	1724	* adjustments based on permanent exp and the like.
1788	* This function should always be used for losing experience -	1725	* This function should always be used for losing experience -
1789	* the 'exp' value passed should be positive - this is the	1726	* the 'exp' value passed should be positive - this is the
1790	* amount that should get subtract from the player.	1727	* amount that should get subtract from the player.
1791	*/	1728	*/
1792	sint64	1729	static sint64
1793	check_exp_loss (const object *op, sint64 exp)	1730	check_exp_loss (const object *op, sint64 exp)
1794	{	1731	{
1795	sint64 del_exp;	1732	sint64 del_exp;
1796		1733
1797	if (exp > op->stats.exp)	1734	if (exp > op->stats.exp)
1798	exp = op->stats.exp;	1735	exp = op->stats.exp;
		1736
1799	if (settings.permanent_exp_ratio)	1737	if (settings.permanent_exp_ratio)
1800	{	1738	{
1801	del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);	1739	del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
		1740
1802	if (del_exp < 0)	1741	if (del_exp < 0)
1803	del_exp = 0;	1742	del_exp = 0;
		1743
1804	if (exp > del_exp)	1744	if (exp > del_exp)
1805	exp = del_exp;	1745	exp = del_exp;
1806	}	1746	}
		1747
1807	return exp;	1748	return exp;
1808	}	1749	}
1809		1750
1810	sint64	1751	sint64
1811	check_exp_adjust (const object *op, sint64 exp)	1752	check_exp_adjust (const object *op, sint64 exp)
1812	{	1753	{
1813	if (exp < 0)	1754	if (exp < 0)
1814	return check_exp_loss (op, exp);	1755	return check_exp_loss (op, exp);
1815	else	1756	else
1816	return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp);	1757	return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1817	}	1758	}
1818
1819		1759
1820	/* Subtracts experience from player.	1760	/* Subtracts experience from player.
1821	* if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we	1761	* if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1822	* only subtract from the matching skill. Otherwise,	1762	* only subtract from the matching skill. Otherwise,
1823	* this subtracts a portion from all	1763	* this subtracts a portion from all
…		…
1828	* where everything is at the minimum perm exp, he would lose nothing.	1768	* where everything is at the minimum perm exp, he would lose nothing.
1829	* exp is the amount of exp to subtract - thus, it should be	1769	* exp is the amount of exp to subtract - thus, it should be
1830	* a postive number.	1770	* a postive number.
1831	*/	1771	*/
1832	static void	1772	static void
1833	subtract_player_exp (object *op, sint64 exp, const char *skill, int flag)	1773	subtract_player_exp (object *op, sint64 exp, shstr_tmp skill, int flag)
1834	{	1774	{
1835	float fraction = (float) exp / (float) op->stats.exp;	1775	float fraction = (float) exp / (float) op->stats.exp;
1836	object *tmp;	1776	object *tmp;
1837	sint64 del_exp;	1777	sint64 del_exp;
1838		1778
1839	for (tmp = op->inv; tmp; tmp = tmp->below)	1779	for (tmp = op->inv; tmp; tmp = tmp->below)
1840	if (tmp->type == SKILL && tmp->stats.exp)	1780	if (tmp->type == SKILL && tmp->stats.exp)
1841	{	1781	{
1842	if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill))	1782	if (flag == SK_SUBTRACT_SKILL_EXP && skill && tmp->skill == skill)
1843	{	1783	{
1844	del_exp = check_exp_loss (tmp, exp);	1784	del_exp = check_exp_loss (tmp, exp);
1845	tmp->stats.exp -= del_exp;	1785	tmp->stats.exp -= del_exp;
1846	player_lvl_adj (op, tmp);	1786	player_lvl_adj (op, tmp);
1847	}	1787	}
1848	else if (flag != SK_SUBTRACT_SKILL_EXP)	1788	else if (flag != SK_SUBTRACT_SKILL_EXP)
1849	{	1789	{
1850	/* only want to process other skills if we are not trying	1790	/* only want to process other skills if we are not trying
1851	* to match a specific skill.	1791	* to match a specific skill.
1852	*/	1792	*/
1853	del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction));	1793	del_exp = check_exp_loss (tmp, tmp->stats.exp * fraction);
1854	tmp->stats.exp -= del_exp;	1794	tmp->stats.exp -= del_exp;
1855	player_lvl_adj (op, tmp);	1795	player_lvl_adj (op, tmp);
1856	}	1796	}
1857	}	1797	}
1858		1798
…		…
1872	* skill_name is the skill that should get the exp added.	1812	* skill_name is the skill that should get the exp added.
1873	* flag is what to do if player doesn't have the skill.	1813	* flag is what to do if player doesn't have the skill.
1874	* these last two values are only used for players.	1814	* these last two values are only used for players.
1875	*/	1815	*/
1876	void	1816	void
1877	change_exp (object *op, sint64 exp, const char *skill_name, int flag)	1817	change_exp (object *op, sint64 exp, shstr_tmp skill_name, int flag)
1878	{	1818	{
1879	#ifdef EXP_DEBUG	1819	#ifdef EXP_DEBUG
1880	LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);	1820	LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
1881	#endif	1821	#endif
1882		1822
…		…
1899	* worth.	1839	* worth.
1900	*/	1840	*/
1901	if (op->type != PLAYER)	1841	if (op->type != PLAYER)
1902	{	1842	{
1903	/* Sanity check */	1843	/* Sanity check */
1904	if (!QUERY_FLAG (op, FLAG_ALIVE))	1844	if (!op->flag [FLAG_ALIVE])
1905	return;	1845	return;
1906		1846
1907	/* reset exp to max allowed value. We subtract from	1847	/* reset exp to max allowed value. We subtract from
1908	* MAX_EXPERIENCE to prevent overflows. If the player somehow has	1848	* MAX_EXPERIENCE to prevent overflows. If the player somehow has
1909	* more than max exp, just return.	1849	* more than max exp, just return.
…		…
1935	* amount of permenent experience, whichever gives the lowest loss.	1875	* amount of permenent experience, whichever gives the lowest loss.
1936	*/	1876	*/
1937	void	1877	void
1938	apply_death_exp_penalty (object *op)	1878	apply_death_exp_penalty (object *op)
1939	{	1879	{
1940	object *tmp;
1941	sint64 loss;	1880	sint64 loss;
1942	sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */	1881	sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
1943	sint64 level_loss; /* defined by the setting 'death_penalty_levels */	1882	sint64 level_loss; /* defined by the setting 'death_penalty_levels */
1944		1883
1945	for (tmp = op->inv; tmp; tmp = tmp->below)	1884	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1946	if (tmp->type == SKILL && tmp->stats.exp)	1885	if (tmp->type == SKILL && tmp->stats.exp)
1947	{	1886	{
1948
1949	percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;	1887	percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
1950	level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)];	1888	level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
1951		1889
1952	/* With the revised exp system, you can get cases where	1890	/* With the revised exp system, you can get cases where
1953	* losing several levels would still require that you have more	1891	* losing several levels would still require that you have more
1954	* exp than you currently have - this is true if the levels	1892	* exp than you currently have - this is true if the levels
1955	* tables is a lot harder.	1893	* tables is a lot harder.
1956	*/	1894	*/
1957	if (level_loss < 0)	1895	if (level_loss < 0)
1958	level_loss = 0;	1896	level_loss = 0;
1959		1897
1960	loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss));	1898	loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
1961		1899
1962	tmp->stats.exp -= loss;	1900	tmp->stats.exp -= loss;
1963	player_lvl_adj (op, tmp);	1901	player_lvl_adj (op, tmp);
1964	}	1902	}
1965		1903
1966	percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;	1904	percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
1967	level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)];	1905	level_loss = op->stats.exp - levels [max (0, op->level - settings.death_penalty_level)];
1968		1906
1969	if (level_loss < 0)	1907	if (level_loss < 0)
1970	level_loss = 0;	1908	level_loss = 0;
		1909
1971	loss = check_exp_loss (op, MIN (level_loss, percentage_loss));	1910	loss = check_exp_loss (op, min (level_loss, percentage_loss));
1972		1911
1973	op->stats.exp -= loss;	1912	op->stats.exp -= loss;
1974	player_lvl_adj (op, NULL);	1913	player_lvl_adj (op, NULL);
1975	}	1914	}
1976		1915

Diff Legend

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