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.30 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs.
Revision 1.33 by root, Sat May 12 22:04:20 2007 UTC

… …
145 145
146 /* reduce chances of subsequent forking */ 146 /* reduce chances of subsequent forking */
147 new_bolt->stats.Dex -= 10; 147 new_bolt->stats.Dex -= 10;
148 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 148 tmp->stats.Dex -= 10; /* less forks from main bolt too */
149 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 149 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
150 new_bolt->speed_left = -0.1; 150 new_bolt->speed_left = -0.1f;
151 new_bolt->direction = t_dir; 151 new_bolt->direction = t_dir;
152 new_bolt->duration++; 152 new_bolt->duration++;
153 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 153 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
154 new_bolt->stats.dam++; 154 new_bolt->stats.dam++;
155 tmp->stats.dam /= 2; /* reduce father bolt damage */ 155 tmp->stats.dam /= 2; /* reduce father bolt damage */
… …
245 else 245 else
246 { /* Create a copy of this object and put it ahead */ 246 { /* Create a copy of this object and put it ahead */
247 object *tmp = op->clone (); 247 object *tmp = op->clone ();
248 248
249 m->insert (tmp, x, y, op); 249 m->insert (tmp, x, y, op);
250 tmp->speed_left = -0.1; 250 tmp->speed_left = -0.1f;
251 /* To make up for the decrease at the top of the function */ 251 /* To make up for the decrease at the top of the function */
252 tmp->duration++; 252 tmp->duration++;
253 253
254 /* New forking code. Possibly create forks of this object 254 /* New forking code. Possibly create forks of this object
255 * going off in other directions. 255 * going off in other directions.
… …
380 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 380 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
381 { 381 {
382 object *tmp = op->clone (); 382 object *tmp = op->clone ();
383 383
384 tmp->state = 0; 384 tmp->state = 0;
385 tmp->speed_left = -0.21; 385 tmp->speed_left = -0.21f;
386 tmp->range--; 386 tmp->range--;
387 tmp->value = 0; 387 tmp->value = 0;
388 388
389 m->insert (tmp, dx, dy, op); 389 m->insert (tmp, dx, dy, op);
390 } 390 }
… …
518 518
519 /* If nothing alive on this space, no reason to do anything further */ 519 /* If nothing alive on this space, no reason to do anything further */
520 if (!(mflags & P_IS_ALIVE)) 520 if (!(mflags & P_IS_ALIVE))
521 return; 521 return;
522 522
523 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 523 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
524 { 524 {
525 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
526 { 526 {
527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
528 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 528 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
… …
604 } 604 }
605 else 605 else
606 check_bullet (op); 606 check_bullet (op);
607} 607}
608 608
609
610
611
612/* fire_bullet 609/* fire_bullet
613 * object op (cast from caster) files a bolt in dir. 610 * object op (cast from caster) files a bolt in dir.
614 * spob is the spell object for the bolt. 611 * spob is the spell object for the bolt.
615 * we remove the magic flag - that can be derived from 612 * we remove the magic flag - that can be derived from
616 * spob->attacktype. 613 * spob->attacktype.
… …
683 check_bullet (tmp); 680 check_bullet (tmp);
684 681
685 return 1; 682 return 1;
686} 683}
687 684
688
689
690
691/***************************************************************************** 685/*****************************************************************************
692 * 686 *
693 * CONE RELATED FUNCTIONS 687 * CONE RELATED FUNCTIONS
694 * 688 *
695 *****************************************************************************/ 689 *****************************************************************************/
696
697 690
698/* drops an object based on what is in the cone's "other_arch" */ 691/* drops an object based on what is in the cone's "other_arch" */
699void 692void
700cone_drop (object *op) 693cone_drop (object *op)
701{ 694{
… …
1453 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1446 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1454 } 1447 }
1455 return 1; 1448 return 1;
1456 } 1449 }
1457 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1450 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1458 force->speed = 1.0; 1451 force->speed = 1.f;
1459 force->speed_left = -1.0; 1452 force->speed_left = -1.f;
1460 SET_FLAG (force, FLAG_APPLIED); 1453 SET_FLAG (force, FLAG_APPLIED);
1461 1454
1462 if (god) 1455 if (god)
1463 { 1456 {
1464 if (spell_ob->last_grace) 1457 if (spell_ob->last_grace)
… …
1610 1603
1611 /* aggravation */ 1604 /* aggravation */
1612 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1605 if (QUERY_FLAG (spell, FLAG_MONSTER))
1613 { 1606 {
1614 CLEAR_FLAG (head, FLAG_SLEEP); 1607 CLEAR_FLAG (head, FLAG_SLEEP);
1615 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1616 remove_friendly_object (head); 1608 remove_friendly_object (head);
1617
1618 done_one = 1; 1609 done_one = 1;
1619 head->enemy = op; 1610 head->enemy = op;
1620 } 1611 }
1621 1612
1622 /* calm monsters */ 1613 /* calm monsters */
… …
1807#if 0 1798#if 0
1808 // this is bogus: it causes wrong places to be checked below 1799 // this is bogus: it causes wrong places to be checked below
1809 // (a wall 2 cells away will block the effect...) and 1800 // (a wall 2 cells away will block the effect...) and
1810 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1801 // doesn't work for SP_BULLET anyhow, so again tests the wrong
1811 // space. 1802 // space.
1812 // should be fixed later, but correctness before featurs... 1803 // should be fixed later, but correctness before features...
1813 // (schmorp) 1804 // (schmorp)
1814 1805
1815 /* new offset calculation to make swarm element distribution 1806 /* new offset calculation to make swarm element distribution
1816 * more uniform 1807 * more uniform
1817 */ 1808 */

Diff Legend

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