stratagus-cvs
[Top][All Lists]
Advanced

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

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


From: Martin Renold
Subject: [Stratagus-CVS] demogame ccl/editor.ccl ccl/icons.ccl ccl/sound...
Date: Wed, 08 Oct 2003 12:47:49 -0400

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

Modified files:
        ccl            : editor.ccl icons.ccl sound.ccl 
        ccl/alliance   : upgrade.ccl 
        ccl/mythical   : buttons.ccl units.ccl upgrade.ccl 
        puds           : default.pud.gz 
Added files:
        scripts        : README ccl.py overview.py removeunit.py 

Log message:
        removed lots of mythical units; added some experimental scripts

Patches:
Index: demogame/ccl/alliance/upgrade.ccl
diff -u demogame/ccl/alliance/upgrade.ccl:1.5 
demogame/ccl/alliance/upgrade.ccl:1.6
--- demogame/ccl/alliance/upgrade.ccl:1.5       Wed Oct  8 07:05:35 2003
+++ demogame/ccl/alliance/upgrade.ccl   Wed Oct  8 12:47:47 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.5 2003/10/08 11:05:35 martinxyz Exp $
+;;     $Id: upgrade.ccl,v 1.6 2003/10/08 16:47:47 martinxyz Exp $
 
 ;;     NOTE: Save can generate this table.
 
@@ -53,11 +53,6 @@
 (define-upgrade 'upgrade-alliance-ship-armor2 'icon 'icon-alliance-ship-armor3
   'costs #(   250  1500   900     0     0     0     0))
 
-(define-upgrade 'upgrade-catapult1 'icon 'icon-catapult1
-  'costs #(   250  1500     0     0     0     0     0))
-(define-upgrade 'upgrade-catapult2 'icon 'icon-catapult2
-  'costs #(   250  4000     0     0     0     0     0))
-
 (define-upgrade 'upgrade-ranger 'icon 'icon-ranger
   'costs #(   250  1500     0     0     0     0     0))
 (define-upgrade 'upgrade-longbow 'icon 'icon-longbow
@@ -145,14 +140,6 @@
   '(apply-to unit-alliance-destroyer) '(apply-to unit-battleship)
   '(apply-to unit-alliance-transport))
 
-(define-modifier 'upgrade-catapult1
-  '(piercing-damage 15)
-  '(apply-to unit-catapult))
-
-(define-modifier 'upgrade-catapult2
-  '(piercing-damage 15)
-  '(apply-to unit-catapult))
-
 (define-modifier 'upgrade-ranger
   '(apply-to unit-archer) '(convert-to unit-ranger))
 
@@ -263,8 +250,6 @@
 (define-allow 'upgrade-alliance-ship-cannon2   "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-alliance-ship-armor1    "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-alliance-ship-armor2    "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-catapult1               "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-catapult2               "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-ranger                  "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-longbow                 "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-ranger-scouting         "AAAAAAAAAAAAAAAA")
@@ -344,8 +329,6 @@
   '(upgrade-arrow1))
 (define-dependency 'upgrade-alliance-shield2
   '(upgrade-alliance-shield1))
-(define-dependency 'upgrade-catapult2
-  '(upgrade-catapult1))
 (define-dependency 'upgrade-alliance-ship-cannon2
   '(upgrade-alliance-ship-cannon1))
 (define-dependency 'upgrade-alliance-ship-armor2
Index: demogame/ccl/editor.ccl
diff -u demogame/ccl/editor.ccl:1.4 demogame/ccl/editor.ccl:1.5
--- demogame/ccl/editor.ccl:1.4 Tue Oct  7 15:18:54 2003
+++ demogame/ccl/editor.ccl     Wed Oct  8 12:47:47 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.4 2003/10/07 19:18:54 martinxyz Exp $
+;;     $Id: editor.ccl,v 1.5 2003/10/08 16:47:47 martinxyz Exp $
 
 
 ;;     Set which icons to display
@@ -97,19 +97,12 @@
 
    'unit-faun
    'unit-grunt
-   'unit-axethrower
-   'unit-berserker
    'unit-ogre
    'unit-ogre-mage
    'unit-death-knight
-   'unit-goblin-sappers
 
-   'unit-mythical-oil-tanker
-   'unit-ogre-juggernaught
 
    'unit-eye-of-vision
-   'unit-zeppelin
-   'unit-dragon
 
    'unit-great-hall
    'unit-pig-farm
Index: demogame/ccl/icons.ccl
diff -u demogame/ccl/icons.ccl:1.3 demogame/ccl/icons.ccl:1.4
--- demogame/ccl/icons.ccl:1.3  Thu Sep 11 08:17:57 2003
+++ demogame/ccl/icons.ccl      Wed Oct  8 12:47:47 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: icons.ccl,v 1.3 2003/09/11 12:17:57 martinxyz Exp $
+;;     $Id: icons.ccl,v 1.4 2003/10/08 16:47:47 martinxyz Exp $
 
 ;;     NOTE:
 ;;             Splitting this file into races is a problem, because all
@@ -94,8 +94,6 @@
   'size '(46 38) 'normal '(15 "tilesets/summer/icons.png"))
 (define-icon 'icon-ballista 'tileset 'tileset-summer
   'size '(46 38) 'normal '(16 "tilesets/summer/icons.png"))
-(define-icon 'icon-catapult 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(17 "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-mythical-oil-tanker 'tileset 'tileset-summer
@@ -122,8 +120,6 @@
   'size '(46 38) 'normal '(29 "tilesets/summer/icons.png"))
 (define-icon 'icon-gryphon-rider 'tileset 'tileset-summer
   'size '(46 38) 'normal '(30 "tilesets/summer/icons.png"))
-(define-icon 'icon-dragon 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(31 "tilesets/summer/icons.png"))
 (define-icon 'icon-wise-man 'tileset 'tileset-summer
   'size '(46 38) 'normal '(32 "tilesets/summer/icons.png"))
 (define-icon 'icon-ice-bringer 'tileset 'tileset-summer
@@ -336,10 +332,6 @@
   'size '(46 38) 'normal '(136 "tilesets/summer/icons.png"))
 (define-icon 'icon-berserker-regeneration 'tileset 'tileset-summer
   'size '(46 38) 'normal '(137 "tilesets/summer/icons.png"))
-(define-icon 'icon-catapult1 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(138 "tilesets/summer/icons.png"))
-(define-icon 'icon-catapult2 'tileset 'tileset-summer
-  'size '(46 38) 'normal '(139 "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
@@ -491,8 +483,6 @@
   'size '(46 38) 'normal '(15 "tilesets/winter/icons.png"))
 (define-icon 'icon-ballista 'tileset 'tileset-winter
   'size '(46 38) 'normal '(16 "tilesets/winter/icons.png"))
-(define-icon 'icon-catapult 'tileset 'tileset-winter
-  'size '(46 38) 'normal '(17 "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-mythical-oil-tanker 'tileset 'tileset-winter
@@ -733,10 +723,6 @@
   'size '(46 38) 'normal '(136 "tilesets/winter/icons.png"))
 (define-icon 'icon-berserker-regeneration 'tileset 'tileset-winter
   'size '(46 38) 'normal '(137 "tilesets/winter/icons.png"))
-(define-icon 'icon-catapult1 'tileset 'tileset-winter
-  'size '(46 38) 'normal '(138 "tilesets/winter/icons.png"))
-(define-icon 'icon-catapult2 'tileset 'tileset-winter
-  'size '(46 38) 'normal '(139 "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
Index: demogame/ccl/mythical/buttons.ccl
diff -u demogame/ccl/mythical/buttons.ccl:1.3 
demogame/ccl/mythical/buttons.ccl:1.4
--- demogame/ccl/mythical/buttons.ccl:1.3       Wed Oct  8 07:05:35 2003
+++ demogame/ccl/mythical/buttons.ccl   Wed Oct  8 12:47:47 2003
@@ -26,135 +26,104 @@
 ;;      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.3 2003/10/08 11:05:35 martinxyz Exp $
+;;     $Id: buttons.ccl,v 1.4 2003/10/08 16:47:47 martinxyz Exp $
 
 ;; general commands -- almost all units have it -------------------------------
 
 (define-button 'pos 1 'level 0 'icon 'icon-move-faun
   'action 'move
   'key "m" 'hint "~!MOVE"
-  'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-faun
-    unit-fad-man unit-double-head
-    unit-sharp-axe unit-beast-cry unit-quick-blade unit-ice-bringer
-    unit-evil-knight unit-skeleton unit-eye-of-vision unit-dragon
-    unit-zeppelin unit-death-knight unit-fire-breeze
+  'for-unit '(unit-grunt unit-ogre  unit-ogre-mage
+       unit-faun
+     
+       
+     unit-skeleton unit-eye-of-vision 
+     unit-death-knight 
     mythical-group unit-daemon))
 
 (define-button 'pos 2 'level 0 'icon 'icon-mythical-shield1
   'action 'stop
   'key "s" 'hint "~!STOP"
-  'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-faun
-    unit-fad-man unit-double-head
-    unit-sharp-axe unit-beast-cry unit-quick-blade unit-ice-bringer
-    unit-evil-knight unit-skeleton unit-eye-of-vision unit-dragon
-    unit-zeppelin unit-death-knight unit-fire-breeze
+  'for-unit '(unit-grunt unit-ogre  unit-ogre-mage
+       unit-faun
+     
+       
+     unit-skeleton unit-eye-of-vision 
+     unit-death-knight 
     mythical-group unit-daemon))
 
 (define-button 'pos 2 'level 0 'icon 'icon-mythical-shield2
   'action 'stop
   'allowed 'check-upgrade 'allow-arg '(upgrade-mythical-shield1)
   'key "s" 'hint "~!STOP"
-  'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-quick-blade
-    unit-beast-cry unit-fad-man unit-double-head))
+  'for-unit '(unit-grunt unit-ogre  unit-ogre-mage
+       
+      ))
 
 (define-button 'pos 2 'level 0 'icon 'icon-mythical-shield3
   'action 'stop
   'allowed 'check-upgrade 'allow-arg '(upgrade-mythical-shield2)
   'key "s" 'hint "~!STOP"
-  'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-quick-blade
-    unit-beast-cry unit-fad-man unit-double-head))
+  'for-unit '(unit-grunt unit-ogre  unit-ogre-mage
+       
+      ))
 
 (define-button 'pos 3 'level 0 'icon 'icon-battle-axe1
   'action 'attack
   'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-faun
-    unit-fad-man unit-double-head
-    unit-sharp-axe unit-beast-cry unit-quick-blade unit-ice-bringer
-    unit-evil-knight unit-skeleton unit-dragon unit-fire-breeze
+  'for-unit '(unit-grunt unit-ogre  unit-ogre-mage
+       unit-faun
+     
+       
+     unit-skeleton  
     mythical-group unit-daemon))
 
 (define-button 'pos 3 'level 0 'icon 'icon-battle-axe2
   'action 'attack
   'allowed 'check-upgrade 'allow-arg '(upgrade-battle-axe1)
   'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-quick-blade
-    unit-beast-cry unit-fad-man unit-double-head))
+  'for-unit '(unit-grunt unit-ogre  unit-ogre-mage
+       
+      ))
 
 (define-button 'pos 3 'level 0 'icon 'icon-battle-axe3
   'action 'attack
   'allowed 'check-upgrade 'allow-arg '(upgrade-battle-axe2)
   'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-quick-blade
-    unit-beast-cry unit-fad-man unit-double-head))
-
-(define-button 'pos 3 'level 0 'icon 'icon-throwing-axe1
-  'action 'attack
-  'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-axethrower unit-berserker unit-sharp-axe))
-
-(define-button 'pos 3 'level 0 'icon 'icon-throwing-axe2
-  'action 'attack
-  'allowed 'check-upgrade 'allow-arg '(upgrade-throwing-axe1)
-  'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-axethrower unit-berserker unit-sharp-axe))
-
-(define-button 'pos 3 'level 0 'icon 'icon-throwing-axe3
-  'action 'attack
-  'allowed 'check-upgrade 'allow-arg '(upgrade-throwing-axe2)
-  'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-axethrower unit-berserker unit-sharp-axe))
-
-(define-button 'pos 3 'level 0 'icon 'icon-catapult1
-  'action 'attack
-  'allowed 'check-upgrade 'allow-arg '(upgrade-catapult1)
-  'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-catapult))
-
-(define-button 'pos 3 'level 0 'icon 'icon-catapult2
-  'action 'attack
-  'allowed 'check-upgrade 'allow-arg '(upgrade-catapult2)
-  'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-catapult))
+  'for-unit '(unit-grunt unit-ogre  unit-ogre-mage
+       
+      ))
 
 (define-button 'pos 4 'level 0 'icon 'icon-mythical-patrol-land
   'action 'patrol
   'key "p" 'hint "~!PATROL"
-  'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-fad-man
-    unit-double-head unit-sharp-axe unit-beast-cry unit-quick-blade
-    unit-skeleton unit-dragon unit-fire-breeze mythical-group unit-daemon
-    unit-zeppelin unit-eye-of-vision))
+  'for-unit '(unit-grunt unit-ogre  unit-ogre-mage
+    unit-skeleton   mythical-group unit-daemon
+     unit-eye-of-vision))
 
 (define-button 'pos 5 'level 0 'icon 'icon-mythical-stand-ground
   'action 'stand-ground
   'key "t" 'hint "S~!TAND GROUND"
-  'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-fad-man
-    unit-double-head unit-sharp-axe unit-beast-cry unit-quick-blade
-    unit-skeleton unit-dragon unit-fire-breeze unit-mythical-submarine
-    unit-ogre-juggernaught unit-mythical-destroyer mythical-group unit-daemon))
+  'for-unit '(unit-grunt unit-ogre  unit-ogre-mage
+       
+       
+    unit-skeleton   
+      mythical-group unit-daemon))
 
 (define-button 'pos 6 'level 0 'icon 'icon-mythical-attack-ground
   'action 'attack-ground
   'key "g" 'hint "ATTACK ~!GROUND"
-  'for-unit '(unit-catapult unit-ogre-juggernaught mythical-group))
+  'for-unit '(  mythical-group))
 
 (define-button 'pos 9 'level 0 'icon 'icon-mythical-demolish
   'action 'demolish
   'key "d" 'hint "~!DEMOLISH"
-  'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-faun
-    unit-fad-man unit-double-head
-    unit-sharp-axe unit-beast-cry unit-quick-blade unit-ice-bringer
-    unit-evil-knight unit-skeleton unit-eye-of-vision unit-dragon
-    unit-zeppelin mythical-group))
+  'for-unit '(unit-grunt unit-ogre  unit-ogre-mage
+       unit-faun
+     
+       
+     unit-skeleton unit-eye-of-vision 
+     mythical-group))
 
 ;; ogre-mage specific actions -------------------------------------------------
 
@@ -162,82 +131,62 @@
   'action 'cast-spell 'value 'spell-eye-of-vision
   'allowed 'check-upgrade 'allow-arg '(upgrade-eye-of-kilrogg)
   'key "k" 'hint "EYE OF ~!KILROGG"
-  'for-unit '(unit-ogre-mage unit-fad-man))
+  'for-unit '(unit-ogre-mage ))
 
 (define-button 'pos 8 'level 0 'icon 'icon-bloodlust
   'action 'cast-spell 'value 'spell-bloodlust
   'allowed 'check-upgrade 'allow-arg '(upgrade-bloodlust)
   'key "b" 'hint "~!BLOODLUST"
-  'for-unit '(unit-ogre-mage unit-fad-man))
+  'for-unit '(unit-ogre-mage ))
 
 (define-button 'pos 9 'level 0 'icon 'icon-runes
   'action 'cast-spell 'value 'spell-runes
   'allowed 'check-upgrade 'allow-arg '(upgrade-runes)
   'key "r" 'hint "~!RUNES"
-  'for-unit '(unit-ogre-mage unit-fad-man))
-
-;; cho'gall specific actions --- same as ogre mage but it has them always -----
-
-(define-button 'pos 7 'level 0 'icon 'icon-eye-of-kilrogg
-  'action 'cast-spell 'value 'spell-eye-of-vision
-  'allowed 'check-true
-  'key "k" 'hint "EYE OF ~!KILROGG"
-  'for-unit '(unit-double-head))
-
-(define-button 'pos 8 'level 0 'icon 'icon-bloodlust
-  'action 'cast-spell 'value 'spell-bloodlust
-  'allowed 'check-true
-  'key "b" 'hint "~!BLOODLUST"
-  'for-unit '(unit-double-head))
-
-(define-button 'pos 9 'level 0 'icon 'icon-runes
-  'action 'cast-spell 'value 'spell-runes
-  'allowed 'check-true
-  'key "r" 'hint "~!RUNES"
-  'for-unit '(unit-double-head))
+  'for-unit '(unit-ogre-mage ))
 
 ;; death-knight specific actions ----------------------------------------------
 
 (define-button 'pos 3 'level 0 'icon 'icon-touch-of-darkness
   'action 'attack
   'key "a" 'hint "TOUCH OF D~!ARKNESS"
-  'for-unit '(unit-death-knight unit-ice-bringer unit-evil-knight))
+  'for-unit '(unit-death-knight  ))
 
 (define-button 'pos 4 'level 0 'icon 'icon-death-coil
   'action 'cast-spell 'value 'spell-death-coil
   'allowed 'check-upgrade 'allow-arg '(upgrade-death-coil)
   'key "c" 'hint "DEATH ~!COIL"
-  'for-unit '(unit-death-knight unit-ice-bringer unit-evil-knight))
+  'for-unit '(unit-death-knight  ))
 
 (define-button 'pos 5 'level 0 'icon 'icon-haste
   'action 'cast-spell 'value 'spell-haste
   'allowed 'check-upgrade 'allow-arg '(upgrade-haste)
   'key "h" 'hint "~!HASTE"
-  'for-unit '(unit-death-knight unit-ice-bringer unit-evil-knight))
+  'for-unit '(unit-death-knight  ))
 
 (define-button 'pos 6 'level 0 'icon 'icon-raise-dead
   'action 'cast-spell 'value 'spell-raise-dead
   'allowed 'check-upgrade 'allow-arg '(upgrade-raise-dead)
   'key "r" 'hint "~!RAISE DEAD"
-  'for-unit '(unit-death-knight unit-ice-bringer unit-evil-knight))
+  'for-unit '(unit-death-knight  ))
 
 (define-button 'pos 7 'level 0 'icon 'icon-whirlwind
   'action 'cast-spell 'value 'spell-whirlwind
   'allowed 'check-upgrade 'allow-arg '(upgrade-whirlwind)
   'key "w" 'hint "~!WHIRLWIND"
-  'for-unit '(unit-death-knight unit-ice-bringer unit-evil-knight))
+  'for-unit '(unit-death-knight  ))
 
 (define-button 'pos 8 'level 0 'icon 'icon-unholy-armor
   'action 'cast-spell 'value 'spell-unholy-armor
   'allowed 'check-upgrade 'allow-arg '(upgrade-unholy-armor)
   'key "u" 'hint "~!UNHOLY ARMOR"
-  'for-unit '(unit-death-knight unit-ice-bringer unit-evil-knight))
+  'for-unit '(unit-death-knight  ))
 
 (define-button 'pos 9 'level 0 'icon 'icon-death-and-decay
   'action 'cast-spell 'value 'spell-death-and-decay
   'allowed 'check-upgrade 'allow-arg '(upgrade-death-and-decay)
   'key "d" 'hint "~!DEATH AND DECAY"
-  'for-unit '(unit-death-knight unit-ice-bringer unit-evil-knight))
+  'for-unit '(unit-death-knight  ))
 
 ;; faun specific actions ------------------------------------------------------
 
@@ -263,16 +212,10 @@
   'key "b" 'hint "~!BUILD BASIC STRUCTURE"
   'for-unit '(unit-faun))
 
-(define-button 'pos 8 'level 0 'icon 'icon-build-advanced
-  'action 'button 'value 2
-  'allowed 'check-units-or 'allow-arg '(unit-troll-lumber-mill unit-stronghold)
-  'key "v" 'hint "BUILD AD~!VANCED STRUCTURE"
-  'for-unit '(unit-faun))
-
 (define-button 'pos 9 'level 0 'icon 'icon-build-advanced
   'action 'button 'value 3
-  'allowed 'check-units-and 'allow-arg '(unit-fortress 
unit-temple-of-the-damned
-    unit-altar-of-storms)
+  'allowed 'check-units-and 'allow-arg '( 
+    )
   'key "e" 'hint "BUILD SP~!ECIAL STRUCTURE"
   'for-unit '(unit-faun))
 
@@ -293,16 +236,6 @@
   'key "h" 'hint "BUILD GREAT ~!HALL"
   'for-unit '(unit-faun))
 
-(define-button 'pos 4 'level 1 'icon 'icon-troll-lumber-mill
-  'action 'build 'value 'unit-troll-lumber-mill
-  'key "l" 'hint "BUILD TROLL ~!LUMBER MILL"
-  'for-unit '(unit-faun))
-
-(define-button 'pos 5 'level 1 'icon 'icon-mythical-blacksmith
-  'action 'build 'value 'unit-mythical-blacksmith
-  'key "s" 'hint "BUILD BLACK~!SMITH"
-  'for-unit '(unit-faun))
-
 (define-button 'pos 7 'level 1 'icon 'icon-mythical-watch-tower
   'action 'build 'value 'unit-mythical-watch-tower
   'key "t" 'hint "BUILD ~!TOWER"
@@ -321,46 +254,6 @@
 
 ;; mythical advanced buildings 
-----------------------------------------------------
 
-(define-button 'pos 1 'level 2 'icon 'icon-mythical-shipyard
-  'action 'build 'value 'unit-mythical-shipyard
-  'key "s" 'hint "BUILD ~!SHIPYARD"
-  'for-unit '(unit-faun))
-
-(define-button 'pos 2 'level 2 'icon 'icon-mythical-foundry
-  'action 'build 'value 'unit-mythical-foundry
-  'key "f" 'hint "BUILD ~!FOUNDRY"
-  'for-unit '(unit-faun))
-
-(define-button 'pos 3 'level 2 'icon 'icon-mythical-refinery
-  'action 'build 'value 'unit-mythical-refinery
-  'key "r" 'hint "BUILD ~!REFINERY"
-  'for-unit '(unit-faun))
-
-(define-button 'pos 4 'level 2 'icon 'icon-alchemist
-  'action 'build 'value 'unit-alchemist
-  'key "a" 'hint "BUILD GOBLIN ~!ALCHEMIST"
-  'for-unit '(unit-faun))
-
-(define-button 'pos 5 'level 2 'icon 'icon-ogre-mound
-  'action 'build 'value 'unit-ogre-mound
-  'key "o" 'hint "BUILD ~!OGRE MOUND"
-  'for-unit '(unit-faun))
-
-(define-button 'pos 6 'level 2 'icon 'icon-temple-of-the-damned
-  'action 'build 'value 'unit-temple-of-the-damned
-  'key "t" 'hint "BUILD ~!TEMPLE OF THE DAMNED"
-  'for-unit '(unit-faun))
-
-(define-button 'pos 7 'level 2 'icon 'icon-altar-of-storms
-  'action 'build 'value 'unit-altar-of-storms
-  'key "l" 'hint "BUILD A~!LTAR OF STORMS"
-  'for-unit '(unit-faun))
-
-(define-button 'pos 8 'level 2 'icon 'icon-dragon-roost
-  'action 'build 'value 'unit-dragon-roost
-  'key "d" 'hint "BUILD ~!DRAGON ROOST"
-  'for-unit '(unit-faun))
-
 (define-button 'pos 9 'level 2 'icon 'icon-cancel
   'action 'button 'value 0
   'key "\033" 'hint "~<ESC~> CANCEL"
@@ -396,68 +289,39 @@
   'action 'train-unit 'value 'unit-faun
   'allowed 'check-no-research
   'key "p" 'hint "TRAIN ~!FAUN"
-  'for-unit '(unit-great-hall unit-stronghold unit-fortress))
-
-;; strong hold upgrades -------------------------------------------------------
-
-(define-button 'pos 2 'level 0 'icon 'icon-stronghold
-  'action 'upgrade-to 'value 'unit-stronghold
-  'allowed 'check-upgrade-to
-  'key "s" 'hint "UPGRADE TO ~!STRONGHOLD"
-  'for-unit '(unit-great-hall))
-
-(define-button 'pos 2 'level 0 'icon 'icon-fortress-upgrade
-  'action 'upgrade-to 'value 'unit-fortress
-  'allowed 'check-upgrade-to
-  'key "f" 'hint "UPGRADE TO ~!FORTRESS"
-  'for-unit '(unit-stronghold))
+  'for-unit '(unit-great-hall  ))
 
 (define-button 'pos 5 'level 0 'icon 'icon-harvest
   'action 'harvest
   'key "h" 'hint "SET ~!HARVEST LUMBER/MINE GOLD"
-  'for-unit '(unit-great-hall unit-stronghold unit-fortress))
+  'for-unit '(unit-great-hall  ))
 
 (define-button 'pos 7 'level 0 'icon 'icon-move-faun
   'action 'move
   'key "m" 'hint "SET ~!MOVE"
-  'for-unit '(unit-great-hall unit-stronghold unit-fortress
-    unit-mythical-barracks unit-temple-of-the-damned unit-dragon-roost
-    unit-alchemist))
+  'for-unit '(unit-great-hall  
+    unit-mythical-barracks  -roost
+    ))
 
 (define-button 'pos 8 'level 0 'icon 'icon-mythical-shield1
   'action 'stop
   'key "z" 'hint "SET ~!ZTOP"
-  'for-unit '(unit-great-hall unit-stronghold unit-fortress
-    unit-mythical-barracks unit-temple-of-the-damned unit-dragon-roost
-    unit-alchemist))
+  'for-unit '(unit-great-hall  
+    unit-mythical-barracks  -roost
+    ))
 
 (define-button 'pos 9 'level 0 'icon 'icon-battle-axe1
   'action 'attack
   'key "e" 'hint "S~!ET ATTACK"
-  'for-unit '(unit-great-hall unit-stronghold unit-fortress
-    unit-mythical-barracks unit-temple-of-the-damned unit-dragon-roost
-    unit-alchemist))
+  'for-unit '(unit-great-hall  
+    unit-mythical-barracks  -roost
+    ))
 
 (define-button 'pos 1 'level 0 'icon 'icon-grunt
   'action 'train-unit 'value 'unit-grunt
   'key "g" 'hint "TRAIN ~!GRUNT"
   'for-unit '(unit-mythical-barracks))
 
-(define-button 'pos 2 'level 0 'icon 'icon-axethrower
-  'action 'train-unit 'value 'unit-axethrower
-  'key "a" 'hint "TRAIN ~!AXETHROWER"
-  'for-unit '(unit-mythical-barracks))
-
-(define-button 'pos 2 'level 0 'icon 'icon-berserker
-  'action 'train-unit 'value 'unit-berserker
-  'key "b" 'hint "TRAIN ~!BERSERKER"
-  'for-unit '(unit-mythical-barracks))
-
-(define-button 'pos 3 'level 0 'icon 'icon-catapult
-  'action 'train-unit 'value 'unit-catapult
-  'key "c" 'hint "BUILD ~!CATAPULT"
-  'for-unit '(unit-mythical-barracks))
-
 (define-button 'pos 4 'level 0 'icon 'icon-ogre
   'action 'train-unit 'value 'unit-ogre
   'key "o" 'hint "TRAIN TWO-HEADED ~!OGRE"
@@ -468,279 +332,8 @@
   'key "o" 'hint "TRAIN ~!OGRE MAGE"
   'for-unit '(unit-mythical-barracks))
 
-(define-button 'pos 1 'level 0 'icon 'icon-zeppelin
-  'action 'train-unit 'value 'unit-zeppelin
-  'key "z" 'hint "BUILD GOBLIN ~!ZEPPELIN"
-  'for-unit '(unit-alchemist))
-
-(define-button 'pos 2 'level 0 'icon 'icon-goblin-sappers
-  'action 'train-unit 'value 'unit-goblin-sappers
-  'key "s" 'hint "TRAIN GOBLIN ~!SAPPERS"
-  'for-unit '(unit-alchemist))
-
-(define-button 'pos 1 'level 0 'icon 'icon-death-knight
-  'action 'train-unit 'value 'unit-death-knight
-  'key "t" 'hint "~!TRAIN DEATH KNIGHT"
-  'for-unit '(unit-temple-of-the-damned))
-
-(define-button 'pos 1 'level 0 'icon 'icon-dragon
-  'action 'train-unit 'value 'unit-dragon
-  'key "d" 'hint "BUILD ~!DRAGON"
-  'for-unit '(unit-dragon-roost))
-
-(define-button 'pos 1 'level 0 'icon 'icon-mythical-oil-tanker
-  'action 'train-unit 'value 'unit-mythical-oil-tanker
-  'key "o" 'hint "BUILD ~!OIL TANKER"
-  'for-unit '(unit-mythical-shipyard))
-
-(define-button 'pos 2 'level 0 'icon 'icon-mythical-destroyer
-  'action 'train-unit 'value 'unit-mythical-destroyer
-  'key "d" 'hint "BUILD ~!DESTROYER"
-  'for-unit '(unit-mythical-shipyard))
-
-(define-button 'pos 3 'level 0 'icon 'icon-mythical-transport
-  'action 'train-unit 'value 'unit-mythical-transport
-  'key "t" 'hint "BUILD ~!TRANSPORT"
-  'for-unit '(unit-mythical-shipyard))
-
-(define-button 'pos 4 'level 0 'icon 'icon-mythical-submarine
-  'action 'train-unit 'value 'unit-mythical-submarine
-  'key "g" 'hint "BUILD ~!GIANT TURTLE"
-  'for-unit '(unit-mythical-shipyard))
-
-(define-button 'pos 5 'level 0 'icon 'icon-ogre-juggernaught
-  'action 'train-unit 'value 'unit-ogre-juggernaught
-  'key "j" 'hint "BUILD ~!JUGGERNAUHGT"
-  'for-unit '(unit-mythical-shipyard))
-
-(define-button 'pos 6 'level 0 'icon 'icon-mythical-ship-haul-oil
-  'action 'harvest
-  'key "h" 'hint "SET ~!HAUL OIL"
-  'for-unit '(unit-mythical-shipyard))
-
 (define-button 'pos 1 'level 0 'icon 'icon-mythical-guard-tower
   'action 'upgrade-to 'value 'unit-mythical-guard-tower
   'key "g" 'hint "UPGRADE TO ~!GUARD TOWER"
   'for-unit '(unit-mythical-watch-tower))
 
-(define-button 'pos 2 'level 0 'icon 'icon-mythical-cannon-tower
-  'action 'upgrade-to 'value 'unit-mythical-cannon-tower
-  'key "c" 'hint "UPGRADE TO ~!CANNON TOWER"
-  'for-unit '(unit-mythical-watch-tower))
-
-;; ships ----------------------------------------------------------------------
-
-(define-button 'pos 1 'level 0 'icon 'icon-mythical-ship-move
-  'action 'move
-  'key "m" 'hint "~!MOVE"
-  'for-unit '(unit-mythical-oil-tanker unit-mythical-submarine
-    unit-ogre-juggernaught unit-mythical-destroyer unit-mythical-transport))
-
-(define-button 'pos 2 'level 0 'icon 'icon-mythical-ship-armor1
-  'action 'stop
-  'key "s" 'hint "~!STOP"
-  'for-unit '(unit-mythical-oil-tanker unit-mythical-submarine
-    unit-ogre-juggernaught unit-mythical-destroyer unit-mythical-transport))
-
-(define-button 'pos 3 'level 0 'icon 'icon-mythical-unload
-  'action 'unload
-  'key "u" 'hint "~!UNLOAD"
-  'for-unit '(unit-mythical-transport))
-
-(define-button 'pos 4 'level 0 'icon 'icon-mythical-oil-platform
-  'action 'build 'value 'unit-mythical-oil-platform
-  'key "b" 'hint "~!BUILD OIL PLATFORM"
-  'for-unit '(unit-mythical-oil-tanker))
-
-(define-button 'pos 5 'level 0 'icon 'icon-mythical-ship-haul-oil
-  'action 'harvest
-  'key "h" 'hint "~!HAUL OIL"
-  'for-unit '(unit-mythical-oil-tanker))
-
-(define-button 'pos 6 'level 0 'icon 'icon-mythical-ship-return-oil
-  'action 'return-goods
-  'key "g" 'hint "RETURN WITH ~!GOODS"
-  'for-unit '(unit-mythical-oil))
-
-(define-button 'pos 3 'level 0 'icon 'icon-mythical-ship-cannon1
-  'action 'attack
-  'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-mythical-submarine unit-ogre-juggernaught 
unit-mythical-destroyer))
-
-(define-button 'pos 3 'level 0 'icon 'icon-mythical-ship-cannon2
-  'action 'attack
-  'allowed 'check-upgrade 'allow-arg '(upgrade-mythical-ship-cannon1)
-  'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-mythical-submarine unit-ogre-juggernaught 
unit-mythical-destroyer))
-
-(define-button 'pos 3 'level 0 'icon 'icon-mythical-ship-cannon3
-  'action 'attack
-  'allowed 'check-upgrade 'allow-arg '(upgrade-mythical-ship-cannon2)
-  'key "a" 'hint "~!ATTACK"
-  'for-unit '(unit-mythical-submarine unit-ogre-juggernaught 
unit-mythical-destroyer))
-
-(define-button 'pos 4 'level 0 'icon 'icon-mythical-patrol-naval
-  'action 'patrol
-  'key "p" 'hint "~!PATROL"
-  'for-unit '(unit-mythical-submarine unit-ogre-juggernaught 
unit-mythical-destroyer))
-
-(define-button 'pos 7 'level 0 'icon 'icon-mythical-ship-move
-  'action 'move
-  'key "m" 'hint "SET ~!MOVE"
-  'for-unit '(unit-mythical-shipyard))
-
-(define-button 'pos 8 'level 0 'icon 'icon-mythical-ship-armor1
-  'action 'stop
-  'key "z" 'hint "SET ~!ZTOP"
-  'for-unit '(unit-mythical-shipyard))
-
-(define-button 'pos 9 'level 0 'icon 'icon-mythical-ship-cannon1
-  'action 'attack
-  'key "e" 'hint "S~!ET ATTACK"
-  'for-unit '(unit-mythical-shipyard))
-
-;; upgrades -------------------------------------------------------------------
-
-(define-button 'pos 1 'level 0 'icon 'icon-battle-axe2
-  'action 'research 'value 'upgrade-battle-axe1
-  'allowed 'check-single-research
-  'key "w" 'hint "UPGRADE ~!WEAPONS (Damage +2)"
-  'for-unit '(unit-mythical-blacksmith))
-
-(define-button 'pos 1 'level 0 'icon 'icon-battle-axe3
-  'action 'research 'value 'upgrade-battle-axe2
-  'allowed 'check-single-research
-  'key "w" 'hint "UPGRADE ~!WEAPONS (Damage +2)"
-  'for-unit '(unit-mythical-blacksmith))
-
-(define-button 'pos 2 'level 0 'icon 'icon-mythical-shield2
-  'action 'research 'value 'upgrade-mythical-shield1
-  'allowed 'check-single-research
-  'key "s" 'hint "UPGRADE ~!SHIELDS (Armor +2)"
-  'for-unit '(unit-mythical-blacksmith))
-
-(define-button 'pos 2 'level 0 'icon 'icon-mythical-shield3
-  'action 'research 'value 'upgrade-mythical-shield2
-  'allowed 'check-single-research
-  'key "s" 'hint "UPGRADE ~!SHIELDS (Armor +2)"
-  'for-unit '(unit-mythical-blacksmith))
-
-(define-button 'pos 3 'level 0 'icon 'icon-catapult1
-  'action 'research 'value 'upgrade-catapult1
-  'allowed 'check-single-research
-  'key "c" 'hint "UPGRADE ~!CATAPULT (Damage +15)"
-  'for-unit '(unit-mythical-blacksmith))
-
-(define-button 'pos 3 'level 0 'icon 'icon-catapult2
-  'action 'research 'value 'upgrade-catapult2
-  'allowed 'check-single-research
-  'key "c" 'hint "UPGRADE ~!CATAPULT (Damage +15)"
-  'for-unit '(unit-mythical-blacksmith))
-
-(define-button 'pos 1 'level 0 'icon 'icon-throwing-axe2
-  'action 'research 'value 'upgrade-throwing-axe1
-  'allowed 'check-single-research
-  'key "u" 'hint "~!UPGRADE THROWING AXE (Damage +1)"
-  'for-unit '(unit-troll-lumber-mill))
-
-(define-button 'pos 1 'level 0 'icon 'icon-throwing-axe3
-  'action 'research 'value 'upgrade-throwing-axe2
-  'allowed 'check-single-research
-  'key "u" 'hint "~!UPGRADE THROWING AXE (Damage +1)"
-  'for-unit '(unit-troll-lumber-mill))
-
-(define-button 'pos 4 'level 0 'icon 'icon-berserker
-  'action 'research 'value 'upgrade-berserker
-  'allowed 'check-single-research
-  'key "b" 'hint "TROLL ~!BERSERKER TRAINING"
-  'for-unit '(unit-troll-lumber-mill))
-
-(define-button 'pos 4 'level 0 'icon 'icon-berserker-scouting
-  'action 'research 'value 'upgrade-berserker-scouting
-  'allowed 'check-single-research
-  'key "s" 'hint "BERSERKER ~!SCOUTING (Sight:9)"
-  'for-unit '(unit-troll-lumber-mill))
-
-(define-button 'pos 5 'level 0 'icon 'icon-light-axes
-  'action 'research 'value 'upgrade-light-axes
-  'allowed 'check-single-research
-  'key "a" 'hint "RESEARCH LIGHTER ~!AXES (Range +1)"
-  'for-unit '(unit-troll-lumber-mill))
-
-(define-button 'pos 6 'level 0 'icon 'icon-berserker-regeneration
-  'action 'research 'value 'upgrade-berserker-regeneration
-  'allowed 'check-single-research
-  'key "r" 'hint "BERSERKER ~!REGENERATION"
-  'for-unit '(unit-troll-lumber-mill))
-
-(define-button 'pos 1 'level 0 'icon 'icon-ogre-mage
-  'action 'research 'value 'upgrade-ogre-mage
-  'allowed 'check-single-research
-  'key "m" 'hint "UPGRADES OGRES TO ~!MAGES"
-  'for-unit '(unit-altar-of-storms))
-
-(define-button 'pos 2 'level 0 'icon 'icon-bloodlust
-  'action 'research 'value 'upgrade-bloodlust
-  'allowed 'check-single-research
-  'key "b" 'hint "RESEARCH ~!BLOODLUST"
-  'for-unit '(unit-altar-of-storms))
-
-(define-button 'pos 3 'level 0 'icon 'icon-runes
-  'action 'research 'value 'upgrade-runes
-  'allowed 'check-single-research
-  'key "r" 'hint "RESEARCH ~!RUNES"
-  'for-unit '(unit-altar-of-storms))
-
-(define-button 'pos 2 'level 0 'icon 'icon-haste
-  'action 'research 'value 'upgrade-haste
-  'allowed 'check-single-research
-  'key "h" 'hint "RESEARCH ~!HASTE"
-  'for-unit '(unit-temple-of-the-damned))
-
-(define-button 'pos 3 'level 0 'icon 'icon-skeleton
-  'action 'research 'value 'upgrade-raise-dead
-  'allowed 'check-single-research
-  'key "r" 'hint "RESEARCH ~!RAISE DEAD"
-  'for-unit '(unit-temple-of-the-damned))
-
-(define-button 'pos 4 'level 0 'icon 'icon-whirlwind
-  'action 'research 'value 'upgrade-whirlwind
-  'allowed 'check-single-research
-  'key "w" 'hint "RESEARCH ~!WHIRLWIND"
-  'for-unit '(unit-temple-of-the-damned))
-
-(define-button 'pos 5 'level 0 'icon 'icon-unholy-armor
-  'action 'research 'value 'upgrade-unholy-armor
-  'allowed 'check-single-research
-  'key "u" 'hint "RESEARCH ~!UNHOLY ARMOR"
-  'for-unit '(unit-temple-of-the-damned))
-
-(define-button 'pos 6 'level 0 'icon 'icon-death-and-decay
-  'action 'research 'value 'upgrade-death-and-decay
-  'allowed 'check-single-research
-  'key "d" 'hint "RESEARCH ~!DEATH AND DECAY"
-  'for-unit '(unit-temple-of-the-damned))
-
-(define-button 'pos 1 'level 0 'icon 'icon-mythical-ship-cannon2
-  'action 'research 'value 'upgrade-mythical-ship-cannon1
-  'allowed 'check-single-research
-  'key "c" 'hint "UPGRADE ~!CANNONS (Damage +5)"
-  'for-unit '(unit-mythical-foundry))
-
-(define-button 'pos 1 'level 0 'icon 'icon-mythical-ship-cannon3
-  'action 'research 'value 'upgrade-mythical-ship-cannon2
-  'allowed 'check-single-research
-  'key "c" 'hint "UPGRADE ~!CANNONS (Damage +5)"
-  'for-unit '(unit-mythical-foundry))
-
-(define-button 'pos 2 'level 0 'icon 'icon-mythical-ship-armor2
-  'action 'research 'value 'upgrade-mythical-ship-armor1
-  'allowed 'check-single-research
-  'key "a" 'hint "UPGRADE SHIP ~!ARMOR (Armor +5)"
-  'for-unit '(unit-mythical-foundry))
-
-(define-button 'pos 2 'level 0 'icon 'icon-mythical-ship-armor3
-  'action 'research 'value 'upgrade-mythical-ship-armor2
-  'allowed 'check-single-research
-  'key "a" 'hint "UPGRADE SHIP ~!ARMOR (Armor +5)"
-  'for-unit '(unit-mythical-foundry))
Index: demogame/ccl/mythical/units.ccl
diff -u demogame/ccl/mythical/units.ccl:1.12 
demogame/ccl/mythical/units.ccl:1.13
--- demogame/ccl/mythical/units.ccl:1.12        Wed Oct  8 07:05:35 2003
+++ demogame/ccl/mythical/units.ccl     Wed Oct  8 12:47:47 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.12 2003/10/08 11:05:35 martinxyz Exp $
+;;     $Id: units.ccl,v 1.13 2003/10/08 16:47:47 martinxyz Exp $
 
 ;;=============================================================================
 ;;     Define unit-types.
@@ -110,37 +110,6 @@
     dead "basic mythical voices dead"
     attack "faun-attack"))
 
-(define-unit-type 'unit-catapult 'name "Catapult"
-  'files '(tileset-summer "mythical/units/catapult.png")
-  'size '(64 64)
-  'animations 'animations-catapult 'icon 'icon-catapult
-  'costs '(time 250 gold 900 wood 300)
-  'speed 5
-  'hit-points 110
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(63 63)
-  'sight-range 9 'computer-reaction-range 11 'person-reaction-range 9
-  'basic-damage 80 'piercing-damage 0 'missile 'missile-catapult-rock
-  'min-attack-range 2 'max-attack-range 8
-  'weapons-upgradable 1
-  'priority 70
-  'points 100
-  'demand 1
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'right-attack
-  'can-ground-attack
-  'can-attack
-  'can-target-land 'can-target-sea
-  'selectable-by-rectangle
-  'sounds '(
-    selected "catapult-selected"
-    acknowledge "catapult-acknowledge"
-    ready "catapult-ready"
-    help "basic mythical voices help 1"
-    dead "explosion"
-    attack "catapult-attack"))
-
 (define-unit-type 'unit-ogre 'name "Ogre"
   'files '(tileset-summer "mythical/units/ogre.png")
   'size '(72 72)
@@ -173,38 +142,6 @@
     dead "basic mythical voices dead"
     attack "ogre-attack"))
 
-(define-unit-type 'unit-axethrower 'name "Troll Axethrower"
-  'files '(tileset-summer "mythical/units/axethrower.png")
-  'size '(72 72)
-  'animations 'animations-axethrower 'icon 'icon-axethrower
-  'costs '(time 70 gold 500 wood 50)
-  'speed 10
-  'hit-points 40
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(36 36)
-  'sight-range 5 'computer-reaction-range 7 'person-reaction-range 5
-  'basic-damage 3 'piercing-damage 6 'missile 'missile-axe
-  'max-attack-range 4
-  'weapons-upgradable 1
-  'priority 55
-  'points 60
-  'demand 1
-  'corpse '(unit-dead-body 0)
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land 'can-target-sea 'can-target-air
-  'land-unit
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "axethrower-selected"
-    acknowledge "axethrower-acknowledge"
-    ready "axethrower-ready"
-    help "basic mythical voices help 1"
-    dead "basic mythical voices dead"
-    attack "axethrower-attack"))
-
 (define-unit-type 'unit-death-knight 'name "Death Knight"
   'files '(tileset-summer "mythical/units/death_knight.png")
   'size '(72 72)
@@ -280,585 +217,32 @@
     dead "basic mythical voices dead"
     attack "ogre-mage-attack"))
 
-(define-unit-type 'unit-goblin-sappers 'name "Goblin Sappers"
-  'files '(tileset-summer "mythical/units/goblin_sappers.png")
-  'size '(56 56)
-  'animations 'animations-goblin-sappers 'icon 'icon-goblin-sappers
-  'costs '(time 200 gold 700 wood 250)
-  'speed 11
-  'hit-points 40
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(37 37)
-  '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
-  'type-land
-  'right-demolish
-  'demolish-range 2
-  'demolish-damage 400
-  'can-attack
-  'can-target-land
-  'land-unit
-  'volatile
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "goblin-sappers-selected"
-    acknowledge "goblin-sappers-acknowledge"
-    ready "goblin-sappers-ready"
-    help "basic mythical voices help 1"
-    dead "explosion"
-    attack "goblin-sappers-attack"))
-
-(define-unit-type 'unit-berserker 'name "Berserker"
-  'use 'unit-axethrower
-  'size '(72 72)
-  'animations 'animations-axethrower 'icon 'icon-berserker
-  'costs '(time 70 gold 500 wood 50)
-  'speed 10
-  'hit-points 50
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(36 36)
-  'sight-range 6 'computer-reaction-range 9 'person-reaction-range 6
-  'basic-damage 3 'piercing-damage 6 'missile 'missile-axe
-  'max-attack-range 4
-  'weapons-upgradable 1
-  'priority 57
-  'points 70
-  'demand 1
-  'corpse '(unit-dead-body 0)
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land 'can-target-sea 'can-target-air
-  'land-unit
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "berserker-selected"
-    acknowledge "berserker-acknowledge"
-    ready "berserker-ready"
-    help "basic mythical voices help 1"
-    dead "basic mythical voices dead"
-    attack "berserker-attack"))
-
-(define-unit-type 'unit-evil-knight 'name "Teron Gorefiend"
-  'use 'unit-death-knight
-  'size '(72 72)
-  'animations 'animations-death-knight 'icon 'icon-evil-knight
-  'costs '(time 120 gold 1200)
-  'speed 8
-  'hit-points 180
-  'draw-level 40
-  'max-mana 255
-  'magic 1
-  'tile-size '(1 1) 'box-size '(39 39)
-  'sight-range 9 'computer-reaction-range 11 'person-reaction-range 9
-  'armor 2 'basic-damage 0 'piercing-damage 16 'missile 'missile-touch-of-death
-  'max-attack-range 4
-  'priority 70
-  'points 100
-  'demand 1
-  'corpse '(unit-dead-body 0)
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land 'can-target-sea 'can-target-air
-  'land-unit
-  'coward
-  'isundead
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "evil-knight-selected"
-    acknowledge "evil-knight-acknowledge"
-    ready "evil-knight-ready"
-    help "basic mythical voices help 1"
-    dead "basic mythical voices dead"
-    attack "evil-knight-attack"))
-
-(define-unit-type 'unit-fad-man 'name "Fad_Man"
-  'use 'unit-ogre
-  'size '(72 72)
-  'animations 'animations-ogre 'icon 'icon-fad-man
-  'costs '(time 90 gold 800 wood 100)
-  'speed 13
-  'hit-points 300
-  'draw-level 40
-  'max-mana 255
-  'magic 1
-  'tile-size '(1 1) 'box-size '(42 42)
-  'sight-range 6 'computer-reaction-range 6 'person-reaction-range 4
-  'armor 8 'basic-damage 18 'piercing-damage 6 'missile 'missile-none
-  'max-attack-range 1
-  'weapons-upgradable 1 'armor-upgradable 1
-  'priority 63
-  'points 100
-  'demand 1
-  'corpse '(unit-dead-body 0)
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land
-  'land-unit
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "fad-man-selected"
-    acknowledge "fad-man-acknowledge"
-    ready "fad-man-ready"
-    help "basic mythical voices help 1"
-    dead "basic mythical voices dead"
-    attack "fad-man-attack"))
-
-(define-unit-type 'unit-beast-cry 'name "Grom Hellscream"
-  'use 'unit-grunt
-  'size '(72 72)
-  'animations 'animations-footman 'icon 'icon-beast-cry
-  'costs '(time 60 gold 600)
-  'speed 10
-  'hit-points 240
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(31 31)
-  'sight-range 5 'computer-reaction-range 6 'person-reaction-range 4
-  'armor 8 'basic-damage 16 'piercing-damage 6 '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 "beast-cry-selected"
-    acknowledge "beast-cry-acknowledge"
-    ready "beast-cry-ready"
-    help "basic mythical voices help 1"
-    dead "basic mythical voices dead"
-    attack "beast-cry-attack"))
-
-(define-unit-type 'unit-mythical-oil-tanker 'name "Oil tanker"
-  'files '(tileset-summer "mythical/units/oil_tanker_empty.png")
-  'size '(72 72)
-  'animations 'animations-alliance-oil-tanker 'icon 'icon-mythical-oil-tanker
-  'costs '(time 50 gold 400 wood 200)
-  'speed 10
-  'hit-points 90
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(63 63)
-  'sight-range 4
-  'armor 10 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'max-attack-range 1
-  'priority 50 'annoy-computer-factor 10
-  'points 40
-  'demand 1
-  'corpse '(unit-dead-body 12)
-  'type-naval
-  'right-harvest
-  'sea-unit 'coward
-  'can-gather-resource '(
-        file-when-empty "alliance/units/oil_tanker_empty.png"
-        file-when-loaded "alliance/units/oil_tanker_full.png"
-       resource-id oil
-        resource-capacity 100
-       wait-at-resource 100
-       wait-at-depot 100 )
-  'selectable-by-rectangle
-  'sounds '(
-    selected "mythical-oil-tanker-selected"
-    acknowledge "mythical-oil-tanker-acknowledge"
-    ready "mythical-oil-tanker-ready"
-    help "basic mythical voices help 1"
-    dead "ship sinking"
-    attack "mythical-oil-tanker-attack"))
-
-(define-unit-type 'unit-mythical-transport 'name "Transport"
-  'files '(tileset-summer "mythical/units/transport.png")
-  'size '(72 72)
-  'animations 'animations-alliance-transport 'icon 'icon-mythical-transport
-  'costs '(time 70 gold 600 wood 200 oil 500)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1 oil 1)
-  'speed 10
-  'hit-points 150
-  'draw-level 40
-  'max-on-board 6
-  'tile-size '(1 1) 'box-size '(63 63)
-  '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
-  'corpse '(unit-dead-body 12)
-  'type-naval
-  'right-sail
-  'sea-unit
-  'transporter
-  'selectable-by-rectangle
-  'sounds '(
-    selected "mythical-transport-selected"
-    acknowledge "mythical-transport-acknowledge"
-    ready "mythical-transport-ready"
-    help "basic mythical voices help 1"
-    dead "ship sinking"
-    attack "mythical-transport-attack"))
-
-(define-unit-type 'unit-mythical-destroyer 'name "Troll Destroyer"
-  'files '(tileset-summer "mythical/units/mythical_destroyer.png")
-  'size '(88 88)
-  'animations 'animations-alliance-destroyer 'icon 'icon-mythical-destroyer
-  'costs '(time 90 gold 700 wood 350 oil 700)
-  'speed 10
-  'hit-points 100
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(63 63)
-  '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
-  'corpse '(unit-dead-body 12)
-  'type-naval
-  'right-attack
-  'can-attack
-  'can-target-land 'can-target-sea 'can-target-air
-  'sea-unit
-  'selectable-by-rectangle
-  'sounds '(
-    selected "mythical-destroyer-selected"
-    acknowledge "mythical-destroyer-acknowledge"
-    ready "mythical-destroyer-ready"
-    help "basic mythical voices help 1"
-    dead "ship sinking"
-    attack "mythical-destroyer-attack"))
-
-(define-unit-type 'unit-ogre-juggernaught 'name "Ogre Juggernaught"
-  'files '(tileset-summer "mythical/units/juggernaught.png")
-  'size '(88 88)
-  'animations 'animations-battleship 'icon 'icon-ogre-juggernaught
-  'costs '(time 140 gold 1000 wood 500 oil 1000)
-  'speed 6
-  'hit-points 150
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(70 70)
-  '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
-  'corpse '(unit-dead-body 12)
-  'type-naval
-  'right-attack
-  'can-ground-attack
-  'can-attack
-  'can-target-land 'can-target-sea
-  'sea-unit
-  'selectable-by-rectangle
-  'sounds '(
-    selected "ogre-juggernaught-selected"
-    acknowledge "ogre-juggernaught-acknowledge"
-    ready "ogre-juggernaught-ready"
-    help "basic mythical voices help 1"
-    dead "ship sinking"
-    attack "ogre-juggernaught-attack"))
-
-(define-unit-type 'unit-fire-breeze 'name "Fire_Breeze"
-  'files '(tileset-summer "mythical/units/dragon.png")
-  'size '(88 80)
-  'animations 'animations-fire-breeze 'icon 'icon-fire-breeze
-  'costs '(time 250 gold 2500)
-  'speed 14
-  'hit-points 800
-  'draw-level 60
-  'tile-size '(1 1) 'box-size '(71 71)
-  'sight-range 9 'computer-reaction-range 8 'person-reaction-range 6
-  'armor 10 'basic-damage 10 'piercing-damage 25 'missile 
'missile-dragon-breath
-  '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 "fire-breeze-selected"
-    acknowledge "fire-breeze-acknowledge"
-    ready "fire-breeze-ready"
-    help "basic mythical voices help 1"
-    dead "explosion"
-    attack "fire-breeze-attack"))
-
-(define-unit-type 'unit-mythical-submarine 'name "Giant Turtle"
-  'files '(tileset-summer "mythical/units/submarine.png")
-  'size '(72 72)
-  'animations 'animations-submarine 'icon 'icon-mythical-submarine
-  'costs '(time 100 gold 800 wood 150 oil 900)
-  'speed 7
-  'hit-points 60
-  'draw-level 30
-  'tile-size '(1 1) 'box-size '(63 63)
-  'sight-range 5 'computer-reaction-range 7 'person-reaction-range 5
-  'basic-damage 50 'piercing-damage 0 'missile 'missile-turtle-missile
-  'max-attack-range 4
-  'priority 60 'annoy-computer-factor 20
-  'points 120
-  'demand 1
-  'corpse '(unit-dead-body 12)
-  'type-naval
-  'right-attack
-  'can-attack
-  'can-target-sea
-  'sea-unit
-  'permanent-cloak
-  'detect-cloak
-  'selectable-by-rectangle
-  'sounds '(
-    selected "mythical-submarine-selected"
-    acknowledge "mythical-submarine-acknowledge"
-    ready "mythical-submarine-ready"
-    help "basic mythical voices help 1"
-    dead "ship sinking"
-    attack "mythical-submarine-attack"))
-
-(define-unit-type 'unit-zeppelin 'name "Goblin Zeppelin"
-  'files '(tileset-summer "mythical/units/zeppelin.png")
-  'size '(72 72)
-  'animations 'animations-zeppelin 'icon 'icon-zeppelin
-  'costs '(time 65 gold 500 wood 100)
-  'speed 17
-  'hit-points 150
-  'draw-level 60
-  'tile-size '(1 1) 'box-size '(63 63)
-  'sight-range 9 'computer-reaction-range 19 'person-reaction-range 15
-  'armor 2 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'max-attack-range 1
-  'priority 40
-  'points 40
-  'demand 1
-  'type-fly
-  'right-move
-  'air-unit 'coward
-  'detect-cloak
-  'selectable-by-rectangle
-  'sounds '(
-    selected "zeppelin-selected"
-    acknowledge "zeppelin-acknowledge"
-    ready "zeppelin-ready"
-    help "basic mythical voices help 1"
-    dead "explosion"
-    attack "zeppelin-attack"))
-
-(define-unit-type 'unit-dragon 'name "Dragon"
-  'use 'unit-fire-breeze
-  'size '(88 80)
-  'animations 'animations-fire-breeze 'icon 'icon-dragon
-  'costs '(time 250 gold 2500)
-  'speed 14
-  'hit-points 100
-  'draw-level 60
-  'tile-size '(1 1) 'box-size '(71 71)
-  'sight-range 6 'computer-reaction-range 8 'person-reaction-range 6
-  'armor 5 'basic-damage 0 'piercing-damage 16 'missile 'missile-dragon-breath
-  'max-attack-range 4
-  '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 "dragon-selected"
-    acknowledge "dragon-acknowledge"
-    ready "dragon-ready"
-    help "basic mythical voices help 1"
-    dead "explosion"
-    attack "dragon-attack"))
-
 (define-unit-type 'unit-eye-of-vision 'name "Eye of Kilrogg"
   'files '(tileset-summer "mythical/units/eye_of_vision.png")
   'size '(32 32)
   'animations 'animations-eye-of-vision 'icon 'icon-eye-of-kilrogg
   'speed 42
   'hit-points 100
-  'draw-level 60
-  'tile-size '(1 1) 'box-size '(31 31)
-  'sight-range 3 'computer-reaction-range 20 'person-reaction-range 10
-  'basic-damage 1 'piercing-damage 0 'missile 'missile-none
-  'max-attack-range 1
-  'priority 0
-  'decay-rate 3
-  'demand 1
-  'type-fly
-  'right-move
-  'air-unit
-  'detect-cloak
-  'selectable-by-rectangle
-  'sounds '(
-    selected "eye-of-vision-selected"
-    acknowledge "eye-of-vision-acknowledge"
-    ready "eye-of-vision-ready"
-    help "basic mythical voices help 1"
-    dead "eye-of-vision-dead"
-    attack "eye-of-vision-attack"))
-
-(define-unit-type 'unit-quick-blade 'name "Korgath Bladefist"
-  'use 'unit-grunt
-  'size '(72 72)
-  'animations 'animations-footman 'icon 'icon-quick-blade
-  'costs '(time 60 gold 600)
-  'speed 10
-  'hit-points 240
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(31 31)
-  'sight-range 5 'computer-reaction-range 6 'person-reaction-range 4
-  'armor 8 'basic-damage 16 'piercing-damage 6 '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 "quick-blade-selected"
-    acknowledge "quick-blade-acknowledge"
-    ready "quick-blade-ready"
-    help "basic mythical voices help 1"
-    dead "basic mythical voices dead"
-    attack "quick-blade-attack"))
-
-(define-unit-type 'unit-double-head 'name "Double_Head"
-  'use 'unit-ogre
-  'size '(72 72)
-  'animations 'animations-ogre 'icon 'icon-double-head
-  'costs '(time 100 gold 1100 wood 50)
-  'speed 13
-  'hit-points 100
-  '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
-  'basic-damage 10 'piercing-damage 5 'missile 'missile-none
-  'max-attack-range 1
-  'weapons-upgradable 1 'armor-upgradable 1
-  'priority 65
-  'points 120
-  'demand 1
-  'corpse '(unit-dead-body 0)
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land
-  'land-unit
-  'hero
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "double-head-selected"
-    acknowledge "double-head-acknowledge"
-    ready "double-head-ready"
-    help "basic mythical voices help 1"
-    dead "basic mythical voices dead"
-    attack "double-head-attack"))
-
-(define-unit-type 'unit-ice-bringer 'name "Ice_Bringer"
-  'use 'unit-death-knight
-  'size '(72 72)
-  'animations 'animations-death-knight 'icon 'icon-ice-bringer
-  'costs '(time 120 gold 1200)
-  'speed 8
-  'hit-points 40
-  'draw-level 40
-  'max-mana 255
-  'magic 1
-  'tile-size '(1 1) 'box-size '(33 33)
-  'sight-range 8 'computer-reaction-range 10 'person-reaction-range 8
-  'basic-damage 0 'piercing-damage 3 'missile 'missile-touch-of-death
-  'max-attack-range 3
-  'priority 70
-  'points 120
-  'demand 1
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land 'can-target-sea 'can-target-air
-  'land-unit
-  'hero
-  'isundead
-  'organic
-  'selectable-by-rectangle
-  'sounds '(
-    selected "ice-bringer-selected"
-    acknowledge "ice-bringer-acknowledge"
-    ready "ice-bringer-ready"
-    help "basic mythical voices help 1"
-    dead "basic mythical voices dead"
-    attack "ice-bringer-attack"))
-
-(define-unit-type 'unit-sharp-axe 'name "Sharp_Axe"
-  'use 'unit-axethrower
-  'size '(72 72)
-  'animations 'animations-axethrower 'icon 'icon-sharp-axe
-  'costs '(time 70 gold 500 wood 50)
-  'speed 10
-  'hit-points 40
-  'draw-level 40
-  'tile-size '(1 1) 'box-size '(36 36)
-  'sight-range 6 'computer-reaction-range 8 'person-reaction-range 6
-  'basic-damage 3 'piercing-damage 6 'missile 'missile-axe
-  'max-attack-range 5
-  'weapons-upgradable 1
-  'priority 55
-  'points 120
+  'draw-level 60
+  'tile-size '(1 1) 'box-size '(31 31)
+  'sight-range 3 'computer-reaction-range 20 'person-reaction-range 10
+  'basic-damage 1 'piercing-damage 0 'missile 'missile-none
+  'max-attack-range 1
+  'priority 0
+  'decay-rate 3
   'demand 1
-  'corpse '(unit-dead-body 0)
-  'type-land
-  'right-attack
-  'can-attack
-  'can-target-land 'can-target-sea 'can-target-air
-  'land-unit
-  'hero
-  'organic
+  'type-fly
+  'right-move
+  'air-unit
+  'detect-cloak
   'selectable-by-rectangle
   'sounds '(
-    selected "sharp-axe-selected"
-    acknowledge "sharp-axe-acknowledge"
-    ready "sharp-axe-ready"
+    selected "eye-of-vision-selected"
+    acknowledge "eye-of-vision-acknowledge"
+    ready "eye-of-vision-ready"
     help "basic mythical voices help 1"
-    dead "basic mythical voices dead"
-    attack "sharp-axe-attack"))
+    dead "eye-of-vision-dead"
+    attack "eye-of-vision-attack"))
 
 (define-unit-type 'unit-skeleton 'name "Skeleton"
   'files '(tileset-summer "neutral/units/skeleton.png")
@@ -949,35 +333,6 @@
     dead "building destroyed"
     attack "mythical-barracks-attack"))
 
-(define-unit-type 'unit-altar-of-storms 'name "Altar of Storms"
-  'files '(tileset-summer 
"tilesets/summer/mythical/buildings/altar_of_storms.png"
-    tileset-winter "tilesets/winter/mythical/buildings/altar_of_storms.png")
-  'size '(96 96)
-  'animations 'animations-building 'icon 'icon-altar-of-storms
-  'costs '(time 175 gold 900 wood 500)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1)
-  'construction 'construction-land
-  'speed 0
-  'hit-points 700
-  'draw-level 20
-  'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 1
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 15 'annoy-computer-factor 35
-  'points 240
-  'corpse '(unit-destroyed-3x3-place 0)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'sounds '(
-    selected "altar-of-storms-selected"
-    acknowledge "altar-of-storms-acknowledge"
-    ready "altar-of-storms-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "altar-of-storms-attack"))
-
 (define-unit-type 'unit-mythical-watch-tower 'name "Watch Tower"
   'files '(tileset-summer "tilesets/summer/mythical/buildings/watch_tower.png"
     tileset-winter "tilesets/winter/mythical/buildings/watch_tower.png")
@@ -1009,124 +364,6 @@
     dead "building destroyed"
     attack "mythical-watch-tower-attack"))
 
-(define-unit-type 'unit-ogre-mound 'name "Ogre Mound"
-  'files '(tileset-summer "tilesets/summer/mythical/buildings/ogre_mound.png"
-    tileset-winter "tilesets/winter/mythical/buildings/ogre_mound.png")
-  'size '(96 96)
-  'animations 'animations-building 'icon 'icon-ogre-mound
-  'costs '(time 150 gold 1000 wood 300)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1)
-  'construction 'construction-land
-  'speed 0
-  'hit-points 500
-  'draw-level 20
-  'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 1
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 15 'annoy-computer-factor 15
-  'points 210
-  'corpse '(unit-destroyed-3x3-place 0)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'sounds '(
-    selected "ogre-mound-selected"
-    acknowledge "ogre-mound-acknowledge"
-    ready "ogre-mound-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "ogre-mound-attack"))
-
-(define-unit-type 'unit-alchemist 'name "Goblin Alchemist"
-  'files '(tileset-summer "tilesets/summer/mythical/buildings/alchemist.png"
-    tileset-winter "tilesets/winter/mythical/buildings/alchemist.png")
-  'size '(96 96)
-  'animations 'animations-building 'icon 'icon-alchemist
-  'costs '(time 150 gold 1000 wood 400)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1)
-  'construction 'construction-land
-  'speed 0
-  'hit-points 500
-  'draw-level 20
-  'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 1
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 15 'annoy-computer-factor 20
-  'points 230
-  'corpse '(unit-destroyed-3x3-place 0)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'sounds '(
-    selected "alchemist-selected"
-    acknowledge "alchemist-acknowledge"
-    ready "alchemist-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "alchemist-attack"))
-
-(define-unit-type 'unit-dragon-roost 'name "Dragon Roost"
-  'files '(tileset-summer "tilesets/summer/mythical/buildings/dragon_roost.png"
-    tileset-winter "tilesets/winter/mythical/buildings/dragon_roost.png")
-  'size '(96 96)
-  'animations 'animations-building 'icon 'icon-dragon-roost
-  'costs '(time 150 gold 1000 wood 400)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1)
-  'construction 'construction-land
-  'speed 0
-  'hit-points 500
-  'draw-level 20
-  'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 1
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 15 'annoy-computer-factor 20
-  'points 280
-  'corpse '(unit-destroyed-3x3-place 0)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'sounds '(
-    selected "dragon-roost-selected"
-    acknowledge "dragon-roost-acknowledge"
-    ready "dragon-roost-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "dragon-roost-attack"))
-
-(define-unit-type 'unit-mythical-shipyard 'name "Shipyard"
-  'files '(tileset-summer "tilesets/summer/mythical/buildings/shipyard.png"
-    tileset-winter "tilesets/winter/mythical/buildings/shipyard.png")
-  'size '(96 96)
-  'animations 'animations-building 'icon 'icon-mythical-shipyard
-  'costs '(time 200 gold 800 wood 450)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1)
-  'construction 'construction-mythical-shipyard
-  'speed 0
-  'hit-points 1100
-  'draw-level 20
-  'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 1
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 30 'annoy-computer-factor 20
-  'points 170
-  'corpse '(unit-destroyed-3x3-place 3)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'shore-building
-  'can-store '(oil)
-  'sounds '(
-    selected "mythical-shipyard-selected"
-    acknowledge "mythical-shipyard-acknowledge"
-    ready "mythical-shipyard-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "mythical-shipyard-attack"))
-
 (define-unit-type 'unit-great-hall 'name "Great Hall"
   'files '(tileset-summer "tilesets/summer/mythical/buildings/great_hall.png"
     tileset-winter "tilesets/winter/mythical/buildings/great_hall.png")
@@ -1158,250 +395,6 @@
     dead "building destroyed"
     attack "great-hall-attack"))
 
-(define-unit-type 'unit-troll-lumber-mill 'name "Troll Lumber Mill"
-  'files '(tileset-summer 
"tilesets/summer/mythical/buildings/mythical_lumber_mill.png"
-    tileset-winter 
"tilesets/winter/mythical/buildings/mythical_lumber_mill.png")
-  'size '(96 96)
-  'animations 'animations-building 'icon 'icon-troll-lumber-mill
-  'costs '(time 150 gold 600 wood 450)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1)
-  'improve-production '(wood 25)
-  'construction 'construction-land
-  'speed 0
-  'hit-points 600
-  'draw-level 20
-  'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 1
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 25 'annoy-computer-factor 15
-  'points 150
-  'corpse '(unit-destroyed-3x3-place 0)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'can-store '(wood)
-  'sounds '(
-    selected "troll-lumber-mill-selected"
-    acknowledge "troll-lumber-mill-acknowledge"
-    ready "troll-lumber-mill-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "troll-lumber-mill-attack"))
-
-(define-unit-type 'unit-mythical-foundry 'name "Foundry"
-  'files '(tileset-summer "tilesets/summer/mythical/buildings/foundry.png"
-    tileset-winter "tilesets/winter/mythical/buildings/foundry.png")
-  'size '(96 96)
-  'animations 'animations-building 'icon 'icon-mythical-foundry
-  'costs '(time 175 gold 700 wood 400 oil 400)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1 oil 1)
-  'construction 'construction-mythical-foundry
-  'speed 0
-  'hit-points 750
-  'draw-level 20
-  'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 1
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 15 'annoy-computer-factor 20
-  'points 200
-  'corpse '(unit-destroyed-3x3-place 3)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'shore-building
-  'sounds '(
-    selected "mythical-foundry-selected"
-    acknowledge "mythical-foundry-acknowledge"
-    ready "mythical-foundry-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "mythical-foundry-attack"))
-
-(define-unit-type 'unit-temple-of-the-damned 'name "Temple of the Damned"
-  'files '(tileset-summer 
"tilesets/summer/mythical/buildings/temple_of_the_damned.png"
-    tileset-winter 
"tilesets/winter/mythical/buildings/temple_of_the_damned.png")
-  'size '(96 96)
-  'animations 'animations-building 'icon 'icon-temple-of-the-damned
-  'costs '(time 125 gold 1000 wood 200)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1)
-  'construction 'construction-land
-  'speed 0
-  'hit-points 500
-  'draw-level 20
-  'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 1
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 35 'annoy-computer-factor 20
-  'points 240
-  'corpse '(unit-destroyed-3x3-place 0)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'sounds '(
-    selected "temple-of-the-damned-selected"
-    acknowledge "temple-of-the-damned-acknowledge"
-    ready "temple-of-the-damned-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "temple-of-the-damned-attack"))
-
-(define-unit-type 'unit-mythical-blacksmith 'name "Blacksmith"
-  'files '(tileset-summer "tilesets/summer/mythical/buildings/blacksmith.png"
-    tileset-winter "tilesets/winter/mythical/buildings/blacksmith.png")
-  'size '(96 96)
-  'animations 'animations-building 'icon 'icon-mythical-blacksmith
-  'costs '(time 200 gold 800 wood 450 oil 100)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1 oil 1)
-  'construction 'construction-land
-  'speed 0
-  'hit-points 775
-  'draw-level 20
-  'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 1
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 15 'annoy-computer-factor 20
-  'points 170
-  'corpse '(unit-destroyed-3x3-place 0)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'sounds '(
-    selected "mythical-blacksmith-selected"
-    acknowledge "mythical-blacksmith-acknowledge"
-    ready "mythical-blacksmith-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "mythical-blacksmith-attack"))
-
-(define-unit-type 'unit-mythical-refinery 'name "Refinery"
-  'files '(tileset-summer "tilesets/summer/mythical/buildings/refinery.png"
-    tileset-winter "tilesets/winter/mythical/buildings/refinery.png")
-  'size '(96 96)
-  'animations 'animations-building 'icon 'icon-mythical-refinery
-  'costs '(time 225 gold 800 wood 350 oil 200)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1 oil 1)
-  'improve-production '(oil 25)
-  'construction 'construction-mythical-refinery
-  'speed 0
-  'hit-points 600
-  'draw-level 20
-  'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 1
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 25 'annoy-computer-factor 20
-  'points 200
-  'corpse '(unit-destroyed-3x3-place 3)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'shore-building
-  'can-store '(oil)
-  'sounds '(
-    selected "mythical-refinery-selected"
-    acknowledge "mythical-refinery-acknowledge"
-    ready "mythical-refinery-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "mythical-refinery-attack"))
-
-(define-unit-type 'unit-mythical-oil-platform 'name "Oil Platform"
-  'files '(tileset-summer "tilesets/summer/mythical/buildings/oil_platform.png"
-    tileset-winter "tilesets/winter/mythical/buildings/oil_platform.png")
-  'size '(96 96)
-  'animations 'animations-building 'icon 'icon-mythical-oil-platform
-  'costs '(time 200 gold 700 wood 450)
-  'construction 'construction-mythical-oil-well
-  'speed 0
-  'hit-points 650
-  'draw-level 20
-  'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 1
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 20 'annoy-computer-factor 20
-  'points 160
-  'corpse '(unit-destroyed-3x3-place 3)
-  'explode-when-killed 'missile-explosion
-  'type-naval
-  'building 
-  'must-build-on-top 'unit-oil-patch
-  'gives-resource 'oil 'can-harvest
-  'sounds '(
-    selected "mythical-oil-platform-selected"
-    acknowledge "mythical-oil-platform-acknowledge"
-    ready "mythical-oil-platform-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "mythical-oil-platform-attack"))
-
-(define-unit-type 'unit-stronghold 'name "Stronghold"
-  'files '(tileset-summer "tilesets/summer/mythical/buildings/stronghold.png"
-    tileset-winter "tilesets/winter/mythical/buildings/stronghold.png")
-  'size '(128 128)
-  'animations 'animations-building 'icon 'icon-stronghold
-  'costs '(time 200 gold 2000 wood 1000 oil 200)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1 oil 1)
-  'improve-production '(gold 10)
-  'construction 'construction-land
-  'speed 0
-  'hit-points 1400
-  'draw-level 20
-  'tile-size '(4 4) 'box-size '(127 127)
-  'sight-range 2
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 37 'annoy-computer-factor 40
-  'points 600
-  'supply 1
-  'corpse '(unit-destroyed-4x4-place 0)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'can-store '(gold wood)
-  'sounds '(
-    selected "stronghold-selected"
-    acknowledge "stronghold-acknowledge"
-    ready "stronghold-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "stronghold-attack"))
-
-(define-unit-type 'unit-fortress 'name "Fortress"
-  'files '(tileset-summer "tilesets/summer/mythical/buildings/fortress.png"
-    tileset-winter "tilesets/winter/mythical/buildings/fortress.png")
-  'size '(128 128)
-  'animations 'animations-building 'icon 'icon-fortress
-  'costs '(time 200 gold 2500 wood 1200 oil 500)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1 oil 1)
-  'improve-production '(gold 20)
-  'construction 'construction-land
-  'speed 0
-  'hit-points 1600
-  'draw-level 20
-  'tile-size '(4 4) 'box-size '(127 127)
-  'sight-range 6
-  'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
-  'priority 40 'annoy-computer-factor 50
-  'points 1500
-  'supply 1
-  'corpse '(unit-destroyed-4x4-place 0)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'building 
-  'can-store '(gold wood)
-  'sounds '(
-    selected "fortress-selected"
-    acknowledge "fortress-acknowledge"
-    ready "fortress-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "fortress-attack"))
-
 (define-unit-type 'unit-mythical-start-location 'name "Start Location"
   'files '(tileset-summer "mythical/o_startpoint.png")
   'size '(32 32)
@@ -1456,39 +449,6 @@
     dead "building destroyed"
     attack "mythical-guard-tower-attack"))
 
-(define-unit-type 'unit-mythical-cannon-tower 'name "Cannon Tower"
-  'files '(tileset-summer "tilesets/summer/mythical/buildings/cannon_tower.png"
-    tileset-winter "tilesets/winter/mythical/buildings/cannon_tower.png")
-  'size '(64 64)
-  'animations 'animations-alliance-cannon-tower 'icon 
'icon-mythical-cannon-tower
-  'costs '(time 190 gold 1000 wood 300)
-  'repair-hp 4
-  'repair-costs '(gold 1 wood 1)
-  'construction 'construction-land
-  'speed 0
-  'hit-points 160
-  'draw-level 40
-  'tile-size '(2 2) 'box-size '(63 63)
-  'sight-range 9 'computer-reaction-range 7 'person-reaction-range 7
-  'armor 20 'basic-damage 50 'piercing-damage 0 'missile 'missile-small-cannon
-  'min-attack-range 2 'max-attack-range 7
-  'priority 40 'annoy-computer-factor 50
-  'points 250
-  'corpse '(unit-destroyed-2x2-place 0)
-  'explode-when-killed 'missile-explosion
-  'type-land
-  'can-attack
-  'can-target-land 'can-target-sea
-  'building 
-  'detect-cloak
-  'sounds '(
-    selected "mythical-cannon-tower-selected"
-    acknowledge "mythical-cannon-tower-acknowledge"
-    ready "mythical-cannon-tower-ready"
-    help "basic mythical voices help 2"
-    dead "building destroyed"
-    attack "mythical-cannon-tower-attack"))
-
 (define-unit-type 'unit-orc-wall 'name "Wall"
   'use 'unit-human-wall
   'size '(32 32)
@@ -1514,4 +474,3 @@
     help "basic mythical voices help 2"
     dead "building destroyed"
     attack "mythical-wall-attack"))
-
Index: demogame/ccl/mythical/upgrade.ccl
diff -u demogame/ccl/mythical/upgrade.ccl:1.7 
demogame/ccl/mythical/upgrade.ccl:1.8
--- demogame/ccl/mythical/upgrade.ccl:1.7       Wed Oct  8 07:05:35 2003
+++ demogame/ccl/mythical/upgrade.ccl   Wed Oct  8 12:47:48 2003
@@ -26,343 +26,22 @@
 ;;      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.7 2003/10/08 11:05:35 martinxyz Exp $
-
-;;     NOTE: Save can generate this table.
-
-(define-upgrade 'upgrade-battle-axe1 'icon 'icon-battle-axe2
-  'costs #(   200   500   100     0     0     0     0))
-(define-upgrade 'upgrade-battle-axe2 'icon 'icon-battle-axe3
-  'costs #(   250  1500   300     0     0     0     0))
-(define-upgrade 'upgrade-throwing-axe1 'icon 'icon-throwing-axe2
-  'costs #(   200   300   300     0     0     0     0))
-(define-upgrade 'upgrade-throwing-axe2 'icon 'icon-throwing-axe3
-  'costs #(   250   900   500     0     0     0     0))
-(define-upgrade 'upgrade-mythical-shield1 'icon 'icon-mythical-shield2
-  'costs #(   200   300   300     0     0     0     0))
-(define-upgrade 'upgrade-mythical-shield2 'icon 'icon-mythical-shield3
-  'costs #(   250   900   500     0     0     0     0))
-(define-upgrade 'upgrade-mythical-ship-cannon1 'icon 
'icon-mythical-ship-cannon2
-  'costs #(   200   700   100  1000     0     0     0))
-(define-upgrade 'upgrade-mythical-ship-cannon2 'icon 
'icon-mythical-ship-cannon3
-  'costs #(   250  2000   250  3000     0     0     0))
-(define-upgrade 'upgrade-mythical-ship-armor1 'icon 'icon-mythical-ship-armor2
-  'costs #(   200   500   500     0     0     0     0))
-(define-upgrade 'upgrade-mythical-ship-armor2 'icon 'icon-mythical-ship-armor3
-  'costs #(   250  1500   900     0     0     0     0))
-(define-upgrade 'upgrade-ballista1 'icon 'icon-ballista1
-  'costs #(   250  1500     0     0     0     0     0))
-(define-upgrade 'upgrade-ballista2 'icon 'icon-ballista2
-  'costs #(   250  4000     0     0     0     0     0))
-(define-upgrade 'upgrade-berserker 'icon 'icon-berserker
-  'costs #(   250  1500     0     0     0     0     0))
-(define-upgrade 'upgrade-light-axes 'icon 'icon-light-axes
-  'costs #(   250  2000     0     0     0     0     0))
-(define-upgrade 'upgrade-berserker-scouting 'icon 'icon-berserker-scouting
-  'costs #(   250  1500     0     0     0     0     0))
-(define-upgrade 'upgrade-berserker-regeneration
-  'icon 'icon-berserker-regeneration
-  'costs #(   250  3000     0     0     0     0     0))
-(define-upgrade 'upgrade-ogre-mage 'icon 'icon-ogre-mage
-  'costs #(   250  1000     0     0     0     0     0))
-(define-upgrade 'upgrade-eye-of-kilrogg 'icon 'icon-eye-of-kilrogg
-  'costs #(     0     0     0     0     0     0     0))
-(define-upgrade 'upgrade-bloodlust 'icon 'icon-bloodlust
-  'costs #(   100  1000     0     0     0     0     0))
-(define-upgrade 'upgrade-raise-dead 'icon 'icon-skeleton
-  'costs #(   100  1500     0     0     0     0     0))
-(define-upgrade 'upgrade-death-coil 'icon 'icon-death-coil
-  'costs #(   100     0     0     0     0     0     0))
-(define-upgrade 'upgrade-whirlwind 'icon 'icon-whirlwind
-  'costs #(   150  1500     0     0     0     0     0))
-(define-upgrade 'upgrade-haste 'icon 'icon-haste
-  'costs #(   100   500     0     0     0     0     0))
-(define-upgrade 'upgrade-unholy-armor 'icon 'icon-unholy-armor
-  'costs #(   200  2500     0     0     0     0     0))
-(define-upgrade 'upgrade-runes 'icon 'icon-runes
-  'costs #(   150  1000     0     0     0     0     0))
-(define-upgrade 'upgrade-death-and-decay 'icon 'icon-death-and-decay
-  'costs #(   200  2000     0     0     0     0     0))
-
-;;     NOTE: Save can generate this table.
-
-(define-modifier 'upgrade-battle-axe1
-  '(piercing-damage 2)
-  '(apply-to unit-grunt) '(apply-to unit-ogre) '(apply-to unit-ogre-mage)
-  '(apply-to unit-goblin-sappers) '(apply-to unit-quick-blade)
-  '(apply-to unit-beast-cry) '(apply-to unit-fad-man)
-  '(apply-to unit-double-head))
-
-(define-modifier 'upgrade-battle-axe2
-  '(piercing-damage 2)
-  '(apply-to unit-grunt) '(apply-to unit-ogre) '(apply-to unit-ogre-mage)
-  '(apply-to unit-goblin-sappers) '(apply-to unit-quick-blade)
-  '(apply-to unit-beast-cry) '(apply-to unit-fad-man)
-  '(apply-to unit-double-head))
-
-(define-modifier 'upgrade-throwing-axe1
-  '(piercing-damage 1)
-  '(apply-to unit-axethrower) '(apply-to unit-berserker)
-  '(apply-to unit-sharp-axe))
-
-(define-modifier 'upgrade-throwing-axe2
-  '(piercing-damage 1)
-  '(apply-to unit-axethrower) '(apply-to unit-berserker)
-  '(apply-to unit-sharp-axe))
-
-(define-modifier 'upgrade-mythical-shield1
-  '(armor 2)
-  '(apply-to unit-grunt) '(apply-to unit-ogre) '(apply-to unit-ogre-mage)
-  '(apply-to unit-goblin-sappers) '(apply-to unit-quick-blade)
-  '(apply-to unit-beast-cry) '(apply-to unit-fad-man)
-  '(apply-to unit-double-head))
-
-(define-modifier 'upgrade-mythical-shield2
-  '(armor 2)
-  '(apply-to unit-grunt) '(apply-to unit-ogre) '(apply-to unit-ogre-mage)
-  '(apply-to unit-goblin-sappers) '(apply-to unit-quick-blade)
-  '(apply-to unit-beast-cry) '(apply-to unit-fad-man)
-  '(apply-to unit-double-head))
-
-(define-modifier 'upgrade-mythical-ship-cannon1
-  '(piercing-damage 5)
-  '(apply-to unit-mythical-destroyer) '(apply-to unit-ogre-juggernaught)
-  '(apply-to unit-mythical-submarine))
-
-(define-modifier 'upgrade-mythical-ship-cannon2
-  '(piercing-damage 5)
-  '(apply-to unit-mythical-destroyer) '(apply-to unit-ogre-juggernaught)
-  '(apply-to unit-mythical-submarine))
-
-(define-modifier 'upgrade-mythical-ship-armor1
-  '(armor 5)
-  '(apply-to unit-mythical-destroyer) '(apply-to unit-ogre-juggernaught)
-  '(apply-to unit-mythical-transport))
-
-(define-modifier 'upgrade-mythical-ship-armor2
-  '(armor 5)
-  '(apply-to unit-mythical-destroyer) '(apply-to unit-ogre-juggernaught)
-  '(apply-to unit-mythical-transport))
-
-(define-modifier 'upgrade-ballista1
-  '(piercing-damage 15)
-  '(apply-to unit-ballista))
-
-(define-modifier 'upgrade-ballista2
-  '(piercing-damage 15)
-  '(apply-to unit-ballista))
-
-(define-modifier 'upgrade-berserker
-  '(apply-to unit-axethrower) '(convert-to unit-berserker))
-
-(define-modifier 'upgrade-light-axes
-  '(sight-range 1)
-  '(attack-range 1)
-  '(apply-to unit-axethrower) '(apply-to unit-berserker))
-
-(define-modifier 'upgrade-berserker-scouting
-  '(sight-range 3)
-  '(apply-to unit-axethrower) '(apply-to unit-berserker))
-
-(define-modifier 'upgrade-berserker-regeneration
-  '(regeneration-rate 1)
-  '(apply-to unit-axethrower) '(apply-to unit-berserker))
-
-(define-modifier 'upgrade-ogre-mage
-  '(apply-to unit-ogre) '(convert-to unit-ogre-mage))
-
-(define-modifier 'upgrade-eye-of-kilrogg
-  '(apply-to unit-ogre-mage))
-
-(define-modifier 'upgrade-bloodlust
-  '(apply-to unit-ogre-mage))
-
-(define-modifier 'upgrade-runes
-  '(apply-to unit-ogre-mage))
-
-(define-modifier 'upgrade-raise-dead
-  '(apply-to unit-death-knight) '(apply-to unit-ice-bringer)
-  '(apply-to unit-evil-knight))
-
-(define-modifier 'upgrade-death-coil
-  '(apply-to unit-death-knight) '(apply-to unit-ice-bringer)
-  '(apply-to unit-evil-knight))
-
-(define-modifier 'upgrade-whirlwind
-  '(apply-to unit-death-knight) '(apply-to unit-ice-bringer)
-  '(apply-to unit-evil-knight))
-
-(define-modifier 'upgrade-haste
-  '(apply-to unit-death-knight) '(apply-to unit-ice-bringer)
-  '(apply-to unit-evil-knight))
-
-(define-modifier 'upgrade-unholy-armor
-  '(apply-to unit-death-knight) '(apply-to unit-ice-bringer)
-  '(apply-to unit-evil-knight))
-
-(define-modifier 'upgrade-death-and-decay
-  '(apply-to unit-death-knight) '(apply-to unit-ice-bringer)
-  '(apply-to unit-evil-knight))
+;;     $Id: upgrade.ccl,v 1.8 2003/10/08 16:47:48 martinxyz Exp $
 
 ;;     NOTE: Save can generate this table.
 
 (define-allow 'unit-grunt                      "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-faun                       "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-catapult                   "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-ogre                       "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-axethrower                 "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-death-knight               "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-ogre-mage                  "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-goblin-sappers             "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-berserker                  "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-evil-knight                        "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-fad-man                    "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-beast-cry                  "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-oil-tanker                "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-transport         "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-destroyer         "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-ogre-juggernaught          "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-fire-breeze                        "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-submarine         "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-zeppelin                   "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-dragon                     "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-eye-of-vision              "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-quick-blade                        "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-double-head                        "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-ice-bringer                        "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-sharp-axe                  "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-pig-farm                   "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-mythical-barracks          "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-altar-of-storms            "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-mythical-watch-tower       "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-ogre-mound                 "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-alchemist                  "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-dragon-roost               "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-shipyard          "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-great-hall                 "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-troll-lumber-mill          "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-foundry           "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-temple-of-the-damned       "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-blacksmith                "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-refinery          "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-oil-platform      "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-stronghold                 "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-fortress                   "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-mythical-start-location    "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-mythical-guard-tower       "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-cannon-tower      "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-orc-wall                   "AAAAAAAAAAAAAAAA")
 
-;;     - upgrades
-
-(define-allow 'upgrade-battle-axe1             "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-battle-axe2             "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-throwing-axe1           "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-throwing-axe2           "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-mythical-shield1                "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-mythical-shield2                "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-mythical-ship-cannon1           "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-mythical-ship-cannon2           "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-mythical-ship-armor1            "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-mythical-ship-armor2            "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-ballista1               "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-ballista2               "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-berserker               "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-light-axes              "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-berserker-scouting      "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-berserker-regeneration  "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-ogre-mage               "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-eye-of-kilrogg          "RRRRRRRRRRRRRRRR")
-(define-allow 'upgrade-bloodlust               "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-raise-dead              "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-death-coil              "RRRRRRRRRRRRRRRR")
-(define-allow 'upgrade-whirlwind               "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-haste                   "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-unholy-armor            "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-runes                   "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-death-and-decay         "AAAAAAAAAAAAAAAA")
-
-;;     NOTE: Save can generate this table.
-
-;;     - mythical land fmythicales
-(define-dependency 'unit-axethrower
-  '(unit-troll-lumber-mill))
-(define-dependency 'unit-catapult
-  '(unit-mythical-blacksmith unit-troll-lumber-mill))
-(define-dependency 'unit-berserker
-  '(upgrade-berserker unit-troll-lumber-mill))
-(define-dependency 'unit-ogre
-  '(unit-ogre-mound unit-mythical-blacksmith))
-(define-dependency 'unit-ogre-mage
-  '(upgrade-ogre-mage unit-ogre-mound unit-mythical-blacksmith))
-
-;;     - mythical naval fmythicales
-(define-dependency 'unit-mythical-submarine
-  '(unit-alchemist))
-(define-dependency 'unit-mythical-transport
-  '(unit-mythical-foundry))
-(define-dependency 'unit-ogre-juggernaught
-  '(unit-mythical-foundry))
-
-;;     - mythical air fmythicales
-(define-dependency 'unit-zeppelin
-  '(unit-troll-lumber-mill))
-
-;;     - mythical buildings
-(define-dependency 'unit-mythical-guard-tower
-  '(unit-troll-lumber-mill))
-(define-dependency 'unit-mythical-cannon-tower
-  '(unit-mythical-blacksmith))
-(define-dependency 'unit-mythical-shipyard
-  '(unit-troll-lumber-mill))
-(define-dependency 'unit-mythical-foundry
-  '(unit-mythical-shipyard))
-(define-dependency 'unit-mythical-refinery
-  '(unit-mythical-shipyard))
-(define-dependency 'unit-stronghold
-  '(unit-mythical-barracks))
-(define-dependency 'unit-alchemist
-  '(unit-stronghold)
-  'or '(unit-fortress))
-(define-dependency 'unit-ogre-mound
-  '(unit-stronghold)
-  'or '(unit-fortress))
-(define-dependency 'unit-fortress
-  '(unit-ogre-mound unit-mythical-blacksmith unit-troll-lumber-mill))
-(define-dependency 'unit-altar-of-storms
-  '(unit-fortress))
-(define-dependency 'unit-temple-of-the-damned
-  '(unit-fortress))
-(define-dependency 'unit-dragon-roost
-  '(unit-fortress))
-
-;;     - mythical upgrades/research
-(define-dependency 'upgrade-battle-axe2
-  '(upgrade-battle-axe1))
-(define-dependency 'upgrade-throwing-axe2
-  '(upgrade-throwing-axe1))
-(define-dependency 'upgrade-mythical-shield2
-  '(upgrade-mythical-shield1))
-(define-dependency 'upgrade-ballista2
-  '(upgrade-ballista1))
-(define-dependency 'upgrade-mythical-ship-cannon2
-  '(upgrade-mythical-ship-cannon1))
-(define-dependency 'upgrade-mythical-ship-armor2
-  '(upgrade-mythical-ship-armor1))
-(define-dependency 'upgrade-berserker
-  '(unit-stronghold)
-  'or '(unit-fortress))
-(define-dependency 'upgrade-berserker-scouting
-  '(unit-fortress upgrade-berserker))
-(define-dependency 'upgrade-berserker-regeneration
-  '(unit-fortress upgrade-berserker))
-(define-dependency 'upgrade-light-axes
-  '(unit-fortress upgrade-berserker))
-
-;;     - mythical spells
-(define-dependency 'upgrade-eye-of-kilrogg
-  '(upgrade-ogre-mage))
-(define-dependency 'upgrade-bloodlust
-  '(upgrade-ogre-mage))
-(define-dependency 'upgrade-runes
-  '(upgrade-ogre-mage))
+;; No upgrades.
Index: demogame/ccl/sound.ccl
diff -u demogame/ccl/sound.ccl:1.4 demogame/ccl/sound.ccl:1.5
--- demogame/ccl/sound.ccl:1.4  Mon Oct  6 17:10:13 2003
+++ demogame/ccl/sound.ccl      Wed Oct  8 12:47:47 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.4 2003/10/06 21:10:13 martinxyz Exp $
+;;     $Id: sound.ccl,v 1.5 2003/10/08 16:47:47 martinxyz Exp $
 
 (if (with-sound) (begin
 
@@ -694,7 +694,6 @@
 (map-sound "footman-ready" "basic alliance voices ready")
 (map-sound "grunt-ready" "basic mythical voices ready")
 (map-sound "ballista-ready" "basic alliance voices ready")
-(map-sound "catapult-ready" "basic mythical voices ready")
 (map-sound "archer-ready" "elven archer-ranger ready")
 (map-sound "axethrower-ready" "troll axethrower-berserker ready")
 (map-sound "ranger-ready" "elven archer-ranger ready")
@@ -712,7 +711,6 @@
     ;;  selection sounds
 (map-sound "faun-selected" "grunt-selected")
 (map-sound "ballista-selected" "click")
-(map-sound "catapult-selected" "click")
 (map-sound "ranger-selected" "elven archer-ranger selected")
 (map-sound "berserker-selected" "troll axethrower-berserker selected")
 (map-sound "alliance-transport-selected" "alliance-oil-tanker-selected")
@@ -763,7 +761,6 @@
 (map-sound "peasant-attack" "peasant attack")
 (map-sound "faun-attack" "peasant attack")
 (map-sound "ballista-attack" "catapult-ballista attack")
-(map-sound "catapult-attack" "catapult-ballista attack")
 (map-sound "knight-attack" "sword attack")
 (map-sound "ogre-attack" "punch")
 (map-sound "archer-attack" "bow throw")
Index: demogame/puds/default.pud.gz




reply via email to

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