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

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

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.25 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs. Revision 1.118 by root, Sun Apr 11 00:34:05 2010 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.25 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.118 by root, Sun Apr 11 00:34:05 2010 UTC