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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.59 by root, Thu May 17 00:33:29 2007 UTC vs.
Revision 1.118 by root, Sun Apr 11 00:34:05 2010 UTC

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

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.59 by root, Thu May 17 00:33: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.59 by root, Thu May 17 00:33:29 2007 UTC vs.
Revision 1.118 by root, Sun Apr 11 00:34:05 2010 UTC