ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.68 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.131 by root, Wed Nov 14 05:18:17 2012 UTC

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

Diff Legend

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