[Stratagus-CVS] stratagus data/ccl/spells.ccl data/ccl/units.cc...

[Crestez Leonard]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Crestez Leonard <address@hidden>        03/10/26 19:36:19

Modified files:
        data/ccl       : spells.ccl units.ccl 
        doc/ccl        : unittype.html 
        src/action     : actions.c 

Log message:
        Fixed holy-vision bug

Patches:
Index: stratagus/data/ccl/spells.ccl
diff -u stratagus/data/ccl/spells.ccl:1.16 stratagus/data/ccl/spells.ccl:1.17
--- stratagus/data/ccl/spells.ccl:1.16  Sat Oct 25 17:05:32 2003
+++ stratagus/data/ccl/spells.ccl       Sun Oct 26 19:36:19 2003
@@ -26,7 +26,7 @@
 ;;      along with this program; if not, write to the Free Software

 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA

 ;;

-;;     $Id: spells.ccl,v 1.16 2003/10/25 21:05:32 n0body Exp $

+;;     $Id: spells.ccl,v 1.17 2003/10/27 00:36:19 n0body Exp $

 

 ;; For documentation see stratagus/doc/ccl/ccl.html ;; FIXME write and move 
doc.

 

@@ -54,7 +54,7 @@
        'manacost 70

        'range 'infinite

        'target 'position

-       'action '( (summon unit-type unit-revealer time-to-live 10) )

+       'action '( (summon unit-type unit-revealer time-to-live 25) )

        'sound-when-cast "holy vision"

        'missile-when-cast "missile-normal-spell"

 )

@@ -292,7 +292,7 @@
        'manacost 50

        'range  6

        'target 'position

-       'action '((summon unit-type unit-skeleton time-to-live 100 
require-corpse))

+       'action '((summon unit-type unit-skeleton time-to-live 3600 
require-corpse))

        'sound-when-cast "raise dead"

        'missile-when-cast "missile-normal-spell"

 ;;     'autocast '(range 6)

Index: stratagus/data/ccl/units.ccl
diff -u stratagus/data/ccl/units.ccl:1.49 stratagus/data/ccl/units.ccl:1.50
--- stratagus/data/ccl/units.ccl:1.49   Wed Sep 24 12:03:23 2003
+++ stratagus/data/ccl/units.ccl        Sun Oct 26 19:36:19 2003
@@ -26,7 +26,7 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: units.ccl,v 1.49 2003/09/24 16:03:23 n0body Exp $
+;;     $Id: units.ccl,v 1.50 2003/10/27 00:36:19 n0body Exp $
 
 ;; Load the animations for the units.
 (ccl:load "ccl/anim.ccl")
@@ -409,7 +409,7 @@
   'size '(0 0)
   'animations 'animations-building 'icon 'icon-holy-vision
   'speed 0
-  'hit-points 0
+  'hit-points 1
   'tile-size '(1 1) 'box-size '(1 1)
   'sight-range 12
   'basic-damage 0 'piercing-damage 0 'missile 'missile-none
Index: stratagus/doc/ccl/unittype.html
diff -u stratagus/doc/ccl/unittype.html:1.37 
stratagus/doc/ccl/unittype.html:1.38
--- stratagus/doc/ccl/unittype.html:1.37        Sat Oct 25 14:58:42 2003
+++ stratagus/doc/ccl/unittype.html     Sun Oct 26 19:36:19 2003
@@ -485,9 +485,7 @@
 </dd>
 <dt>clicks-to-explode</dt>
 <dd>If this is non-zero, then after that many clicks the unit will commit
-suicide. Doesn't work with resource workers/resources. It can even be used
-in combination with demolish-damage and demolish-range, though it wouldn't
-be very fair.
+suicide. Doesn't work with resource workers/resources.
 </dd>
 <dt>computer-reaction-range</dt>
 <dd>This is supossed to be the reaction range for AI units, but it is not used.
@@ -508,6 +506,12 @@
 cycles. If you set this the unit will die by itself after a while. Don't use 
it for spells,
 spells will override this with their own ttl setting.
 </dd>
+<dt>burn-percent</dt>
+<dd>The unit will start burning when it has less health than this, in percents.
+</dd>
+<dt>burn-damage-rate</dt>
+<dd>The rate at which the unit will get damaged. The period is the same as 
with regeneration.
+</dd>
 <dt>points</dt>
 <dd>This is the score value of an unit. Used for the final score.
 </dd>
@@ -767,7 +771,7 @@
 <h4>Not Used</h4>
 
 <hr>
-Last changed: $Id: unittype.html,v 1.37 2003/10/25 18:58:42 n0body Exp $<br>
+Last changed: $Id: unittype.html,v 1.38 2003/10/27 00:36:19 n0body Exp $<br>
 All trademarks and copyrights on this page are owned by their respective 
owners.
 <address>(c) 2002-2003 by <a href="http://stratagus.org";>
 The Stratagus Project</a></address></body></html>
Index: stratagus/src/action/actions.c
diff -u stratagus/src/action/actions.c:1.103 
stratagus/src/action/actions.c:1.104
--- stratagus/src/action/actions.c:1.103        Sun Oct 26 14:46:04 2003
+++ stratagus/src/action/actions.c      Sun Oct 26 19:36:19 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: actions.c,v 1.103 2003/10/26 19:46:04 n0body Exp $
+//     $Id: actions.c,v 1.104 2003/10/27 00:36:19 n0body Exp $
 
 //@{
 
@@ -327,7 +327,13 @@
     //
     if (unit->TTL && unit->TTL < (GameCycle - unit->HP)) {
        DebugLevel0Fn("Unit must die %lu %lu!\n" _C_ unit->TTL _C_ GameCycle);
-       HitUnit(0, unit, amount);       // * type->LossPerCycle or somthing?
+       //
+       //      Hit unit does some funky stuff...
+       //
+       unit->HP -= amount;
+       if (unit->HP < 0) {
+           LetUnitDie(unit);
+       }
        if (unit->Selected) {
            MustRedraw |= RedrawInfoPanel;
        }