stratagus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Stratagus-CVS] demogame ccl/anim.ccl ccl/editor.ccl ccl/icons....


From: Martin Renold
Subject: [Stratagus-CVS] demogame ccl/anim.ccl ccl/editor.ccl ccl/icons....
Date: Thu, 09 Oct 2003 12:10:39 -0400

CVSROOT:        /cvsroot/stratagus
Module name:    demogame
Branch:         
Changes by:     Martin Renold <address@hidden>  03/10/09 12:10:38

Modified files:
        ccl            : anim.ccl editor.ccl icons.ccl sound.ccl 
                         spells.ccl 
        ccl/alliance   : buttons.ccl units.ccl upgrade.ccl 
        ccl/mythical   : units.ccl 
        puds           : default.pud.gz 
Added files:
        ccl/alliance   : spells.ccl 
        ccl/mythical   : spells.ccl 
Removed files:
        sounds/spells  : bloodlust.wav.gz death_and_decay.wav.gz 
                         death_coil.wav.gz haste.wav.gz whirlwind.wav.gz 

Log message:
        removed alliance heros; removed mythical spells; merged engine changes

Patches:
Index: demogame/ccl/alliance/buttons.ccl
diff -u demogame/ccl/alliance/buttons.ccl:1.2 
demogame/ccl/alliance/buttons.ccl:1.3
--- demogame/ccl/alliance/buttons.ccl:1.2       Wed Oct  8 07:05:34 2003
+++ demogame/ccl/alliance/buttons.ccl   Thu Oct  9 12:10:35 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: buttons.ccl,v 1.2 2003/10/08 11:05:34 martinxyz Exp $
+;;     $Id: buttons.ccl,v 1.3 2003/10/09 16:10:35 martinxyz Exp $
 
 ;;----------------------------------------------------------------------------
 ;;     Define unit-button.
@@ -42,9 +42,9 @@
   'key "m" 'hint "~!MOVE"
   'for-unit '(unit-footman unit-knight unit-archer unit-paladin
     unit-dwarves unit-ranger unit-ballista unit-peasant
-    unit-female-hero
-    unit-flying-angle unit-arthor-literios unit-knight-rider unit-wise-man
-    unit-man-of-light unit-white-mage unit-balloon
+    
+       
+      unit-balloon
     unit-gryphon-rider unit-mage unit-critter
     alliance-group))
 
@@ -53,9 +53,9 @@
   'key "s" 'hint "~!STOP"
   'for-unit '(unit-footman unit-knight unit-archer unit-paladin
     unit-dwarves unit-ranger unit-ballista unit-peasant
-    unit-female-hero
-    unit-flying-angle unit-arthor-literios unit-knight-rider unit-wise-man
-    unit-man-of-light unit-white-mage unit-balloon
+    
+       
+      unit-balloon
     unit-gryphon-rider unit-mage unit-critter
     alliance-group))
 
@@ -64,75 +64,75 @@
   'allowed 'check-upgrade 'allow-arg '(upgrade-alliance-shield1)
   'key "s" 'hint "~!STOP"
   'for-unit '(unit-footman unit-knight unit-archer unit-paladin
-    unit-dwarves unit-ranger unit-ballista unit-arthor-literios 
unit-knight-rider
-    unit-wise-man unit-man-of-light))
+    unit-dwarves unit-ranger unit-ballista  
+     ))
 
 (define-button 'pos 2 'level 0 'icon 'icon-alliance-shield3
   'action 'stop
   'allowed 'check-upgrade 'allow-arg '(upgrade-alliance-shield2)
   'key "s" 'hint "~!STOP"
   'for-unit '(unit-footman unit-knight unit-archer unit-paladin
-    unit-dwarves unit-ranger unit-ballista unit-arthor-literios 
unit-knight-rider
-    unit-wise-man unit-man-of-light))
+    unit-dwarves unit-ranger unit-ballista  
+     ))
 
 (define-button 'pos 3 'level 0 'icon 'icon-sword1
   'action 'attack
   'key "a" 'hint "~!ATTACK"
   'for-unit '(unit-footman unit-knight unit-archer unit-paladin
     unit-dwarves unit-ranger unit-ballista unit-peasant
-    unit-female-hero
-    unit-flying-angle unit-arthor-literios unit-knight-rider unit-wise-man
-    unit-man-of-light unit-white-mage unit-gryphon-rider alliance-group))
+    
+       
+      unit-gryphon-rider alliance-group))
 
 (define-button 'pos 3 'level 0 'icon 'icon-sword2
   'action 'attack
   'allowed 'check-upgrade 'allow-arg '(upgrade-sword1)
   'key "a" 'hint "~!ATTACK"
   'for-unit '(unit-footman unit-knight unit-archer unit-paladin
-    unit-dwarves unit-ranger unit-ballista unit-arthor-literios 
unit-knight-rider
-    unit-wise-man unit-man-of-light))
+    unit-dwarves unit-ranger unit-ballista  
+     ))
 
 (define-button 'pos 3 'level 0 'icon 'icon-sword3
   'action 'attack
   'allowed 'check-upgrade 'allow-arg '(upgrade-sword2)
   'key "a" 'hint "~!ATTACK"
   'for-unit '(unit-footman unit-knight unit-archer unit-paladin
-    unit-dwarves unit-ranger unit-ballista unit-arthor-literios 
unit-knight-rider
-    unit-wise-man unit-man-of-light))
+    unit-dwarves unit-ranger unit-ballista  
+     ))
 
 (define-button 'pos 3 'level 0 'icon 'icon-arrow1
   'action 'attack
   'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-archer unit-ranger unit-female-hero))
+  'for-unit '(unit-archer unit-ranger ))
 
 (define-button 'pos 3 'level 0 'icon 'icon-arrow2
   'action 'attack
   'allowed 'check-upgrade 'allow-arg '(upgrade-arrow1)
   'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-archer unit-ranger unit-female-hero))
+  'for-unit '(unit-archer unit-ranger ))
 
 (define-button 'pos 3 'level 0 'icon 'icon-arrow3
   'action 'attack
   'allowed 'check-upgrade 'allow-arg '(upgrade-arrow2)
   'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-archer unit-ranger unit-female-hero))
+  'for-unit '(unit-archer unit-ranger ))
 
 (define-button 'pos 4 'level 0 'icon 'icon-alliance-patrol-land
   'action 'patrol
   'key "p" 'hint "~!PATROL"
   'for-unit '(unit-footman unit-knight unit-archer unit-paladin
-    unit-dwarves unit-ranger unit-ballista unit-female-hero
-    unit-flying-angle unit-arthor-literios unit-knight-rider unit-wise-man
-    unit-man-of-light unit-gryphon-rider alliance-group
+    unit-dwarves unit-ranger unit-ballista 
+       
+     unit-gryphon-rider alliance-group
     unit-balloon))
 
 (define-button 'pos 5 'level 0 'icon 'icon-alliance-stand-ground
   'action 'stand-ground
   'key "t" 'hint "S~!TAND GROUND"
   'for-unit '(unit-footman unit-knight unit-archer unit-paladin
-    unit-dwarves unit-ranger unit-ballista unit-female-hero
-    unit-flying-angle unit-arthor-literios unit-knight-rider unit-wise-man
-    unit-man-of-light unit-gryphon-rider alliance-group
+    unit-dwarves unit-ranger unit-ballista 
+       
+     unit-gryphon-rider alliance-group
     unit-alliance-submarine unit-battleship unit-alliance-destroyer))
 
 (define-button 'pos 6 'level 0 'icon 'icon-alliance-attack-ground
@@ -152,72 +152,72 @@
   'action 'cast-spell 'value 'spell-area-healing
   'allowed 'check-upgrade 'allow-arg '(upgrade-area-healing)
   'key "l" 'hint "AREA HEA~!LING (per 1 HP)"
-  'for-unit '(unit-paladin unit-knight-rider 
-    unit-man-of-light))
+  'for-unit '(unit-paladin  
+    ))
 
 (define-button 'pos 7 'level 0 'icon 'icon-holy-vision
   'action 'cast-spell 'value 'spell-holy-vision
   'allowed 'check-upgrade 'allow-arg '(upgrade-holy-vision)
   'key "v" 'hint "HOLY ~!VISION"
-  'for-unit '(unit-paladin unit-knight-rider
-    unit-man-of-light))
+  'for-unit '(unit-paladin 
+    ))
 
 (define-button 'pos 8 'level 0 'icon 'icon-heal
   'action 'cast-spell 'value 'spell-healing
   'allowed 'check-upgrade 'allow-arg '(upgrade-healing)
   'key "h" 'hint "~!HEALING (per 1 HP)"
-  'for-unit '(unit-paladin unit-knight-rider 
-    unit-man-of-light))
+  'for-unit '(unit-paladin  
+    ))
 
 (define-button 'pos 9 'level 0 'icon 'icon-exorcism
   'action 'cast-spell 'value 'spell-exorcism
   'allowed 'check-upgrade 'allow-arg '(upgrade-exorcism)
   'key "e" 'hint "~!EXORCISM"
-  'for-unit '(unit-paladin unit-knight-rider
-    unit-man-of-light))
+  'for-unit '(unit-paladin 
+    ))
 
 ;; mage specific actions ------------------------------------------------------
 
 (define-button 'pos 3 'level 0 'icon 'icon-lightning
   'action 'attack
   'key "a" 'hint "LIGHTNING ~!ATTACK"
-  'for-unit '(unit-mage unit-white-mage))
+  'for-unit '(unit-mage ))
 
 (define-button 'pos 4 'level 0 'icon 'icon-fireball
   'action 'cast-spell 'value 'spell-fireball
   'allowed 'check-upgrade 'allow-arg '(upgrade-fireball)
   'key "f" 'hint "~!FIREBALL"
-  'for-unit '(unit-mage unit-white-mage))
+  'for-unit '(unit-mage ))
 
 (define-button 'pos 5 'level 0 'icon 'icon-slow
   'action 'cast-spell 'value 'spell-slow
   'allowed 'check-upgrade 'allow-arg '(upgrade-slow)
   'key "o" 'hint "SL~!OW"
-  'for-unit '(unit-mage unit-white-mage))
+  'for-unit '(unit-mage ))
 
 (define-button 'pos 6 'level 0 'icon 'icon-flame-shield
   'action 'cast-spell 'value 'spell-flame-shield
   'allowed 'check-upgrade 'allow-arg '(upgrade-flame-shield)
   'key "l" 'hint "F~!LAME SHIELD"
-  'for-unit '(unit-mage unit-white-mage))
+  'for-unit '(unit-mage ))
 
 (define-button 'pos 7 'level 0 'icon 'icon-invisibility
   'action 'cast-spell 'value 'spell-invisibility
   'allowed 'check-upgrade 'allow-arg '(upgrade-invisibility)
   'key "i" 'hint "~!INVISIBILITY"
-  'for-unit '(unit-mage unit-white-mage))
+  'for-unit '(unit-mage ))
 
 (define-button 'pos 8 'level 0 'icon 'icon-polymorph
   'action 'cast-spell 'value 'spell-polymorph
   'allowed 'check-upgrade 'allow-arg '(upgrade-polymorph)
   'key "p" 'hint "~!POLYMORPH"
-  'for-unit '(unit-mage unit-white-mage))
+  'for-unit '(unit-mage ))
 
 (define-button 'pos 9 'level 0 'icon 'icon-blizzard
   'action 'cast-spell 'value 'spell-blizzard
   'allowed 'check-upgrade 'allow-arg '(upgrade-blizzard)
   'key "b" 'hint "~!BLIZZARD"
-  'for-unit '(unit-mage unit-white-mage))
+  'for-unit '(unit-mage ))
 
 ;; peasant specific actions ---------------------------------------------------
 
Index: demogame/ccl/alliance/units.ccl
diff -u demogame/ccl/alliance/units.ccl:1.11 
demogame/ccl/alliance/units.ccl:1.12
--- demogame/ccl/alliance/units.ccl:1.11        Wed Oct  8 07:05:34 2003
+++ demogame/ccl/alliance/units.ccl     Thu Oct  9 12:10:35 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.11 2003/10/08 11:05:34 martinxyz Exp $
+;;     $Id: units.ccl,v 1.12 2003/10/09 16:10:35 martinxyz Exp $
 
 ;;=============================================================================
 ;;     Define unit-types.
@@ -46,7 +46,6 @@
   'sight-range 4 'computer-reaction-range 6 'person-reaction-range 4
   'armor 2 'basic-damage 6 'piercing-damage 3 'missile 'missile-none
   'max-attack-range 1
-  'weapons-upgradable 1 'armor-upgradable 1
   'priority 60
   'points 50
   'demand 1
@@ -126,7 +125,6 @@
   'sight-range 9 'computer-reaction-range 11 'person-reaction-range 9
   'basic-damage 80 'piercing-damage 0 'missile 'missile-ballista-bolt
   'min-attack-range 2 'max-attack-range 8
-  'weapons-upgradable 1
   'priority 70
   'points 100
   'demand 1
@@ -157,7 +155,6 @@
   'sight-range 4 'computer-reaction-range 6 'person-reaction-range 4
   'armor 4 'basic-damage 8 'piercing-damage 4 'missile 'missile-none
   'max-attack-range 1
-  'weapons-upgradable 1 'armor-upgradable 1
   'priority 63
   'points 100
   'demand 1
@@ -189,7 +186,6 @@
   'sight-range 5 'computer-reaction-range 7 'person-reaction-range 5
   'basic-damage 3 'piercing-damage 6 'missile 'missile-arrow
   'max-attack-range 4
-  'weapons-upgradable 1
   'priority 55
   'points 60
   'demand 1
@@ -218,7 +214,6 @@
   'hit-points 60
   'draw-level 40
   'max-mana 255
-  'magic 1
   'tile-size '(1 1) 'box-size '(33 33)
   'sight-range 9 'computer-reaction-range 11 'person-reaction-range 9
   'basic-damage 0 'piercing-damage 9 'missile 'missile-lightning
@@ -262,7 +257,6 @@
   'sight-range 5 'computer-reaction-range 7 'person-reaction-range 5
   'armor 4 'basic-damage 8 'piercing-damage 4 'missile 'missile-none
   'max-attack-range 1
-  'weapons-upgradable 1 'armor-upgradable 1
   'priority 65
   'points 110
   'demand 1
@@ -295,7 +289,6 @@
   'sight-range 4 'computer-reaction-range 4 'person-reaction-range 2
   'basic-damage 4 'piercing-damage 2 'missile 'missile-none
   'max-attack-range 1
-  'weapons-upgradable 1
   'priority 55
   'points 100
   'demand 1
@@ -329,7 +322,6 @@
   'sight-range 6 'computer-reaction-range 9 'person-reaction-range 6
   'basic-damage 3 'piercing-damage 6 'missile 'missile-arrow
   'max-attack-range 4
-  'weapons-upgradable 1
   'priority 57
   'points 70
   'demand 1
@@ -349,110 +341,6 @@
     dead "basic alliance voices dead"
     attack "ranger-attack"))
 
-(define-unit-type 'unit-female-hero 'name "Female_Hero"
-  'use 'unit-archer
-  'size '(72 72)
-  'animations 'animations-archer 'icon 'icon-female-hero
-  'costs '(time 70 gold 500 wood 50)
-  'speed 10
-  'hit-points 120
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(33 33)
-  'sight-range 9 'computer-reaction-range 7 'person-reaction-range 5
-  'armor 5 'basic-damage 10 'piercing-damage 18 'missile 'missile-arrow
-  'max-attack-range 7
-  'weapons-upgradable 1
-  'priority 55
-  'points 60
-  'demand 1
-  'corpse '(unit-dead-body 6)
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land 'can-target-sea 'can-target-air
-  'land-unit
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "female-hero-selected"
-    acknowledge "female-hero-acknowledge"
-    ready "female-hero-ready"
-    help "basic alliance voices help 1"
-    dead "basic alliance voices dead"
-    attack "female-hero-attack"))
-
-(define-unit-type 'unit-flying-angle 'name "Kurdan and Sky'ree"
-  'files '(tileset-summer "alliance/units/gryphon_rider.png")
-  'size '(80 80)
-  'draw-level 45
-  'animations 'animations-flying-angle 'icon 'icon-flying-angle
-  'costs '(time 250 gold 2500)
-  'speed 14
-  'hit-points 250
-  'draw-level 60
-  'tile-size '(1 1) 'box-size '(63 63)
-  'sight-range 9 'computer-reaction-range 8 'person-reaction-range 6
-  'armor 6 'basic-damage 0 'piercing-damage 25 'missile 'missile-griffon-hammer
-  'max-attack-range 5
-  'priority 65
-  'points 150
-  'demand 1
-  'type-fly
-  'right-attack
-  'can-attack
-  'can-target-land 'can-target-sea 'can-target-air
-  'air-unit
-  'detect-cloak
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "flying-angle-selected"
-    acknowledge "flying-angle-acknowledge"
-    ready "flying-angle-ready"
-    help "basic alliance voices help 1"
-    dead "basic alliance voices dead"
-    attack "flying-angle-attack"))
-
-(define-unit-type 'unit-white-mage 'name "White_Mage"
-  'use 'unit-mage
-  'size '(72 72)
-  'animations 'animations-mage 'icon 'icon-white-mage
-  'costs '(time 120 gold 1200)
-  'speed 8
-  'hit-points 120
-  'draw-level 40
-  'max-mana 255
-  'magic 1
-  'tile-size '(1 1) 'box-size '(33 33)
-  'sight-range 9 'computer-reaction-range 11 'person-reaction-range 9
-  'armor 3 'basic-damage 0 'piercing-damage 16 'missile 'missile-lightning
-  'max-attack-range 6
-  'priority 70
-  'points 100
-  'demand 1
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land 'can-target-sea 'can-target-air
-  'can-cast-spell '(
-      spell-fireball
-      spell-slow
-      spell-flame-shield
-      spell-invisibility
-      spell-polymorph
-      spell-blizzard)
-  'land-unit
-  'coward
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "white-mage-selected"
-    acknowledge "white-mage-acknowledge"
-    ready "white-mage-ready"
-    help "basic alliance voices help 1"
-    dead "basic alliance voices dead"
-    attack "white-mage-attack"))
-
 (define-unit-type 'unit-alliance-oil-tanker 'name "Oil tanker"
   'files '(tileset-summer "alliance/units/oil_tanker_empty.png")
   'size '(72 72)
@@ -503,7 +391,6 @@
   'sight-range 4
   'basic-damage 0 'piercing-damage 0 'missile 'missile-none
   'max-attack-range 1
-  'armor-upgradable 1
   'priority 70 'annoy-computer-factor 15
   'points 50
   'demand 1
@@ -533,7 +420,6 @@
   'sight-range 8 'computer-reaction-range 10 'person-reaction-range 8
   'armor 10 'basic-damage 35 'piercing-damage 0 'missile 'missile-small-cannon
   'max-attack-range 4
-  'weapons-upgradable 1 'armor-upgradable 1
   'priority 65 'annoy-computer-factor 20
   'points 150
   'demand 1
@@ -564,7 +450,6 @@
   'sight-range 8 'computer-reaction-range 10 'person-reaction-range 8
   'armor 15 'basic-damage 130 'piercing-damage 0 'missile 'missile-big-cannon
   'max-attack-range 6
-  'weapons-upgradable 1 'armor-upgradable 1
   'priority 63 'annoy-computer-factor 25
   'points 300
   'demand 1
@@ -645,7 +530,7 @@
     attack "balloon-attack"))
 
 (define-unit-type 'unit-gryphon-rider 'name "Gryphon Rider"
-  'use 'unit-flying-angle
+  'files '(tileset-summer "alliance/units/gryphon_rider.png")
   'size '(80 80)
   'draw-level 45
   'animations 'animations-flying-angle 'icon 'icon-gryphon-rider
@@ -676,139 +561,6 @@
     dead "basic alliance voices dead"
     attack "gryphon-rider-attack"))
 
-(define-unit-type 'unit-knight-rider 'name "Knight_Rider"
-  'use 'unit-knight
-  'size '(72 72)
-  'animations 'animations-knight 'icon 'icon-knight-rider
-  'costs '(time 90 gold 800 wood 100)
-  'speed 13
-  'hit-points 180
-  'draw-level 40
-  'max-mana 255
-  'tile-size '(1 1) 'box-size '(42 42)
-  'sight-range 6 'computer-reaction-range 7 'person-reaction-range 5
-  'armor 10 'basic-damage 14 'piercing-damage 5 'missile 'missile-none
-  'max-attack-range 1
-  'weapons-upgradable 1 'armor-upgradable 1
-  'priority 65
-  'points 110
-  'demand 1
-  'corpse '(unit-dead-body 6)
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land
-  'land-unit
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "knight-rider-selected"
-    acknowledge "knight-rider-acknowledge"
-    ready "knight-rider-ready"
-    help "basic alliance voices help 1"
-    dead "basic alliance voices dead"
-    attack "knight-rider-attack"))
-
-(define-unit-type 'unit-arthor-literios 'name "Arthor_Literios"
-  'use 'unit-footman
-  'size '(72 72)
-  'animations 'animations-footman 'icon 'icon-ugly-guy
-  'costs '(time 60 gold 600)
-  'speed 10
-  'hit-points 220
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(31 31)
-  'sight-range 6 'computer-reaction-range 6 'person-reaction-range 4
-  'armor 8 'basic-damage 15 'piercing-damage 8 'missile 'missile-none
-  'max-attack-range 1
-  'weapons-upgradable 1 'armor-upgradable 1
-  'priority 60
-  'points 50
-  'demand 1
-  'corpse '(unit-dead-body 6)
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land
-  'land-unit
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "arthor-literios-selected"
-    acknowledge "arthor-literios-acknowledge"
-    ready "arthor-literios-ready"
-    help "basic alliance voices help 1"
-    dead "basic alliance voices dead"
-    attack "arthor-literios-attack"))
-
-(define-unit-type 'unit-wise-man 'name "Wise_Man"
-  'use 'unit-knight
-  'size '(72 72)
-  'animations 'animations-knight 'icon 'icon-wise-man
-  'costs '(time 100 gold 900 wood 100)
-  'speed 13
-  'hit-points 90
-  'draw-level 40
-  'max-mana 255
-  'tile-size '(1 1) 'box-size '(42 42)
-  'sight-range 5 'computer-reaction-range 7 'person-reaction-range 5
-  'armor 4 'basic-damage 8 'piercing-damage 4 'missile 'missile-none
-  'max-attack-range 1
-  'weapons-upgradable 1 'armor-upgradable 1
-  'priority 65
-  'points 120
-  'demand 1
-  'corpse '(unit-dead-body 6)
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land
-  'land-unit
-  'hero
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "wise-man-selected"
-    acknowledge "wise-man-acknowledge"
-    ready "wise-man-ready"
-    help "basic alliance voices help 1"
-    dead "basic alliance voices dead"
-    attack "wise-man-attack"))
-
-(define-unit-type 'unit-man-of-light 'name "Uther Lightbringer"
-  'use 'unit-knight
-  'size '(72 72)
-  'animations 'animations-knight 'icon 'icon-man-of-light
-  'costs '(time 100 gold 900 wood 100)
-  'speed 13
-  'hit-points 90
-  'draw-level 40
-  'max-mana 255
-  'tile-size '(1 1) 'box-size '(42 42)
-  'sight-range 5 'computer-reaction-range 7 'person-reaction-range 5
-  'armor 4 'basic-damage 8 'piercing-damage 4 'missile 'missile-none
-  'max-attack-range 1
-  'weapons-upgradable 1 'armor-upgradable 1
-  'priority 65
-  'points 120
-  'demand 1
-  'corpse '(unit-dead-body 6)
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land
-  'land-unit
-  'hero
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "man-of-light-selected"
-    acknowledge "man-of-light-acknowledge"
-    ready "man-of-light-ready"
-    help "basic alliance voices help 1"
-    dead "basic alliance voices dead"
-    attack "man-of-light-attack"))
-
 (define-unit-type 'unit-farm 'name "Farm"
   'files '(tileset-summer "tilesets/summer/alliance/buildings/farm.png"
     tileset-winter "tilesets/winter/alliance/buildings/farm.png")
@@ -1435,5 +1187,3 @@
     help "basic alliance voices help 2"
     dead "building destroyed"
     attack "alliance-wall-attack"))
-
-
Index: demogame/ccl/alliance/upgrade.ccl
diff -u demogame/ccl/alliance/upgrade.ccl:1.6 
demogame/ccl/alliance/upgrade.ccl:1.7
--- demogame/ccl/alliance/upgrade.ccl:1.6       Wed Oct  8 12:47:47 2003
+++ demogame/ccl/alliance/upgrade.ccl   Thu Oct  9 12:10:35 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: upgrade.ccl,v 1.6 2003/10/08 16:47:47 martinxyz Exp $
+;;     $Id: upgrade.ccl,v 1.7 2003/10/09 16:10:35 martinxyz Exp $
 
 ;;     NOTE: Save can generate this table.
 
@@ -91,34 +91,34 @@
 (define-modifier 'upgrade-sword1
   '(piercing-damage 2)
   '(apply-to unit-footman) '(apply-to unit-knight) '(apply-to unit-paladin)
-  '(apply-to unit-dwarves) '(apply-to unit-arthor-literios) '(apply-to 
unit-wise-man)
-  '(apply-to unit-man-of-light) '(apply-to unit-knight-rider))
+  '(apply-to unit-dwarves)  
+   )
 
 (define-modifier 'upgrade-sword2
   '(piercing-damage 2)
   '(apply-to unit-footman) '(apply-to unit-knight) '(apply-to unit-paladin)
-  '(apply-to unit-dwarves) '(apply-to unit-arthor-literios) '(apply-to 
unit-wise-man)
-  '(apply-to unit-man-of-light) '(apply-to unit-knight-rider))
+  '(apply-to unit-dwarves)  
+   )
 
 (define-modifier 'upgrade-arrow1
   '(piercing-damage 1)
-  '(apply-to unit-archer) '(apply-to unit-ranger) '(apply-to unit-female-hero))
+  '(apply-to unit-archer) '(apply-to unit-ranger) )
 
 (define-modifier 'upgrade-arrow2
   '(piercing-damage 1)
-  '(apply-to unit-archer) '(apply-to unit-ranger) '(apply-to unit-female-hero))
+  '(apply-to unit-archer) '(apply-to unit-ranger) )
 
 (define-modifier 'upgrade-alliance-shield1
   '(armor 2)
   '(apply-to unit-footman) '(apply-to unit-knight) '(apply-to unit-paladin)
-  '(apply-to unit-dwarves) '(apply-to unit-arthor-literios) '(apply-to 
unit-wise-man)
-  '(apply-to unit-man-of-light) '(apply-to unit-knight-rider))
+  '(apply-to unit-dwarves)  
+   )
 
 (define-modifier 'upgrade-alliance-shield2
   '(armor 2)
   '(apply-to unit-footman) '(apply-to unit-knight) '(apply-to unit-paladin)
-  '(apply-to unit-dwarves) '(apply-to unit-arthor-literios) '(apply-to 
unit-wise-man)
-  '(apply-to unit-man-of-light) '(apply-to unit-knight-rider))
+  '(apply-to unit-dwarves)  
+   )
 
 (define-modifier 'upgrade-alliance-ship-cannon1
   '(piercing-damage 5)
@@ -172,22 +172,22 @@
   '(apply-to unit-paladin))
 
 (define-modifier 'upgrade-flame-shield
-  '(apply-to unit-mage) '(apply-to unit-white-mage))
+  '(apply-to unit-mage) )
 
 (define-modifier 'upgrade-fireball
-  '(apply-to unit-mage) '(apply-to unit-white-mage))
+  '(apply-to unit-mage) )
 
 (define-modifier 'upgrade-slow
-  '(apply-to unit-mage) '(apply-to unit-white-mage))
+  '(apply-to unit-mage) )
 
 (define-modifier 'upgrade-invisibility
-  '(apply-to unit-mage) '(apply-to unit-white-mage))
+  '(apply-to unit-mage) )
 
 (define-modifier 'upgrade-polymorph
-  '(apply-to unit-mage) '(apply-to unit-white-mage))
+  '(apply-to unit-mage) )
 
 (define-modifier 'upgrade-blizzard
-  '(apply-to unit-mage) '(apply-to unit-white-mage))
+  '(apply-to unit-mage) )
 
 ;;     NOTE: Save can generate this table.
 
@@ -202,9 +202,6 @@
 (define-allow 'unit-paladin                    "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-dwarves                    "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-ranger                     "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-female-hero                        "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-flying-angle               "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-white-mage                 "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-alliance-oil-tanker                "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-alliance-transport         "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-alliance-destroyer         "AAAAAAAAAAAAAAAA")
@@ -212,10 +209,6 @@
 (define-allow 'unit-alliance-submarine         "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-balloon                    "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-gryphon-rider              "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-knight-rider               "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-arthor-literios            "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-wise-man                   "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-man-of-light               "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-farm                       "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-alliance-barracks          "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-church                     "AAAAAAAAAAAAAAAA")
Index: demogame/ccl/anim.ccl
diff -u demogame/ccl/anim.ccl:1.6 demogame/ccl/anim.ccl:1.7
--- demogame/ccl/anim.ccl:1.6   Tue Oct  7 15:18:54 2003
+++ demogame/ccl/anim.ccl       Thu Oct  9 12:10:34 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: anim.ccl,v 1.6 2003/10/07 19:18:54 martinxyz Exp $
+;;     $Id: anim.ccl,v 1.7 2003/10/09 16:10:34 martinxyz Exp $
 
 ;;------
 ;;     Footman, Grunt, Grom Hellscream, Arthor_Literios, Korgath Bladefist
@@ -74,7 +74,7 @@
     #( 3 0   1   0)))
 
 ;;------
-;;     Knight, Paladin, Knight_Rider, Wise_Man, Uther Lightbringer
+;;     Knight, Paladin
 (define-animations 'animations-knight
   'still '(    ; #5
     #( 0 0   4   0) #( 3 0   1   0))
@@ -90,53 +90,21 @@
     #( 0 0 200  65) #( 3 0   1  65)))
 
 ;;------
-;;     Ogre, Ogre Mage, Fad_Man, Double_Head
-(define-animations 'animations-ogre
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #12 P32
-    #( 0 3   1   0) #( 0 3   1   5) #( 0 3   1   5) #( 0 2   1  10)
-    #( 0 3   1  10) #( 0 2   1   0) #( 0 3   1   0) #( 0 3   1  15)
-    #( 0 3   1  15) #( 0 2   1  20) #( 0 3   1  20) #( 3 2   1   0))
-  'attack '(   ; #25
-    #( 0 0   3  25) #( 0 0   3  30) #( 0 0   3  35) #(12 0   5  40)
-    #( 0 0  10   0) #( 3 0   1   0))
-  'die '(      ; #507
-    #( 0 0   3  45) #( 0 0   3  50) #( 0 0 100  55) #( 0 0 200  60)
-    #( 0 0 200  65) #( 3 0   1  65)))
-
-;;------
-;;     Archer, Ranger, Female_Hero
-;;      hacked for sniper (maxy)
+;;     Archer, Ranger
 (define-animations 'animations-archer
   'still '(    ; #5
     #( 0 0   4   0) #( 3 0   1   0))
   'move '(     ; #16 P32
-    #( 0 3   2   0) #( 0 3   2   5) #( 0 3   2   5) #( 0 2   2  10)
-    #( 0 3   2  10) #( 0 2   2   0) #( 0 3   2   0) #( 0 3   2  15)
-    #( 0 3   2  15) #( 0 2   2  20) #( 0 3   2  20) #( 3 2   2   0))
-  'attack '(   ; #65
-    #( 0 0  10  25) #(12 0  10  30) #( 0 0 150   0) #( 3 0   1   0))
-  'die '(      ; #107
-    #( 0 0   3  35) #( 0 0   3  40) #( 0 0 100  45) #( 3 0   1  45)))
-
-;;------
-;;     Troll Axethrower, Berserker, Sharp_Axe
-(define-animations 'animations-axethrower
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #16 P32
     #( 0 3   2   0) #( 0 3   1   5) #( 0 3   2   5) #( 0 2   1  10)
     #( 0 3   1  10) #( 0 2   1   0) #( 0 3   2   0) #( 0 3   1  15)
     #( 0 3   2  15) #( 0 2   1  20) #( 0 3   1  20) #( 3 2   1   0))
   'attack '(   ; #65
-    #( 0 0   3  25) #( 0 0   3  30) #( 0 0   3  35) #(12 0   3  40)
-    #( 0 0  52   0) #( 3 0   1   0))
+    #( 0 0  10  25) #(12 0  10  30) #( 0 0  44   0) #( 3 0   1   0))
   'die '(      ; #107
-    #( 0 0   3  45) #( 0 0   3  50) #( 0 0 100  55) #( 3 0   1  55)))
+    #( 0 0   3  35) #( 0 0   3  40) #( 0 0 100  45) #( 3 0   1  45)))
 
 ;;------
-;;     Mage, White_Mage
+;;     Mage
 (define-animations 'animations-mage
   'still '(    ; #5
     #( 0 0   4   0) #( 3 0   1   0))
@@ -152,22 +120,6 @@
     #( 0 0   5  65) #( 0 0   5  70) #( 0 0   5  75) #( 3 0   1  75)))
 
 ;;------
-;;     Death Knight, Teron Gorefiend, Ice_Bringer
-(define-animations 'animations-death-knight
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #19 P32
-    #( 0 3   2   0) #( 0 3   2   5) #( 0 4   2   5) #( 0 3   2  10)
-    #( 0 3   2  10) #( 0 3   2  15) #( 0 4   2  15) #( 0 3   2  20)
-    #( 0 3   2  20) #( 3 3   1   0))
-  'attack '(   ; #40
-    #( 0 0   5  25) #( 0 0   5  30) #(12 0   7  35) #( 0 0   5  40)
-    #( 0 0  17   0) #( 3 0   1   0))
-  'die '(      ; #21
-    #( 0 0   5  45) #( 0 0   5  50) #( 0 0   5  55) #( 0 0   5  60)
-    #( 3 0   1  60)))
-
-;;------
 ;;     Dwarves
 (define-animations 'animations-dwarves
   'still '(    ; #5
@@ -184,53 +136,7 @@
     #( 0 0   3  60) #( 3 0   1  60)))
 
 ;;------
-;;     Goblin Sappers
-(define-animations 'animations-goblin-sappers
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #14 P32
-    #( 0 3   1   0) #( 0 3   1  10) #( 0 2   1  10) #( 0 3   2  25)
-    #( 0 3   1  25) #( 0 2   1  40) #( 0 3   1  40) #( 0 3   1  55)
-    #( 0 2   1  55) #( 0 3   2  65) #( 0 3   1  65) #( 3 2   1   0))
-  'attack '(   ; #25
-    #( 0 0   3  15) #(12 0   5  30) #( 0 0   3  45) #( 0 0  13   0)
-    #( 3 0   1   0))
-  'die '(      ; #19
-    #( 0 0   3   5) #( 0 0   3  20) #( 0 0   3  35) #( 0 0   3  50)
-    #( 0 0   3  60) #( 0 0   3  70) #( 3 0   1  70)))
-
-;;------
 ;;     Kurdan and Sky'ree, Gryphon Rider
-(if (symbol-bound? 'stratagus-feature-new-ships ())
-(define-animations 'animations-flying-angle
-  'still '(    ; #24
-    #( 2 0   6   0) #( 2 0   6   5) #( 2 0   6  10) #( 3 0   6  15))
-  'move '(     ; #24 P32
-    #( 0 0   1   0) #( 0 2   2   0) #( 0 3   2   0) #( 0 3   2   5)
-    #( 0 2   2   5) #( 0 3   2   5) #( 0 3   2  10) #( 0 2   2  10)
-    #( 0 3   2  10) #( 0 3   2  15) #( 0 2   2  15) #( 0 3   2  15)
-    #( 3 3   1   0))
-  'attack '(   ; #1
-    #( 0 0   6   0) #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15)
-    #( 2 0   1  15) #( 0 0   6  20) #( 0 0   6  25) #(12 0   8  30)
-    #( 0 0   6   0) #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15)
-    #( 0 0   6   0) #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15)
-    #( 0 0   6   0) #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15)
-    #( 0 0   6   0) #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15)
-    #( 0 0   6   0) #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15)
-    #( 0 0   6   0) #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15)
-    #( 1 0   1   0) #( 0 0   6   0) #( 0 0   6   5) #( 0 0   6  10)
-    #( 0 0   6  15) #( 2 0   1  15) #(12 0  20  20) #( 0 0   6   0)
-    #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0)
-    #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0)
-    #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0)
-    #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0)
-    #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0)
-    #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15) #( 1 0   1   0)
-    #( 3 0   1   0))
-  'die '(      ; #31
-    #( 0 0   5  35) #( 0 0   5  40) #( 0 0   5  45) #( 0 0   5  50)
-    #( 0 0   5  55) #( 0 0   5  60) #( 3 0   1  60)))
 (define-animations 'animations-flying-angle
   'still '(    ; #24
     #( 2 0   6   0) #( 2 0   6   5) #( 2 0   6  10) #( 3 0   6  15))
@@ -258,27 +164,10 @@
     #( 3 0   1   0))
   'die '(      ; #31
     #( 0 0   5  35) #( 0 0   5  40) #( 0 0   5  45) #( 0 0   5  50)
-    #( 0 0   5  55) #( 0 0   5  60) #( 3 0   1  60))))
+    #( 0 0   5  55) #( 0 0   5  60) #( 3 0   1  60)))
 
 ;;------
 ;;     Oil tanker, Oil tanker, Oil tanker, Oil tanker
-(if (symbol-bound? 'stratagus-feature-new-ships ())
-(define-animations 'animations-alliance-oil-tanker
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #32 P32
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 3 1   1   0))
-  'attack '(   ; #130
-    #(12 0  30   0) #( 0 0  99   0) #( 3 0   1   0))
-  'die '(      ; #101
-    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10)))
 (define-animations 'animations-alliance-oil-tanker
   'still '(    ; #5
     #( 0 0   4   0) #( 3 0   1   0))
@@ -290,27 +179,10 @@
   'attack '(   ; #130
     #(12 0  30   0) #( 0 0  99   0) #( 3 0   1   0))
   'die '(      ; #101
-    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10))))
+    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10)))
 
 ;;------
 ;;     Transport, Transport
-(if (symbol-bound? 'stratagus-feature-new-ships ())
-(define-animations 'animations-alliance-transport
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #32 P32
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 3 1   1   0))
-  'attack '(   ; #120
-    #(12 0 119   0) #( 3 0   1   0))
-  'die '(      ; #101
-    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10)))
 (define-animations 'animations-alliance-transport
   'still '(    ; #5
     #( 0 0   4   0) #( 3 0   1   0))
@@ -322,27 +194,10 @@
   'attack '(   ; #120
     #(12 0 119   0) #( 3 0   1   0))
   'die '(      ; #101
-    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10))))
+    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10)))
 
 ;;------
 ;;     Elven Destroyer, Troll Destroyer
-(if (symbol-bound? 'stratagus-feature-new-ships ())
-(define-animations 'animations-alliance-destroyer
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #32 P32
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   1   0) #( 3 1   1   0))
-  'attack '(   ; #120
-    #(12 0 119   0) #( 3 0   1   0))
-  'die '(      ; #101
-    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10)))
 (define-animations 'animations-alliance-destroyer
   'still '(    ; #5
     #( 0 0   4   0) #( 3 0   1   0))
@@ -354,27 +209,10 @@
   'attack '(   ; #120
     #(12 0 119   0) #( 3 0   1   0))
   'die '(      ; #101
-    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10))))
+    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10)))
 
 ;;------
-;;     Battleship, Ogre Juggernaught
-(if (symbol-bound? 'stratagus-feature-new-ships ())
-(define-animations 'animations-battleship
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #53 P32
-    #( 0 1   2   0) #( 0 1   2   0) #( 0 1   1   0) #( 0 1   2   0)
-    #( 0 1   2   0) #( 0 1   1   0) #( 0 1   2   0) #( 0 1   2   0)
-    #( 0 1   1   0) #( 0 1   2   0) #( 0 1   2   0) #( 0 1   1   0)
-    #( 0 1   2   0) #( 0 1   2   0) #( 0 1   1   0) #( 0 1   2   0)
-    #( 0 1   2   0) #( 0 1   1   0) #( 0 1   2   0) #( 0 1   2   0)
-    #( 0 1   1   0) #( 0 1   2   0) #( 0 1   2   0) #( 0 1   1   0)
-    #( 0 1   2   0) #( 0 1   2   0) #( 0 1   1   0) #( 0 1   2   0)
-    #( 0 1   2   0) #( 0 1   1   0) #( 0 1   2   0) #( 3 1   1   0))
-  'attack '(   ; #230
-    #(12 0 127   0) #( 0 0 102   0) #( 3 0   1   0))
-  'die '(      ; #101
-    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10)))
+;;     Battleship
 (define-animations 'animations-battleship
   'still '(    ; #5
     #( 0 0   4   0) #( 3 0   1   0))
@@ -386,71 +224,10 @@
   'attack '(   ; #230
     #(12 0 127   0) #( 0 0 102   0) #( 3 0   1   0))
   'die '(      ; #101
-    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10))))
-
-;;------
-;;     Fire_Breeze, Dragon
-(if (symbol-bound? 'stratagus-feature-new-ships ())
-(define-animations 'animations-fire-breeze
-  'still '(    ; #24
-    #( 2 0   6   0) #( 2 0   6   5) #( 2 0   6  10) #( 3 0   6  15))
-  'move '(     ; #24 P32
-    #( 0 0   1   0) #( 0 2   2   0) #( 0 3   2   0) #( 0 3   2   5)
-    #( 0 2   2   5) #( 0 3   2   5) #( 0 3   2  10) #( 0 2   2  10)
-    #( 0 3   2  10) #( 0 3   2  15) #( 0 2   2  15) #( 0 3   2  15)
-    #( 3 3   1   0))
-  'attack '(   ; #1
-    #( 0 0   6   0) #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15)
-    #( 2 0   1  15) #(12 0  20  20) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 1 0   1   0) #( 3 0   1   0))
-  'die '(      ; #26
-    #( 0 0   5  25) #( 0 0   5  30) #( 0 0   5  35) #( 0 0   5  40)
-    #( 0 0   5  45) #( 3 0   1  45)))
-(define-animations 'animations-fire-breeze
-  'still '(    ; #24
-    #( 2 0   6   0) #( 2 0   6   5) #( 2 0   6  10) #( 3 0   6  15))
-  'move '(     ; #12 P32
-    #( 0 0   1   0) #( 0 3   1   0) #( 0 3   1   0) #( 0 3   1   5)
-    #( 0 3   1   5) #( 0 3   1   5) #( 0 3   1  10) #( 0 2   1  10)
-    #( 0 3   1  10) #( 0 3   1  15) #( 0 3   1  15) #( 3 3   1   0))
-  'attack '(   ; #1
-    #( 0 0   6   0) #( 0 0   6   5) #( 0 0   6  10) #( 0 0   6  15)
-    #( 2 0   1  15) #(12 0  20  20) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 0 0   6   0) #( 0 0   6   5)
-    #( 0 0   6  10) #( 0 0   6  15) #( 1 0   1   0) #( 3 0   1   0))
-  'die '(      ; #26
-    #( 0 0   5  25) #( 0 0   5  30) #( 0 0   5  35) #( 0 0   5  40)
-    #( 0 0   5  45) #( 3 0   1  45))))
+    #( 0 0  50   5) #( 0 0  50  10) #( 3 0   1  10)))
 
 ;;------
 ;;     Gnomish Submarine, Giant Turtle
-(if (symbol-bound? 'stratagus-feature-new-ships ())
-(define-animations 'animations-submarine
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #43 P32
-    #( 0 1   2   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   2   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   2   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   2   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   2   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   2   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   2   0) #( 0 1   1   0)
-    #( 0 1   1   0) #( 0 1   2   0) #( 0 1   1   0) #( 0 1   1   0)
-    #( 0 1   2   0) #( 0 1   1   0) #( 0 1   1   0) #( 0 1   2   0)
-    #( 0 1   1   0) #( 0 1   1   0) #( 0 1   2   0) #( 3 1   1   0))
-  'attack '(   ; #115
-    #( 0 0  10   5) #( 0 0  25  10) #(12 0  25  10) #( 0 0  25   5)
-    #( 0 0  29   0) #( 3 0   1   0))
-  'die '(      ; #1
-    #( 3 0   1   0)))
 (define-animations 'animations-submarine
   'still '(    ; #5
     #( 0 0   4   0) #( 3 0   1   0))
@@ -463,24 +240,10 @@
     #( 0 0  10   5) #( 0 0  25  10) #(12 0  25  10) #( 0 0  25   5)
     #( 0 0  29   0) #( 3 0   1   0))
   'die '(      ; #1
-    #( 3 0   1   0))))
+    #( 3 0   1   0)))
 
 ;;------
 ;;     Gnomish Flying Machine
-(if (symbol-bound? 'stratagus-feature-new-ships ())
-(define-animations 'animations-balloon
-  'still '(    ; #4
-    #( 2 0   1   0) #( 2 0   1   5) #( 2 0   1   5) #( 3 0   1   0))
-  'move '(     ; #20 P32
-    #( 0 2   1   0) #( 0 1   1   5) #( 0 2   1   5) #( 0 2   1   0)
-    #( 0 1   1   0) #( 0 2   1   5) #( 0 1   1   5) #( 0 2   1   0)
-    #( 0 2   1   0) #( 0 1   1   5) #( 0 2   1   5) #( 0 1   1   0)
-    #( 0 2   1   0) #( 0 2   1   5) #( 0 1   1   5) #( 0 2   1   0)
-    #( 0 1   1   0) #( 0 2   1   5) #( 0 2   1   5) #( 3 1   1   0))
-  'attack '(   ; #1
-    #( 3 0   1   0))
-  'die '(      ; #1
-    #( 3 0   1   0)))
 (define-animations 'animations-balloon
   'still '(    ; #4
     #( 2 0   1   0) #( 2 0   1   5) #( 2 0   1   5) #( 3 0   1   0))
@@ -491,86 +254,10 @@
   'attack '(   ; #1
     #( 3 0   1   0))
   'die '(      ; #1
-    #( 3 0   1   0))) )
-
-;;------
-;;     Goblin Zeppelin
-(if (symbol-bound? 'stratagus-feature-new-ships ())
-(define-animations 'animations-zeppelin
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #20 P32
-    #( 0 2   1   0) #( 0 1   1   0) #( 0 2   1   0) #( 0 2   1   0)
-    #( 0 1   1   0) #( 0 2   1   0) #( 0 1   1   0) #( 0 2   1   0)
-    #( 0 2   1   0) #( 0 1   1   0) #( 0 2   1   0) #( 0 1   1   0)
-    #( 0 2   1   0) #( 0 2   1   0) #( 0 1   1   0) #( 0 2   1   0)
-    #( 0 1   1   0) #( 0 2   1   0) #( 0 2   1   0) #( 3 1   1   0))
-  'attack '(   ; #1
     #( 3 0   1   0)))
-(define-animations 'animations-zeppelin
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #10 P32
-    #( 0 4   1   0) #( 0 3   1   0) #( 0 3   1   0) #( 0 3   1   0)
-    #( 0 3   1   0) #( 0 4   1   0) #( 0 3   1   0) #( 0 3   1   0)
-    #( 0 3   1   0) #( 3 3   1   0))
-  'attack '(   ; #1
-    #( 3 0   1   0))) )
-
-;;------
-;;     Eye of Kilrogg
-(if (symbol-bound? 'stratagus-feature-new-ships ())
-(define-animations 'animations-eye-of-vision
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #8 P32
-    #( 0 4   1   0) #( 0 4   1   0) #( 0 4   1   0) #( 0 4   1   0)
-    #( 0 4   1   0) #( 0 4   1   0) #( 0 4   1   0) #( 3 4   1   0))
-  'attack '(   ; #1
-    #( 3 0   1   0)))
-(define-animations 'animations-eye-of-vision
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #4 P32
-    #( 0 8   1   0) #( 0 8   1   0) #( 0 8   1   0) #( 3 8   1   0))
-  'attack '(   ; #1
-    #( 3 0   1   0))) )
-
-;;------
-;;     Skeleton
-(define-animations 'animations-skeleton
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #21 P32
-    #( 0 3   2   0) #( 0 3   2  10) #( 0 3   1  10) #( 0 2   2  25)
-    #( 0 3   3  25) #( 0 2   1   0) #( 0 3   2   0) #( 0 3   2  40)
-    #( 0 3   1  40) #( 0 2   2  55) #( 0 3   2  55) #( 3 2   1   0))
-  'attack '(   ; #35
-    #( 0 0   4  15) #( 0 0   4  30) #(12 0   4  45) #( 0 0   4  60)
-    #( 0 0  18   0) #( 3 0   1   0))
-  'die '(      ; #16
-    #( 0 0   3   5) #( 0 0   3  20) #( 0 0   3  35) #( 0 0   3  50)
-    #( 0 0   3  65) #( 3 0   1  65)))
 
 ;;------
 ;;     Daemon
-(if (symbol-bound? 'stratagus-feature-new-ships ())
-(define-animations 'animations-daemon
-  'still '(    ; #16
-    #( 2 0   4   0) #( 2 0   4   5) #( 2 0   4  10) #( 3 0   4  15))
-  'move '(     ; #24 P32
-    #( 0 3   2   0) #( 0 2   1   0) #( 0 2   2   5) #( 0 2   2   5)
-    #( 0 2   1   5) #( 0 2   2  10) #( 0 2   1  10) #( 0 3   2  10)
-    #( 0 2   2  15) #( 0 2   1  15) #( 0 2   2  15) #( 0 2   1  20)
-    #( 0 2   2  20) #( 0 2   2  20) #( 3 2   1   0))
-  'attack '(   ; #60
-    #( 0 0   4   0) #( 0 0   4   5) #( 0 0   4  10) #( 0 0   4  15)
-    #( 0 0   4  20) #( 2 0   1  20) #( 0 0   4  25) #( 0 0   4  30)
-    #( 0 0   4  35) #(12 0   4  40) #( 0 0   4  45) #( 1 0   1   0)
-    #(12 0  59   0) #( 3 0   1   0))
-  'die '(      ; #21
-    #( 0 0   5  50) #( 0 0   5  55) #( 0 0   5  60) #( 0 0   5  65)
-    #( 3 0   1  65)))
 (define-animations 'animations-daemon
   'still '(    ; #16
     #( 2 0   4   0) #( 2 0   4   5) #( 2 0   4  10) #( 3 0   4  15))
@@ -585,7 +272,7 @@
     #(12 0  59   0) #( 3 0   1   0))
   'die '(      ; #21
     #( 0 0   5  50) #( 0 0   5  55) #( 0 0   5  60) #( 0 0   5  65)
-    #( 3 0   1  65))) )
+    #( 3 0   1  65)))
 
 ;;------
 ;;     Critter
@@ -654,3 +341,4 @@
     #( 0 0 200   0) #(16 0 200   1) #( 3 0   1   1)
     ;; Destroyed water site
     #( 0 0 200   2) #(16 0 200   3) #( 3 0   1   3)))
+
Index: demogame/ccl/editor.ccl
diff -u demogame/ccl/editor.ccl:1.6 demogame/ccl/editor.ccl:1.7
--- demogame/ccl/editor.ccl:1.6 Thu Oct  9 09:52:08 2003
+++ demogame/ccl/editor.ccl     Thu Oct  9 12:10:34 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: editor.ccl,v 1.6 2003/10/09 13:52:08 martinxyz Exp $
+;;     $Id: editor.ccl,v 1.7 2003/10/09 16:10:34 martinxyz Exp $
 
 
 ;;     Set which icons to display
@@ -83,13 +83,6 @@
    'unit-alliance-refinery
    'unit-alliance-oil-platform
 
-   'unit-female-hero
-   'unit-flying-angle
-   'unit-white-mage
-   'unit-knight-rider
-   'unit-arthor-literios
-   'unit-wise-man
-   'unit-man-of-light
 
 ;- - - - - - - - - - - - - - - - - - -
 
Index: demogame/ccl/icons.ccl
diff -u demogame/ccl/icons.ccl:1.5 demogame/ccl/icons.ccl:1.6
--- demogame/ccl/icons.ccl:1.5  Thu Oct  9 09:52:09 2003
+++ demogame/ccl/icons.ccl      Thu Oct  9 12:10:34 2003
@@ -26,37 +26,21 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: icons.ccl,v 1.5 2003/10/09 13:52:09 martinxyz Exp $
+;;     $Id: icons.ccl,v 1.6 2003/10/09 16:10:34 martinxyz Exp $
 
 ;;     NOTE:
 ;;             Splitting this file into races is a problem, because all
 ;;             icons are in a single file.
 
-
 ;;     FIXME: can be removed: Set the icon size (width height)
 (set-icon-size! 46 38)
-
 ;;     FIXME: can be removed: Set the number of icons per row
 (set-icons-per-row! 5)
 
 ;;=============================================================================
-;;     Define an icon.
-;;
-;;     (define-icon ident 'tileset tileset 'size (x y) type (index file))
-;;
-;;     ident   is the name of the icon
-;;     tileset is the name of the tileset
-;;     type    is the 'normal
-;;     index   is the index into the graphic file
-;;     file    is the filename of the graphic file containing the graphics
-;;
-
-;;=============================================================================
 ;;     Summer Tileset
 ;;=============================================================================
 
-
-
 ; FIXME: don't repeat filename and size
 ;        could be done with a helper function
 (define-icon 'icon-peasant 'tileset 'tileset-summer
@@ -69,51 +53,32 @@
   'size '(46 38) 'normal '(3 "tilesets/summer/icons.png"))
 (define-icon 'icon-archer 'tileset 'tileset-summer
   'size '(46 38) 'normal '(4 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-ranger 'tileset 'tileset-summer
   'size '(46 38) 'normal '(6 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-knight 'tileset 'tileset-summer
   'size '(46 38) 'normal '(8 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-paladin 'tileset 'tileset-summer
   'size '(46 38) 'normal '(10 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-dwarves 'tileset 'tileset-summer
   'size '(46 38) 'normal '(12 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-mage 'tileset 'tileset-summer
   'size '(46 38) 'normal '(14 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-ballista 'tileset 'tileset-summer
   'size '(46 38) 'normal '(16 "tilesets/summer/icons.png"))
 (define-icon 'icon-alliance-oil-tanker 'tileset 'tileset-summer
   'size '(46 38) 'normal '(18 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-transport 'tileset 'tileset-summer
   'size '(46 38) 'normal '(20 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-destroyer 'tileset 'tileset-summer
   'size '(46 38) 'normal '(22 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-battleship 'tileset 'tileset-summer
   'size '(46 38) 'normal '(24 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-submarine 'tileset 'tileset-summer
   'size '(46 38) 'normal '(26 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-balloon 'tileset 'tileset-summer
   'size '(46 38) 'normal '(28 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-gryphon-rider 'tileset 'tileset-summer
   'size '(46 38) 'normal '(30 "tilesets/summer/icons.png"))
-(define-icon 'icon-wise-man 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(32 "tilesets/summer/icons.png"))
-
-(define-icon 'icon-man-of-light 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(34 "tilesets/summer/icons.png"))
-
-
 (define-icon 'icon-daemon 'tileset 'tileset-summer
   'size '(46 38) 'normal '(37 "tilesets/summer/icons.png"))
 (define-icon 'icon-farm 'tileset 'tileset-summer
@@ -130,57 +95,40 @@
   'size '(46 38) 'normal '(43 "tilesets/summer/icons.png"))
 (define-icon 'icon-elven-lumber-mill 'tileset 'tileset-summer
   'size '(46 38) 'normal '(44 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-blacksmith 'tileset 'tileset-summer
   'size '(46 38) 'normal '(46 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-shipyard 'tileset 'tileset-summer
   'size '(46 38) 'normal '(48 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-refinery 'tileset 'tileset-summer
   'size '(46 38) 'normal '(50 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-foundry 'tileset 'tileset-summer
   'size '(46 38) 'normal '(52 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-oil-platform 'tileset 'tileset-summer
   'size '(46 38) 'normal '(54 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-stables 'tileset 'tileset-summer
   'size '(46 38) 'normal '(56 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-inventor 'tileset 'tileset-summer
   'size '(46 38) 'normal '(58 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-watch-tower 'tileset 'tileset-summer
   'size '(46 38) 'normal '(60 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-church 'tileset 'tileset-summer
   'size '(46 38) 'normal '(62 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-mage-tower 'tileset 'tileset-summer
   'size '(46 38) 'normal '(64 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-keep 'tileset 'tileset-summer
   'size '(46 38) 'normal '(66 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-castle-upgrade 'tileset 'tileset-summer
   'size '(46 38) 'normal '(68 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-castle 'tileset 'tileset-summer
   'size '(46 38) 'normal '(70 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-gryphon-aviary 'tileset 'tileset-summer
   'size '(46 38) 'normal '(72 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-gold-mine 'tileset 'tileset-summer
   'size '(46 38) 'normal '(74 "tilesets/summer/icons.png"))
 (define-icon 'icon-alliance-guard-tower 'tileset 'tileset-summer
   'size '(46 38) 'normal '(75 "tilesets/summer/icons.png"))
 (define-icon 'icon-alliance-cannon-tower 'tileset 'tileset-summer
   'size '(46 38) 'normal '(76 "tilesets/summer/icons.png"))
-
-
 (define-icon 'icon-oil-patch 'tileset 'tileset-summer
   'size '(46 38) 'normal '(79 "tilesets/summer/icons.png"))
 (define-icon 'icon-dark-portal 'tileset 'tileset-summer
@@ -215,33 +163,21 @@
   'size '(46 38) 'normal '(94 "tilesets/summer/icons.png"))
 (define-icon 'icon-invisibility 'tileset 'tileset-summer
   'size '(46 38) 'normal '(95 "tilesets/summer/icons.png"))
-
-
-
 (define-icon 'icon-lightning 'tileset 'tileset-summer
   'size '(46 38) 'normal '(99 "tilesets/summer/icons.png"))
 (define-icon 'icon-flame-shield 'tileset 'tileset-summer
   'size '(46 38) 'normal '(100 "tilesets/summer/icons.png"))
 (define-icon 'icon-fireball 'tileset 'tileset-summer
   'size '(46 38) 'normal '(101 "tilesets/summer/icons.png"))
-
-
-
 (define-icon 'icon-blizzard 'tileset 'tileset-summer
   'size '(46 38) 'normal '(105 "tilesets/summer/icons.png"))
 (define-icon 'icon-holy-vision 'tileset 'tileset-summer
   'size '(46 38) 'normal '(106 "tilesets/summer/icons.png"))
 (define-icon 'icon-heal 'tileset 'tileset-summer
   'size '(46 38) 'normal '(107 "tilesets/summer/icons.png"))
-
-
 (define-icon 'icon-exorcism 'tileset 'tileset-summer
   'size '(46 38) 'normal '(110 "tilesets/summer/icons.png"))
 
-
-
-(define-icon 'icon-skeleton 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(114 "tilesets/summer/icons.png"))
 (define-icon 'icon-critter 'tileset 'tileset-summer
   'size '(46 38) 'normal '(115 "tilesets/summer/icons.png"))
 (define-icon 'icon-sword1 'tileset 'tileset-summer
@@ -252,30 +188,18 @@
   'size '(46 38) 'normal '(118 "tilesets/summer/icons.png"))
 (define-icon 'icon-battle-axe1 'tileset 'tileset-summer
   'size '(46 38) 'normal '(119 "tilesets/summer/icons.png"))
-
-
-
-
 (define-icon 'icon-arrow1 'tileset 'tileset-summer
   'size '(46 38) 'normal '(124 "tilesets/summer/icons.png"))
 (define-icon 'icon-arrow2 'tileset 'tileset-summer
   'size '(46 38) 'normal '(125 "tilesets/summer/icons.png"))
 (define-icon 'icon-arrow3 'tileset 'tileset-summer
   'size '(46 38) 'normal '(126 "tilesets/summer/icons.png"))
-
-
-
-
-
 (define-icon 'icon-longbow 'tileset 'tileset-summer
   'size '(46 38) 'normal '(132 "tilesets/summer/icons.png"))
 (define-icon 'icon-ranger-scouting 'tileset 'tileset-summer
   'size '(46 38) 'normal '(133 "tilesets/summer/icons.png"))
 (define-icon 'icon-ranger-marksmanship 'tileset 'tileset-summer
   'size '(46 38) 'normal '(134 "tilesets/summer/icons.png"))
-
-
-
 (define-icon 'icon-ballista1 'tileset 'tileset-summer
   'size '(46 38) 'normal '(140 "tilesets/summer/icons.png"))
 (define-icon 'icon-ballista2 'tileset 'tileset-summer
@@ -290,30 +214,20 @@
   'size '(46 38) 'normal '(145 "tilesets/summer/icons.png"))
 (define-icon 'icon-alliance-ship-cannon3 'tileset 'tileset-summer
   'size '(46 38) 'normal '(146 "tilesets/summer/icons.png"))
-
-
-
-
-
-
 (define-icon 'icon-alliance-ship-armor1 'tileset 'tileset-summer
   'size '(46 38) 'normal '(153 "tilesets/summer/icons.png"))
 (define-icon 'icon-alliance-ship-armor2 'tileset 'tileset-summer
   'size '(46 38) 'normal '(154 "tilesets/summer/icons.png"))
 (define-icon 'icon-alliance-ship-armor3 'tileset 'tileset-summer
   'size '(46 38) 'normal '(155 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-ship-move 'tileset 'tileset-summer
   'size '(46 38) 'normal '(157 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-ship-return-oil 'tileset 'tileset-summer
   'size '(46 38) 'normal '(159 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-ship-haul-oil 'tileset 'tileset-summer
   'size '(46 38) 'normal '(161 "tilesets/summer/icons.png"))
 (define-icon 'icon-alliance-unload 'tileset 'tileset-summer
   'size '(46 38) 'normal '(162 "tilesets/summer/icons.png"))
-
 (define-icon 'icon-alliance-shield1 'tileset 'tileset-summer
   'size '(46 38) 'normal '(164 "tilesets/summer/icons.png"))
 (define-icon 'icon-alliance-shield2 'tileset 'tileset-summer
@@ -322,16 +236,6 @@
   'size '(46 38) 'normal '(166 "tilesets/summer/icons.png"))
 (define-icon 'icon-mythical-shield1 'tileset 'tileset-summer
   'size '(46 38) 'normal '(167 "tilesets/summer/icons.png"))
-
-
-
-
-
-
-
-
-
-
 (define-icon 'icon-alliance-patrol-land 'tileset 'tileset-summer
   'size '(46 38) 'normal '(178 "tilesets/summer/icons.png"))
 (define-icon 'icon-mythical-patrol-land 'tileset 'tileset-summer
@@ -347,26 +251,9 @@
 (define-icon 'icon-alliance-patrol-naval 'tileset 'tileset-summer
   'size '(46 38) 'normal '(184 "tilesets/summer/icons.png"))
 
-
-(define-icon 'icon-female-hero 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(187 "tilesets/summer/icons.png"))
-(define-icon 'icon-ugly-guy 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(188 "tilesets/summer/icons.png"))
-
-
-(define-icon 'icon-flying-angle 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(191 "tilesets/summer/icons.png"))
-
-(define-icon 'icon-white-mage 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(193 "tilesets/summer/icons.png"))
-
-(define-icon 'icon-knight-rider 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(195 "tilesets/summer/icons.png"))
-
 ;;=============================================================================
 ;;     Winter Tileset
 ;;=============================================================================
-
 (define-icon 'icon-peasant 'tileset 'tileset-winter
   'size '(46 38) 'normal '(0 "tilesets/winter/icons.png"))
 (define-icon 'icon-faun 'tileset 'tileset-winter
@@ -377,52 +264,32 @@
   'size '(46 38) 'normal '(3 "tilesets/winter/icons.png"))
 (define-icon 'icon-archer 'tileset 'tileset-winter
   'size '(46 38) 'normal '(4 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-ranger 'tileset 'tileset-winter
   'size '(46 38) 'normal '(6 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-knight 'tileset 'tileset-winter
   'size '(46 38) 'normal '(8 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-paladin 'tileset 'tileset-winter
   'size '(46 38) 'normal '(10 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-dwarves 'tileset 'tileset-winter
   'size '(46 38) 'normal '(12 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-mage 'tileset 'tileset-winter
   'size '(46 38) 'normal '(14 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-ballista 'tileset 'tileset-winter
   'size '(46 38) 'normal '(16 "tilesets/winter/icons.png"))
 (define-icon 'icon-alliance-oil-tanker 'tileset 'tileset-winter
   'size '(46 38) 'normal '(18 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-transport 'tileset 'tileset-winter
   'size '(46 38) 'normal '(20 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-destroyer 'tileset 'tileset-winter
   'size '(46 38) 'normal '(22 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-battleship 'tileset 'tileset-winter
   'size '(46 38) 'normal '(24 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-submarine 'tileset 'tileset-winter
   'size '(46 38) 'normal '(26 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-balloon 'tileset 'tileset-winter
   'size '(46 38) 'normal '(28 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-gryphon-rider 'tileset 'tileset-winter
   'size '(46 38) 'normal '(30 "tilesets/winter/icons.png"))
-
-(define-icon 'icon-wise-man 'tileset 'tileset-winter
-  'size '(46 38) 'normal '(32 "tilesets/winter/icons.png"))
-
-(define-icon 'icon-man-of-light 'tileset 'tileset-winter
-  'size '(46 38) 'normal '(34 "tilesets/winter/icons.png"))
-
-
 (define-icon 'icon-daemon 'tileset 'tileset-winter
   'size '(46 38) 'normal '(37 "tilesets/winter/icons.png"))
 (define-icon 'icon-farm 'tileset 'tileset-winter
@@ -439,57 +306,40 @@
   'size '(46 38) 'normal '(43 "tilesets/winter/icons.png"))
 (define-icon 'icon-elven-lumber-mill 'tileset 'tileset-winter
   'size '(46 38) 'normal '(44 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-blacksmith 'tileset 'tileset-winter
   'size '(46 38) 'normal '(46 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-shipyard 'tileset 'tileset-winter
   'size '(46 38) 'normal '(48 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-refinery 'tileset 'tileset-winter
   'size '(46 38) 'normal '(50 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-foundry 'tileset 'tileset-winter
   'size '(46 38) 'normal '(52 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-oil-platform 'tileset 'tileset-winter
   'size '(46 38) 'normal '(54 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-stables 'tileset 'tileset-winter
   'size '(46 38) 'normal '(56 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-inventor 'tileset 'tileset-winter
   'size '(46 38) 'normal '(58 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-watch-tower 'tileset 'tileset-winter
   'size '(46 38) 'normal '(60 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-church 'tileset 'tileset-winter
   'size '(46 38) 'normal '(62 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-mage-tower 'tileset 'tileset-winter
   'size '(46 38) 'normal '(64 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-keep 'tileset 'tileset-winter
   'size '(46 38) 'normal '(66 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-castle-upgrade 'tileset 'tileset-winter
   'size '(46 38) 'normal '(68 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-castle 'tileset 'tileset-winter
   'size '(46 38) 'normal '(70 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-gryphon-aviary 'tileset 'tileset-winter
   'size '(46 38) 'normal '(72 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-gold-mine 'tileset 'tileset-winter
   'size '(46 38) 'normal '(74 "tilesets/winter/icons.png"))
 (define-icon 'icon-alliance-guard-tower 'tileset 'tileset-winter
   'size '(46 38) 'normal '(75 "tilesets/winter/icons.png"))
 (define-icon 'icon-alliance-cannon-tower 'tileset 'tileset-winter
   'size '(46 38) 'normal '(76 "tilesets/winter/icons.png"))
-
-
 (define-icon 'icon-oil-patch 'tileset 'tileset-winter
   'size '(46 38) 'normal '(79 "tilesets/winter/icons.png"))
 (define-icon 'icon-dark-portal 'tileset 'tileset-winter
@@ -524,33 +374,21 @@
   'size '(46 38) 'normal '(94 "tilesets/winter/icons.png"))
 (define-icon 'icon-invisibility 'tileset 'tileset-winter
   'size '(46 38) 'normal '(95 "tilesets/winter/icons.png"))
-
-
-
 (define-icon 'icon-lightning 'tileset 'tileset-winter
   'size '(46 38) 'normal '(99 "tilesets/winter/icons.png"))
 (define-icon 'icon-flame-shield 'tileset 'tileset-winter
   'size '(46 38) 'normal '(100 "tilesets/winter/icons.png"))
 (define-icon 'icon-fireball 'tileset 'tileset-winter
   'size '(46 38) 'normal '(101 "tilesets/winter/icons.png"))
-
-
-
 (define-icon 'icon-blizzard 'tileset 'tileset-winter
   'size '(46 38) 'normal '(105 "tilesets/winter/icons.png"))
 (define-icon 'icon-holy-vision 'tileset 'tileset-winter
   'size '(46 38) 'normal '(106 "tilesets/winter/icons.png"))
 (define-icon 'icon-heal 'tileset 'tileset-winter
   'size '(46 38) 'normal '(107 "tilesets/winter/icons.png"))
-
-
 (define-icon 'icon-exorcism 'tileset 'tileset-winter
   'size '(46 38) 'normal '(110 "tilesets/winter/icons.png"))
 
-
-
-(define-icon 'icon-skeleton 'tileset 'tileset-winter
-  'size '(46 38) 'normal '(114 "tilesets/winter/icons.png"))
 (define-icon 'icon-critter 'tileset 'tileset-winter
   'size '(46 38) 'normal '(115 "tilesets/winter/icons.png"))
 (define-icon 'icon-sword1 'tileset 'tileset-winter
@@ -561,30 +399,18 @@
   'size '(46 38) 'normal '(118 "tilesets/winter/icons.png"))
 (define-icon 'icon-battle-axe1 'tileset 'tileset-winter
   'size '(46 38) 'normal '(119 "tilesets/winter/icons.png"))
-
-
-
-
 (define-icon 'icon-arrow1 'tileset 'tileset-winter
   'size '(46 38) 'normal '(124 "tilesets/winter/icons.png"))
 (define-icon 'icon-arrow2 'tileset 'tileset-winter
   'size '(46 38) 'normal '(125 "tilesets/winter/icons.png"))
 (define-icon 'icon-arrow3 'tileset 'tileset-winter
   'size '(46 38) 'normal '(126 "tilesets/winter/icons.png"))
-
-
-
-
-
 (define-icon 'icon-longbow 'tileset 'tileset-winter
   'size '(46 38) 'normal '(132 "tilesets/winter/icons.png"))
 (define-icon 'icon-ranger-scouting 'tileset 'tileset-winter
   'size '(46 38) 'normal '(133 "tilesets/winter/icons.png"))
 (define-icon 'icon-ranger-marksmanship 'tileset 'tileset-winter
   'size '(46 38) 'normal '(134 "tilesets/winter/icons.png"))
-
-
-
 (define-icon 'icon-ballista1 'tileset 'tileset-winter
   'size '(46 38) 'normal '(140 "tilesets/winter/icons.png"))
 (define-icon 'icon-ballista2 'tileset 'tileset-winter
@@ -599,30 +425,20 @@
   'size '(46 38) 'normal '(145 "tilesets/winter/icons.png"))
 (define-icon 'icon-alliance-ship-cannon3 'tileset 'tileset-winter
   'size '(46 38) 'normal '(146 "tilesets/winter/icons.png"))
-
-
-
-
-
-
 (define-icon 'icon-alliance-ship-armor1 'tileset 'tileset-winter
   'size '(46 38) 'normal '(153 "tilesets/winter/icons.png"))
 (define-icon 'icon-alliance-ship-armor2 'tileset 'tileset-winter
   'size '(46 38) 'normal '(154 "tilesets/winter/icons.png"))
 (define-icon 'icon-alliance-ship-armor3 'tileset 'tileset-winter
   'size '(46 38) 'normal '(155 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-ship-move 'tileset 'tileset-winter
   'size '(46 38) 'normal '(157 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-ship-return-oil 'tileset 'tileset-winter
   'size '(46 38) 'normal '(159 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-ship-haul-oil 'tileset 'tileset-winter
   'size '(46 38) 'normal '(161 "tilesets/winter/icons.png"))
 (define-icon 'icon-alliance-unload 'tileset 'tileset-winter
   'size '(46 38) 'normal '(162 "tilesets/winter/icons.png"))
-
 (define-icon 'icon-alliance-shield1 'tileset 'tileset-winter
   'size '(46 38) 'normal '(164 "tilesets/winter/icons.png"))
 (define-icon 'icon-alliance-shield2 'tileset 'tileset-winter
@@ -631,16 +447,6 @@
   'size '(46 38) 'normal '(166 "tilesets/winter/icons.png"))
 (define-icon 'icon-mythical-shield1 'tileset 'tileset-winter
   'size '(46 38) 'normal '(167 "tilesets/winter/icons.png"))
-
-
-
-
-
-
-
-
-
-
 (define-icon 'icon-alliance-patrol-land 'tileset 'tileset-winter
   'size '(46 38) 'normal '(178 "tilesets/winter/icons.png"))
 (define-icon 'icon-mythical-patrol-land 'tileset 'tileset-winter
@@ -656,29 +462,3 @@
 (define-icon 'icon-alliance-patrol-naval 'tileset 'tileset-winter
   'size '(46 38) 'normal '(184 "tilesets/winter/icons.png"))
 
-
-(define-icon 'icon-female-hero 'tileset 'tileset-winter
-  'size '(46 38) 'normal '(187 "tilesets/winter/icons.png"))
-(define-icon 'icon-ugly-guy 'tileset 'tileset-winter
-  'size '(46 38) 'normal '(188 "tilesets/winter/icons.png"))
-
-
-(define-icon 'icon-flying-angle 'tileset 'tileset-winter
-  'size '(46 38) 'normal '(191 "tilesets/winter/icons.png"))
-
-(define-icon 'icon-white-mage 'tileset 'tileset-winter
-  'size '(46 38) 'normal '(193 "tilesets/winter/icons.png"))
-
-(define-icon 'icon-knight-rider 'tileset 'tileset-winter
-  'size '(46 38) 'normal '(195 "tilesets/winter/icons.png"))
-
-;;=============================================================================
-;;     Define an icon alias.
-;;
-;;     (define-icon-alias alias icon)
-;;
-;;     alias   Is the new alias name.
-;;     icon    Must be an already existing icon name.
-;;
-(define-icon-alias 'icon-raise-dead    'icon-skeleton)
-(define-icon-alias 'icon-polymorph     'icon-critter)
Index: demogame/ccl/mythical/units.ccl
diff -u demogame/ccl/mythical/units.ccl:1.14 
demogame/ccl/mythical/units.ccl:1.15
--- demogame/ccl/mythical/units.ccl:1.14        Thu Oct  9 09:52:10 2003
+++ demogame/ccl/mythical/units.ccl     Thu Oct  9 12:10:35 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.14 2003/10/09 13:52:10 martinxyz Exp $
+;;     $Id: units.ccl,v 1.15 2003/10/09 16:10:35 martinxyz Exp $
 
 ;;=============================================================================
 ;;     Define unit-types.
@@ -44,7 +44,6 @@
   'sight-range 4 'computer-reaction-range 6 'person-reaction-range 4
   'armor 2 'basic-damage 6 'piercing-damage 3 'missile 'missile-none
   'max-attack-range 1
-  'weapons-upgradable 1 'armor-upgradable 1
   'priority 60
   'points 50
   'demand 1
Index: demogame/ccl/sound.ccl
diff -u demogame/ccl/sound.ccl:1.6 demogame/ccl/sound.ccl:1.7
--- demogame/ccl/sound.ccl:1.6  Thu Oct  9 09:52:09 2003
+++ demogame/ccl/sound.ccl      Thu Oct  9 12:10:34 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: sound.ccl,v 1.6 2003/10/09 13:52:09 martinxyz Exp $
+;;     $Id: sound.ccl,v 1.7 2003/10/09 16:10:34 martinxyz Exp $
 
 ;;     Uncomment this to enable threaded sound
 ;(sound-thread)
@@ -131,18 +131,18 @@
 (make-sound "mage-tower-selected" "alliance/buildings/mage_tower.wav")
 
     ;; spells
-(make-sound "bloodlust" "spells/bloodlust.wav")
-(make-sound "death and decay" "spells/death_and_decay.wav")
-(make-sound "death coil" "spells/death_coil.wav")
+
+
+
 (make-sound "flame shield" "spells/flame_shield.wav")
-(make-sound "haste" "spells/haste.wav")
+
 (make-sound "healing" "spells/healing.wav")
 (make-sound "holy vision" "spells/holy_vision.wav")
 (make-sound "blizzard" "spells/blizzard.wav")
 (make-sound "invisibility" "spells/invisibility.wav")
 (make-sound "polymorph" "spells/polymorph.wav")
 (make-sound "slow" "spells/slow.wav")
-(make-sound "whirlwind" "spells/whirlwind.wav")
+
     ;; ready sounds
 (make-sound "faun-ready" "mythical/faun/ready.wav")
 (make-sound "knight-ready" "alliance/units/knight/ready.wav")
Index: demogame/ccl/spells.ccl
diff -u demogame/ccl/spells.ccl:1.3 demogame/ccl/spells.ccl:1.4
--- demogame/ccl/spells.ccl:1.3 Thu Oct  9 09:52:09 2003
+++ demogame/ccl/spells.ccl     Thu Oct  9 12:10:35 2003
@@ -26,300 +26,8 @@
 ;;      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.3 2003/10/09 13:52:09 martinxyz Exp $

-

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

-

-;;             // Warning, Some names and specifications should be changed

-;;             // Todo parameter coherency ? negative for dealing damage, 
positive for healing ?

-;;

-;;             ...             : for list.

-;;             {a, b, c}       : choice between a, b, or c.

-;;             name#n          : name is of type number.

-;;             #n                      : Number.

-;;             #t                      : {true, false}

-;;             #target         : {'self, 'Unit, 'position}

-;;             #f_inv          : {unholyarmor, invisibility}

-;;             #f_haste        : {bloodlust, slow, haste, HP, mana, 
HP_percent, mana_percent}

-;;             #f_flag         : {invisibility, bloodlust, unholyarmor, slow, 
haste, flameshield,

-;;                               HP, mana, HP_percent, mana_percent

-;;             #flagtype       : {coward, organic, undead, canattack, building}

-;;             <condition>     : Same syntax as 'condition

-;;

-;;     (define-spell   "IdentName"     // Ident name for call in unit

-;;             'Showname "ShowName"    // Name show in the engine

-;;             'ManaCost #n            // Mana to cast the spell

-;;             'range #n               // Range of the spell (0)

-;;             'Target #target         // Which target is allowed (None by 
default)

-;;             'Action '({

-;;                     Blizzard ('fields #n 'shards #n 'damage #n),

-;;                     CircleOfPower "unit-goal",

-;;                     DeathAndDecay(fields #n shards #n damage #n),

-;;                     DeathCoil,

-;;                     FireBall (ttl #n damage #n),

-;;                     FlameShield (ttl #n),

-;;                     Haste (#f_haste #n ...),

-;;                     Healing (HP#n), // Healing (HP >0) or exorcism (HP < 0)

-;;                     HolyVision "unit-revealer",

-;;                     Invisibility (flag #f_inv value #n missile 
"MissileType")

-;;                     Polymorph "unittype",

-;;                     RaiseDead "skeleton",

-;;                     Runes (ttl #n damage #n),

-;;                     Summon "UnitType",

-;;                     Whirlwind (ttl #n)

-;;                             } )

-;;             'sound-when-cast "SoundConfig"

-;;             'missile-when-cast "MissileType"

-;;             'condition '( {

-;;                     Enemypresence   (#t range #n),                  // 
enemy in range

-;;                     DurationEffect  (#t flag #f_flag value #n),     // 
"f_flag" < #n

-;;                     Alliance        #t,                             // 
check the target is allied.

-;;                     UnitTypeflag    (#t #flagtype),                 // Unit 
is a "type"

-;;                     ...}

-;;                     )

-;;             'autocast '(

-;;                             range #n

-;;                             condition (<condition>)// Additional condition

-;;                             +++order () // which target choose.

-;;                             )

-;;

-

-;;  Declare some unit types used in spells. This is quite accetable, the other

-;;  way would be to define can-cast-spell outside unit definitions, not much 
of an improvement.

-(define-unit-type 'unit-revealer)

-(define-unit-type 'unit-critter)

-(define-unit-type 'unit-circle-of-power)

-

-(define-spell "spell-holy-vision"

-       'showname "Holy Vision"

-       'manacost 70

-       'range 'infinite

-       'target 'position

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

-       'sound-when-cast "holy vision"

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

-)

-

-(define-spell "spell-healing"

-       'showname "Healing"

-       'manacost 6

-       'range  6

-       'target 'unit

-       'action '(adjust-vitals hit-points 1)

-       'condition '(

-           organic only

-           building false

-           max-hp-percent 100)

-       'sound-when-cast "healing"

-       'missile-when-cast "missile-heal-effect"

-       'autocast '(range 6

-           condition (

-               coward false

-               alliance only

-               max-hp-percent 50

-           )

-       )

-)

-

-(define-spell "spell-exorcism"

-       'showname "Exorcism"

-       'manacost 4

-       'range  10

-       'target 'unit

-       'action '(adjust-vitals hit-points -1)

-       'condition '(

-           undead only

-           building false ; any undead buildings?

-           alliance false

-       )

-       'sound-when-cast "exorcism"

-       'missile-when-cast "missile-exorcism"

-       'autocast '(range 10 condition (coward false alliance false))

-)

-

-(define-spell "spell-haste"

-       'showname "haste"

-       'manacost 50

-       'range  6

-       'target 'unit

-       'action '(adjust-buffs haste-ticks 1000 slow-ticks 0)

-       'condition '(

-           building false

-           max-haste-ticks 10 ;; FIXME: proper value?

-       )

-       'sound-when-cast "haste"

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

-       'autocast '(range 6 combat only condition (coward false alliance only))

-       'ai-cast '(range 6 condition (coward false alliance only))

-)

-

-(define-spell "spell-slow"

-       'showname "slow"

-       'manacost 50

-       'range  10

-       'target 'unit

-       'action '(adjust-buffs slow-ticks 1000 haste-ticks 0)

-       'condition '(

-           building false

-           max-slow-ticks 10)

-       'sound-when-cast "slow"

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

-       'autocast '(range 10 combat only condition (coward false alliance 
false))

-       'ai-cast '(range 10 condition (coward false alliance false))

-)

-

-(define-spell "spell-bloodlust"

-       'showname "bloodlust"

-       'manacost 50

-       'range  6

-       'target 'unit

-       'action '(adjust-buffs bloodlust-ticks 1000)

-       'condition '(

-           organic only

-           max-bloodlust-ticks 10)

-       'sound-when-cast "bloodlust"

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

-       'autocast '(range 6 condition (coward false alliance only))

-       'ai-cast '(range 6 combat only condition (coward false alliance only))

-)

-

-(define-spell "spell-invisibility"

-       'showname "invisibility"

-       'manacost 200

-       'range  6

-       'target 'unit

-       'action '(adjust-buffs invisibility-ticks 2000)

-       'condition '(

-           building false

-           max-invisibility-ticks 10)

-       'sound-when-cast "invisibility"

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

-;      'autocast '(range 6 condition (coward false))

-)

-

-(define-spell "spell-unholy-armor"

-       'showname "unholyarmor"

-       'manacost 100

-       'range  6

-       'target 'unit

-       'action '(adjust-buffs invincibility-ticks 500)

-       'condition '(

-           building false

-           max-invincibility-ticks 10)

-       'sound-when-cast "unholyarmor"

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

-;      'autocast '(range 6 condition (coward false alliance only))

-)

-

-(define-spell "spell-flame-shield"

-       'showname "flame shield"

-       'manacost 50

-       'range  6

-       'target 'unit

-       'action '(flame-shield duration 600)

-       ;; I think it's better if we can cast it multiple times and the effects 
stack.

-       ;; Can be casted, and is effective on both allies and enemies

-       'condition '(building false)

-       'sound-when-cast "flame shield"

-       'missile-when-cast "missile-flame-shield" ; NOT use

-;      'autocast '(range 6 condition (coward false))

-)

-

-(define-spell "spell-polymorph"

-       'showname "polymorph"

-       'manacost 200

-       'range  10

-       'target 'unit

-       'action '(polymorph new-form unit-critter)

-       'condition '(organic only)

-       'sound-when-cast "polymorph"

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

-       ;;  Only cast on the strongest units!!!

-;      'autocast '(range 10 condition (alliance false min-hp-percent 75))

-)

-

-

-(define-spell "spell-blizzard"

-       'showname "blizzard"

-       'manacost 25

-       'range  12

-       'target 'position

-       'action '(area-bombardment

-            fields 5

-            shards 10

-            damage 10

-            ;;  128=4*32=4 tiles

-            start-offset-x -128

-            start-offset-y -128)

-       'sound-when-cast "blizzard"

-       'missile-when-cast "missile-blizzard"

-;;     'autocast '(range 12)

-)

-

-(define-spell "spell-death-and-decay"

-       'showname "death and decay"

-       'manacost 25

-       'range  12

-       'target 'position

-       'action '(area-bombardment fields 5 shards 10 damage 10)

-       'sound-when-cast "death and decay"

-       'missile-when-cast "missile-death-and-decay"

-;;     'autocast '(range 12)

-)

-

-(define-spell "spell-fireball"

-       'showname "fireball"

-       'manacost 100

-       'range  8

-       'target 'position

-       'action '(fireball ttl 1000 damage 20)

-       'sound-when-cast "fireball throw"

-       'missile-when-cast "missile-fireball"

-;;     'autocast '(range 8)

-)

-

-(define-spell "spell-runes"

-       'showname "runes"

-       'manacost 200

-       'range  10

-       'target 'position

-       'action '(runes ttl 2000 damage 50)

-       'sound-when-cast "runes"

-       'missile-when-cast "missile-rune"

-;;     'autocast '(range 10)

-)

-

-(define-spell "spell-death-coil"

-       'showname "death coil"

-       'manacost 100

-       'range  10

-       'target 'position ;; FIXME position or organic target

-       'action '(fireball ttl 10000 damage 10000 )

-;      'condition '(UnitTypeflag (true organic))

-       'sound-when-cast "death coil"

-       'missile-when-cast "missile-death-coil"

-;      'autocast '(range 6)

-)

-

-(define-spell "spell-whirlwind"

-       'showname "whirlwind"

-       'manacost 100

-       'range  12

-       'target 'position

-       'action '(whirlwind duration 801) ; TODO damage1 4 damage2 1

-       'sound-when-cast "whirlwind"

-       'missile-when-cast "missile-whirlwind"

-;;     'autocast '(range 12)

-)

-

-(define-spell "spell-circle-of-power"

-       'showname "circle of power"

-       'manacost 25

-       'range  -1

-       'target 'position

-       'action '(spawn-portal portal-type unit-circle-of-power)

-       'sound-when-cast "circle of power"

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

-;;     'autocast '(range -1)

-)

+;;     $Id: spells.ccl,v 1.4 2003/10/09 16:10:35 martinxyz Exp $

 

+;; Load the different races

+(load "ccl/alliance/spells.ccl" #f #t)

+(load "ccl/mythical/spells.ccl" #f #t)

Index: demogame/puds/default.pud.gz




reply via email to

[Prev in Thread] Current Thread [Next in Thread]