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.23 by pippijn, Wed Jan 3 00:21:35 2007 UTC vs.
Revision 1.128 by root, Mon Oct 29 23:55:52 2012 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
10	(at your option) any later version.	11	* option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
18	along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
20		21	*
21	The authors can be reached via e-mail at <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	*/
…		…
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
…		…
191	static const char *const drain_msg[NUM_STATS] = {	189	static const char *const drain_msg[NUM_STATS] = {
192	"Oh no! You are weakened!",	190	"Oh no! You are weakened!",
193	"You're feeling clumsy!",	191	"You're feeling clumsy!",
194	"You feel less healthy",	192	"You feel less healthy",
195	"You suddenly begin to lose your memory!",	193	"You suddenly begin to lose your memory!",
		194	"Watch out, your mind is going!",
		195	"Your spirit feels drained!",
196	"Your face gets distorted!",	196	"Your face gets distorted!",
197	"Watch out, your mind is going!",
198	"Your spirit feels drained!"
199	};	197	};
200	const char *const restore_msg[NUM_STATS] = {	198	const char *const restore_msg[NUM_STATS] = {
201	"You feel your strength return.",	199	"You feel your strength return.",
202	"You feel your agility return.",	200	"You feel your agility return.",
203	"You feel your health return.",	201	"You feel your health return.",
		202	"You feel your memory return.",
204	"You feel your wisdom return.",	203	"You feel your wisdom return.",
		204	"You feel your spirits return.",
205	"You feel your charisma return.",	205	"You feel your charisma return.",
206	"You feel your memory return.",
207	"You feel your spirits return."
208	};	206	};
209	const char *const gain_msg[NUM_STATS] = {	207	const char *const gain_msg[NUM_STATS] = {
210	"You feel stronger.",	208	"You feel stronger.",
211	"You feel more agile.",	209	"You feel more agile.",
212	"You feel healthy.",	210	"You feel healthy.",
		211	"You feel smarter.",
213	"You feel wiser.",	212	"You feel wiser.",
		213	"You feel more potent.",
214	"You seem to look better.",	214	"You seem to look better.",
215	"You feel smarter.",
216	"You feel more potent."
217	};	215	};
218	const char *const lose_msg[NUM_STATS] = {	216	const char *const lose_msg[NUM_STATS] = {
219	"You feel weaker!",	217	"You feel weaker!",
220	"You feel clumsy!",	218	"You feel clumsy!",
221	"You feel less healthy!",	219	"You feel less healthy!",
		220	"You feel stupid!",
222	"You lose some of your memory!",	221	"You lose some of your memory!",
		222	"You feel less potent!",
223	"You look ugly!",	223	"You look ugly!",
224	"You feel stupid!",
225	"You feel less potent!"
226	};	224	};
227		225
228	const char *const statname[NUM_STATS] = {	226	const char *const statname[NUM_STATS] = {
229	"strength", "dexterity", "constitution", "intelligence", "wisdom", "power", "charisma"	227	"strength", "dexterity", "constitution", "intelligence", "wisdom", "power", "charisma"
230	};	228	};
231		229
232	const char *const short_stat_name[NUM_STATS] = {	230	const char *const short_stat_name[NUM_STATS] = {
233	"Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha"	231	"Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha"
234	};	232	};
235
236	/*
237	* sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on
238	* what attr is (STR to POW).
239	*/
240	void
241	set_attr_value (living *stats, int attr, sint8 value)
242	{
243	switch (attr)
244	{
245	case STR:
246	stats->Str = value;
247	break;
248	case DEX:
249	stats->Dex = value;
250	break;
251	case CON:
252	stats->Con = value;
253	break;
254	case WIS:
255	stats->Wis = value;
256	break;
257	case POW:
258	stats->Pow = value;
259	break;
260	case CHA:
261	stats->Cha = value;
262	break;
263	case INT:
264	stats->Int = value;
265	break;
266	}
267	}
268		233
269	/*	234	/*
270	* Like set_attr_value(), but instead the value (which can be negative)	235	* Like set_attr_value(), but instead the value (which can be negative)
271	* is added to the specified stat.	236	* is added to the specified stat.
272	*/	237	*/
273	void	238	void
274	change_attr_value (living *stats, int attr, sint8 value)	239	change_attr_value (living *stats, int attr, sint8 value)
275	{	240	{
276	if (value == 0)	241	stats->stat (attr) += value;
277	return;
278
279	switch (attr)
280	{
281	case STR:
282	stats->Str += value;
283	break;
284	case DEX:
285	stats->Dex += value;
286	break;
287	case CON:
288	stats->Con += value;
289	break;
290	case WIS:
291	stats->Wis += value;
292	break;
293	case POW:
294	stats->Pow += value;
295	break;
296	case CHA:
297	stats->Cha += value;
298	break;
299	case INT:
300	stats->Int += value;
301	break;
302	default:
303	LOG (llevError, "Invalid attribute in change_attr_value: %d\n", attr);
304	}
305	}
306
307	/*
308	* returns the specified stat. See also set_attr_value().
309	*/
310
311	sint8
312	get_attr_value (const living *stats, int attr)
313	{
314	switch (attr)
315	{
316	case STR: return stats->Str;
317	case DEX: return stats->Dex;
318	case CON: return stats->Con;
319	case WIS: return stats->Wis;
320	case CHA: return stats->Cha;
321	case INT: return stats->Int;
322	case POW: return stats->Pow;
323	}
324
325	return 0;
326	}	242	}
327		243
328	/*	244	/*
329	* Ensures that all stats (str/dex/con/wis/cha/int) are within the	245	* Ensures that all stats (str/dex/con/wis/cha/int) are within the
330	* 1-30 stat limit.	246	* 1-30 stat limit.
331	*/	247	*/
332
333	void	248	void
334	check_stat_bounds (living *stats)	249	check_stat_bounds (living *stats)
335	{	250	{
336	int i, v;
337
338	for (i = 0; i < NUM_STATS; i++)	251	for (int i = 0; i < NUM_STATS; i++)
339	if ((v = get_attr_value (stats, i)) > MAX_STAT)	252	{
340	set_attr_value (stats, i, MAX_STAT);	253	sint8 &v = stats->stat (i);
341	else if (v < MIN_STAT)	254	v = clamp (v, MIN_STAT, MAX_STAT);
342	set_attr_value (stats, i, MIN_STAT);	255	}
343	}	256	}
344		257
345	#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc)	258	#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc)
346		259
347	/* 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,
348	* 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
349	* 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.
350	*/	263	*/
351	#define DIFF_MSG(flag, msg1, msg2) \	264	#define DIFF_MSG(flag, msg1, msg2) \
352	new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2);	265	new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
353		266
354	/* 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. */
355		268
356	/* 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
357	* the object.	270	* the object.
358	* It is the calling functions responsibilty to check to see if the object	271	* It is the calling functions responsibilty to check to see if the object
359	* can be applied or not.	272	* can be applied or not.
360	* The main purpose of calling this function is the messages that are	273	* The main purpose of calling this function is the messages that are
361	* displayed - fix_player should really always be called after this when	274	* displayed - update_stats should really always be called after this when
362	* removing an object - that is because it is impossible to know if some object	275	* removing an object - that is because it is impossible to know if some object
363	* is the only source of an attacktype or spell attunement, so this function	276	* is the only source of an attacktype or spell attunement, so this function
364	* will clear the bits, but the player may still have some other object	277	* will clear the bits, but the player may still have some other object
365	* that gives them that ability.	278	* that gives them that ability.
366	*/	279	*/
367	int	280	int
368	change_abil (object *op, object *tmp)	281	change_abil (object *op, object *tmp)
369	{	282	{
370	int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, i, j, success = 0;	283	int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1;
		284	int success = 0;
371	char message[MAX_BUF];	285	char message[MAX_BUF];
372	int potion_max = 0;	286	int potion_max = 0;
373		287
374	/* remember what object was like before it was changed. note that	288	// keep some stats for comparison purposes
375	* refop is a local copy of op only to be used for detecting changes	289	object::flags_t prev_flag = op->flag;
376	* found by update_stats. refop is not a real object	290	MoveType prev_move_type = op->move_type;
377	*/	291	sint16 prev_resist [NROFATTACKS]; // clumsy
378	object_copy refop = *op;	292	assert (sizeof (prev_resist) == sizeof (op->resist));
		293	memcpy (prev_resist, op->resist, sizeof (prev_resist));
379		294
380	if (op->type == PLAYER)	295	if (op->type == PLAYER)
381	{	296	{
382	if (tmp->type == POTION)	297	if (tmp->type == POTION)
383	{	298	{
384	potion_max = 1;	299	potion_max = 1;
		300
385	for (j = 0; j < NUM_STATS; j++)	301	for (int j = 0; j < NUM_STATS; j++)
386	{	302	{
387	int nstat, ostat;	303	int ostat = op->contr->orig_stats.stat (j);
388		304	int i = tmp->stats.stat (j);
389	ostat = get_attr_value (&(op->contr->orig_stats), j);
390	i = get_attr_value (&(tmp->stats), j);
391		305
392	/* nstat is what the stat will be after use of the potion */	306	/* nstat is what the stat will be after use of the potion */
393	nstat = flag * i + ostat;	307	int nstat = flag * i + ostat;
394		308
395	/* Do some bounds checking. While I don't think any	309	/* Do some bounds checking. There is the potential for potions
396	* potions do so right now, there is the potential for potions
397	* 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
398	* to allow for that.	311	* to allow for that.
399	*/	312	*/
400	if (nstat < 1 && i * flag < 0)	313	if (nstat < 1 && i * flag < 0)
401	nstat = 1;	314	nstat = 1;
402	else if (nstat > 20 + get_attr_value (&(op->arch->clone.stats), j))	315	else if (nstat > 20 + op->arch->stats.stat (j))
403	{	316	nstat = 20 + op->arch->stats.stat (j);
404	nstat = 20 + get_attr_value (&(op->arch->clone.stats), j);
405	}
406		317
407	if (nstat != ostat)	318	if (nstat != ostat)
408	{	319	{
409	set_attr_value (&(op->contr->orig_stats), j, nstat);	320	op->contr->orig_stats.stat (j) = nstat;
410	potion_max = 0;	321	potion_max = 0;
411	}	322	}
412	else if (i)	323	else if (i)
413	{	324	{
414	/* potion is useless - player has already hit the natural maximum */	325	/* potion is useless - player has already hit the natural maximum */
…		…
418		329
419	/* This section of code ups the characters normal stats also. I am not	330	/* This section of code ups the characters normal stats also. I am not
420	* sure if this is strictly necessary, being that fix_player probably	331	* sure if this is strictly necessary, being that fix_player probably
421	* recalculates this anyway.	332	* recalculates this anyway.
422	*/	333	*/
423	for (j = 0; j < NUM_STATS; j++)	334	for (int j = 0; j < NUM_STATS; j++)
424	change_attr_value (&(op->stats), j, flag * get_attr_value (&(tmp->stats), j));	335	change_attr_value (&op->stats, j, flag * tmp->stats.stat (j));
425		336
426	check_stat_bounds (&(op->stats));	337	check_stat_bounds (&op->stats);
427	} /* end of potion handling code */	338	} /* end of potion handling code */
428	}	339	}
429		340
430	/* reset attributes that fix_player doesn't reset since it doesn't search	341	/* reset attributes that update_stats doesn't reset since it doesn't search
431	* everything to set	342	* everything to set
432	*/	343	*/
433	if (flag == -1)	344	if (flag == -1)
434	{	345	{
435	op->attacktype &= ~tmp->attacktype;	346	op->attacktype &= ~tmp->attacktype;
436	op->path_attuned &= ~tmp->path_attuned;	347	op->path_attuned &= ~tmp->path_attuned;
437	op->path_repelled &= ~tmp->path_repelled;	348	op->path_repelled &= ~tmp->path_repelled;
438	op->path_denied &= ~tmp->path_denied;	349	op->path_denied &= ~tmp->path_denied;
439	/* Presuming here that creatures only have move_type,	350	/* Presuming here that creatures only have move_type,
440	* and not the other move_ fields.	351	* and not the other move_ fields.
441	*/	352	*/
442	op->move_type &= ~tmp->move_type;	353	op->move_type &= ~tmp->move_type;
443	}	354	}
444		355
445	/* call fix_player since op object could have whatever attribute due	356	/* call fix_player since op object could have whatever attribute due
446	* to multiple items. if fix_player always has to be called after	357	* to multiple items. if update_stats always has to be called after
447	* change_ability then might as well call it from here	358	* change_ability then might as well call it from here
448	*/	359	*/
449	op->update_stats ();	360	op->update_stats ();
450		361
451	/* Fix player won't add the bows ability to the player, so don't	362	/* update_stats won't add the bows ability to the player, so don't
452	* print out message if this is a bow.	363	* print out message if this is a bow.
453	*/	364	*/
454	if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)	365	if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)
455	{	366	{
456	success = 1;	367	success = 1;
457	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.");
458	}	369	}
459		370
460	if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE))	371	if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
461	{	372	{
462	success = 1;	373	success = 1;
463	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.");
464	}	375	}
465		376
466	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])
467	{	378	{
468	success = 1;	379	success = 1;
469	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.");
470	}	381	}
471		382
472	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])
473	{	384	{
474	success = 1;	385	success = 1;
475	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.");
476	}	387	}
477		388
…		…
479	* user has multiple items giving the same type appled like we	390	* user has multiple items giving the same type appled like we
480	* 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
481	* can be misleading (a little higher could be miscontrued from	392	* can be misleading (a little higher could be miscontrued from
482	* from fly high)	393	* from fly high)
483	*/	394	*/
484	if (tmp->move_type && op->move_type != refop.move_type)	395	if (tmp->move_type && op->move_type != prev_move_type)
485	{	396	{
486	success = 1;	397	success = 1;
487		398
488	/* 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
489	* status doesn't make a difference if you are flying high	400	* status doesn't make a difference if you are flying high
490	*/	401	*/
491	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))
492	{	403	{
493	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.");
494	}	405	}
495		406
496	if (tmp->move_type & MOVE_FLY_HIGH)	407	if (tmp->move_type & MOVE_FLY_HIGH)
497	{	408	{
498	/* double conditional - second case covers if you have move_fly_low -	409	/* double conditional - second case covers if you have move_fly_low -
499	* in that case, you don't actually land	410	* in that case, you don't actually land
500	*/	411	*/
501	DIFF_MSG (flag, "You soar into the air air!.",	412	DIFF_MSG (flag, "You soar into the air!",
502	(op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));	413	(op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
503	}	414	}
		415
504	if (tmp->move_type & MOVE_SWIM)	416	if (tmp->move_type & MOVE_SWIM)
505	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");
506
507	/* Changing move status may mean you are affected by things you weren't before */
508	check_move_on (op, op);
509	}	418	}
510		419
511	/* becoming UNDEAD... a special treatment for this flag. Only those not	420	/* becoming UNDEAD... a special treatment for this flag. Only those not
512	* originally undead may change their status	421	* originally undead may change their status
513	*/	422	*/
514	if (!QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	423	if (!op->arch->flag [FLAG_UNDEAD])
515	if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD))	424	if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
516	{	425	{
517	success = 1;	426	success = 1;
518	if (flag > 0)	427	if (flag > 0)
519	{	428	{
520	op->race = "undead";	429	op->race = "undead";
521	new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");	430	new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");
522	}	431	}
523	else	432	else
524	{	433	{
525	op->race = op->arch->clone.race;	434	op->race = op->arch->race;
526	new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");	435	new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
527	}	436	}
528	}	437	}
529		438
530	if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH))	439	if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
531	{	440	{
532	success = 1;	441	success = 1;
533	DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");	442	DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
534	}	443	}
535		444
536	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])
537	{	446	{
538	success = 1;	447	success = 1;
539	DIFF_MSG (flag, "You become transparent.", "You can see yourself.");	448	DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
540	}	449	}
541		450
542	/* 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
543	* vision	452	* vision
544	*/	453	*/
545	if (QUERY_FLAG (tmp, FLAG_BLIND))	454	if (tmp->flag [FLAG_BLIND])
546	{	455	{
547	success = 1;	456	success = 1;
548	if (flag > 0)	457	if (flag > 0)
549	{	458	{
550	if (QUERY_FLAG (op, FLAG_WIZ))	459	if (op->flag [FLAG_WIZ])
551	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.");
552	else	461	else
553	{	462	{
554	new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");	463	new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
555	SET_FLAG (op, FLAG_BLIND);	464	op->set_flag (FLAG_BLIND);
556	if (op->type == PLAYER)	465	if (op->type == PLAYER)
557	op->contr->do_los = 1;	466	op->contr->do_los = 1;
558	}	467	}
559	}	468	}
560	else	469	else
561	{	470	{
562	if (QUERY_FLAG (op, FLAG_WIZ))	471	if (op->flag [FLAG_WIZ])
563	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.");
564	else	473	else
565	{	474	{
566	new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");	475	new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
567	CLEAR_FLAG (op, FLAG_BLIND);	476	op->clr_flag (FLAG_BLIND);
568	if (op->type == PLAYER)	477	if (op->type == PLAYER)
569	op->contr->do_los = 1;	478	op->contr->do_los = 1;
570	}	479	}
571	}	480	}
572	}	481	}
573		482
574	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])
575	{	484	{
576	success = 1;	485	success = 1;
577	if (op->type == PLAYER)	486	if (op->type == PLAYER)
578	op->contr->do_los = 1;	487	op->contr->do_los = 1;
579	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.");
580	}	489	}
581		490
582	if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS))	491	if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
583	{	492	{
584	success = 1;	493	success = 1;
585	if (flag > 0)	494	if (flag > 0)
586	{	495	{
587	if (QUERY_FLAG (op, FLAG_WIZ))	496	if (op->flag [FLAG_WIZ])
588	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.");
589	else	498	else
590	{	499	{
591	new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");	500	new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
592	if (op->type == PLAYER)	501	if (op->type == PLAYER)
593	op->contr->do_los = 1;	502	op->contr->do_los = 1;
594	}	503	}
595	}	504	}
596	else	505	else
597	{	506	{
598	if (QUERY_FLAG (op, FLAG_WIZ))	507	if (op->flag [FLAG_WIZ])
599	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.");
600	else	509	else
601	{	510	{
602	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.");
603	if (op->type == PLAYER)	512	if (op->type == PLAYER)
…		…
610	{	519	{
611	success = 1;	520	success = 1;
612	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.");
613	}	522	}
614		523
		524	if (digest_types [tmp->type])
		525	{
615	if (tmp->stats.hp && op->type == PLAYER)	526	if (tmp->stats.hp && op->type == PLAYER)
616	{	527	{
617	success = 1;	528	success = 1;
618	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!");
619	}	530	}
620		531
621	if (tmp->stats.sp && op->type == PLAYER && tmp->type != SKILL)	532	if (tmp->stats.sp && op->type == PLAYER
622	{	533	&& tmp->type != SKILL && tmp->type != BOW)
		534	{
623	success = 1;	535	success = 1;
624	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.");
625	}	537	}
626		538
627	/* for the future when artifacts set this -b.t. */	539	/* for the future when artifacts set this -b.t. */
628	if (tmp->stats.grace && op->type == PLAYER)	540	if (tmp->stats.grace && op->type == PLAYER)
629	{	541	{
630	success = 1;	542	success = 1;
631	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.");
632	}	544	}
633		545
634	if (tmp->stats.food && op->type == PLAYER)	546	if (tmp->stats.food && op->type == PLAYER)
635	{	547	{
636	success = 1;	548	success = 1;
637	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	}
638	}	551	}
639		552
640	/* Messages for changed resistance */	553	/* Messages for changed resistance */
641	for (i = 0; i < NROFATTACKS; i++)	554	for (int i = 0; i < NROFATTACKS; i++)
642	{	555	{
643	if (i == ATNR_PHYSICAL)	556	if (i == ATNR_PHYSICAL)
644	continue; /* Don't display about armour */	557	continue; /* Don't display about armour */
645		558
646	if (op->resist[i] != refop.resist[i])	559	if (op->resist [i] != prev_resist [i])
647	{	560	{
648	success = 1;	561	success = 1;
		562
649	if (op->resist[i] > refop.resist[i])	563	if (op->resist [i] > prev_resist [i])
650	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]);
651	else	565	else
652	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]);
653		567
654	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);	568	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
655	}	569	}
656	}	570	}
657		571
658	if (!potion_max)	572	if (!potion_max)
659	{
660	for (j = 0; j < NUM_STATS; j++)	573	for (int j = 0; j < NUM_STATS; j++)
661	{	574	if (int i = tmp->stats.stat (j))
662	if ((i = get_attr_value (&(tmp->stats), j)) != 0)
663	{	575	{
664	success = 1;	576	success = 1;
665	DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);	577	DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
666	}	578	}
667	}
668	}
669		579
670	return success;	580	return success;
671	}	581	}
672		582
673	/*	583	/*
674	* Stat draining by Vick 930307	584	* Stat draining by Vick 930307
675	* (Feeling evil, I made it work as well now. -Frank 8)	585	* (Feeling evil, I made it work as well now. -Frank 8)
676	*/	586	*/
677
678	void	587	void
679	object::drain_stat ()	588	object::drain_stat ()
680	{	589	{
681	drain_specific_stat (RANDOM () % NUM_STATS);	590	drain_specific_stat (rndm (NUM_STATS));
682	}	591	}
683		592
684	void	593	void
685	object::drain_specific_stat (int deplete_stats)	594	object::drain_specific_stat (int deplete_stats)
686	{	595	{
687	object *tmp;	596	object *tmp;
688	archetype *at;	597	archetype *at;
689		598
690	at = archetype::find (ARCH_DEPLETION);	599	at = archetype::find (shstr_depletion);
691	if (!at)	600	if (!at)
692	{	601	{
693	LOG (llevError, "Couldn't find archetype depletion.\n");	602	LOG (llevError, "Couldn't find archetype depletion.\n");
694	return;	603	return;
695	}	604	}
…		…
697	{	606	{
698	tmp = present_arch_in_ob (at, this);	607	tmp = present_arch_in_ob (at, this);
699		608
700	if (!tmp)	609	if (!tmp)
701	{	610	{
702	tmp = arch_to_object (at);	611	tmp = at->instance ();
703	tmp = insert_ob_in_ob (tmp, this);	612	tmp = insert_ob_in_ob (tmp, this);
704	SET_FLAG (tmp, FLAG_APPLIED);	613	tmp->set_flag (FLAG_APPLIED);
705	}	614	}
706	}	615	}
707		616
708	new_draw_info (NDI_UNIQUE, 0, this, drain_msg[deplete_stats]);	617	new_draw_info (NDI_UNIQUE, 0, this, drain_msg[deplete_stats]);
709	change_attr_value (&tmp->stats, deplete_stats, -1);	618	change_attr_value (&tmp->stats, deplete_stats, -1);
…		…
715	* via an applied bad_luck object.	624	* via an applied bad_luck object.
716	*/	625	*/
717	void	626	void
718	object::change_luck (int value)	627	object::change_luck (int value)
719	{	628	{
720	archetype *at = archetype::find ("luck");	629	archetype *at = archetype::find (shstr_luck);
721	if (!at)	630	if (!at)
722	LOG (llevError, "Couldn't find archetype luck.\n");	631	LOG (llevError, "Couldn't find archetype luck.\n");
723	else	632	else
724	{	633	{
725	object *tmp = present_arch_in_ob (at, this);	634	object *tmp = present_arch_in_ob (at, this);
…		…
727	if (!tmp)	636	if (!tmp)
728	{	637	{
729	if (!value)	638	if (!value)
730	return;	639	return;
731		640
732	tmp = arch_to_object (at);	641	tmp = at->instance ();
733	tmp = insert_ob_in_ob (tmp, this);	642	tmp = insert_ob_in_ob (tmp, this);
734	SET_FLAG (tmp, FLAG_APPLIED);	643	tmp->set_flag (FLAG_APPLIED);
735	}	644	}
736		645
737	if (value)	646	if (value)
738	{	647	{
739	/* 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
…		…
754	return;	663	return;
755		664
756	/* Randomly change the players luck. Basically, we move it	665	/* Randomly change the players luck. Basically, we move it
757	* back neutral (if greater>0, subtract, otherwise add)	666	* back neutral (if greater>0, subtract, otherwise add)
758	*/	667	*/
759	if (RANDOM () % (FABS (tmp->stats.luck)) >= RANDOM () % 30)	668	if (rndm (abs (tmp->stats.luck)) >= rndm (30))
760	{	669	{
761	int diff = tmp->stats.luck > 0 ? -1 : 1;	670	int diff = tmp->stats.luck > 0 ? -1 : 1;
762		671
763	stats.luck += diff;	672	stats.luck += diff;
764	tmp->stats.luck += diff;	673	tmp->stats.luck += diff;
…		…
771	* Subtracts stat-bonuses given by the class which the player has chosen.	680	* Subtracts stat-bonuses given by the class which the player has chosen.
772	*/	681	*/
773	void	682	void
774	object::remove_statbonus ()	683	object::remove_statbonus ()
775	{	684	{
776	stats.Str -= arch->clone.stats.Str;	685	for (int i = 0; i < NUM_STATS; ++i)
777	stats.Dex -= arch->clone.stats.Dex;	686	{
778	stats.Con -= arch->clone.stats.Con;	687	sint8 v = arch->stats.stat (i);
779	stats.Wis -= arch->clone.stats.Wis;	688	stats.stat (i) -= v;
780	stats.Pow -= arch->clone.stats.Pow;	689	contr->orig_stats.stat (i) -= v;
781	stats.Cha -= arch->clone.stats.Cha;	690	}
782	stats.Int -= arch->clone.stats.Int;
783
784	contr->orig_stats.Str -= arch->clone.stats.Str;
785	contr->orig_stats.Dex -= arch->clone.stats.Dex;
786	contr->orig_stats.Con -= arch->clone.stats.Con;
787	contr->orig_stats.Wis -= arch->clone.stats.Wis;
788	contr->orig_stats.Pow -= arch->clone.stats.Pow;
789	contr->orig_stats.Cha -= arch->clone.stats.Cha;
790	contr->orig_stats.Int -= arch->clone.stats.Int;
791	}	691	}
792		692
793	/*	693	/*
794	* Adds stat-bonuses given by the class which the player has chosen.	694	* Adds stat-bonuses given by the class which the player has chosen.
795	*/	695	*/
796	void	696	void
797	object::add_statbonus ()	697	object::add_statbonus ()
798	{	698	{
799	stats.Str += arch->clone.stats.Str;	699	for (int i = 0; i < NUM_STATS; ++i)
800	stats.Dex += arch->clone.stats.Dex;	700	{
801	stats.Con += arch->clone.stats.Con;	701	sint8 v = arch->stats.stat (i);
802	stats.Wis += arch->clone.stats.Wis;	702	stats.stat (i) += v;
803	stats.Pow += arch->clone.stats.Pow;	703	contr->orig_stats.stat (i) += v;
804	stats.Cha += arch->clone.stats.Cha;	704	}
805	stats.Int += arch->clone.stats.Int;
806
807	contr->orig_stats.Str += arch->clone.stats.Str;
808	contr->orig_stats.Dex += arch->clone.stats.Dex;
809	contr->orig_stats.Con += arch->clone.stats.Con;
810	contr->orig_stats.Wis += arch->clone.stats.Wis;
811	contr->orig_stats.Pow += arch->clone.stats.Pow;
812	contr->orig_stats.Cha += arch->clone.stats.Cha;
813	contr->orig_stats.Int += arch->clone.stats.Int;
814	}	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;
815		720
816	/*	721	/*
817	* Updates all abilities given by applied objects in the inventory	722	* Updates all abilities given by applied objects in the inventory
818	* of the given object. Note: This function works for both monsters	723	* of the given object. Note: This function works for both monsters
819	* 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.
820	* This functions starts from base values (archetype or player object)	725	* This functions starts from base values (archetype or player object)
821	* and then adjusts them according to what the player has equipped.	726	* and then adjusts them according to what the player has equipped.
822	*/	727	*
823
824	/* July 95 - inserted stuff to handle new skills/exp system - b.t.	728	* July 95 - inserted stuff to handle new skills/exp system - b.t.
825	spell system split, grace points now added to system --peterm	729	* spell system split, grace points now added to system --peterm
826	*/	730	*/
827
828	void	731	void
829	object::update_stats ()	732	object::update_stats ()
830	{	733	{
831	int i, j;
832	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;
833	int weapon_weight = 0, weapon_speed = 0;	735	int weapon_weight = 0, weapon_speed = 0;
834	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;	736	int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
835	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];	737	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
836	object *grace_obj = NULL, *mana_obj = NULL, *wc_obj = NULL, *tmp;	738	object *grace_obj = NULL, *mana_obj = NULL, *tmp;
		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
837		743
838	/* 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 */
839	if (type == PLAYER)	745	if (type == PLAYER)
840	{	746	{
		747	contr->delayed_update = false;
		748
841	for (i = 0; i < NUM_STATS; i++)	749	for (int i = 0; i < NUM_STATS; i++)
842	set_attr_value (&(stats), i, get_attr_value (&(contr->orig_stats), i));	750	stat_sum [i] = contr->orig_stats.stat (i);
843		751
844	if (settings.spell_encumbrance == TRUE)	752	if (settings.spell_encumbrance == TRUE)
845	contr->encumbrance = 0;	753	contr->encumbrance = 0;
846		754
847	attacktype = 0;	755	attacktype = 0;
		756
848	contr->digestion = 0;	757	contr->digestion = 0;
849	contr->gen_hp = 0;	758	contr->gen_hp = 0;
850	contr->gen_sp = 0;	759	contr->gen_sp = 0;
851	contr->gen_grace = 0;	760	contr->gen_grace = 0;
852	contr->gen_sp_armour = 10;	761	contr->gen_sp_armour = 10;
853	contr->item_power = 0;	762	contr->item_power = 0;
854
855	/* Don't clobber all the range_ values. range_golem otherwise
856	* gets reset for no good reason, and we don't want to reset
857	* range_magic (what spell is readied). These three below
858	* well get filled in based on what the player has equipped.
859	*/
860	contr->ranges[range_bow] = NULL;
861	contr->ranges[range_misc] = NULL;
862	contr->ranges[range_skill] = NULL;
863	}	763	}
864		764
865	memcpy (body_used, body_info, sizeof (body_info));	765	for (int i = NUM_BODY_LOCATIONS; i--; )
		766	slot[i].used = slot[i].info;
866		767
867	slaying = 0;	768	slaying = 0;
868		769
869	if (!QUERY_FLAG (this, FLAG_WIZ))	770	if (!this->flag [FLAG_WIZ])
870	{
871	CLEAR_FLAG (this, FLAG_XRAYS);
872	CLEAR_FLAG (this, FLAG_MAKE_INVIS);
873	}	771	{
		772	this->clr_flag (FLAG_XRAYS);
		773	this->clr_flag (FLAG_MAKE_INVIS);
		774	}
874		775
875	CLEAR_FLAG (this, FLAG_LIFESAVE);	776	this->clr_flag (FLAG_LIFESAVE);
876	CLEAR_FLAG (this, FLAG_STEALTH);	777	this->clr_flag (FLAG_STEALTH);
877	CLEAR_FLAG (this, FLAG_BLIND);	778	this->clr_flag (FLAG_BLIND);
878		779
879	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);	780	if (!arch->flag [FLAG_REFL_SPELL ]) this->clr_flag (FLAG_REFL_SPELL);
880	if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);	781	if (!arch->flag [FLAG_REFL_MISSILE]) this->clr_flag (FLAG_REFL_MISSILE);
881	if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);	782	if (!arch->flag [FLAG_UNDEAD ]) this->clr_flag (FLAG_UNDEAD);
882	if (!QUERY_FLAG (&arch->clone, 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);
883		784
884	path_attuned = arch->clone.path_attuned;	785	path_attuned = arch->path_attuned;
885	path_repelled = arch->clone.path_repelled;	786	path_repelled = arch->path_repelled;
886	path_denied = arch->clone.path_denied;	787	path_denied = arch->path_denied;
887	glow_radius = arch->clone.glow_radius;	788	glow_radius = arch->glow_radius;
888	move_type = arch->clone.move_type;	789	move_type = arch->move_type;
889	chosen_skill = NULL;
890		790
891	/* initializing resistances from the values in player/monster's	791	/* initializing resistances from the values in player/monster's
892	* archetype clone	792	* archetype clone
893	*/	793	*/
894	memcpy (&resist, &arch->clone.resist, sizeof (resist));	794	memcpy (&resist, &arch->resist, sizeof (resist));
895		795
896	for (i = 0; i < NROFATTACKS; i++)	796	for (int i = 0; i < NROFATTACKS; i++)
897	{	797	{
898	if (resist[i] > 0)	798	if (resist[i] > 0)
899	prot[i] = resist[i], vuln[i] = 0;	799	prot[i] = resist[i], vuln[i] = 0;
900	else	800	else
901	vuln[i] = -(resist[i]), prot[i] = 0;	801	vuln[i] = -resist[i], prot[i] = 0;
		802
902	potion_resist[i] = 0;	803	potion_resist[i] = -1000;
903	}	804	}
904		805
905	wc = arch->clone.stats.wc;	806	wc = arch->stats.wc;
906	stats.dam = arch->clone.stats.dam;	807	stats.dam = arch->stats.dam;
907		808
908	/* for players which cannot use armour, they gain AC -1 per 3 levels,	809	/* for players which cannot use armour, they gain AC -1 per 3 levels,
909	* plus a small amount of physical resist, those poor suckers. ;)	810	* plus a small amount of physical resist, those poor suckers. ;)
910	* 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 -
911	* 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,
912	* 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
913	* that their protection from physical goes down	814	* that their protection from physical goes down
914	*/	815	*/
915	if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)	816	if (!this->flag [FLAG_USE_ARMOUR] && type == PLAYER)
916	{	817	{
917	ac = MAX (-10, arch->clone.stats.ac - level / 3);	818	ac = max (-10, arch->stats.ac - level / 3);
918	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;
919	}	820	}
920	else	821	else
921	ac = arch->clone.stats.ac;	822	ac = arch->stats.ac;
922		823
923	stats.luck = arch->clone.stats.luck;	824	stats.luck = arch->stats.luck;
924	speed = arch->clone.speed;	825	speed = arch->speed;
		826
		827	chosen_skill = 0;
925		828
926	/* 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.
927	* 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.
928	*/	831	*/
929
930	for (tmp = inv; tmp; tmp = tmp->below)	832	for (tmp = inv; tmp; tmp = tmp->below)
931	{	833	{
932	/* See note in map.c:update_position about making this additive
933	* since light sources are never applied, need to put check here.
934	*/
935	if (tmp->glow_radius > glow_radius)
936	glow_radius = tmp->glow_radius;
937
938	/* This happens because apply_potion calls change_abil with the potion	834	/* This happens because apply_potion calls change_abil with the potion
939	* applied so we can tell the player what chagned. But change_abil	835	* applied so we can tell the player what changed. But change_abil
940	* then calls this function.	836	* then calls this function.
941	*/	837	*/
942	if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)	838	if (tmp->flag [FLAG_APPLIED] && tmp->type == POTION)
943	continue;	839	continue;
		840
		841	glow_radius += tmp->glow_radius;
944		842
945	/* For some things, we don't care what is equipped */	843	/* For some things, we don't care what is equipped */
946	if (tmp->type == SKILL)	844	if (tmp->type == SKILL)
947	{	845	{
948	/* Want to take the highest skill here. */	846	/* Want to take the highest skill here. */
…		…
961	else if (tmp->level > grace_obj->level)	859	else if (tmp->level > grace_obj->level)
962	grace_obj = tmp;	860	grace_obj = tmp;
963	}	861	}
964	}	862	}
965		863
966	/* Container objects are not meant to adjust a players, but other applied	864	/* Container objects are not meant to adjust players, but other applied
967	* objects need to make adjustments.	865	* objects need to make adjustments.
968	* This block should handle all player specific changes	866	* This block should handle all player specific changes
969	* 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
970	* in the praying skill, and the player should always get those.	868	* in the praying skill, and the player should always get those.
971	* 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,
972	* because the skill shouldn't count against body positions being used	870	* because the skill shouldn't count against body positions being used
973	* up, etc.	871	* up, etc.
974	*/	872	*/
975	if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) ||	873	if ((tmp->flag [FLAG_APPLIED]
		874	&& tmp->type != CONTAINER
		875	&& tmp->type != CLOSE_CON
		876	&& tmp->type != SPELL)
976	(tmp->type == SKILL && tmp->subtype == SK_PRAYING))	877	|| (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
977	{	878	{
978	if (type == PLAYER)	879	if (type == PLAYER)
979	{	880	{
980	if (tmp->type == BOW)	881	contr->item_power += tmp->item_power;
981	contr->ranges[range_bow] = tmp;
982		882
983	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
984	contr->ranges[range_misc] = tmp;
985
986	for (i = 0; i < NUM_STATS; i++)	883	for (int i = 0; i < NUM_STATS; i++)
987	change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), i));	884	stat_sum [i] += tmp->stats.stat (i);
988		885
989	/* these are the items that currently can change digestion, regeneration,	886	if (digest_types [tmp->type])
990	* spell point recovery and mana point recovery. Seems sort of an arbitary
991	* list, but other items store other info into stats array.
992	*/
993	if ((tmp->type == WEAPON) ||
994	(tmp->type == ARMOUR) || (tmp->type == HELMET) ||
995	(tmp->type == SHIELD) || (tmp->type == RING) ||
996	(tmp->type == BOOTS) || (tmp->type == GLOVES) ||
997	(tmp->type == AMULET) || (tmp->type == GIRDLE) ||
998	(tmp->type == BRACERS) || (tmp->type == CLOAK) ||
999	(tmp->type == DISEASE) || (tmp->type == FORCE) ||
1000	(tmp->type == SKILL))
1001	{	887	{
1002	contr->digestion += tmp->stats.food;	888	contr->digestion += tmp->stats.food;
1003	contr->gen_hp += tmp->stats.hp;	889	contr->gen_hp += tmp->stats.hp;
		890	if (tmp->type != BOW) // ugly exception for bows
1004	contr->gen_sp += tmp->stats.sp;	891	contr->gen_sp += tmp->stats.sp;
1005	contr->gen_grace += tmp->stats.grace;	892	contr->gen_grace += tmp->stats.grace;
1006	contr->gen_sp_armour += tmp->gen_sp_armour;	893	contr->gen_sp_armour += tmp->gen_sp_armour;
1007	contr->item_power += tmp->item_power;
1008	}	894	}
1009	} /* if this is a player */	895	} /* if this is a player */
		896	else
		897	{
		898	if (tmp->type == WEAPON)
		899	current_weapon = tmp;
		900	}
1010		901
1011	/* Update slots used for items */	902	/* Update slots used for items */
1012	if (QUERY_FLAG (tmp, FLAG_APPLIED))	903	if (tmp->flag [FLAG_APPLIED]) // exclude praying...
1013	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	904	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1014	body_used[i] += tmp->body_info[i];	905	slot[i].used += tmp->slot[i].info;
1015		906
1016	if (tmp->type == SYMPTOM)	907	if (tmp->type == SYMPTOM)
1017	{
1018	speed_reduce_from_disease = tmp->last_sp / 100.0;	908	min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
1019	if (speed_reduce_from_disease == 0)
1020	speed_reduce_from_disease = 1;
1021	}
1022		909
1023	/* Pos. and neg. protections are counted seperate (-> pro/vuln).	910	/* Pos. and neg. protections are counted separate (-> pro/vuln).
1024	* (Negative protections are calculated extactly like positive.)	911	* (Negative protections are calculated exactly like positive.)
1025	* Resistance from potions are treated special as well. If there's	912	* Resistance from potions are treated special as well. If there's
1026	* more than one potion-effect, the bigger prot.-value is taken.	913	* more than one potion-effect, the bigger prot.-value is taken.
1027	*/	914	*/
		915	if (tmp->type == POTION_EFFECT)
		916	for (int i = 0; i < NROFATTACKS; i++)
		917	max_it (potion_resist[i], tmp->resist[i]);
1028	if (tmp->type != POTION)	918	else if (tmp->type != POTION)
		919	for (int i = 0; i < NROFATTACKS; i++)
		920	if (tmp->resist[i] > 0)
		921	prot[i] += (100 - prot[i]) * tmp->resist[i] / 100;
		922	else if (tmp->resist[i] < 0)
		923	vuln[i] += (100 - vuln[i]) * -tmp->resist[i] / 100;
		924
		925	/* There may be other things that should not adjust the attacktype */
		926	if (tmp->type != SYMPTOM)
1029	{	927	{
1030	for (i = 0; i < NROFATTACKS; i++)	928	attacktype |= tmp->attacktype;
1031	{	929	path_attuned |= tmp->path_attuned;
1032	/* Potential for cursed potions, in which case we just can use	930	path_repelled |= tmp->path_repelled;
1033	* a straight MAX, as potion_resist is initialised to zero.	931	path_denied |= tmp->path_denied;
1034	*/	932	move_type |= tmp->move_type;
1035	if (tmp->type == POTION_EFFECT)	933	stats.luck += tmp->stats.luck;
1036	{
1037	if (potion_resist[i])
1038	potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]);
1039	else
1040	potion_resist[i] = tmp->resist[i];
1041	}
1042	else if (tmp->resist[i] > 0)
1043	prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
1044	else if (tmp->resist[i] < 0)
1045	vuln[i] += ((100 - vuln[i]) * (-tmp->resist[i])) / 100;
1046	}
1047	}	934	}
1048		935
1049	/* There may be other things that should not adjust the attacktype */	936	flag |= tmp->flag & copy_flags;
1050	if (tmp->type != BOW && tmp->type != SYMPTOM)
1051	attacktype |= tmp->attacktype;
1052		937
1053	path_attuned |= tmp->path_attuned;	938	if (tmp->flag [FLAG_UNDEAD] && !arch->flag [FLAG_UNDEAD])
1054	path_repelled |= tmp->path_repelled;	939	this->set_flag (FLAG_UNDEAD);
1055	path_denied |= tmp->path_denied;
1056	stats.luck += tmp->stats.luck;
1057	move_type |= tmp->move_type;
1058		940
1059	if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);	941	//TODO: copy_flags?
1060	if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);	942	if (tmp->flag [FLAG_MAKE_INVIS])
1061	if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1062	if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
1063	if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
1064	if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
1065	if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
1066
1067	if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD))
1068	SET_FLAG (this, FLAG_UNDEAD);
1069
1070	if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
1071	{	943	{
1072	SET_FLAG (this, FLAG_MAKE_INVIS);	944	set_flag (FLAG_MAKE_INVIS);
1073	invisible = 1;	945	invisible = 1;
1074	}	946	}
1075		947
1076	if (tmp->stats.exp && tmp->type != SKILL)	948	if (tmp->stats.exp && tmp->type != SKILL)
1077	{	949	{
1078	if (tmp->stats.exp > 0)	950	if (tmp->stats.exp > 0)
1079	{	951	{
1080	added_speed += (float) tmp->stats.exp / 3.0;	952	added_speed += tmp->stats.exp / 3.f;
1081	bonus_speed += 1.0 + (float) tmp->stats.exp / 3.0;	953	bonus_speed += tmp->stats.exp / 3.f + 1.f;
1082	}	954	}
1083	else	955	else
1084	added_speed += (float) tmp->stats.exp;	956	added_speed += tmp->stats.exp;
1085	}	957	}
1086		958
1087	switch (tmp->type)	959	switch (tmp->type)
1088	{	960	{
1089	/* skills modifying the character -b.t. */
1090	/* for all skills and skill granting objects */
1091	case SKILL:	961	case SKILL:
1092	if (!QUERY_FLAG (tmp, FLAG_APPLIED))	962	{
		963	// some skills will end up here without counting as "applied"
		964	if (!tmp->flag [FLAG_APPLIED] || skill_flags [tmp->subtype] & SF_AUTARK)
1093	break;	965	break;
1094		966
1095	if (IS_COMBAT_SKILL (tmp->subtype))
1096	wc_obj = tmp;
1097
1098	if (chosen_skill)	967	if (chosen_skill)
		968	{
1099	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);	969	LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
		970	&name, &chosen_skill->name, &tmp->name);
1100		971
		972	tmp->flag [FLAG_APPLIED] = false;
		973	update_stats ();
		974	return;
		975	}
		976
1101	chosen_skill = tmp;	977	chosen_skill = tmp;
1102		978
1103	if (tmp->stats.dam > 0)	979	if (tmp->stats.dam > 0)
1104	{ /* skill is a 'weapon' */	980	{ /* skill is a 'weapon' */
1105	if (!QUERY_FLAG (this, FLAG_READY_WEAPON))	981	if (!this->flag [FLAG_READY_WEAPON])
1106	weapon_speed = (int) WEAPON_SPEED (tmp);	982	weapon_speed = max (0, WEAPON_SPEED (tmp));
1107		983
1108	if (weapon_speed < 0)
1109	weapon_speed = 0;
1110
1111	weapon_weight = tmp->weight;	984	weapon_weight = tmp->weight;
1112	stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9));	985	stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1113		986
1114	if (tmp->magic)	987	if (tmp->magic)
1115	stats.dam += tmp->magic;	988	stats.dam += tmp->magic;
1116	}	989	}
1117		990
1118	if (tmp->stats.wc)	991	if (tmp->stats.wc)
1119	wc -= (tmp->stats.wc + tmp->magic);	992	wc -= tmp->stats.wc + tmp->magic;
1120		993
1121	if (tmp->slaying != NULL)	994	if (tmp->slaying)
1122	slaying = tmp->slaying;	995	slaying = tmp->slaying;
1123		996
1124	if (tmp->stats.ac)	997	if (tmp->stats.ac)
1125	ac -= (tmp->stats.ac + tmp->magic);	998	ac -= tmp->stats.ac + tmp->magic;
1126		999
1127	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1000	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1128	contr->encumbrance += (int) 3 *tmp->weight / 1000;	1001	contr->encumbrance += 3 * tmp->weight / 1000;
1129
1130	if (type == PLAYER)
1131	contr->ranges[range_skill] = this;
1132
1133	break;	1002	}
1134		1003
1135	case SKILL_TOOL:
1136	if (chosen_skill)
1137	LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1138
1139	chosen_skill = tmp;
1140
1141	if (type == PLAYER)
1142	contr->ranges[range_skill] = this;
1143	break;	1004	break;
1144		1005
1145	case SHIELD:	1006	case SHIELD:
1146	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1007	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1147	contr->encumbrance += (int) tmp->weight / 2000;	1008	contr->encumbrance += tmp->weight / 2000;
		1009	//FALLTHROUGH
1148	case RING:	1010	case RING:
1149	case AMULET:	1011	case AMULET:
1150	case GIRDLE:	1012	case GIRDLE:
1151	case HELMET:	1013	case HELMET:
1152	case BOOTS:	1014	case BOOTS:
1153	case GLOVES:	1015	case GLOVES:
1154	case CLOAK:	1016	case CLOAK:
1155	if (tmp->stats.wc)	1017	if (tmp->stats.wc)
1156	wc -= (tmp->stats.wc + tmp->magic);	1018	wc -= tmp->stats.wc + tmp->magic;
1157		1019
1158	if (tmp->stats.dam)	1020	if (tmp->stats.dam)
1159	stats.dam += (tmp->stats.dam + tmp->magic);	1021	stats.dam += tmp->stats.dam + tmp->magic;
1160		1022
1161	if (tmp->stats.ac)	1023	if (tmp->stats.ac)
1162	ac -= (tmp->stats.ac + tmp->magic);	1024	ac -= tmp->stats.ac + tmp->magic;
1163		1025
1164	break;	1026	break;
1165		1027
		1028	case RANGED:
		1029	case BOW:
1166	case WEAPON:	1030	case WEAPON:
1167	wc -= (tmp->stats.wc + tmp->magic);	1031	wc -= tmp->stats.wc + tmp->magic;
1168		1032
1169	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)	1033	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1170	ac -= tmp->stats.ac + tmp->magic;	1034	ac -= tmp->stats.ac + tmp->magic;
1171		1035
1172	stats.dam += (tmp->stats.dam + tmp->magic);	1036	stats.dam += tmp->stats.dam + tmp->magic;
1173	weapon_weight = tmp->weight;	1037	weapon_weight = tmp->weight;
1174	weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;	1038	weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1175		1039
1176	if (weapon_speed < 0)	1040	if (weapon_speed < 0)
1177	weapon_speed = 0;	1041	weapon_speed = 0;
1178		1042
1179	slaying = tmp->slaying;	1043	slaying = tmp->slaying;
		1044
1180	/* If there is desire that two handed weapons should do	1045	/* If there is desire that two handed weapons should do
1181	* extra strength damage, this is where the code should	1046	* extra strength damage, this is where the code should
1182	* go.	1047	* go.
1183	*/	1048	*/
1184	current_weapon = tmp;	1049
		1050	if (type == PLAYER)
1185	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1051	if (settings.spell_encumbrance)
1186	contr->encumbrance += (int) 3 *tmp->weight / 1000;	1052	contr->encumbrance += tmp->weight * 3 / 1000;
1187		1053
1188	break;	1054	break;
1189		1055
1190	case ARMOUR: /* Only the best of these three are used: */	1056	case ARMOUR: /* Only the best of these three are used: */
1191	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1057	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1192	contr->encumbrance += (int) tmp->weight / 1000;	1058	contr->encumbrance += tmp->weight / 1000;
1193		1059
1194	case BRACERS:	1060	case BRACERS:
1195	case FORCE:	1061	case FORCE:
1196	if (tmp->stats.wc)	1062	if (tmp->stats.wc)
1197	{	1063	{
…		…
1214	else /* To nullify the below effect */	1080	else /* To nullify the below effect */
1215	ac += tmp->stats.ac + tmp->magic;	1081	ac += tmp->stats.ac + tmp->magic;
1216	}	1082	}
1217		1083
1218	if (tmp->stats.wc)	1084	if (tmp->stats.wc)
1219	wc -= (tmp->stats.wc + tmp->magic);	1085	wc -= tmp->stats.wc + tmp->magic;
1220		1086
1221	if (tmp->stats.ac)	1087	if (tmp->stats.ac)
1222	ac -= (tmp->stats.ac + tmp->magic);	1088	ac -= tmp->stats.ac + tmp->magic;
1223		1089
1224	if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.0 < max)	1090	if (ARMOUR_SPEED (tmp))
1225	max = ARMOUR_SPEED (tmp) / 10.0;	1091	min_it (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1226		1092
1227	break;	1093	break;
1228	} /* switch tmp->type */	1094	} /* switch tmp->type */
1229	} /* item is equipped */	1095	} /* item is equipped */
1230	} /* for loop of items */	1096	} /* for loop of items */
		1097
		1098	min_it (glow_radius, MAX_LIGHT_RADIUS);
1231		1099
1232	/* 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
1233	* have generated intermediate values which we now need to assign.	1101	* have generated intermediate values which we now need to assign.
1234	*/	1102	*/
1235		1103
…		…
1237	* If there is an uncursed potion in effect, granting more protection	1105	* If there is an uncursed potion in effect, granting more protection
1238	* than that, we take: 'total resistance = resistance from potion'.	1106	* than that, we take: 'total resistance = resistance from potion'.
1239	* 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
1240	* 'total resistance = vulnerability from cursed potion'.	1108	* 'total resistance = vulnerability from cursed potion'.
1241	*/	1109	*/
1242	for (i = 0; i < NROFATTACKS; i++)	1110	for (int i = 0; i < NROFATTACKS; i++)
1243	{	1111	{
1244	resist[i] = prot[i] - vuln[i];	1112	resist[i] = prot[i] - vuln[i];
1245		1113
1246	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]))
1247	resist[i] = potion_resist[i];	1116	resist[i] = potion_resist[i];
1248	}	1117	}
1249		1118
1250	/* Figure out the players sp/mana/hp totals. */
1251	if (type == PLAYER)	1119	if (type == PLAYER)
1252	{	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. */
1253	int pl_level;	1130	int pl_level;
1254		1131
1255	check_stat_bounds (&(stats));
1256	pl_level = level;
1257
1258	if (pl_level < 1)
1259	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! */
1260		1133
1261	/* 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,
1262	* 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.
1263	*/	1136	*/
1264	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++)
1265	{	1139	{
1266	j = contr->levhp[i] + con_bonus[stats.Con] / 2;	1140	int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1267		1141
1268	if (i % 2 && con_bonus[stats.Con] % 2)	1142	if (i % 2 && con_bonus[stats.Con] % 2)
1269	{
1270	if (con_bonus[stats.Con] > 0)	1143	if (con_bonus[stats.Con] > 0)
1271	j++;	1144	j++;
1272	else	1145	else
1273	j--;	1146	j--;
1274	}
1275		1147
1276	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 */
1277	}	1149	}
1278		1150
1279	for (i = 11; i <= level; i++)	1151	stats.maxhp += 2 * max (0, level - 10);
1280	stats.maxhp += 2;
1281		1152
1282	if (stats.hp > stats.maxhp)	1153	if (stats.hp > stats.maxhp)
1283	stats.hp = stats.maxhp;	1154	stats.hp = stats.maxhp;
1284		1155
1285	/* Sp gain is controlled by the level of the player's	1156	/* Sp gain is controlled by the level of the player's
…		…
1298		1169
1299	if (mana_obj == this && type == PLAYER)	1170	if (mana_obj == this && type == PLAYER)
1300	stats.maxsp = 1;	1171	stats.maxsp = 1;
1301	else	1172	else
1302	{	1173	{
1303	sp_tmp = 0.0;	1174	float sp_tmp = 0.f;
1304		1175
1305	for (i = 1; i <= mana_obj->level && i <= 10; i++)	1176	for (int i = 1; i <= min (10, mana_obj->level); i++)
1306	{	1177	{
1307	float stmp;	1178	float stmp;
1308		1179
1309	/* Got some extra bonus at first level */	1180	/* Got some extra bonus at first level */
1310	if (i < 2)	1181	if (i < 2)
1311	stmp = contr->levsp[i] + ((2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 6.0);	1182	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1312	else	1183	else
1313	stmp = (float) contr->levsp[i] + (2.0 * (float) sp_bonus[stats.Pow] + (float) sp_bonus[stats.Int]) / 12.0;	1184	stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1314		1185
1315	if (stmp < 1.0)
1316	stmp = 1.0;
1317
1318	sp_tmp += stmp;	1186	sp_tmp += max (1.f, stmp);
1319	}	1187	}
1320		1188
1321	stats.maxsp = (int) sp_tmp;	1189	stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1322
1323	for (i = 11; i <= mana_obj->level; i++)
1324	stats.maxsp += 2;
1325	}	1190	}
		1191
1326	/* Characters can get their sp supercharged via rune of transferrance */	1192	/* Characters can get their sp supercharged via rune of transferrance */
1327	if (stats.sp > stats.maxsp * 2)	1193	stats.sp = min (stats.sp, stats.maxsp * 2);
1328	stats.sp = stats.maxsp * 2;
1329		1194
1330	/* 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 */
1331	if (!grace_obj || !grace_obj->level || type != PLAYER)	1196	if (!grace_obj || !grace_obj->level || type != PLAYER)
1332	grace_obj = this;	1197	grace_obj = this;
1333		1198
…		…
1338	/* 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
1339	* 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
1340	* 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
1341	* step of 8 - with floats, even fractional ones are useful.	1206	* step of 8 - with floats, even fractional ones are useful.
1342	*/	1207	*/
1343	sp_tmp = 0.0;	1208	float sp_tmp = 0.f;
1344	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++)
1345	{	1211	{
1346	float grace_tmp = 0.0;	1212	float grace_tmp = 0.f;
1347		1213
1348	/* Got some extra bonus at first level */	1214	/* Got some extra bonus at first level */
1349	if (i < 2)	1215	if (i < 2)
1350	grace_tmp = contr->levgrace[i] + (((float) grace_bonus[stats.Pow] +	1216	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1351	2.0 * (float) grace_bonus[stats.Wis]) / 6.0);
1352	else	1217	else
1353	grace_tmp = (float) contr->levgrace[i]
1354	+ ((float) grace_bonus[stats.Pow] + 2.0 * (float) grace_bonus[stats.Wis]) / 12.0;	1218	grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1355		1219
1356	if (grace_tmp < 1.0)
1357	grace_tmp = 1.0;
1358
1359	sp_tmp += grace_tmp;	1220	sp_tmp += max (1.f, grace_tmp);
1360	}	1221	}
1361		1222
1362	stats.maxgrace = (int) sp_tmp;
1363
1364	/* two grace points per level after 11 */	1223	/* two grace points per level after 10 */
1365	for (i = 11; i <= grace_obj->level; i++)	1224	stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1366	stats.maxgrace += 2;
1367	}	1225	}
		1226
1368	/* No limit on grace vs maxgrace */	1227	/* No limit on grace vs maxgrace */
1369		1228
1370	if (contr->braced)	1229	if (contr->braced)
1371	{	1230	{
1372	ac += 2;	1231	ac += 2;
…		…
1384	* improvement every level, now its fighterlevel/5. So	1243	* improvement every level, now its fighterlevel/5. So
1385	* we give the player a bonus here in wc and dam	1244	* we give the player a bonus here in wc and dam
1386	* to make up for the change. Note that I left the	1245	* to make up for the change. Note that I left the
1387	* monster bonus the same as before. -b.t.	1246	* monster bonus the same as before. -b.t.
1388	*/	1247	*/
		1248	object *wc_obj = chosen_skill;
1389		1249
1390	if (type == PLAYER && wc_obj && wc_obj->level > 1)	1250	if (contr && wc_obj && wc_obj->level > 1)
1391	{	1251	{
1392	wc -= (wc_obj->level + thaco_bonus[stats.Str]);	1252	wc -= wc_obj->level + thaco_bonus[stats.Str];
		1253
1393	for (i = 1; i < wc_obj->level; i++)	1254	for (int i = 1; i < wc_obj->level; i++)
1394	{	1255	{
1395	/* addtional wc every 6 levels */	1256	/* additional wc every 6 levels */
1396	if (!(i % 6))	1257	if (!(i % 6))
1397	wc--;	1258	wc--;
		1259
1398	/* addtional dam every 4 levels. */	1260	/* additional dam every 4 levels. */
1399	if (!(i % 4) && (dam_bonus[stats.Str] >= 0))	1261	if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1400	stats.dam += (1 + (dam_bonus[stats.Str] / 5));	1262	stats.dam += 1 + dam_bonus[stats.Str] / 5;
1401	}	1263	}
1402	}	1264	}
1403	else	1265	else
1404	wc -= (level + thaco_bonus[stats.Str]);	1266	wc -= level + thaco_bonus[stats.Str];
1405		1267
1406	stats.dam += dam_bonus[stats.Str];	1268	stats.dam += dam_bonus[stats.Str];
1407		1269
1408	if (stats.dam < 1)	1270	if (stats.dam < 1)
1409	stats.dam = 1;	1271	stats.dam = 1;
1410		1272
1411	speed = 1.0 + speed_bonus[stats.Dex];	1273	speed = 1.f + speed_bonus[stats.Dex];
1412		1274
1413	if (settings.search_items && contr->search_str[0])	1275	if (settings.search_items && contr->search_str[0])
1414	speed -= 1;	1276	speed -= 1;
1415
1416	if (attacktype == 0)
1417	attacktype = arch->clone.attacktype;
1418
1419	} /* End if player */	1277	} /* End if player */
1420		1278
1421	if (added_speed >= 0)	1279	if (added_speed >= 0)
1422	speed += added_speed / 10.0;	1280	speed += added_speed / 10.f;
1423	else /* Something wrong here...: */	1281	else /* Something wrong here...: */
1424	speed /= (float) (1.0 - added_speed);	1282	speed /= 1.f - added_speed;
1425		1283
1426	/* Max is determined by armour */	1284	/* Max is determined by armour */
1427	if (speed > max)	1285	speed = min (speed, max_speed);
1428	speed = max;
1429		1286
1430	if (type == PLAYER)	1287	if (type == PLAYER)
1431	{	1288	{
1432	/* 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)
1433	* or below (negative number) that the player is carrying. If above	1290	* or below (negative number) that the player is carrying. If above
1434	* weight limit, then player suffers a speed reduction based on how	1291	* weight limit, then player suffers a speed reduction based on how
1435	* much above he is, and what is max carry is	1292	* much above he is, and what is max carry is
1436	*/	1293	*/
1437	f = (carrying / 1000) - max_carry[stats.Str];	1294	float f = (carrying / 1000) - max_carry[stats.Str];
1438	if (f > 0)	1295	if (f > 0.f)
1439	speed = speed / (1.0 + f / max_carry[stats.Str]);	1296	speed = speed / (1.f + f / max_carry[stats.Str]);
1440	}	1297	}
1441		1298
1442	speed += bonus_speed / 10.0; /* Not affected by limits */	1299	speed += bonus_speed / 10.f; /* Not affected by limits */
		1300	speed *= speed_reduce_from_disease;
1443		1301
1444	/* 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
1445	* 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.
1446	*/	1304	*/
1447	speed = speed * speed_reduce_from_disease;	1305	max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1448		1306
1449	if (speed < 0.01 && type == PLAYER)	1307	if (speed != old_speed)
1450	speed = 0.01;	1308	set_speed (speed);
1451		1309
1452	if (type == PLAYER)	1310	if (type == PLAYER)
1453	{	1311	{
1454	float M, W, s, D, K, S, M2;
1455
1456	/* (This formula was made by vidarl@ifi.uio.no)	1312	/* (This formula was made by vidarl@ifi.uio.no)
1457	* Note that we never used these values again - basically	1313	* Note that we never used these values again - basically
1458	* all of these could be subbed into one big equation, but	1314	* all of these could be subbed into one big equation, but
1459	* that would just be a real pain to read.	1315	* that would just be a real pain to read.
1460	*/	1316	*/
1461	M = (max_carry[stats.Str] - 121) / 121.0;	1317	float M = (max_carry[stats.Str] - 121) / 121.f;
1462	M2 = max_carry[stats.Str] / 100.0;	1318	float M2 = max_carry[stats.Str] / 100.f;
1463	W = weapon_weight / 20000.0;	1319	float W = weapon_weight / 20000.f;
1464	s = 2 - weapon_speed / 10.0;	1320	float s = (20 - weapon_speed) / 10.f;
1465	D = (stats.Dex - 14) / 14.0;	1321	float D = (stats.Dex - 14) / 14.f;
1466	K = 1 + M / 3.0 - W / (3 * M2) + speed / 5.0 + D / 2.0;	1322	float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
		1323
1467	K *= (4 + level) / (float) (6 + level) * 1.2;	1324	K *= (4 + level) * 1.2f / (6 + level);
		1325
1468	if (K <= 0)	1326	if (K <= 0.01f)
1469	K = 0.01;	1327	K = 0.01f;
1470	S = speed / (K * s);	1328
1471	contr->weapon_sp = S;	1329	contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1472	}	1330	}
1473		1331
1474	/* I want to limit the power of small monsters with big weapons: */	1332	/* I want to limit the power of small monsters with big weapons: */
1475	if (type != PLAYER && arch != NULL && stats.dam > arch->clone.stats.dam * 3)	1333	if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
1476	stats.dam = arch->clone.stats.dam * 3;	1334	stats.dam = arch->stats.dam * 3;
1477		1335
1478	/* Prevent overflows of wc - best you can get is ABS(120) - this	1336	stats.wc = clamp (wc, MIN_WC, MAX_WC);
1479	* should be more than enough - remember, AC is also in 8 bits,	1337	stats.ac = clamp (ac, MIN_AC, MAX_AC);
1480	* so its value is the same.
1481	*/
1482	if (wc > 120)
1483	wc = 120;
1484	else if (wc < -120)
1485	wc = -120;
1486
1487	stats.wc = wc;
1488
1489	if (ac > 120)
1490	ac = 120;
1491	else if (ac < -120)
1492	ac = -120;
1493
1494	stats.ac = ac;
1495		1338
1496	/* if for some reason the creature doesn't have any move type,	1339	/* if for some reason the creature doesn't have any move type,
1497	* give them walking as a default.	1340	* give them walking as a default.
1498	* The second case is a special case - to more closely mimic the	1341	* The second case is a special case - to more closely mimic the
1499	* old behaviour - if your flying, your not walking - just	1342	* old behaviour - if your flying, your not walking - just
…		…
1502	if (move_type == 0)	1345	if (move_type == 0)
1503	move_type = MOVE_WALK;	1346	move_type = MOVE_WALK;
1504	else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))	1347	else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1505	move_type &= ~MOVE_WALK;	1348	move_type &= ~MOVE_WALK;
1506		1349
1507	set_speed (speed);	1350	// now apply the new move_type
		1351	if (this->move_type != move_type)
		1352	change_move_type (move_type);
1508		1353
1509	/* 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,
1510	* so we will check that now.	1355	* so we will check that now.
1511	*/	1356	*/
1512	if (type == PLAYER)	1357	if (is_player ())
		1358	contr->update_spells ();
		1359
		1360	// update the mapspace, if we are on a map
		1361	if (!flag [FLAG_REMOVED] && map)
		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 ())
1513	{	1373	{
1514	esrv_update_stats (contr);	1374	env->update_stats ();
1515	esrv_update_spells (contr);	1375
		1376	if (env->is_on_map ())
		1377	update_all_los (env->map, env->x, env->y);
1516	}	1378	}
1517	}	1379	}
1518		1380
1519	/*	1381	/*
1520	* Returns true if the given player is a legal class.	1382	* Returns true if the given player is a legal class.
…		…
1524	* false otherwise.	1386	* false otherwise.
1525	*/	1387	*/
1526	int	1388	int
1527	allowed_class (const object *op)	1389	allowed_class (const object *op)
1528	{	1390	{
1529	return op->stats.Dex > 0 && op->stats.Str > 0 && op->stats.Con > 0 &&	1391	return op->stats.Dex > 0
1530	op->stats.Int > 0 && op->stats.Wis > 0 && op->stats.Pow > 0 && op->stats.Cha > 0;	1392	&& op->stats.Str > 0
		1393	&& op->stats.Con > 0
		1394	&& op->stats.Int > 0
		1395	&& op->stats.Wis > 0
		1396	&& op->stats.Pow > 0
		1397	&& op->stats.Cha > 0;
1531	}	1398	}
1532		1399
1533	/*	1400	/*
1534	* set the new dragon name after gaining levels or	1401	* set the new dragon name after gaining levels or
1535	* changing ability focus (later this can be extended to	1402	* changing ability focus (later this can be extended to
1536	* eventually change the player's face and animation)	1403	* eventually change the player's face and animation)
1537	*
1538	* Note that the title is written to 'own_title' in the
1539	* player struct. This should be changed to 'ext_title'
1540	* as soon as clients support this!
1541	* Please, anyone, write support for 'ext_title'.
1542	*/	1404	*/
1543	void	1405	void
1544	set_dragon_name (object *pl, const object *abil, const object *skin)	1406	set_dragon_name (object *pl, const object *abil, const object *skin)
1545	{	1407	{
1546	int atnr = -1; /* attacknumber of highest level */	1408	int atnr = -1; /* attacknumber of highest level */
…		…
1564	/* 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,
1565	or else at random */	1427	or else at random */
1566	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)
1567	atnr = abil->stats.exp;	1429	atnr = abil->stats.exp;
1568		1430
1569	level = (int) (level / 5.);
1570
1571	/* now set the new title */	1431	/* now set the new title */
1572	if (pl->contr != NULL)
1573	{
1574	if (level == 0)
1575	sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);	1432	if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1576	else if (level == 1)
1577	sprintf (pl->contr->title, "%s wyrm", attacks[atnr]);	1433	else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1578	else if (level == 2)
1579	sprintf (pl->contr->title, "%s wyvern", attacks[atnr]);	1434	else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1580	else if (level == 3)
1581	sprintf (pl->contr->title, "%s dragon", attacks[atnr]);	1435	else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1582	else	1436	else
1583	{	1437	{
1584	/* special titles for extra high resistance! */	1438	/* special titles for extra high resistance! */
1585	if (skin->resist[atnr] > 80)
1586	sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);	1439	if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1587	else if (skin->resist[atnr] > 50)
1588	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]);
1589	else
1590	sprintf (pl->contr->title, "big %s dragon", attacks[atnr]);	1441	else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1591	}
1592	}	1442	}
1593		1443
1594	strcpy (pl->contr->own_title, "");	1444	strcpy (pl->contr->own_title, "");
1595	}	1445	}
1596		1446
1597	/*	1447	/*
1598	* This function is called when a dragon-player gains	1448	* This function is called when a dragon-player gains
1599	* an overall level. Here, the dragon might gain new abilities	1449	* an overall level. Here, the dragon might gain new abilities
1600	* or change the ability-focus.	1450	* or change the ability-focus.
1601	*/	1451	*/
1602	void	1452	static void
1603	dragon_level_gain (object *who)	1453	dragon_level_gain (object *who)
1604	{	1454	{
1605	object *abil = NULL; /* pointer to dragon ability force */	1455	object *abil = NULL; /* pointer to dragon ability force */
1606	object *skin = NULL; /* pointer to dragon skin force */	1456	object *skin = NULL; /* pointer to dragon skin force */
1607	object *tmp = NULL; /* tmp. object */	1457	object *tmp = NULL; /* tmp. object */
1608	char buf[MAX_BUF]; /* tmp. string buffer */	1458	char buf[MAX_BUF]; /* tmp. string buffer */
1609		1459
1610	/* now grab the 'dragon_ability'-forces from the player's inventory */	1460	/* now grab the 'dragon_ability'-forces from the player's inventory */
1611	for (tmp = who->inv; tmp != NULL; tmp = tmp->below)	1461	for (tmp = who->inv; tmp; tmp = tmp->below)
1612	{
1613	if (tmp->type == FORCE)	1462	if (tmp->type == FORCE)
1614	{	1463	if (tmp->arch->archname == shstr_dragon_ability_force)
1615	if (strcmp (tmp->arch->name, "dragon_ability_force") == 0)
1616	abil = tmp;	1464	abil = tmp;
1617	if (strcmp (tmp->arch->name, "dragon_skin_force") == 0)	1465	else if (tmp->arch->archname == shstr_dragon_skin_force)
1618	skin = tmp;	1466	skin = tmp;
1619	}	1467
1620	}
1621	/* if the force is missing -> bail out */	1468	/* if the force is missing -> bail out */
1622	if (abil == NULL)	1469	if (abil == NULL)
1623	return;	1470	return;
1624		1471
1625	/* The ability_force keeps track of maximum level ever achieved.	1472	/* The ability_force keeps track of maximum level ever achieved.
…		…
1666	object *skill_obj;	1513	object *skill_obj;
1667		1514
1668	skill_obj = get_archetype_by_skill_name (skill_name, SKILL);	1515	skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1669	if (!skill_obj)	1516	if (!skill_obj)
1670	{	1517	{
1671	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);
1672	return NULL;	1519	return NULL;
1673	}	1520	}
		1521
1674	/* clear the flag - exp goes into this bucket, but player	1522	/* clear the flag - exp goes into this bucket, but player
1675	* still doesn't know it.	1523	* still doesn't know it.
1676	*/	1524	*/
1677	CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);	1525	skill_obj->clr_flag (FLAG_CAN_USE_SKILL);
1678	skill_obj->stats.exp = 0;	1526	skill_obj->stats.exp = 0;
1679	skill_obj->level = 1;	1527	skill_obj->level = 1;
1680	insert_ob_in_ob (skill_obj, op);	1528	op->insert (skill_obj);
1681	if (op->contr)	1529
1682	{	1530	if (player *pl = op->contr)
1683	op->contr->last_skill_ob[skill_obj->subtype] = skill_obj;	1531	pl->link_skills ();
1684	op->contr->last_skill_exp[skill_obj->subtype] = -1;	1532
1685	}
1686	return skill_obj;	1533	return skill_obj;
1687	}	1534	}
1688
1689		1535
1690	/* 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
1691	* whether the player gets more hp, sp and new levels.	1537	* whether the player gets more hp, sp and new levels.
1692	* Note this this function should only be called for players. Monstes	1538	* Note this this function should only be called for players. Monstes
1693	* don't really gain levels	1539	* don't really gain levels
…		…
1696	*/	1542	*/
1697	void	1543	void
1698	player_lvl_adj (object *who, object *op)	1544	player_lvl_adj (object *who, object *op)
1699	{	1545	{
1700	char buf[MAX_BUF];	1546	char buf[MAX_BUF];
		1547	bool changed = false;
1701		1548
1702	if (!op) /* when rolling stats */	1549	if (!op) /* when rolling stats */
1703	op = who;	1550	op = who;
1704		1551
1705	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))
1706	{	1553	{
		1554	changed = true;
		1555
1707	op->level++;	1556	op->level++;
1708		1557
1709	if (op != NULL && op == who && op->stats.exp > 1 && is_dragon_pl (who))	1558	if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1710	dragon_level_gain (who);	1559	dragon_level_gain (who);
1711		1560
1712	/* 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 */
1713	if (op == who && (who->level < 11) && who->type == PLAYER)	1562	if (op == who && (who->level < 11) && who->type == PLAYER)
1714	{	1563	{
1715	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;
1716	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);
1717	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;
1718	}	1567	}
1719		1568
1720	who->update_stats ();
1721	if (op->level > 1)	1569	if (op->level > 1)
1722	{	1570	{
1723	if (op->type != PLAYER)	1571	if (op->type != PLAYER)
		1572	{
		1573	who->contr->play_sound (sound_find ("skill_up"));
1724	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	}
1725	else	1576	else
		1577	{
		1578	who->contr->play_sound (sound_find ("level_up"));
1726	sprintf (buf, "You are now level %d.", op->level);	1579	sprintf (buf, "You are now level %d.", op->level);
		1580	}
		1581
1727	if (who)	1582	if (who)
1728	new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);	1583	new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1729	}	1584	}
1730	player_lvl_adj (who, op); /* To increase more levels */
1731	}	1585	}
		1586
1732	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))
1733	{	1588	{
		1589	changed = true;
		1590
1734	op->level--;	1591	op->level--;
1735	who->update_stats ();	1592
1736	if (op->type != PLAYER)	1593	if (op->type != PLAYER)
1737	{	1594	{
1738	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);
1739	new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);	1596	new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1740	}	1597	}
1741	player_lvl_adj (who, op); /* To decrease more levels */
1742	}	1598	}
1743		1599
1744	/* check if the spell data has changed */	1600	if (changed)
1745	esrv_update_stats (who->contr);	1601	who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1746	esrv_update_spells (who->contr);
1747	}	1602	}
1748		1603
1749	/*	1604	/*
1750	* Returns how much experience is needed for a player to become	1605	* Returns how much experience is needed for a player to become
1751	* the given level. level should really never exceed max_level	1606	* the given level. level should really never exceed max_level
1752	*/	1607	*/
1753		1608
1754	sint64	1609	sint64
1755	level_exp (int level, double expmul)	1610	level_exp (int level, double expmul)
1756	{	1611	{
1757	if (level > settings.max_level)	1612	return expmul * level_to_min_exp (level);
1758	return (sint64) (expmul * levels[settings.max_level]);
1759	return (sint64) (expmul * levels[level]);
1760	}	1613	}
1761		1614
1762	/*	1615	/*
1763	* 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.
1764	* 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
…		…
1792	* NULL, in which case exp increases the players general	1645	* NULL, in which case exp increases the players general
1793	* total, but not any particular skill.	1646	* total, but not any particular skill.
1794	* 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:
1795	*/	1648	*/
1796	static void	1649	static void
1797	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)
1798	{	1651	{
1799	object *skill_obj = NULL;	1652	object *skill_obj;
1800	sint64 limit, exp_to_add;	1653	sint64 limit, exp_to_add;
1801	int i;
1802		1654
1803	/* prevents some forms of abuse. */	1655	/* prevents some forms of abuse. */
1804	if (op->contr->braced)	1656	if (op->contr->braced)
1805	exp = exp / 5;	1657	exp /= 5;
1806		1658
1807	/* Try to find the matching skill.	1659	/* Try to find the matching skill.
1808	* 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
1809	* chosen_skill. This means we don't need to search through	1661	* chosen_skill. This means we don't need to search through
1810	* the players inventory.	1662	* the players inventory.
1811	*/	1663	*/
		1664	skill_obj = 0;
		1665
1812	if (skill_name)	1666	if (skill_name)
1813	{	1667	{
1814	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);
1815	skill_obj = op->chosen_skill;
1816	else
1817	{
1818	for (i = 0; i < NUM_SKILLS; i++)
1819	if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1820	{
1821	skill_obj = op->contr->last_skill_ob[i];
1822	break;
1823	}
1824		1669
1825	/* 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
1826	* it to the player if necessary	1671	* it to the player if necessary
1827	*/	1672	*/
1828	if (!skill_obj)	1673	if (!skill_obj)
1829	{	1674	{
1830	if (flag == SK_EXP_NONE)	1675	if (flag == SK_EXP_NONE)
1831	return;	1676	return;
		1677
1832	else if (flag == SK_EXP_ADD_SKILL)	1678	if (flag == SK_EXP_ADD_SKILL)
1833	give_skill_by_name (op, skill_name);	1679	skill_obj = give_skill_by_name (op, skill_name);
1834	}
1835	}	1680	}
1836	}	1681	}
1837		1682
1838	if (flag != SK_EXP_SKILL_ONLY)	1683	if (flag != SK_EXP_SKILL_ONLY)
1839	{	1684	{
1840	/* Basically, you can never gain more experience in one shot	1685	/* Basically, you can never gain more experience in one shot
1841	* than half what you need to gain for next level.	1686	* than half what you need to gain for next level.
1842	*/	1687	*/
1843	exp_to_add = exp;	1688	exp_to_add = exp;
1844	limit = (levels[op->level + 1] - levels[op->level]) / 2;	1689	limit = (levels [op->level + 1] - levels [op->level]) / 2;
1845	if (exp_to_add > limit)	1690	if (exp_to_add > limit)
1846	exp_to_add = limit;	1691	exp_to_add = limit;
1847		1692
1848	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)));
1849	if (settings.permanent_exp_ratio)	1694	if (settings.permanent_exp_ratio)
…		…
1856	}	1701	}
1857		1702
1858	if (skill_obj)	1703	if (skill_obj)
1859	{	1704	{
1860	exp_to_add = exp;	1705	exp_to_add = exp;
1861	limit = (levels[skill_obj->level + 1] - levels[skill_obj->level]) / 2;	1706	limit = (levels [skill_obj->level + 1] - levels [skill_obj->level]) / 2;
1862	if (exp_to_add > limit)	1707	if (exp_to_add > limit)
1863	exp_to_add = limit;	1708	exp_to_add = limit;
1864		1709
1865	ADD_EXP (skill_obj->stats.exp, exp_to_add);	1710	ADD_EXP (skill_obj->stats.exp, exp_to_add);
1866	if (settings.permanent_exp_ratio)	1711	if (settings.permanent_exp_ratio)
…		…
1872	player_lvl_adj (op, skill_obj);	1717	player_lvl_adj (op, skill_obj);
1873	}	1718	}
1874	}	1719	}
1875		1720
1876	/* This function checks to make sure that object 'op' can	1721	/* This function checks to make sure that object 'op' can
1877	* lost 'exp' experience. It returns the amount of exp	1722	* lose 'exp' experience. It returns the amount of exp
1878	* object 'op' can in fact lose - it basically makes	1723	* object 'op' can in fact lose - it basically makes
1879	* adjustments based on permanent exp and the like.	1724	* adjustments based on permanent exp and the like.
1880	* This function should always be used for losing experience -	1725	* This function should always be used for losing experience -
1881	* the 'exp' value passed should be positive - this is the	1726	* the 'exp' value passed should be positive - this is the
1882	* amount that should get subtract from the player.	1727	* amount that should get subtract from the player.
1883	*/	1728	*/
1884	sint64	1729	static sint64
1885	check_exp_loss (const object *op, sint64 exp)	1730	check_exp_loss (const object *op, sint64 exp)
1886	{	1731	{
1887	sint64 del_exp;	1732	sint64 del_exp;
1888		1733
1889	if (exp > op->stats.exp)	1734	if (exp > op->stats.exp)
1890	exp = op->stats.exp;	1735	exp = op->stats.exp;
		1736
1891	if (settings.permanent_exp_ratio)	1737	if (settings.permanent_exp_ratio)
1892	{	1738	{
1893	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
1894	if (del_exp < 0)	1741	if (del_exp < 0)
1895	del_exp = 0;	1742	del_exp = 0;
		1743
1896	if (exp > del_exp)	1744	if (exp > del_exp)
1897	exp = del_exp;	1745	exp = del_exp;
1898	}	1746	}
		1747
1899	return exp;	1748	return exp;
1900	}	1749	}
1901		1750
1902	sint64	1751	sint64
1903	check_exp_adjust (const object *op, sint64 exp)	1752	check_exp_adjust (const object *op, sint64 exp)
1904	{	1753	{
1905	if (exp < 0)	1754	if (exp < 0)
1906	return check_exp_loss (op, exp);	1755	return check_exp_loss (op, exp);
1907	else	1756	else
1908	return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp);	1757	return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1909	}	1758	}
1910
1911		1759
1912	/* Subtracts experience from player.	1760	/* Subtracts experience from player.
1913	* 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
1914	* only subtract from the matching skill. Otherwise,	1762	* only subtract from the matching skill. Otherwise,
1915	* this subtracts a portion from all	1763	* this subtracts a portion from all
…		…
1920	* 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.
1921	* 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
1922	* a postive number.	1770	* a postive number.
1923	*/	1771	*/
1924	static void	1772	static void
1925	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)
1926	{	1774	{
1927	float fraction = (float) exp / (float) op->stats.exp;	1775	float fraction = (float) exp / (float) op->stats.exp;
1928	object *tmp;	1776	object *tmp;
1929	sint64 del_exp;	1777	sint64 del_exp;
1930		1778
1931	for (tmp = op->inv; tmp; tmp = tmp->below)	1779	for (tmp = op->inv; tmp; tmp = tmp->below)
1932	if (tmp->type == SKILL && tmp->stats.exp)	1780	if (tmp->type == SKILL && tmp->stats.exp)
1933	{	1781	{
1934	if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill))	1782	if (flag == SK_SUBTRACT_SKILL_EXP && skill && tmp->skill == skill)
1935	{	1783	{
1936	del_exp = check_exp_loss (tmp, exp);	1784	del_exp = check_exp_loss (tmp, exp);
1937	tmp->stats.exp -= del_exp;	1785	tmp->stats.exp -= del_exp;
1938	player_lvl_adj (op, tmp);	1786	player_lvl_adj (op, tmp);
1939	}	1787	}
1940	else if (flag != SK_SUBTRACT_SKILL_EXP)	1788	else if (flag != SK_SUBTRACT_SKILL_EXP)
1941	{	1789	{
1942	/* only want to process other skills if we are not trying	1790	/* only want to process other skills if we are not trying
1943	* to match a specific skill.	1791	* to match a specific skill.
1944	*/	1792	*/
1945	del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction));	1793	del_exp = check_exp_loss (tmp, tmp->stats.exp * fraction);
1946	tmp->stats.exp -= del_exp;	1794	tmp->stats.exp -= del_exp;
1947	player_lvl_adj (op, tmp);	1795	player_lvl_adj (op, tmp);
1948	}	1796	}
1949	}	1797	}
		1798
1950	if (flag != SK_SUBTRACT_SKILL_EXP)	1799	if (flag != SK_SUBTRACT_SKILL_EXP)
1951	{	1800	{
1952	del_exp = check_exp_loss (op, exp);	1801	del_exp = check_exp_loss (op, exp);
1953	op->stats.exp -= del_exp;	1802	op->stats.exp -= del_exp;
1954	player_lvl_adj (op, NULL);	1803	player_lvl_adj (op, NULL);
1955	}	1804	}
1956	}	1805	}
1957
1958
1959		1806
1960	/* change_exp() - changes experience to a player/monster. This	1807	/* change_exp() - changes experience to a player/monster. This
1961	* does bounds checking to make sure we don't overflow the max exp.	1808	* does bounds checking to make sure we don't overflow the max exp.
1962	*	1809	*
1963	* The exp passed is typically not modified much by this function -	1810	* The exp passed is typically not modified much by this function -
1964	* it is assumed the caller has modified the exp as needed.	1811	* it is assumed the caller has modified the exp as needed.
1965	* skill_name is the skill that should get the exp added.	1812	* skill_name is the skill that should get the exp added.
1966	* 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.
1967	* these last two values are only used for players.	1814	* these last two values are only used for players.
1968	*/	1815	*/
1969
1970	void	1816	void
1971	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)
1972	{	1818	{
1973
1974	#ifdef EXP_DEBUG	1819	#ifdef EXP_DEBUG
1975	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);
1976	#endif	1821	#endif
1977		1822
1978	/* safety */	1823	/* safety */
…		…
1994	* worth.	1839	* worth.
1995	*/	1840	*/
1996	if (op->type != PLAYER)	1841	if (op->type != PLAYER)
1997	{	1842	{
1998	/* Sanity check */	1843	/* Sanity check */
1999	if (!QUERY_FLAG (op, FLAG_ALIVE))	1844	if (!op->flag [FLAG_ALIVE])
2000	return;	1845	return;
2001		1846
2002	/* reset exp to max allowed value. We subtract from	1847	/* reset exp to max allowed value. We subtract from
2003	* MAX_EXPERIENCE to prevent overflows. If the player somehow has	1848	* MAX_EXPERIENCE to prevent overflows. If the player somehow has
2004	* more than max exp, just return.	1849	* more than max exp, just return.
…		…
2019	else	1864	else
2020	/* note that when you lose exp, it doesn't go against	1865	/* note that when you lose exp, it doesn't go against
2021	* a particular skill, so we don't need to pass that	1866	* a particular skill, so we don't need to pass that
2022	* along.	1867	* along.
2023	*/	1868	*/
2024	subtract_player_exp (op, FABS (exp), skill_name, flag);	1869	subtract_player_exp (op, abs (exp), skill_name, flag);
2025
2026	}	1870	}
2027	}	1871	}
2028		1872
2029	/* Applies a death penalty experience, the size of this is defined by the	1873	/* Applies a death penalty experience, the size of this is defined by the
2030	* settings death_penalty_percentage and death_penalty_levels, and by the	1874	* settings death_penalty_percentage and death_penalty_levels, and by the
2031	* amount of permenent experience, whichever gives the lowest loss.	1875	* amount of permenent experience, whichever gives the lowest loss.
2032	*/	1876	*/
2033
2034	void	1877	void
2035	apply_death_exp_penalty (object *op)	1878	apply_death_exp_penalty (object *op)
2036	{	1879	{
2037	object *tmp;
2038	sint64 loss;	1880	sint64 loss;
2039	sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */	1881	sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
2040	sint64 level_loss; /* defined by the setting 'death_penalty_levels */	1882	sint64 level_loss; /* defined by the setting 'death_penalty_levels */
2041		1883
2042	for (tmp = op->inv; tmp; tmp = tmp->below)	1884	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2043	if (tmp->type == SKILL && tmp->stats.exp)	1885	if (tmp->type == SKILL && tmp->stats.exp)
2044	{	1886	{
2045
2046	percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;	1887	percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
2047	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)];
2048		1889
2049	/* With the revised exp system, you can get cases where	1890	/* With the revised exp system, you can get cases where
2050	* losing several levels would still require that you have more	1891	* losing several levels would still require that you have more
2051	* exp than you currently have - this is true if the levels	1892	* exp than you currently have - this is true if the levels
2052	* tables is a lot harder.	1893	* tables is a lot harder.
2053	*/	1894	*/
2054	if (level_loss < 0)	1895	if (level_loss < 0)
2055	level_loss = 0;	1896	level_loss = 0;
2056		1897
2057	loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss));	1898	loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
2058		1899
2059	tmp->stats.exp -= loss;	1900	tmp->stats.exp -= loss;
2060	player_lvl_adj (op, tmp);	1901	player_lvl_adj (op, tmp);
2061	}	1902	}
2062		1903
2063	percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;	1904	percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
2064	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)];
		1906
2065	if (level_loss < 0)	1907	if (level_loss < 0)
2066	level_loss = 0;	1908	level_loss = 0;
		1909
2067	loss = check_exp_loss (op, MIN (level_loss, percentage_loss));	1910	loss = check_exp_loss (op, min (level_loss, percentage_loss));
2068		1911
2069	op->stats.exp -= loss;	1912	op->stats.exp -= loss;
2070	player_lvl_adj (op, NULL);	1913	player_lvl_adj (op, NULL);
2071	}	1914	}
2072		1915

Diff Legend

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