ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_attack.C
(Generate patch)

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.28 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs.
Revision 1.29 by root, Mon Jan 29 16:11:48 2007 UTC

1483 tmp->update_stats (); 1483 tmp->update_stats ();
1484 return 1; 1484 return 1;
1485 1485
1486} 1486}
1487 1487
1488
1489/********************************************************************** 1488/**********************************************************************
1490 * mood change 1489 * mood change
1491 * Arguably, this may or may not be an attack spell. But since it 1490 * Arguably, this may or may not be an attack spell. But since it
1492 * effects monsters, it seems best to put it into this file 1491 * effects monsters, it seems best to put it into this file
1493 ***********************************************************************/ 1492 ***********************************************************************/
1522 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1521 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1523 race = god->race; 1522 race = god->race;
1524 else 1523 else
1525 race = spell->race; 1524 race = spell->race;
1526 1525
1527
1528 for (x = op->x - range; x <= op->x + range; x++) 1526 for (x = op->x - range; x <= op->x + range; x++)
1529 for (y = op->y - range; y <= op->y + range; y++) 1527 for (y = op->y - range; y <= op->y + range; y++)
1530 { 1528 {
1531
1532 done_one = 0; 1529 done_one = 0;
1533 m = op->map; 1530 m = op->map;
1534 nx = x; 1531 nx = x;
1535 ny = y; 1532 ny = y;
1536 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1533 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1539 1536
1540 /* If there is nothing living on this space, no need to go further */ 1537 /* If there is nothing living on this space, no need to go further */
1541 if (!(mflags & P_IS_ALIVE)) 1538 if (!(mflags & P_IS_ALIVE))
1542 continue; 1539 continue;
1543 1540
1541 // players can only affect spaces that they can actually see
1542 if (caster && caster->contr
1543 && caster->contr->visibility_at (m, nx, ny) < 70)
1544 continue;
1545
1544 for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above) 1546 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1545 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1547 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1546 break; 1548 break;
1547 1549
1548 /* There can be living objects that are not monsters */ 1550 /* There can be living objects that are not monsters */
1549 if (!tmp || tmp->type == PLAYER) 1551 if (!tmp || tmp->type == PLAYER)
1556 head = tmp; 1558 head = tmp;
1557 1559
1558 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1560 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1559 if (race && head->race && !strstr (race, head->race)) 1561 if (race && head->race && !strstr (race, head->race))
1560 continue; 1562 continue;
1563
1561 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1564 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1562 continue; 1565 continue;
1563 1566
1564 /* Now do a bunch of stuff related to saving throws */ 1567 /* Now do a bunch of stuff related to saving throws */
1565 best_at = -1; 1568 best_at = -1;
1602 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1605 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1603 /* Failed, no effect */ 1606 /* Failed, no effect */
1604 continue; 1607 continue;
1605 } 1608 }
1606 1609
1607 /* Done with saving throw. Now start effecting the monster */ 1610 /* Done with saving throw. Now start affecting the monster */
1608 1611
1609 /* aggravation */ 1612 /* aggravation */
1610 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1613 if (QUERY_FLAG (spell, FLAG_MONSTER))
1611 { 1614 {
1612 CLEAR_FLAG (head, FLAG_SLEEP); 1615 CLEAR_FLAG (head, FLAG_SLEEP);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines