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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC vs.
Revision 1.281 by root, Mon Oct 18 09:33:11 2010 UTC

…		…
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
…		…
609	roll_stat ()	608	roll_stat ()
610	{	609	{
611	int a[4], i, j, k;	610	int a[4], i, j, k;
612		611
613	for (i = 0; i < 4; i++)	612	for (i = 0; i < 4; i++)
614	a[i] = (int) rndm (6) + 1;	613	a[i] = rndm (1, 6);
615		614
616	for (i = 0, j = 0, k = 7; i < 4; i++)	615	for (i = 0, j = 0, k = 7; i < 4; i++)
617	if (a[i] < k)	616	if (a[i] < k)
618	k = a[i], j = i;	617	k = a[i], j = i;
619		618
…		…
716	treasurelist *tl = treasurelist::find (shstr_starting_wealth);	715	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
717	if (tl)	716	if (tl)
718	create_treasure (tl, ob, 0, 0, 0);	717	create_treasure (tl, ob, 0, 0, 0);
719		718
720	INVOKE_PLAYER (BIRTH, ob->contr);	719	INVOKE_PLAYER (BIRTH, ob->contr);
721	INVOKE_PLAYER (LOGIN, ob->contr);
722		720
723	ob->contr->ns->state = ST_PLAYING;	721	ob->contr->ns->state = ST_PLAYING;
724		722
725	if (ob->msg)	723	if (ob->msg)
726	ob->msg = 0;	724	ob->msg = 0;
…		…
1447	#endif	1445	#endif
1448		1446
1449	SET_ANIMATION (arrow, arrow->direction);	1447	SET_ANIMATION (arrow, arrow->direction);
1450		1448
1451	/* update the speed */	1449	/* update the speed */
1452	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1453	+ bow->stats.dam / 7.f;
1454		1450
1455	arrow->set_speed (max (arrow->speed, 2.f));
1456	arrow->speed_left = 0;	1451	arrow->speed_left = 0;
		1452	arrow->set_speed (max (2.f,
		1453	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1454	+ bow->stats.dam / 7.f
		1455	));
1457		1456
1458	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1457	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1459		1458
1460	if (op->type == PLAYER)	1459	if (op->type == PLAYER)
1461	{	1460	{
…		…
1868	\|\| mon->flag [FLAG_CAN_ROLL])	1867	\|\| mon->flag [FLAG_CAN_ROLL])
1869	&& mon != op)	1868	&& mon != op)
1870	break;	1869	break;
1871	}	1870	}
1872		1871
1873	if (!mon) /* This happens anytime the player tries to move */	1872	/* no monster == player tries to move into a wall or so */
1874	return false; /* into a wall */	1873	if (!mon)
		1874	{
		1875	if (op->contr->ns->bumpmsg)
		1876	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1877	if (op->move_type & ob->move_block)
		1878	{
		1879	if (ob->move_block == MOVE_ALL)
		1880	{
		1881	op->play_sound (sound_find ("bump_wall"));
		1882
		1883	op->statusmsg (ob->invisible
		1884	? "You bump into something."
		1885	: format ("You bump into the %s.", query_name (ob))
		1886	);
		1887	}
		1888	else
		1889	{
		1890	op->play_sound (sound_find ("blocked_move"));
		1891
		1892	op->statusmsg (ob->invisible
		1893	? "Something blocks you."
		1894	: format ("Something blocks you from entering the %s.", query_name (ob))
		1895	);
		1896	}
		1897
		1898	break;
		1899	}
		1900
		1901	return false;
		1902	}
1875		1903
1876	mon = mon->head_ ();	1904	mon = mon->head_ ();
1877		1905
1878	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	1906	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
1879	if (op->contr->weapon_sp_left > 0.f)	1907	if (op->contr->weapon_sp_left > 0.f)
…		…
2145	void	2173	void
2146	do_some_living (object *op)	2174	do_some_living (object *op)
2147	{	2175	{
2148	int last_food = op->stats.food;	2176	int last_food = op->stats.food;
2149	int gen_hp, gen_sp, gen_grace;	2177	int gen_hp, gen_sp, gen_grace;
2150	int over_hp, over_sp, over_grace;
2151	int i;	2178	int i;
2152	int rate_hp = 1200;	2179	int rate_hp = 1200;
2153	int rate_sp = 2500;	2180	int rate_sp = 2500;
2154	int rate_grace = 2000;	2181	int rate_grace = 2000;
2155	const int max_hp = 1;	2182	const int max_hp = 1;
…		…
2208	if (--op->last_grace < 0)	2235	if (--op->last_grace < 0)
2209	{	2236	{
2210	if (op->stats.grace < op->stats.maxgrace / 2)	2237	if (op->stats.grace < op->stats.maxgrace / 2)
2211	op->stats.grace++; /* no penalty in food for regaining grace */	2238	op->stats.grace++; /* no penalty in food for regaining grace */
2212		2239
		2240	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2241
2213	if (max_grace > 1)	2242	if (max_grace > 1)
2214	{	2243	{
2215	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2244	int over_grace = temp / rate_grace;
		2245
2216	if (over_grace > 0)	2246	if (over_grace > 0)
2217	{	2247	{
2218	op->stats.sp += over_grace	2248	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2219	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2220	op->last_grace = 0;	2249	op->last_grace = 0;
2221	}	2250	}
2222	else	2251	else
2223	{	2252	op->last_grace = rate_grace / temp;
2224	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2225	}
2226	}	2253	}
2227	else	2254	else
2228	{	2255	op->last_grace = rate_grace / temp;
2229	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2256
2230	}
2231	/* wearing stuff doesn't detract from grace generation. */	2257	/* wearing stuff doesn't detract from grace generation. */
2232	}	2258	}
2233		2259
2234	if (op->stats.food > 0)	2260	if (op->stats.food > 0)
2235	{	2261	{
…		…
2254	}	2280	}
2255	}	2281	}
2256		2282
2257	if (max_sp > 1)	2283	if (max_sp > 1)
2258	{	2284	{
2259	over_sp = (gen_sp + 10) / rate_sp;	2285	int over_sp = (gen_sp + 10) / rate_sp;
2260	if (over_sp > 0)	2286	if (over_sp > 0)
2261	{	2287	{
2262	if (op->stats.sp < op->stats.maxsp)	2288	if (op->stats.sp < op->stats.maxsp)
2263	{	2289	{
2264	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2290	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2296	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2322	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2297	op->stats.food = last_food;	2323	op->stats.food = last_food;
2298	}	2324	}
2299	}	2325	}
2300		2326
		2327	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2328
2301	if (max_hp > 1)	2329	if (max_hp > 1)
2302	{	2330	{
2303	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2331	int over_hp = temp / rate_hp;
2304		2332
2305	if (over_hp > 0)	2333	if (over_hp > 0)
2306	{	2334	{
2307	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2335	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2308	op->last_heal = 0;	2336	op->last_heal = 0;
2309	}	2337	}
2310	else	2338	else
2311	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2339	op->last_heal = rate_hp / temp;
2312	}	2340	}
2313	else	2341	else
2314	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2342	op->last_heal = rate_hp / temp;
2315	}	2343	}
2316	}	2344	}
2317		2345
2318	/* Digestion */	2346	/* Digestion */
2319	if (--op->last_eat < 0)	2347	if (--op->last_eat < 0)
…		…
2661	object *force;	2689	object *force;
2662	int at;	2690	int at;
2663		2691
2664	force = get_archetype (FORCE_NAME);	2692	force = get_archetype (FORCE_NAME);
2665	/* 50 ticks should be enough time for the spell to abate */	2693	/* 50 ticks should be enough time for the spell to abate */
2666	force->speed = 0.1f;
2667	force->speed_left = -5.f;	2694	force->speed_left = -5.f;
		2695	force->set_speed (0.1f);
2668	force->set_flag (FLAG_APPLIED);	2696	force->set_flag (FLAG_APPLIED);
		2697
2669	for (at = 0; at < NROFATTACKS; at++)	2698	for (at = 0; at < NROFATTACKS; at++)
2670	if (will_kill_again & (1 << at))	2699	if (will_kill_again & (1 << at))
2671	force->resist[at] = 100;	2700	force->resist[at] = 100;
2672		2701
2673	insert_ob_in_ob (force, op);	2702	insert_ob_in_ob (force, op);

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC vs. Revision 1.281 by root, Mon Oct 18 09:33:11 2010 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC vs.
Revision 1.281 by root, Mon Oct 18 09:33:11 2010 UTC