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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.271 by root, Sun Apr 11 23:32:10 2010 UTC vs.
Revision 1.296 by root, Thu Nov 17 04:59:33 2016 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* 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 Affero GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* and the GNU General Public License along with this program. If not, see	19	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	//+GPL	25	//+GPL
		26
		27	#include <algorithm>
		28	#include <functional>
26		29
27	#include <global.h>	30	#include <global.h>
28	#include <sproto.h>	31	#include <sproto.h>
29	#include <sounds.h>	32	#include <sounds.h>
30	#include <living.h>	33	#include <living.h>
31	#include <object.h>	34	#include <object.h>
32	#include <spells.h>	35	#include <spells.h>
33	#include <skills.h>	36	#include <skills.h>
34		37
35	#include <algorithm>
36	#include <functional>
37
38	playervec players;	38	playervec players;
39		39
40	/* This loads the first map an puts the player on it. */	40	/* This loads the first map an puts the player on it. */
41	static void	41	static void
42	set_first_map (object *op)	42	set_first_map (object *op)
126		126
127	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	127	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
128		128
129	esrv_new_player (this);	129	esrv_new_player (this);
130		130
131	ob->update_stats ();
132
133	ns->floorbox_update ();
134	esrv_send_inventory (ob, ob);
135	esrv_add_spells (this, 0);
136
137	ob->flag [FLAG_READY_WEAPON] = false;	131	ob->flag [FLAG_READY_WEAPON] = false;
138	ob->flag [FLAG_READY_SKILL] = false;	132	ob->flag [FLAG_READY_SKILL] = false;
139	ob->flag [FLAG_READY_RANGE] = false;	133	ob->flag [FLAG_READY_RANGE] = false;
140	ob->flag [FLAG_READY_BOW] = false;	134	ob->flag [FLAG_READY_BOW] = false;
141		135
142	ob->update_stats (); // we unapplied stuff above	136	ob->update_stats ();
		137
		138	ns->floorbox_update ();
		139	esrv_send_inventory (ob, ob);
		140	esrv_add_spells (this, 0);
		141
143	activate ();	142	activate ();
144		143
145	INVOKE_PLAYER (CONNECT, this);	144	INVOKE_PLAYER (CONNECT, this);
146	INVOKE_PLAYER (LOGIN, this);	145	INVOKE_PLAYER (LOGIN, this);
147	}	146	}
…		…
182	player::set_object (object *op)	181	player::set_object (object *op)
183	{	182	{
184	ob = observe = viewpoint = op;	183	ob = observe = viewpoint = op;
185	ob->contr = this; /* this aren't yet in archetype */	184	ob->contr = this; /* this aren't yet in archetype */
186		185
187	ob->speed = 1.0f;	186	ob->speed = 1.0f; // object still inactive, keep it that way
188	ob->speed_left = 0.5f;	187	ob->speed_left = 0.5f;
189		188
190	ob->direction = 5; /* So player faces south */	189	ob->direction = 5; /* So player faces south */
191	}	190	}
192		191
…		…
374	*/	373	*/
375	int	374	int
376	path_to_player (object mon, object pl, unsigned mindiff)	375	path_to_player (object mon, object pl, unsigned mindiff)
377	{	376	{
378	rv_vector rv;	377	rv_vector rv;
379	sint16 x, y;
380	int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;	378	int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES;
381	maptile m, lastmap;
382		379
383	get_rangevector (mon, pl, &rv, 0);	380	get_rangevector (mon, pl, &rv, 0);
384		381
385	if (rv.distance < mindiff)	382	if (rv.distance < mindiff)
386	return 0;	383	return 0;
387		384
388	x = mon->x;	385	mapxy pos (mon);
389	y = mon->y;
390	m = mon->map;
391	dir = rv.direction;	386	dir = rv.direction;
392	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	387	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
393	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	388	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
394		389
395	/* If we can't solve it within the search distance, return now. */	390	/* If we can't solve it within the search distance, return now. */
396	if (diff > max)	391	if (diff > max)
397	return 0;	392	return 0;
398		393
399	while (diff > 1 && max > 0)	394	while (diff > 1 && max > 0)
400	{	395	{
401	lastx = x;	396	mapxy lastpos = pos;
402	lasty = y;
403	lastmap = m;
404	x = lastx + freearr_x[dir];
405	y = lasty + freearr_y[dir];
406		397
407	mflags = get_map_flags (m, &m, x, y, &x, &y);	398	pos.move (dir);
408	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
409		399
410	/* Space is blocked - try changing direction a little */	400	/* Space is blocked - try changing direction a little */
411	if ((mflags & P_OUT_OF_MAP) \|\| ((OB_TYPE_MOVE_BLOCK (mon, blocked) \|\| (mflags & P_BLOCKSVIEW))	401	if (!pos.normalise ()
412	&& (m == mon->map && blocked_link (mon, m, x, y))))	402	\|\| (((pos->flags () & P_BLOCKSVIEW) \|\| OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
		403	&& blocked_link (mon, pos.m, pos.x, pos.y)))
413	{	404	{
414	/* recalculate direction from last good location. Possible	405	/* recalculate direction from last good location. Possible
415	* we were not traversing ideal location before.	406	* we were not traversing ideal location before.
416	*/	407	*/
417	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	408	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
418	if (rv.direction != dir)	409	if (rv.direction != dir)
419	{	410	{
420	/* OK - says direction should be different - lets reset the	411	/* OK - says direction should be different - lets reset the
421	* the values so it will try again.	412	* the values so it will try again.
422	*/	413	*/
423	x = lastx;
424	y = lasty;
425	m = lastmap;	414	pos = lastpos;
426	dir = firstdir = rv.direction;	415	dir = firstdir = rv.direction;
427	}	416	}
428	else	417	else
429	{	418	{
430	/* direct path is blocked - try taking a side step to	419	/* direct path is blocked - try taking a side step to
…		…
437	*/	426	*/
438	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	427	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
439	{	428	{
440	if (i == 0)	429	if (i == 0)
441	continue; /* already did this, so skip it */	430	continue; /* already did this, so skip it */
		431
442	/* Use lastdir here - otherwise,	432	/* Use lastdir here - otherwise,
443	* since the direction that the creature should move in	433	* since the direction that the creature should move in
444	* may change, you could get infinite loops.	434	* may change, you could get infinite loops.
445	* ie, player is northwest, but monster can only	435	* ie, player is northwest, but monster can only
446	* move west, so it does that. It goes some distance,	436	* move west, so it does that. It goes some distance,
…		…
448	* can't do that, but now finds it can move east, and	438	* can't do that, but now finds it can move east, and
449	* gets back to its original point. lastdir contains	439	* gets back to its original point. lastdir contains
450	* the last direction the creature has successfully	440	* the last direction the creature has successfully
451	* moved.	441	* moved.
452	*/	442	*/
453
454	x = lastx + freearr_x[absdir (lastdir + i)];
455	y = lasty + freearr_y[absdir (lastdir + i)];
456	m = lastmap;	443	pos = lastpos;
457	mflags = get_map_flags (m, &m, x, y, &x, &y);	444	pos.move (absdir (lastdir + i));
458	if (mflags & P_OUT_OF_MAP)	445
		446	if (!pos.normalise ())
459	continue;	447	continue;
460	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	448
461	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	449	mapspace &ms = *pos;
		450
		451	if (ms.flags () & P_BLOCKSVIEW)
462	continue;	452	continue;
463	if (mflags & P_BLOCKSVIEW)	453
		454	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
464	continue;	455	continue;
465		456
466	if (m == mon->map && blocked_link (mon, m, x, y))	457	if (blocked_link (mon, pos.m, pos.x, pos.y))
467	break;	458	break;
468	}	459	}
		460
469	/* go through entire loop without finding a valid	461	/* go through entire loop without finding a valid
470	* sidestep to take - thus, no valid path.	462	* sidestep to take - thus, no valid path.
471	*/	463	*/
472	if (i == (DETOUR_AMOUNT + 1))	464	if (i == DETOUR_AMOUNT + 1)
473	return 0;	465	return 0;
		466
474	diff--;	467	diff--;
475	lastdir = dir;	468	lastdir = dir;
476	max--;	469	max--;
477	if (!firstdir)	470	if (!firstdir)
478	firstdir = dir + i;	471	firstdir = dir + i;
…		…
482	{	475	{
483	/* we moved towards creature, so diff is less */	476	/* we moved towards creature, so diff is less */
484	diff--;	477	diff--;
485	max--;	478	max--;
486	lastdir = dir;	479	lastdir = dir;
		480
487	if (!firstdir)	481	if (!firstdir)
488	firstdir = dir;	482	firstdir = dir;
489	}	483	}
490		484
491	if (diff <= 1)	485	if (diff <= 1)
492	{	486	{
493	/* Recalculate diff (distance) because we may not have actually	487	/* Recalculate diff (distance) because we may not have actually
494	* headed toward player for entire distance.	488	* headed toward player for entire distance.
495	*/	489	*/
496	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	490	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
497	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	491	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
498	}	492	}
499		493
500	if (diff > max)	494	if (diff > max)
501	return 0;	495	return 0;
…		…
542	}	536	}
543	}	537	}
544		538
545	/* Here we remove duplicated skills (as duplicated spell objects have	539	/* Here we remove duplicated skills (as duplicated spell objects have
546	* _very_ confusing effects for players), which could for instance be	540	* _very_ confusing effects for players), which could for instance be
547	* generated by bad treasurelists. - elmex	541	* generated by multiple treasurelists specifying the same skills.
548	*/	542	*/
549	if (op->type == SKILL)	543	if (op->type == SKILL)
550	{	544	{
551	for (object *tmp = op->below; tmp; tmp = tmp->below)	545	for (object *tmp = op->below; tmp; tmp = tmp->below)
552	if (tmp->type == op->type && tmp->name == op->name)	546	if (tmp->type == op->type && tmp->name == op->name)
553	{	547	{
554	op->destroy ();	548	op->destroy ();
555	LOG (llevError,
556	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
557	break;	549	break;
558	}	550	}
559		551
560	if (op->nrof > 1)	552	if (op->nrof > 1)
561	op->nrof = 1;	553	op->nrof = 1;
…		…
566		558
567	/* Give starting characters identified, uncursed, and undamned	559	/* Give starting characters identified, uncursed, and undamned
568	* items. Just don't identify gold or silver, or it won't be	560	* items. Just don't identify gold or silver, or it won't be
569	* merged properly.	561	* merged properly.
570	*/	562	*/
571	if (need_identify (op))	563	if (op->need_identify ())
572	{	564	{
573	op->set_flag (FLAG_IDENTIFIED);	565	op->set_flag (FLAG_IDENTIFIED);
574	op->clr_flag (FLAG_CURSED);	566	op->clr_flag (FLAG_CURSED);
575	op->clr_flag (FLAG_DAMNED);	567	op->clr_flag (FLAG_DAMNED);
576	}	568	}
…		…
614	roll_stat ()	606	roll_stat ()
615	{	607	{
616	int a[4], i, j, k;	608	int a[4], i, j, k;
617		609
618	for (i = 0; i < 4; i++)	610	for (i = 0; i < 4; i++)
619	a[i] = (int) rndm (6) + 1;	611	a[i] = rndm (1, 6);
620		612
621	for (i = 0, j = 0, k = 7; i < 4; i++)	613	for (i = 0, j = 0, k = 7; i < 4; i++)
622	if (a[i] < k)	614	if (a[i] < k)
623	k = a[i], j = i;	615	k = a[i], j = i;
624		616
…		…
721	treasurelist *tl = treasurelist::find (shstr_starting_wealth);	713	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
722	if (tl)	714	if (tl)
723	create_treasure (tl, ob, 0, 0, 0);	715	create_treasure (tl, ob, 0, 0, 0);
724		716
725	INVOKE_PLAYER (BIRTH, ob->contr);	717	INVOKE_PLAYER (BIRTH, ob->contr);
726	INVOKE_PLAYER (LOGIN, ob->contr);
727		718
728	ob->contr->ns->state = ST_PLAYING;	719	ob->contr->ns->state = ST_PLAYING;
729		720
730	if (ob->msg)	721	if (ob->msg)
731	ob->msg = 0;	722	ob->msg = 0;
…		…
741	*/	732	*/
742	if (*first_map_ext_path)	733	if (*first_map_ext_path)
743	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);	734	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
744	else	735	else
745	LOG (llevDebug, "first_map_ext_path not set\n");	736	LOG (llevDebug, "first_map_ext_path not set\n");
		737	}
		738
		739	/*
		740	* Returns true if the given player is a legal class.
		741	* The function to add and remove class-bonuses to the stats doesn't
		742	* check if the stat becomes negative, thus this function
		743	* merely checks that all stats are 1 or more, and returns
		744	* false otherwise.
		745	*/
		746	static int
		747	allowed_class (const object *op)
		748	{
		749	return op->stats.Dex > 0
		750	&& op->stats.Str > 0
		751	&& op->stats.Con > 0
		752	&& op->stats.Int > 0
		753	&& op->stats.Wis > 0
		754	&& op->stats.Pow > 0
		755	&& op->stats.Cha > 0;
746	}	756	}
747		757
748	void	758	void
749	player::chargen_race_next ()	759	player::chargen_race_next ()
750	{	760	{
…		…
1452	#endif	1462	#endif
1453		1463
1454	SET_ANIMATION (arrow, arrow->direction);	1464	SET_ANIMATION (arrow, arrow->direction);
1455		1465
1456	/* update the speed */	1466	/* update the speed */
1457	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1458	+ bow->stats.dam / 7.f;
1459		1467
1460	arrow->set_speed (max (arrow->speed, 2.f));
1461	arrow->speed_left = 0;	1468	arrow->speed_left = 0;
		1469	arrow->set_speed (max (2.f,
		1470	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1471	+ bow->stats.dam / 7.f
		1472	));
1462		1473
1463	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1474	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1464		1475
1465	if (op->type == PLAYER)	1476	if (op->type == PLAYER)
1466	{	1477	{
…		…
1487	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);	1498	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1488		1499
1489	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1500	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1490	arrow->move_type = MOVE_FLY_LOW;	1501	arrow->move_type = MOVE_FLY_LOW;
1491	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1502	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
		1503	arrow->set_flag (FLAG_NO_PICK);
1492		1504
1493	op->play_sound (sound_find ("fire_arrow"));	1505	op->play_sound (sound_find ("fire_arrow"));
1494	m->insert (arrow, sx, sy, op);	1506	m->insert (arrow, sx, sy, op);
1495		1507
1496	if (!arrow->destroyed ())	1508	if (!arrow->destroyed ())
…		…
1599		1611
1600	if (item->type == WAND)	1612	if (item->type == WAND)
1601	{	1613	{
1602	if (!(--item->stats.food))	1614	if (!(--item->stats.food))
1603	{	1615	{
1604	object *tmp;
1605
1606	if (item->arch)	1616	if (item->arch)
1607	{	1617	{
1608	item->clr_flag (FLAG_ANIMATE);	1618	item->clr_flag (FLAG_ANIMATE);
1609	item->face = item->arch->face;	1619	item->face = item->arch->face;
1610	item->set_speed (0);	1620	item->set_speed (0);
…		…
1873	\|\| mon->flag [FLAG_CAN_ROLL])	1883	\|\| mon->flag [FLAG_CAN_ROLL])
1874	&& mon != op)	1884	&& mon != op)
1875	break;	1885	break;
1876	}	1886	}
1877		1887
1878	if (!mon) /* This happens anytime the player tries to move */	1888	/* no monster == player tries to move into a wall or so */
1879	return false; /* into a wall */	1889	if (!mon)
		1890	{
		1891	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1892	if (op->move_type & ob->move_block)
		1893	{
		1894	if (ob->move_block == MOVE_ALL)
		1895	move_into_wall (op, ob);
		1896	else
		1897	{
		1898	if (op->contr->ns->bumpmsg)
		1899	{
		1900	op->play_sound (sound_find ("blocked_move"));
		1901
		1902	op->statusmsg (ob->invisible
		1903	? "Something blocks you."
		1904	: format ("Something blocks you from entering the %s.", query_name (ob))
		1905	);
		1906	}
		1907	}
		1908
		1909	break;
		1910	}
		1911
		1912	return false;
		1913	}
1880		1914
1881	mon = mon->head_ ();	1915	mon = mon->head_ ();
1882		1916
1883	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	1917	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
1884	if (op->contr->weapon_sp_left > 0.f)	1918	if (op->contr->weapon_sp_left > 0.f)
…		…
1999	}	2033	}
2000		2034
2001	bool	2035	bool
2002	move_player (object *op, int dir)	2036	move_player (object *op, int dir)
2003	{	2037	{
2004	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)	2038	if (!op->map \|\| op->map->state != MAP_ACTIVE)
2005	return 0;	2039	return 0;
2006		2040
2007	/* Sanity check: make sure dir is valid */	2041	/* Sanity check: make sure dir is valid */
2008	if (dir < 0 \|\| dir > 8)	2042	if (dir < 0 \|\| dir > 8)
2009	{	2043	{
…		…
2150	void	2184	void
2151	do_some_living (object *op)	2185	do_some_living (object *op)
2152	{	2186	{
2153	int last_food = op->stats.food;	2187	int last_food = op->stats.food;
2154	int gen_hp, gen_sp, gen_grace;	2188	int gen_hp, gen_sp, gen_grace;
2155	int over_hp, over_sp, over_grace;
2156	int i;
2157	int rate_hp = 1200;	2189	int rate_hp = 1200;
2158	int rate_sp = 2500;	2190	int rate_sp = 2500;
2159	int rate_grace = 2000;	2191	int rate_grace = 2000;
2160	const int max_hp = 1;	2192	const int max_hp = 1;
2161	const int max_sp = 1;	2193	const int max_sp = 1;
2162	const int max_grace = 1;	2194	const int max_grace = 1;
2163		2195
		2196	#if 0
2164	if (op->contr->hidden)	2197	if (op->contr->hidden)
2165	{	2198	{
2166	op->invisible = 1000;	2199	op->invisible = 1000;
2167	/* the socket code flashes the player visible/invisible	2200	/* the socket code flashes the player visible/invisible
2168	* depending on the value of invisible, so we need to	2201	* depending on the value of invisible, so we need to
2169	* alternate it here for it to work correctly.	2202	* alternate it here for it to work correctly.
2170	*/	2203	*/
2171	if (pticks & 2)	2204	if (server_tick & 2)
2172	op->invisible--;	2205	op->invisible--;
2173	}	2206	}
		2207	else
		2208	#endif
2174	else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))	2209	if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2175	{	2210	{
2176	if (!op->invisible--)	2211	if (!op->invisible--)
2177	{	2212	{
2178	make_visible (op);	2213	make_visible (op);
2179	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2214	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2213	if (--op->last_grace < 0)	2248	if (--op->last_grace < 0)
2214	{	2249	{
2215	if (op->stats.grace < op->stats.maxgrace / 2)	2250	if (op->stats.grace < op->stats.maxgrace / 2)
2216	op->stats.grace++; /* no penalty in food for regaining grace */	2251	op->stats.grace++; /* no penalty in food for regaining grace */
2217		2252
		2253	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2254
2218	if (max_grace > 1)	2255	if (max_grace > 1)
2219	{	2256	{
2220	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2257	int over_grace = temp / rate_grace;
		2258
2221	if (over_grace > 0)	2259	if (over_grace > 0)
2222	{	2260	{
2223	op->stats.sp += over_grace	2261	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2224	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2225	op->last_grace = 0;	2262	op->last_grace = 0;
2226	}	2263	}
2227	else	2264	else
2228	{	2265	op->last_grace = rate_grace / temp;
2229	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2230	}
2231	}	2266	}
2232	else	2267	else
2233	{	2268	op->last_grace = rate_grace / temp;
2234	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2269
2235	}
2236	/* wearing stuff doesn't detract from grace generation. */	2270	/* wearing stuff doesn't detract from grace generation. */
2237	}	2271	}
2238		2272
2239	if (op->stats.food > 0)	2273	if (op->stats.food > 0)
2240	{	2274	{
…		…
2259	}	2293	}
2260	}	2294	}
2261		2295
2262	if (max_sp > 1)	2296	if (max_sp > 1)
2263	{	2297	{
2264	over_sp = (gen_sp + 10) / rate_sp;	2298	int over_sp = (gen_sp + 10) / rate_sp;
2265	if (over_sp > 0)	2299	if (over_sp > 0)
2266	{	2300	{
2267	if (op->stats.sp < op->stats.maxsp)	2301	if (op->stats.sp < op->stats.maxsp)
2268	{	2302	{
2269	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2303	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2301	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2335	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2302	op->stats.food = last_food;	2336	op->stats.food = last_food;
2303	}	2337	}
2304	}	2338	}
2305		2339
		2340	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2341
2306	if (max_hp > 1)	2342	if (max_hp > 1)
2307	{	2343	{
2308	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2344	int over_hp = temp / rate_hp;
2309		2345
2310	if (over_hp > 0)	2346	if (over_hp > 0)
2311	{	2347	{
2312	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2348	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2313	op->last_heal = 0;	2349	op->last_heal = 0;
2314	}	2350	}
2315	else	2351	else
2316	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2352	op->last_heal = rate_hp / temp;
2317	}	2353	}
2318	else	2354	else
2319	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2355	op->last_heal = rate_hp / temp;
2320	}	2356	}
2321	}	2357	}
2322		2358
2323	/* Digestion */	2359	/* Digestion */
2324	if (--op->last_eat < 0)	2360	if (--op->last_eat < 0)
…		…
2664	if (will_kill_again)	2700	if (will_kill_again)
2665	{	2701	{
2666	object *force;	2702	object *force;
2667	int at;	2703	int at;
2668		2704
2669	force = get_archetype (FORCE_NAME);	2705	force = archetype::get (FORCE_NAME);
2670	/* 50 ticks should be enough time for the spell to abate */	2706	/* 50 ticks should be enough time for the spell to abate */
2671	force->speed = 0.1f;
2672	force->speed_left = -5.f;	2707	force->speed_left = -5.f;
		2708	force->set_speed (0.1f);
2673	force->set_flag (FLAG_APPLIED);	2709	force->set_flag (FLAG_APPLIED);
		2710
2674	for (at = 0; at < NROFATTACKS; at++)	2711	for (at = 0; at < NROFATTACKS; at++)
2675	if (will_kill_again & (1 << at))	2712	if (will_kill_again & (1 << at))
2676	force->resist[at] = 100;	2713	force->resist[at] = 100;
2677		2714
2678	insert_ob_in_ob (force, op);	2715	insert_ob_in_ob (force, op);
…		…
2683	}	2720	}
2684		2721
2685	static void	2722	static void
2686	loot_object (object *op)	2723	loot_object (object *op)
2687	{ /* Grab and destroy some treasure */	2724	{ /* Grab and destroy some treasure */
2688	object tmp, tmp2, *next;	2725	object tmp, next;
2689		2726
2690	op->close_container (); /* close open sack first */	2727	op->close_container (); /* close open sack first */
2691		2728
2692	for (tmp = op->inv; tmp; tmp = next)	2729	for (tmp = op->inv; tmp; tmp = next)
2693	{	2730	{
…		…
2725	void	2762	void
2726	fix_weight ()	2763	fix_weight ()
2727	{	2764	{
2728	for_all_players (pl)	2765	for_all_players (pl)
2729	{	2766	{
2730	sint32 old = pl->ob->carrying;	2767	weight_t old = pl->ob->carrying;
2731		2768
2732	pl->ob->update_weight ();	2769	pl->ob->update_weight ();
2733		2770
2734	if (old != pl->ob->carrying)	2771	if (old != pl->ob->carrying)
2735	{	2772	{
…		…
2930	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2967	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
2931	{	2968	{
2932	if ((player \|\|friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])	2969	if ((player \|\|friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
2933	return 1;	2970	return 1;
2934	else if (tmp->type == PLAYER)	2971	else if (tmp->type == PLAYER)
2935	{
2936	/don't let a hidden DM prevent you from hiding /
2937	if (!tmp->flag [FLAG_WIZ] \|\| tmp->contr->hidden == 0)
2938	return 1;	2972	return 1;
2939	}
2940	}	2973	}
2941	}	2974	}
2942	return 0;	2975	return 0;
2943	}	2976	}
2944		2977
2945	/* check the player los field for viewability of the	2978	/* check the player los field for viewability of the
2946	* object op. This function works fine for monsters,	2979	* object op. This function works fine for monsters,
2947	* but we dont worry if the object isnt the top one in	2980	* but we dont worry if the object isnt the top one in
2948	* a pile (say a coin under a table would return "viewable"	2981	* a pile (say a coin under a table would return "viewable"
2949	* by this routine). Another question, should we be	2982	* by this routine). Another question, should we be
2950	* concerned with the direction the player is looking	2983	* concerned with the direction the player is looking
2951	* in? Realistically, most of us can't see stuff behind	2984	* in? Realistically, most of us can't see stuff behind
2952	* our backs...on the other hand, does the "facing" direction	2985	* our backs...on the other hand, does the "facing" direction
2953	* imply the way your head, or body is facing? It's possible	2986	* imply the way your head, or body is facing? It's possible
2954	* for them to differ. Sigh, this fctn could get a bit more complex.	2987	* for them to differ. Sigh, this fctn could get a bit more complex.
2955	* -b.t.	2988	* -b.t.
2956	* This function is now map tiling safe.	2989	* This function is now map tiling safe.
2957	*/	2990	*/
2958	int	2991	int
2959	player_can_view (object pl, object op)	2992	player_can_view (object pl, object op)
2960	{	2993	{

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.271 by root, Sun Apr 11 23:32:10 2010 UTC vs. Revision 1.296 by root, Thu Nov 17 04:59:33 2016 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.271 by root, Sun Apr 11 23:32:10 2010 UTC vs.
Revision 1.296 by root, Thu Nov 17 04:59:33 2016 UTC