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.50 by root, Sat May 12 18:14:47 2007 UTC vs.
Revision 1.119 by root, Thu Apr 15 04:56:46 2010 UTC

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

Diff Legend

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