[ViewVC] Diff of: cvs/deliantra/server/server/spell

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.97 by root, Fri Mar 26 00:53:26 2010 UTC vs.
Revision 1.108 by root, Tue Jan 3 11:25:37 2012 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 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.
59	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	59	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
60	{	60	{
61	int num_sections = 1;	61	int num_sections = 1;
62		62
63	/* don't move DM */	63	/* don't move DM */
64	if (QUERY_FLAG (tmp, FLAG_WIZ))	64	if (tmp->flag [FLAG_WIZ])
65	return;	65	return;
66		66
67	/* don't move parts of objects */	67	/* don't move parts of objects */
68	if (tmp->head)	68	if (tmp->head)
69	continue;	69	continue;
70		70
71	/* don't move floors or immobile objects */	71	/* don't move floors or immobile objects */
72	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK)))	72	if (tmp->flag [FLAG_IS_FLOOR] \|\| (!tmp->flag [FLAG_ALIVE] && tmp->flag [FLAG_NO_PICK]))
73	continue;	73	continue;
74		74
75	/* count the object's sections */	75	/* count the object's sections */
76	for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)	76	for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
77	num_sections++;	77	num_sections++;
…		…
194	* on the space. So only call reflwall if we think the data it returns	194	* on the space. So only call reflwall if we think the data it returns
195	* will be useful.	195	* will be useful.
196	*/	196	*/
197	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) \|\| ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))	197	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) \|\| ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
198	{	198	{
199	if (!QUERY_FLAG (op, FLAG_REFLECTING))	199	if (!op->flag [FLAG_REFLECTING])
200	return;	200	return;
201		201
202	/* Since walls don't run diagonal, if the bolt is in	202	/* Since walls don't run diagonal, if the bolt is in
203	* one of 4 main directions, it just reflects back in the	203	* one of 4 main directions, it just reflects back in the
204	* opposite direction. However, if the bolt is travelling	204	* opposite direction. However, if the bolt is travelling
…		…
294	tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);	294	tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
295	tmp->stats.Dex = spob->stats.Dex;	295	tmp->stats.Dex = spob->stats.Dex;
296	tmp->stats.Con = spob->stats.Con;	296	tmp->stats.Con = spob->stats.Con;
297		297
298	tmp->direction = dir;	298	tmp->direction = dir;
299	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	299	if (tmp->flag [FLAG_IS_TURNABLE])
300	SET_ANIMATION (tmp, dir);	300	SET_ANIMATION (tmp, dir);
301		301
302	tmp->set_owner (op);	302	tmp->set_owner (op);
303	set_spell_skill (op, caster, spob, tmp);	303	set_spell_skill (op, caster, spob, tmp);
304		304
…		…
316		316
317	tmp->map = newmap;	317	tmp->map = newmap;
318		318
319	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))	319	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
320	{	320	{
321	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))	321	if (!tmp->flag [FLAG_REFLECTING])
322	{	322	{
323	tmp->drop_and_destroy ();	323	tmp->drop_and_destroy ();
324	return 0;	324	return 0;
325	}	325	}
326		326
…		…
521	if (!(mflags & P_IS_ALIVE))	521	if (!(mflags & P_IS_ALIVE))
522	return;	522	return;
523		523
524	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	524	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
525	{	525	{
526	if (QUERY_FLAG (tmp, FLAG_ALIVE))	526	if (tmp->flag [FLAG_ALIVE])
527	{	527	{
528	dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);	528	dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
529		529
530	// TODO: can't understand the following if's	530	// TODO: can't understand the following if's
531	if (op->destroyed () \|\| !tmp->destroyed () \|\| (op->stats.dam -= dam) < 0)	531	if (op->destroyed () \|\| !tmp->destroyed () \|\| (op->stats.dam -= dam) < 0)
532	{	532	{
533	if (!QUERY_FLAG (op, FLAG_REMOVED))	533	if (!op->flag [FLAG_REMOVED])
534	{	534	{
535	op->destroy ();	535	op->destroy ();
536	return;	536	return;
537	}	537	}
538	}	538	}
…		…
640	tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob);	640	tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob);
641	tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob);	641	tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob);
642	tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob);	642	tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob);
643		643
644	tmp->direction = dir;	644	tmp->direction = dir;
645	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	645	if (tmp->flag [FLAG_IS_TURNABLE])
646	SET_ANIMATION (tmp, dir);	646	SET_ANIMATION (tmp, dir);
647		647
648	tmp->set_owner (op);	648	tmp->set_owner (op);
649	set_spell_skill (op, caster, spob, tmp);	649	set_spell_skill (op, caster, spob, tmp);
650		650
…		…
675	return 0;	675	return 0;
676	}	676	}
677		677
678	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))	678	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
679	{	679	{
680	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))	680	if (!tmp->flag [FLAG_REFLECTING])
681	{	681	{
682	tmp->destroy ();	682	tmp->destroy ();
683	return 0;	683	return 0;
684	}	684	}
685		685
…		…
729	op->set_speed (0);	729	op->set_speed (0);
730	return;	730	return;
731	}	731	}
732		732
733	/* lava saves it's life, but not yours :) */	733	/* lava saves it's life, but not yours :) */
734	if (QUERY_FLAG (op, FLAG_LIFESAVE))	734	if (op->flag [FLAG_LIFESAVE])
735	{	735	{
736	hit_map (op, 0, op->attacktype, 0);	736	hit_map (op, 0, op->attacktype, 0);
737	return;	737	return;
738	}	738	}
739		739
…		…
820	MoveType movetype;	820	MoveType movetype;
821		821
822	if (!spell->other_arch)	822	if (!spell->other_arch)
823	return 0;	823	return 0;
824		824
825	if (op->type == PLAYER && QUERY_FLAG (op, FLAG_UNDEAD) && op->attacktype & AT_TURN_UNDEAD)	825	if (op->type == PLAYER && op->flag [FLAG_UNDEAD] && op->attacktype & AT_TURN_UNDEAD)
826	{	826	{
827	new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!");	827	op->failmsg ("Your undead nature prevents you from turning undead!");
828	return 0;	828	return 0;
829	}	829	}
830		830
831	if (!dir)	831	if (!dir)
832	{	832	{
…		…
996	tmp->attacktype = op->attacktype;	996	tmp->attacktype = op->attacktype;
997	tmp->set_owner (op);	997	tmp->set_owner (op);
998	if (op->skill && op->skill != tmp->skill)	998	if (op->skill && op->skill != tmp->skill)
999	tmp->skill = op->skill;	999	tmp->skill = op->skill;
1000		1000
1001	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	1001	if (tmp->flag [FLAG_IS_TURNABLE])
1002	SET_ANIMATION (tmp, i);	1002	SET_ANIMATION (tmp, i);
1003		1003
1004	op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);	1004	op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1005	move_bullet (tmp);	1005	move_bullet (tmp);
1006	}	1006	}
…		…
1025	// to fix create bomb traps in doors, which cast with dir=0).	1025	// to fix create bomb traps in doors, which cast with dir=0).
1026	if (dir)	1026	if (dir)
1027	{	1027	{
1028	if ((mflags & P_OUT_OF_MAP) \|\| (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))	1028	if ((mflags & P_OUT_OF_MAP) \|\| (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1029	{	1029	{
1030	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");	1030	op->failmsg ("There is something in the way.");
1031	return 0;	1031	return 0;
1032	}	1032	}
1033	}	1033	}
1034		1034
1035	tmp = spell->other_arch->instance ();	1035	tmp = spell->other_arch->instance ();
…		…
1089	if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)	1089	if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1090	return NULL;	1090	return NULL;
1091		1091
1092	if (mflags & P_IS_ALIVE)	1092	if (mflags & P_IS_ALIVE)
1093	for (target = GET_MAP_OB (mp, x, y); target; target = target->above)	1093	for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1094	if (QUERY_FLAG (target, FLAG_MONSTER))	1094	if (target->flag [FLAG_MONSTER])
1095	return target;	1095	return target;
1096	}	1096	}
1097		1097
1098	return NULL;	1098	return NULL;
1099	}	1099	}
…		…
1129	\|\| target->flag [FLAG_REFL_SPELL]	1129	\|\| target->flag [FLAG_REFL_SPELL]
1130	\|\| (!god && spell->stats.grace)	1130	\|\| (!god && spell->stats.grace)
1131	\|\| (god && target->title == god->name)	1131	\|\| (god && target->title == god->name)
1132	\|\| (god && target->race.contains (god->race)))	1132	\|\| (god && target->race.contains (god->race)))
1133	{	1133	{
1134	new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");	1134	op->failmsg ("Your request is unheeded.");
1135	return 0;	1135	return 0;
1136	}	1136	}
1137		1137
1138	if (spell->other_arch)	1138	if (spell->other_arch)
1139	effect = spell->other_arch->instance ();	1139	effect = spell->other_arch->instance ();
…		…
1147	{	1147	{
1148	if (tailor_god_spell (effect, op))	1148	if (tailor_god_spell (effect, op))
1149	new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));	1149	new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1150	else	1150	else
1151	{	1151	{
1152	new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored.");	1152	op->failmsg ("Your request is ignored.");
1153	return 0;	1153	return 0;
1154	}	1154	}
1155	}	1155	}
1156		1156
1157	/* size of the area of destruction */	1157	/* size of the area of destruction */
…		…
1161	if (effect->attacktype & AT_DEATH)	1161	if (effect->attacktype & AT_DEATH)
1162	{	1162	{
1163	effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1163	effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1164		1164
1165	/* casting death spells at undead isn't a good thing */	1165	/* casting death spells at undead isn't a good thing */
1166	if (QUERY_FLAG (target, FLAG_UNDEAD))	1166	if (target->flag [FLAG_UNDEAD])
1167	{	1167	{
1168	if (random_roll (0, 2, op, PREFER_LOW))	1168	if (random_roll (0, 2, op, PREFER_LOW))
1169	{	1169	{
1170	new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");	1170	new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1171	effect->x = op->x;	1171	effect->x = op->x;
…		…
1264	{	1264	{
1265	/* some things are unaffected... */	1265	/* some things are unaffected... */
1266	if (op->path_denied & PATH_LIGHT)	1266	if (op->path_denied & PATH_LIGHT)
1267	return 0;	1267	return 0;
1268		1268
1269	object *tmp = get_archetype (FORCE_NAME);	1269	object *tmp = archetype::get (FORCE_NAME);
1270	tmp->speed = 0.01;	1270	tmp->set_speed (0.01);
1271	tmp->stats.food = time;	1271	tmp->stats.food = time;
1272	SET_FLAG (tmp, FLAG_IS_USED_UP);	1272	tmp->set_flag (FLAG_IS_USED_UP);
1273	tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));	1273	tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1274	tmp = insert_ob_in_ob (tmp, op);	1274	tmp = insert_ob_in_ob (tmp, op);
1275		1275
1276	if (tmp->glow_radius > op->glow_radius)	1276	if (tmp->glow_radius > op->glow_radius)
1277	op->set_glow_radius (tmp->glow_radius);	1277	op->set_glow_radius (tmp->glow_radius);
…		…
1285	int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);	1285	int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1286	int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);	1286	int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1287	int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	1287	int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1288		1288
1289	bool friendly = op->flag [FLAG_FRIENDLY] \|\| op->is_player ();	1289	bool friendly = op->flag [FLAG_FRIENDLY] \|\| op->is_player ();
1290
1291	/* destruction doesn't use another spell object, so we need
1292	* update op's skill pointer so that exp is properly awarded.
1293	*/
1294	const shstr skill = op->skill;
1295
1296	if (caster == op)
1297	op->skill = spell_ob->skill;
1298	else if (caster->skill)
1299	op->skill = caster->skill;
1300	else
1301	op->skill = 0;
1302
1303	op->change_skill (find_skill_by_name (op, op->skill));
1304		1290
1305	dynbuf buf;	1291	dynbuf buf;
1306	unordered_mapwalk (buf, op, -range, -range, range, range)	1292	unordered_mapwalk (buf, op, -range, -range, range, range)
1307	{	1293	{
1308	mapspace &ms = m->at (nx, ny);	1294	mapspace &ms = m->at (nx, ny);
…		…
1334	}	1320	}
1335	}	1321	}
1336	}	1322	}
1337	}	1323	}
1338		1324
1339	op->skill = skill;
1340	return 1;	1325	return 1;
1341	}	1326	}
1342		1327
1343	/***************************************************************************	1328	/***************************************************************************
1344	*	1329	*
…		…
1352	object tmp, force;	1337	object tmp, force;
1353		1338
1354	tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE);	1339	tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE);
1355	if (!tmp)	1340	if (!tmp)
1356	{	1341	{
1357	new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");	1342	op->failmsg ("There is no one in that direction to curse.");
1358	return 0;	1343	return 0;
1359	}	1344	}
1360		1345
1361	tmp = tmp->head_ ();	1346	tmp = tmp->head_ ();
1362		1347
…		…
1377	}	1362	}
1378	}	1363	}
1379		1364
1380	if (!force)	1365	if (!force)
1381	{	1366	{
1382	force = get_archetype (FORCE_NAME);	1367	force = archetype::get (FORCE_NAME);
1383	force->subtype = FORCE_CHANGE_ABILITY;	1368	force->subtype = FORCE_CHANGE_ABILITY;
1384		1369
1385	if (spell_ob->race)	1370	if (spell_ob->race)
1386	force->name = spell_ob->race;	1371	force->name = spell_ob->race;
1387	else	1372	else
…		…
1405		1390
1406	return 1;	1391	return 1;
1407	}	1392	}
1408		1393
1409	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;	1394	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1410	force->speed = 1.f;
1411	force->speed_left = -1.f;	1395	force->speed_left = -1.f;
1412	SET_FLAG (force, FLAG_APPLIED);	1396	force->set_speed (1.f);
		1397	force->set_flag (FLAG_APPLIED);
1413		1398
1414	if (god)	1399	if (god)
1415	{	1400	{
1416	if (spell_ob->last_grace)	1401	if (spell_ob->last_grace)
1417	force->path_repelled = god->path_repelled;	1402	force->path_repelled = god->path_repelled;
…		…
1500		1485
1501	/* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */	1486	/* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1502	if (race && head->race && !strstr (race, head->race))	1487	if (race && head->race && !strstr (race, head->race))
1503	continue;	1488	continue;
1504		1489
1505	if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))	1490	if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1506	continue;	1491	continue;
1507		1492
1508	/* Now do a bunch of stuff related to saving throws */	1493	/* Now do a bunch of stuff related to saving throws */
1509	best_at = -1;	1494	best_at = -1;
1510	if (spell->attacktype)	1495	if (spell->attacktype)
…		…
1552		1537
1553	/* Done with saving throw. Now start affecting the monster */	1538	/* Done with saving throw. Now start affecting the monster */
1554	done_one = 0;	1539	done_one = 0;
1555		1540
1556	/* aggravation */	1541	/* aggravation */
1557	if (QUERY_FLAG (spell, FLAG_MONSTER))	1542	if (spell->flag [FLAG_MONSTER])
1558	{	1543	{
1559	CLEAR_FLAG (head, FLAG_SLEEP);	1544	head->clr_flag (FLAG_SLEEP);
1560	remove_friendly_object (head);	1545	remove_friendly_object (head);
1561	done_one = 1;	1546	done_one = 1;
1562	head->enemy = op;	1547	head->enemy = op;
1563	}	1548	}
1564		1549
1565	/* calm monsters */	1550	/* calm monsters */
1566	if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE))	1551	if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1567	{	1552	{
1568	SET_FLAG (head, FLAG_UNAGGRESSIVE);	1553	head->set_flag (FLAG_UNAGGRESSIVE);
1569	head->enemy = NULL;	1554	head->enemy = NULL;
1570	done_one = 1;	1555	done_one = 1;
1571	}	1556	}
1572		1557
1573	/* berserk monsters */	1558	/* berserk monsters */
1574	if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))	1559	if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1575	{	1560	{
1576	SET_FLAG (head, FLAG_BERSERK);	1561	head->set_flag (FLAG_BERSERK);
1577	done_one = 1;	1562	done_one = 1;
1578	}	1563	}
1579		1564
1580	/* charm */	1565	/* charm */
1581	if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))	1566	if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1582	{	1567	{
1583	INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));	1568	INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1584		1569
1585	/* Prevent uncontrolled outbreaks of self replicating monsters.	1570	/* Prevent uncontrolled outbreaks of self replicating monsters.
1586	Typical use case is charm, go somwhere, use aggravation to make hostile.	1571	Typical use case is charm, go somwhere, use aggravation to make hostile.
1587	This could lead to fun stuff like mice outbreak in bigworld and server crawl. */	1572	This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1588	CLEAR_FLAG (head, FLAG_GENERATOR);	1573	head->clr_flag (FLAG_GENERATOR);
1589	head->set_owner (op);	1574	head->set_owner (op);
1590	set_spell_skill (op, caster, spell, head);	1575	set_spell_skill (op, caster, spell, head);
1591	add_friendly_object (head);	1576	add_friendly_object (head);
1592	head->attack_movement = PETMOVE;	1577	head->attack_movement = PETMOVE;
1593	done_one = 1;	1578	done_one = 1;
…		…
1887		1872
1888	mflags = get_map_flags (m, &m, x, y, &x, &y);	1873	mflags = get_map_flags (m, &m, x, y, &x, &y);
1889		1874
1890	if (mflags & P_OUT_OF_MAP)	1875	if (mflags & P_OUT_OF_MAP)
1891	{	1876	{
1892	new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");	1877	op->failmsg ("Nothing is there.");
1893	return 0;	1878	return 0;
1894	}	1879	}
1895		1880
1896	if (mflags & P_IS_ALIVE && spell->attacktype)	1881	if (mflags & P_IS_ALIVE && spell->attacktype)
1897	{	1882	{
1898	for (target = GET_MAP_OB (m, x, y); target; target = target->above)	1883	for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1899	if (QUERY_FLAG (target, FLAG_MONSTER))	1884	if (target->flag [FLAG_MONSTER])
1900	{	1885	{
1901	/* oky doky. got a target monster. Lets make a blinding attack */	1886	/* oky doky. got a target monster. Lets make a blinding attack */
1902	if (target->head)	1887	if (target->head)
1903	target = target->head;	1888	target = target->head;
1904		1889
…		…
1908	}	1893	}
1909		1894
1910	/* no live target, perhaps a wall is in the way? */	1895	/* no live target, perhaps a wall is in the way? */
1911	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))	1896	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1912	{	1897	{
1913	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");	1898	op->failmsg ("Something is in the way.");
1914	return 0;	1899	return 0;
1915	}	1900	}
1916	}	1901	}
1917		1902
1918	/* ok, looks groovy to just insert a new light on the map */	1903	/* ok, looks groovy to just insert a new light on the map */
…		…
1988	/* Only bother looking on this space if there is something living here */	1973	/* Only bother looking on this space if there is something living here */
1989	if (mflags & P_IS_ALIVE)	1974	if (mflags & P_IS_ALIVE)
1990	{	1975	{
1991	/* search this square for a victim */	1976	/* search this square for a victim */
1992	for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)	1977	for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
1993	if (QUERY_FLAG (walk, FLAG_MONSTER) \|\| (walk->type == PLAYER))	1978	if (walk->flag [FLAG_MONSTER] \|\| (walk->type == PLAYER))
1994	{ /* found a victim */	1979	{ /* found a victim */
1995	object *disease = spell->other_arch->instance ();	1980	object *disease = spell->other_arch->instance ();
1996		1981
1997	disease->set_owner (op);	1982	disease->set_owner (op);
1998	set_spell_skill (op, caster, spell, disease);	1983	set_spell_skill (op, caster, spell, disease);
1999	disease->stats.exp = 0;	1984	disease->stats.exp = 0;
2000	disease->level = casting_level (caster, spell);	1985	disease->level = casting_level (caster, spell);
2001		1986
2002	/* do level adjustments */	1987	/* do level adjustments */
2003	if (disease->stats.wc)	1988	if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
2004	disease->stats.wc += dur_mod / 2;	1989	if (disease->magic > 0) disease->magic += dur_mod / 8;
2005		1990	if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
2006	if (disease->magic > 0)	1991	if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
2007	disease->magic += dur_mod / 8;
2008
2009	if (disease->stats.maxhp > 0)
2010	disease->stats.maxhp += dur_mod;
2011
2012	if (disease->stats.maxgrace > 0)
2013	disease->stats.maxgrace += dur_mod;
2014
2015	if (disease->stats.dam)
2016	{
2017	if (disease->stats.dam > 0)
2018	disease->stats.dam += dam_mod;
2019	else
2020	disease->stats.dam -= dam_mod;
2021	}
2022		1992
2023	if (disease->last_sp)	1993	if (disease->last_sp)
2024	{	1994	{
2025	disease->last_sp -= 2 * dam_mod;	1995	disease->last_sp -= 2 * dam_mod;
		1996
2026	if (disease->last_sp < 1)	1997	if (disease->last_sp < 1)
2027	disease->last_sp = 1;	1998	disease->last_sp = 1;
2028	}	1999	}
2029		2000
2030	if (disease->stats.maxsp)	2001	if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod);
2031	{	2002	if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod);
2032	if (disease->stats.maxsp > 0)	2003	if (disease->stats.ac ) disease->stats.ac += dam_mod;
2033	disease->stats.maxsp += dam_mod;	2004	if (disease->last_eat ) disease->last_eat -= dam_mod;
2034	else	2005	if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2035	disease->stats.maxsp -= dam_mod;	2006	if (disease->stats.sp ) disease->stats.sp -= dam_mod;
2036	}
2037
2038	if (disease->stats.ac)
2039	disease->stats.ac += dam_mod;
2040
2041	if (disease->last_eat)
2042	disease->last_eat -= dam_mod;
2043
2044	if (disease->stats.hp)
2045	disease->stats.hp -= dam_mod;
2046
2047	if (disease->stats.sp)
2048	disease->stats.sp -= dam_mod;
2049		2007
2050	if (infect_object (walk, disease, 1))	2008	if (infect_object (walk, disease, 1))
2051	{	2009	{
2052	new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);	2010	op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
2053		2011
2054	disease->destroy (); /* don't need this one anymore */	2012	disease->destroy (); /* don't need this one anymore */
2055	walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);	2013	walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2056	return 1;	2014	return 1;
2057	}	2015	}
2058		2016
2059	disease->destroy ();	2017	disease->destroy ();
2060	}	2018	}

Diff Legend

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

Comparing deliantra/server/server/spell_attack.C (file contents): Revision 1.97 by root, Fri Mar 26 00:53:26 2010 UTC vs. Revision 1.108 by root, Tue Jan 3 11:25:37 2012 UTC

Diff Legend

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.97 by root, Fri Mar 26 00:53:26 2010 UTC vs.
Revision 1.108 by root, Tue Jan 3 11:25:37 2012 UTC