stratagus-cvs
[Top][All Lists]
Advanced

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

[Stratagus-CVS] demogame ./README ccl/ai.ccl ccl/buttons.ccl cc...


From: Martin Renold
Subject: [Stratagus-CVS] demogame ./README ccl/ai.ccl ccl/buttons.ccl cc...
Date: Tue, 07 Oct 2003 09:28:01 -0400

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

Modified files:
        .              : README 
        ccl            : ai.ccl buttons.ccl stratagus.ccl units.ccl 
        ccl/alliance   : units.ccl upgrade.ccl 
        ccl/mythical   : units.ccl upgrade.ccl 
Added files:
        ccl/alliance   : buttons.ccl 
        ccl/mythical   : buttons.ccl 

Log message:
        works without NEW_UI now

Patches:
Index: demogame/README
diff -u demogame/README:1.2 demogame/README:1.3
--- demogame/README:1.2 Thu Aug 14 04:49:03 2003
+++ demogame/README     Tue Oct  7 09:27:57 2003
@@ -8,20 +8,20 @@
                           T H E   W A R   B E G I N S
            Stratagus - A free fantasy real time strategy game engine
 
-This is the stratagus demogame. To run it, compile stratagus with NEW_UI:
-$ cd stratagus 
-$ ./configure --with-new-ui --enable-debug
-$ make clean
-$ make
-and run:
-$ ./stratagus -d ../demogame/
+This is the stratagus demogame. To run it, start stratagus with:
+./stratagus -d /path/to/demogame/
 
-New engine features are tested (and documented?) here. It is not meant to 
-be a full-blown game, just some easily changeable stuff to experiment with 
+New engine features can be tested here. It is not meant to be a 
+full-blown game, just some easily changeable stuff to experiment with 
 and learn about the stratagus engine.
 
-Most directories should contain a README file to describe the big picture
+Some directories contain a README file to describe the big picture
 and help you to add stuff yourself. The heart of the demogame are some
-scheme scripts, found in the ccl/ directory. Start with ccl/stratagus.ccl.
+scheme scripts in the ccl/ directory. Start with ccl/stratagus.ccl.
+
+The documentation for the individual ccl commands come with the engine
+in html format, see stratagus/doc/ccl/. If you had a hard time figuring
+out something, please send us docu updates.
 
 Have fun :)
+
Index: demogame/ccl/ai.ccl
diff -u demogame/ccl/ai.ccl:1.3 demogame/ccl/ai.ccl:1.4
--- demogame/ccl/ai.ccl:1.3     Thu Sep 11 08:17:57 2003
+++ demogame/ccl/ai.ccl Tue Oct  7 09:27:59 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: ai.ccl,v 1.3 2003/09/11 12:17:57 martinxyz Exp $
+;;     $Id: ai.ccl,v 1.4 2003/10/07 13:27:59 martinxyz Exp $
 
 ;(define (ai:sleep) () #t)
 
@@ -56,10 +56,10 @@
     (list 'build 'unit-peasant
        'unit-farm 'unit-alliance-barracks 'unit-town-hall 
'unit-elven-lumber-mill
        'unit-alliance-blacksmith 'unit-alliance-watch-tower 'unit-human-wall
-       'unit-alliance-shipyard 'unit-alliance-foundry 'unit-alliance-refinery
+       'unit-alliance-shipyard 'unit-alliance-foundry 'unit-human-refinery
        'unit-inventor 'unit-stables 'unit-mage-tower 'unit-church
        'unit-gryphon-aviary 'unit-dark-portal 'unit-runestone)
-    (list 'build 'unit-alliance-oil-tanker 'unit-alliance-oil-platform)
+    (list 'build 'unit-human-oil-tanker 'unit-alliance-oil-platform)
     ;;
     ;; Building can train which units.
     ;;
@@ -75,7 +75,7 @@
     (list 'train 'unit-mage-tower 'unit-mage)
     (list 'train 'unit-gryphon-aviary 'unit-gryphon-rider)
     (list 'train 'unit-alliance-shipyard
-       'unit-alliance-oil-tanker 'unit-alliance-destroyer 
'unit-alliance-transport
+       'unit-human-oil-tanker 'unit-alliance-destroyer 'unit-alliance-transport
        'unit-alliance-submarine 'unit-battleship)
     ;;
     ;; Building can upgrade which upgrades.
@@ -109,7 +109,7 @@
        'unit-farm 'unit-alliance-barracks 'unit-town-hall 'unit-keep 
'unit-castle
        'unit-elven-lumber-mill 'unit-alliance-blacksmith 
'unit-alliance-watch-tower
        'unit-alliance-guard-tower 'unit-alliance-cannon-tower 'unit-human-wall
-       'unit-alliance-shipyard 'unit-alliance-foundry 'unit-alliance-refinery
+       'unit-alliance-shipyard 'unit-alliance-foundry 'unit-human-refinery
        'unit-inventor 'unit-stables 'unit-mage-tower 'unit-church
        'unit-gryphon-aviary 'unit-dark-portal 'unit-runestone
        'unit-alliance-transport)
@@ -129,7 +129,7 @@
     (list 'unit-equiv 'unit-knight
        'unit-paladin)
     (list 'unit-equiv 'unit-peasant)
-    (list 'unit-equiv 'unit-alliance-oil-tanker)
+    (list 'unit-equiv 'unit-human-oil-tanker)
     (list 'unit-equiv 'unit-alliance-watch-tower
         'unit-alliance-guard-tower 'unit-alliance-cannon-tower) )
 
@@ -144,12 +144,11 @@
     (list 'build 'unit-peon
        'unit-pig-farm 'unit-mythical-barracks 'unit-great-hall
        'unit-troll-lumber-mill 'unit-mythical-blacksmith 
'unit-mythical-watch-tower
-       'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry
-       'unit-mythical-refinery
+       'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry 
'unit-orc-refinery
        'unit-alchemist 'unit-ogre-mound 'unit-temple-of-the-damned
        'unit-altar-of-storms
        'unit-dragon-roost 'unit-dark-portal 'unit-runestone)
-    (list 'build 'unit-mythical-oil-tanker 'unit-mythical-oil-platform)
+    (list 'build 'unit-orc-oil-tanker 'unit-mythical-oil-platform)
     ;;
     ;; Building can train which units.
     ;;
@@ -165,7 +164,7 @@
     (list 'train 'unit-temple-of-the-damned 'unit-death-knight)
     (list 'train 'unit-dragon-roost 'unit-dragon)
     (list 'train 'unit-mythical-shipyard
-       'unit-mythical-oil-tanker 'unit-mythical-destroyer 
'unit-mythical-transport
+       'unit-orc-oil-tanker 'unit-mythical-destroyer 'unit-mythical-transport
        'unit-mythical-submarine 'unit-ogre-juggernaught)
     ;;
     ;; Building can upgrade which upgrades.
@@ -200,8 +199,7 @@
        'unit-pig-farm 'unit-mythical-barracks 'unit-great-hall 'unit-stronghold
        'unit-fortress 'unit-troll-lumber-mill 'unit-mythical-blacksmith
        'unit-mythical-watch-tower 'unit-mythical-guard-tower 
'unit-mythical-cannon-tower
-       'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry
-       'unit-mythical-refinery
+       'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry 
'unit-orc-refinery
        'unit-alchemist 'unit-ogre-mound 'unit-temple-of-the-damned
        'unit-altar-of-storms 'unit-dragon-roost 'unit-dark-portal
        'unit-runestone 'unit-mythical-transport)
@@ -221,7 +219,7 @@
     (list 'unit-equiv 'unit-ogre
        'unit-ogre-mage)
     (list 'unit-equiv 'unit-peon)
-    (list 'unit-equiv 'unit-mythical-oil-tanker)
+    (list 'unit-equiv 'unit-orc-oil-tanker)
     (list 'unit-equiv 'unit-mythical-watch-tower
         'unit-mythical-guard-tower 'unit-mythical-cannon-tower) )
 
@@ -793,7 +791,7 @@
 ;;
 (define (ai:refinery)
   (if (eq? (ai:get-race) race1)
-      'unit-alliance-refinery 'unit-mythical-refinery) )
+      'unit-human-refinery 'unit-orc-refinery) )
 
 ;;
 ;;     Foundry of the current race.
@@ -842,7 +840,7 @@
 ;;
 (define (ai:tanker)
   (if (eq? (ai:get-race) race1)
-      'unit-alliance-oil-tanker 'unit-mythical-oil-tanker) )
+      'unit-human-oil-tanker 'unit-orc-oil-tanker) )
 
 ;;
 ;;     Submarine of the current race.
Index: demogame/ccl/alliance/units.ccl
diff -u demogame/ccl/alliance/units.ccl:1.9 demogame/ccl/alliance/units.ccl:1.10
--- demogame/ccl/alliance/units.ccl:1.9 Tue Sep 23 03:05:38 2003
+++ demogame/ccl/alliance/units.ccl     Tue Oct  7 09:28:00 2003
@@ -1,4 +1,4 @@
-;;       _________ __                 __                               
+;;       _________ __                 __
 ;;      /   _____//  |_____________ _/  |______     ____  __ __  ______
 ;;      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
 ;;      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
@@ -26,22 +26,23 @@
 ;;      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.9 2003/09/23 07:05:38 martinxyz Exp $
+;;     $Id: units.ccl,v 1.10 2003/10/07 13:28:00 martinxyz Exp $
 
 ;;=============================================================================
 ;;     Define unit-types.
 ;;
 ;;     NOTE: Save can generate this table.
 ;;
+
 (define-unit-type 'unit-footman 'name "Footman"
   'files '(tileset-summer "alliance/units/footman.png")
   'size '(72 72)
-  'tile-size '(1 1) 'box-size '(31 31)
   'animations 'animations-footman 'icon 'icon-footman
   'costs '(time 60 gold 600)
-  'speed 40
+  'speed 10
   'hit-points 60
   'draw-level 40
+  'tile-size '(1 1) 'box-size '(31 31)
   '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
@@ -52,12 +53,11 @@
   'corpse '(unit-dead-body 6)
   'type-land
   'right-attack
-  'can-attack
+  'can-attack 'repair-range 1
   'can-target-land
   'land-unit
   'organic
   'selectable-by-rectangle
-  'add-buttons '(generic-combat-buttons)
   'sounds '(
     selected "footman-selected"
     acknowledge "footman-acknowledge"
@@ -106,42 +106,6 @@
        terrain-harvester )
   'organic
   'selectable-by-rectangle
-  'add-buttons '(begin
-    (if (= (get-global 'button-level) 0) (begin
-      (add-button 'pos 4 'icon 'icon-repair
-        'key "r" 'hint "~!REPAIR"
-        'action (lambda () (command-repair)))
-      (add-button 'pos 5 'icon 'icon-harvest
-        'key "h" 'hint "~!HARVEST LUMBER/MINE GOLD"
-        'action (lambda () (command-harvest)))
-      (if (selected-resource-loaded) (begin
-        (writes nil (string-append "Selected unit has loaded " 
(selected-resource-loaded) " resources.\n"))
-        (add-button 'pos 6 'icon 'icon-return-goods-peasant
-          'key "g" 'hint "RETURN WITH ~!GOODS"
-          'action (lambda () (command-return-goods)))))
-      (add-button 'pos 7 'icon 'icon-build-basic
-        'key "b" 'hint "BUILD ~!BASIC"
-        'action (lambda ()
-          (set-global 'button-level 1)
-         (rebuild-buttons)))))
-    (if (= (get-global 'button-level) 1) (begin
-      ; FIXME: construct some cool helper functions for the build buttons
-      (add-button 'pos 1 'icon 'icon-farm
-        'key "f" 
-       'hint (string-append "BUILD ~!FARM   " (get-cost-string 'unit-farm))
-        'action (lambda() (command-build 'unit-farm)))
-      (add-button 'pos 2 'icon 'icon-alliance-barracks
-        'key "b" 
-       'hint (string-append "~!BARRACKS   " (get-cost-string 
'unit-alliance-barracks))
-        'action (lambda() (command-build 'unit-alliance-barracks)))
-      (add-button 'pos 3 'icon 'icon-town-hall
-        'key "t" 
-       'hint (string-append "~!TOWN HALL   " (get-cost-string 'unit-town-hall))
-        'action (lambda() (command-build 'unit-town-hall)))
-      (add-button 'pos 4 'icon 'icon-elven-lumber-mill
-        'key "l" 
-       'hint (string-append "BUILD ELVEN ~!LUMBER MILL   " (get-cost-string 
'unit-elven-lumber-mill))
-        'action (lambda() (command-build 'unit-elven-lumber-mill))))))
   'sounds '(
     selected "peasant-selected"
     acknowledge "peasant-acknowledge"
@@ -150,9 +114,6 @@
     dead "basic alliance voices dead"
     attack "peasant-attack"))
 
-;(define (build-button pos unittype key hint)
-  
-
 (define-unit-type 'unit-ballista 'name "Ballista"
   'files '(tileset-summer "alliance/units/ballista.png")
   'size '(64 64)
@@ -176,7 +137,6 @@
   'can-attack
   'can-target-land 'can-target-sea
   'selectable-by-rectangle
-  'add-buttons '(generic-combat-buttons)
   'sounds '(
     selected "ballista-selected"
     acknowledge "ballista-acknowledge"
@@ -217,21 +177,18 @@
     dead "basic alliance voices dead"
     attack "knight-attack"))
 
-(define-unit-type 'unit-archer 'name "Sniper"
-  ;'files '(tileset-summer "alliance/units/archer.png")
-  'files '(tileset-summer "alliance/units/sniper.png")
+(define-unit-type 'unit-archer 'name "Archer"
+  'files '(tileset-summer "alliance/units/archer.png")
   'size '(72 72)
-  ;'animations 'animations-archer 'icon 'icon-archer
-  'animations 'animations-archer 'icon 'icon-sniper
+  'animations 'animations-archer 'icon 'icon-archer
   'costs '(time 70 gold 500 wood 50)
   'speed 10
   'hit-points 40
   'draw-level 40
   'tile-size '(1 1) 'box-size '(33 33)
   'sight-range 5 'computer-reaction-range 7 'person-reaction-range 5
-  'basic-damage 12 'piercing-damage 24 
-  'missile 'missile-none
-  'max-attack-range 5
+  'basic-damage 3 'piercing-damage 6 'missile 'missile-arrow
+  'max-attack-range 4
   'weapons-upgradable 1
   'priority 55
   'points 60
@@ -244,7 +201,6 @@
   'land-unit
   'organic
   'selectable-by-rectangle
-  'add-buttons '(generic-combat-buttons)
   'sounds '(
     selected "archer-selected"
     acknowledge "archer-acknowledge"
@@ -385,7 +341,6 @@
   'land-unit
   'organic
   'selectable-by-rectangle
-  'add-buttons '(generic-combat-buttons)
   'sounds '(
     selected "ranger-selected"
     acknowledge "ranger-acknowledge"
@@ -498,7 +453,7 @@
     dead "basic alliance voices dead"
     attack "white-mage-attack"))
 
-(define-unit-type 'unit-alliance-oil-tanker 'name "Oil tanker"
+(define-unit-type 'unit-human-oil-tanker 'name "Oil tanker"
   'files '(tileset-summer "alliance/units/oil_tanker_empty.png")
   'size '(72 72)
   'animations 'animations-alliance-oil-tanker 'icon 'icon-alliance-oil-tanker
@@ -525,7 +480,6 @@
       wait-at-resource 100
       wait-at-depot 100)
   'selectable-by-rectangle
-  ; FIXME: buttons
   'sounds '(
     selected "alliance-oil-tanker-selected"
     acknowledge "alliance-oil-tanker-acknowledge"
@@ -876,7 +830,7 @@
   'corpse '(unit-destroyed-2x2-place 0)
   'explode-when-killed 'missile-explosion
   'type-land
-  'building 'builder-outside
+  'building 
   'sounds '(
     selected "farm-selected"
     acknowledge "farm-acknowledge"
@@ -898,20 +852,14 @@
   'hit-points 800
   'draw-level 20
   'tile-size '(3 3) 'box-size '(95 95)
-  'sight-range 3
+  'sight-range 1
   'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
   'priority 30 'annoy-computer-factor 35
   'points 160
   'corpse '(unit-destroyed-3x3-place 0)
   'explode-when-killed 'missile-explosion
   'type-land
-  'building
-  'add-buttons '(begin
-    (train-button 'footman 1 "f" "TRAIN ~!FOOTMAN")
-    (train-button 'archer 2  "a" "TRAIN ~!ARCHER")
-    ; demonstrates button-overwrite
-    ; but might be faster to do the allowed check from train-button here
-    (train-button 'ranger 2  "r" "TRAIN ~!RANGER"))
+  'building 
   'sounds '(
     selected "alliance-barracks-selected"
     acknowledge "alliance-barracks-acknowledge"
@@ -951,7 +899,8 @@
 
 (define-unit-type 'unit-alliance-watch-tower 'name "Scout Tower"
   'files '(tileset-summer "tilesets/summer/alliance/buildings/scout_tower.png"
-    tileset-winter "tilesets/winter/alliance/buildings/scout_tower.png")
+    tileset-winter
+  "tilesets/winter/alliance/buildings/scout_tower.png")
   'size '(64 64)
   'animations 'animations-building 'icon 'icon-alliance-watch-tower
   'costs '(time 60 gold 550 wood 200)
@@ -1121,12 +1070,6 @@
   'type-land
   'building 
   'can-store '(wood)
-  'add-buttons '(begin
-    (if (check-allowed 'upgrade-ranger) 
-      (add-button 'pos 4
-        'icon 'icon-ranger
-        'key "r" 'hint "ELVEN ~!RANGER TRAINING"
-        'action (lambda () (command-research 'upgrade-ranger)))))
   'sounds '(
     selected "elven-lumber-mill-selected"
     acknowledge "elven-lumber-mill-acknowledge"
@@ -1188,15 +1131,6 @@
   'type-land
   'building 
   'can-store '(wood gold)
-  'add-buttons '(begin
-    ; just a test
-    (train-button 'peasant 1 "p" "Train a test peasant")
-    (if (check-allowed 'unit-keep)
-      (add-button 'pos 2
-      'icon 'icon-keep
-      'key "k" 
-      'hint (string-append "UPGRADE TO ~!KEEP   " (get-cost-string 'unit-keep))
-      'action (lambda () (command-upgrade-to 'unit-keep)))))
   'sounds '(
     selected "town-hall-selected"
     acknowledge "town-hall-acknowledge"
@@ -1263,7 +1197,7 @@
     dead "building destroyed"
     attack "alliance-blacksmith-attack"))
 
-(define-unit-type 'unit-alliance-refinery 'name "Refinery"
+(define-unit-type 'unit-human-refinery 'name "Refinery"
   'files '(tileset-summer "tilesets/summer/alliance/buildings/refinery.png"
     tileset-winter "tilesets/winter/alliance/buildings/refinery.png")
   'size '(96 96)
@@ -1475,7 +1409,6 @@
     dead "building destroyed"
     attack "alliance-cannon-tower-attack"))
 
-; FIXME: hardcoded magic unit type
 (define-unit-type 'unit-human-wall 'name "Wall"
   'files '(tileset-summer "tilesets/summer/neutral/buildings/wall.png"
     tileset-winter "tilesets/winter/neutral/buildings/wall.png")
@@ -1502,4 +1435,5 @@
     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.3 
demogame/ccl/alliance/upgrade.ccl:1.4
--- demogame/ccl/alliance/upgrade.ccl:1.3       Thu Sep 11 08:17:58 2003
+++ demogame/ccl/alliance/upgrade.ccl   Tue Oct  7 09:28:00 2003
@@ -26,19 +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: upgrade.ccl,v 1.3 2003/09/11 12:17:58 martinxyz Exp $
+;;     $Id: upgrade.ccl,v 1.4 2003/10/07 13:28:00 martinxyz Exp $
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;=============================================================================
-;;     Define the upgrades
-;;
-;;     (define-upgrade upgrade-name 'icon icon 'costs #( costs ))
-;;
-;;     upgrade-name    is the identifier of the upgrade
-;;     icon            is the icon shown for upgrading.
-;;     costs           are the costs of the upgrade
-;;                     (time gold wood oil ore stone coal)
-;;
 ;;     NOTE: Save can generate this table.
 
 (define-upgrade 'upgrade-sword1 'icon 'icon-sword2
@@ -102,17 +91,6 @@
 (define-upgrade 'upgrade-blizzard 'icon 'icon-blizzard
   'costs #(   200  2000     0     0     0     0     0))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;=============================================================================
-;;     Define the upgrade modifiers
-;;
-;;     (define-modifier upgrade-name '(modifiers) ... )
-;;
-;,     This does the real upgrades.
-;;
-;;     upgrade-name    is the identifier of the upgrade modifier
-;;     modifiers       is a pair of the effect name and value.
-;;
 ;;     NOTE: Save can generate this table.
 
 (define-modifier 'upgrade-sword1
@@ -167,14 +145,13 @@
   '(apply-to unit-alliance-destroyer) '(apply-to unit-battleship)
   '(apply-to unit-alliance-transport))
 
-; FIXME
-;(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-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))
@@ -225,17 +202,7 @@
 (define-modifier 'upgrade-blizzard
   '(apply-to unit-mage) '(apply-to unit-white-mage))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;=============================================================================
-;;
-;;     Define which units/upgrades are allowed.
-;;             A: allowed, E: enabled, F: forbidden, R: researched
-;;
-;;     (define-allow unit/upgrade "AAAAAAAAAAAAAAAA")
-;;                                 ^- player 0 ... 15
-;;
 ;;     NOTE: Save can generate this table.
-;;
 
 ;;     - units
 
@@ -251,15 +218,15 @@
 (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-human-oil-tanker           "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-alliance-transport         "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-alliance-destroyer         "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-battleship                 "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-alliance-submarine         "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-balloon    "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-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")
@@ -275,7 +242,7 @@
 (define-allow 'unit-alliance-foundry           "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-mage-tower                 "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-alliance-blacksmith                "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-alliance-refinery          "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-human-refinery             "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-alliance-oil-platform              "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-keep                       "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-castle                     "AAAAAAAAAAAAAAAA")
@@ -316,20 +283,6 @@
 (define-allow 'upgrade-polymorph               "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-blizzard                        "AAAAAAAAAAAAAAAA")
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;=============================================================================
-;;     Define the dependencies
-;;
-;;     (define-dependency unit/upgrade
-;;             '( required-unit/upgrade count ... ) ['or ...] )
-;;
-;;     Define the dependencies of an unit or upgrade.
-;;
-;;     unit/upgrade    Dependencies for this unit or upgrade.
-;;     required-unit/upgrade   Units required to build or research.
-;;     count           Number of units required.
-;;     'or             Alternative set of units/upgrades required.
-;;
 ;;     NOTE: Save can generate this table.
 
 ;;     - alliance land forces
@@ -365,7 +318,7 @@
   '(unit-elven-lumber-mill))
 (define-dependency 'unit-alliance-foundry
   '(unit-alliance-shipyard))
-(define-dependency 'unit-alliance-refinery
+(define-dependency 'unit-human-refinery
   '(unit-alliance-shipyard))
 (define-dependency 'unit-keep
   '(unit-alliance-barracks))
Index: demogame/ccl/buttons.ccl
diff -u demogame/ccl/buttons.ccl:1.3 demogame/ccl/buttons.ccl:1.4
--- demogame/ccl/buttons.ccl:1.3        Sun Sep 14 07:51:58 2003
+++ demogame/ccl/buttons.ccl    Tue Oct  7 09:28:00 2003
@@ -26,162 +26,50 @@
 ;;      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/09/14 11:51:58 martinxyz Exp $
-
-; Shortcut scripts for common button types, as well as some central
-; hooks
-
-; FIXME: this is most likely a very ugly hack to scheme
-(define (set-global symbol value)
-  (set-symbol-value! symbol value nil))
-(define (get-global symbol)
-  (symbol-value symbol nil))
-
-; just a shortcut around to avoid the ugly strcmp
-(define (selected-action-is actionstr)
-  (= (strcmp (selected-get-action) actionstr) 0))
-
-;
-; Move and Stop, always visible for moveable units
-;
-(define (generic-movement-buttons)
-  ;(writes nil (string-append "Selected-get-action: " (selected-get-action) 
"\n"))
-  (add-button 'pos 1
-    'icon 'icon-move-peasant
-    'key "m" 'hint "~!MOVE TO"
-    'highlight (selected-action-is 'Move)
-    'action (lambda () (command-move)))
-  (add-button 'pos 2
-    ; FIXME: check for shield upgrades to choose icon
-    ;'icon (string-append "icon-" (selected-get-race) "shield1")
-    'icon 'icon-alliance-shield1
-    'key "s" 'hint "~!STOP"
-    'action (lambda () (command-stop))))
-
-;
-; generic combat button, bow units might want an other icon etc.
-;
-(define (attack-button)
-  (add-button 'pos 3
-    ; FIXME: check for sword upgrades to choose icon
-    'icon (string-append "icon-sword1")
-    'key "a" 'hint "~!ATTACK"
-    'highlight (= (strcmp (selected-get-action) 'Attack) 0)
-    'action (lambda () (command-attack))))
-(define (patrol-button)
-  (add-button 'pos 4
-    'icon (string-append "icon-" (selected-get-race) "-patrol-land")
-    'key "p" 'hint "~!PATROL"
-    'action (lambda () (command-patrol))))
-(define (stand-button)
-  (add-button 'pos 5
-    'icon (string-append "icon-" (selected-get-race) "-stand-ground")
-    'key "t" 'hint "S~!TAND GROUND"
-    'action (lambda () (command-stand-ground))))
-(define (generic-combat-buttons) 
-  (attack-button)
-  (stand-button)
-  (patrol-button))
-
-(define (train-button type pos key hint)
-  (if (check-allowed (string-append 'unit- type))
-    (add-button
-      'icon (string-append 'icon- type)
-      'hint (string-append hint "   " (get-cost-string (string-append 'unit- 
type)))
-      'pos pos
-      'key key
-      'action (lambda ()
-        (writes nil "Train-command\n")
-        (command-train-unit  (string-append 'unit- type))))))
-
-;(define (add-build-button pos type . args)
-;  (apply add-button 
-;    'pos pos 'icon (string-append 'icon- type)
-;    'pre-action (lambda ()
-;      (set-mouse-mode 'building-place-mode (string-append type '-sprite)))
-;    'action (lambda (x y)
-;      (building-place 'townhall x y))
-;    args))
-
-; FIXME: maxy: does not work like that
-;(define (train-button type . args)
-;  (writes nil "Train-Button\n")
-;  ; FIXME: allowed check goes here...
-;  (apply add-button
-;    ;'icon (string-append 'icon- type)
-;    'icon 'icon-peasant
-;    'action (lambda ()
-;      (command-train-unit  (string-append 'unit- type)))
-;    args)
-;  (writes nil "Apply done.\n"))
-
-; FIXME: should not be necessary, selection-changed-hook should be
-; called first anyway
-(set-global 'button-level 0)
-
-(set-selected-unit-changed-hook '(begin
-  (rebuild-buttons)))
-
-(set-selection-changed-hook '(begin
-  (set-global 'button-level 0)
-  (rebuild-buttons)))
-  
-; When doing a target selection, only draw a cancel button.
-; If you leave them both empty, you can choose another building while
-; setting the destination and such things.
-(set-choose-target-begin-hook '(begin
-  (set-global 'button-level 9)
-  (rebuild-buttons)))
-(set-choose-target-finish-hook '(begin
-  (set-global 'button-level 0)
-  (rebuild-buttons)))
-
-; Build all the command buttons from scratch.
-(define (rebuild-buttons)
-  (remove-all-buttons)
-  ; FIXME: planned: make it possible to add to other panels
-  (if (selected-owned-by-player) (begin
-    ; draw some generic buttons
-    (if (= (get-global 'button-level) 0) (begin
-      (if (> (selected-get-speed) 0) (begin
-        (generic-movement-buttons)
-       (if (selected-mixed-units) (begin
-         ; attack/stand/patrol buttons for mixed selections
-          (generic-combat-buttons))
-         ; Uniform selection: draw the unit's own buttons
-         (selected-draw-buttons))))
-      (if (selected-is-building) (begin
-        ; there can be only one building selected
-        ; no common buttons should be here for now, 
-       ; "destroy building" or something could be added.
-        (add-button 'pos 7
-          'icon 'icon-move-peasant
-          'key "m" 'hint "SET ~!MOVE"
-          'action (lambda () (command-move)))
-        ;
-        ; Call the building's own button-draw hook
-        ;
-        (selected-draw-buttons)
-       ; FIXME: maybe non-buildings could be upgrading too
-       ; note: upgrade is both researching and changing unit type
-        (if (selected-is-upgrading) (begin
-         ; could be optimized by not calling (selected-draw-buttons)
-         (remove-all-buttons)
-          (add-button 'pos 9 'icon 'icon-cancel
-            'key "\033" 'hint "~<ESC~> CANCEL UPGRADE"
-            'action (lambda() (command-cancel-upgrade))))))))
-    (begin ; else: button level is not zero
-      ;
-      ; Generic cancel button to go back to button level 0
-      ;
-      (add-button 'pos 9 'icon 'icon-cancel
-        'key "\033" 'hint "~<ESC~> CANCEL"
-        'action (lambda()
-         (set-global 'button-level 0)
-         (rebuild-buttons)))
-      ;
-      ; Call the unit's own button-draw hook
-      ;
-      (selected-draw-buttons))))))
-; no command buttons for enemy units.
+;;     $Id: buttons.ccl,v 1.4 2003/10/07 13:28:00 martinxyz Exp $
 
+;; Load the buttons of all races
+(load "ccl/alliance/buttons.ccl" #f #t)
+(load "ccl/mythical/buttons.ccl" #f #t)
+
+;;----------------------------------------------------------------------------
+;;     Define unit-button.
+;;
+;;     (define-button 'pos n 'level n 'icon ident 'action name ['value value]
+;;             ['allowed check ['values]] 'key key 'hint hint 'for-unit units)
+;;
+
+;; neutral --------------------------------------------------------------------
+
+(define-button 'pos 1 'level 0 'icon 'icon-circle-of-power
+  'action 'cast-spell 'value 'spell-circle-of-power
+  'allowed 'check-true
+  'key "d" 'hint "SET ~!DESTINATION"
+  'for-unit '(unit-dark-portal))
+
+(define-button 'pos 2 'level 0 'icon 'icon-daemon
+  'action 'train-unit 'value 'unit-daemon
+  'key "d" 'hint "SUMMON ~!DAEMON"
+  'for-unit '(unit-dark-portal))
+
+;; general cancel button ------------------------------------------------------
+
+(define-button 'pos 9 'level 9 'icon 'icon-cancel
+  'action 'cancel
+  'key "\033" 'hint "~<ESC~> CANCEL"
+  'for-unit '(*))
+
+(define-button 'pos 9 'level 0 'icon 'icon-cancel
+  'action 'cancel-upgrade
+  'key "\033" 'hint "~<ESC~> CANCEL UPGRADE"
+  'for-unit '(cancel-upgrade))
+
+(define-button 'pos 9 'level 0 'icon 'icon-cancel
+  'action 'cancel-train-unit
+  'key "\033" 'hint "~<ESC~> CANCEL UNIT TRAINING"
+  'for-unit '(*))
+
+(define-button 'pos 9 'level 0 'icon 'icon-cancel
+  'action 'cancel-build
+  'key "\033" 'hint "~<ESC~> CANCEL CONSTRUCTION"
+  'for-unit '(cancel-build))
Index: demogame/ccl/mythical/units.ccl
diff -u demogame/ccl/mythical/units.ccl:1.9 demogame/ccl/mythical/units.ccl:1.10
--- demogame/ccl/mythical/units.ccl:1.9 Mon Oct  6 17:10:13 2003
+++ demogame/ccl/mythical/units.ccl     Tue Oct  7 09:28:00 2003
@@ -1,4 +1,4 @@
-;;       _________ __                 __                               
+;;       _________ __                 __
 ;;      /   _____//  |_____________ _/  |______     ____  __ __  ______
 ;;      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
 ;;      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
@@ -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.9 2003/10/06 21:10:13 martinxyz Exp $
+;;     $Id: units.ccl,v 1.10 2003/10/07 13:28:00 martinxyz Exp $
 
 ;;=============================================================================
 ;;     Define unit-types.
@@ -447,7 +447,7 @@
     dead "basic mythical voices dead"
     attack "beast-cry-attack"))
 
-(define-unit-type 'unit-mythical-oil-tanker 'name "Oil tanker"
+(define-unit-type 'unit-orc-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
@@ -1149,7 +1149,6 @@
   'explode-when-killed 'missile-explosion
   'type-land
   'building 
-  'builder-outside
   'can-store '(gold wood)
   'sounds '(
     selected "great-hall-selected"
@@ -1278,7 +1277,7 @@
     dead "building destroyed"
     attack "mythical-blacksmith-attack"))
 
-(define-unit-type 'unit-mythical-refinery 'name "Refinery"
+(define-unit-type 'unit-orc-refinery 'name "Refinery"
   'files '(tileset-summer "tilesets/summer/mythical/buildings/refinery.png"
     tileset-winter "tilesets/winter/mythical/buildings/refinery.png")
   'size '(96 96)
@@ -1490,7 +1489,6 @@
     dead "building destroyed"
     attack "mythical-cannon-tower-attack"))
 
-; FIXME: hardcoded magic unit type
 (define-unit-type 'unit-orc-wall 'name "Wall"
   'use 'unit-human-wall
   'size '(32 32)
Index: demogame/ccl/mythical/upgrade.ccl
diff -u demogame/ccl/mythical/upgrade.ccl:1.4 
demogame/ccl/mythical/upgrade.ccl:1.5
--- demogame/ccl/mythical/upgrade.ccl:1.4       Tue Sep 23 03:05:38 2003
+++ demogame/ccl/mythical/upgrade.ccl   Tue Oct  7 09:28:01 2003
@@ -26,19 +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: upgrade.ccl,v 1.4 2003/09/23 07:05:38 martinxyz Exp $
+;;     $Id: upgrade.ccl,v 1.5 2003/10/07 13:28:01 martinxyz Exp $
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;=============================================================================
-;;     Define the upgrades
-;;
-;;     (define-upgrade upgrade-name 'icon icon 'costs #( costs ))
-;;
-;;     upgrade-name    is the identifier of the upgrade
-;;     icon            is the icon shown for upgrading.
-;;     costs           are the costs of the upgrade
-;;                     (time gold wood oil ore stone coal)
-;;
 ;;     NOTE: Save can generate this table.
 
 (define-upgrade 'upgrade-battle-axe1 'icon 'icon-battle-axe2
@@ -95,17 +84,6 @@
 (define-upgrade 'upgrade-death-and-decay 'icon 'icon-death-and-decay
   'costs #(   200  2000     0     0     0     0     0))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;=============================================================================
-;;     Define the upgrade modifiers
-;;
-;;     (define-modifier upgrade-name '(modifiers) ... )
-;;
-;,     This does the real upgrades.
-;;
-;;     upgrade-name    is the identifier of the upgrade modifier
-;;     modifiers       is a pair of the effect name and value.
-;;
 ;;     NOTE: Save can generate this table.
 
 (define-modifier 'upgrade-battle-axe1
@@ -226,18 +204,7 @@
   '(apply-to unit-death-knight) '(apply-to unit-ice-bringer)
   '(apply-to unit-evil-knight))
 
-;;=============================================================================
-;;
-;;     Define which units/upgrades are allowed.
-;;             A: allowed, E: enabled, F: forbidden, R: researched
-;;
-;;     (define-allow unit/upgrade "AAAAAAAAAAAAAAAA")
-;;                                 ^- player 0 ... 15
-;;
 ;;     NOTE: Save can generate this table.
-;;
-
-;;     - units
 
 (define-allow 'unit-grunt                      "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-peon                       "AAAAAAAAAAAAAAAA")
@@ -248,42 +215,42 @@
 (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-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-beast-cry                  "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-orc-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-zeppelin                   "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-dragon                     "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-eye-of-vision              "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-quick-blade                "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-mythical-watch-tower       "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-ogre-mound                 "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-alchemist          "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-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-orc-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-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
@@ -315,20 +282,6 @@
 (define-allow 'upgrade-runes                   "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-death-and-decay         "AAAAAAAAAAAAAAAA")
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;=============================================================================
-;;     Define the dependencies
-;;
-;;     (define-dependency unit/upgrade
-;;             '( required-unit/upgrade count ... ) ['or ...] )
-;;
-;;     Define the dependencies of an unit or upgrade.
-;;
-;;     unit/upgrade    Dependencies for this unit or upgrade.
-;;     required-unit/upgrade   Units required to build or research.
-;;     count           Number of units required.
-;;     'or             Alternative set of units/upgrades required.
-;;
 ;;     NOTE: Save can generate this table.
 
 ;;     - mythical land fmythicales
@@ -364,7 +317,7 @@
   '(unit-troll-lumber-mill))
 (define-dependency 'unit-mythical-foundry
   '(unit-mythical-shipyard))
-(define-dependency 'unit-mythical-refinery
+(define-dependency 'unit-orc-refinery
   '(unit-mythical-shipyard))
 (define-dependency 'unit-stronghold
   '(unit-mythical-barracks))
Index: demogame/ccl/stratagus.ccl
diff -u demogame/ccl/stratagus.ccl:1.7 demogame/ccl/stratagus.ccl:1.8
--- demogame/ccl/stratagus.ccl:1.7      Mon Oct  6 17:10:13 2003
+++ demogame/ccl/stratagus.ccl  Tue Oct  7 09:28:00 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: stratagus.ccl,v 1.7 2003/10/06 21:10:13 martinxyz Exp $
+;;     $Id: stratagus.ccl,v 1.8 2003/10/07 13:28:00 martinxyz Exp $
 
 ;; For documentation see stratagus/doc/ccl/ccl.html
 
@@ -428,8 +428,8 @@
 (load "ccl/missiles.ccl" #f #t)
 (load "ccl/constructions.ccl" #f #t)
 (load "ccl/spells.ccl" #f #t)
-(load "ccl/buttons.ccl" #f #t)
 (load "ccl/units.ccl" #f #t)
+(load "ccl/buttons.ccl" #f #t)
 (load "ccl/upgrade.ccl" #f #t)
 (load "ccl/fonts.ccl" #f #t)
 (load "ccl/ui.ccl" #f #t)
Index: demogame/ccl/units.ccl
diff -u demogame/ccl/units.ccl:1.8 demogame/ccl/units.ccl:1.9
--- demogame/ccl/units.ccl:1.8  Mon Oct  6 17:10:13 2003
+++ demogame/ccl/units.ccl      Tue Oct  7 09:28:00 2003
@@ -1,4 +1,4 @@
-;;       _________ __                 __
+;;       _________ __                 __                               
 ;;      /   _____//  |_____________ _/  |______     ____  __ __  ______
 ;;      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
 ;;      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
@@ -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.8 2003/10/06 21:10:13 martinxyz Exp $
+;;     $Id: units.ccl,v 1.9 2003/10/07 13:28:00 martinxyz Exp $
 
 ;; Load the animations for the units.
 (load "ccl/anim.ccl" #f #t)
@@ -205,7 +205,8 @@
     attack "gold-mine-attack"))
 
 (define-unit-type 'unit-oil-patch 'name "Oil Patch"
-  'files '(tileset-summer "tilesets/summer/neutral/buildings/oil_patch.png")
+  'files '(tileset-summer
+  "tilesets/summer/neutral/buildings/oil_patch.png")
   'size '(96 96)
   'animations 'animations-building 'icon 'icon-oil-patch
   'speed 0
@@ -251,7 +252,8 @@
 
 (define-unit-type 'unit-dark-portal 'name "Dark Portal"
   'files '(tileset-summer "tilesets/summer/neutral/buildings/dark_portal.png"
-    tileset-winter "tilesets/winter/neutral/buildings/dark_portal.png")
+    tileset-winter
+  "tilesets/winter/neutral/buildings/dark_portal.png")
   'size '(128 128)
   'animations 'animations-building 'icon 'icon-dark-portal
   'costs '(time 100 gold 3000 wood 3000 oil 1000)
@@ -327,7 +329,8 @@
 (define-unit-type 'unit-destroyed-1x1-place 'name "Destroyed 1x1 Place"
   'files '(
     tileset-summer "tilesets/summer/neutral/buildings/small_destroyed_site.png"
-    tileset-winter 
"tilesets/winter/neutral/buildings/small_destroyed_site.png")
+    tileset-winter
+  "tilesets/winter/neutral/buildings/small_destroyed_site.png")
   'size '(32 32)
   'animations 'animations-destroyed-place 'icon 'icon-peasant
   'speed 0
@@ -344,7 +347,8 @@
 
 (define-unit-type 'unit-destroyed-2x2-place 'name "Destroyed 2x2 Place"
   'files '(tileset-summer 
"tilesets/summer/neutral/buildings/destroyed_site.png"
-    tileset-winter "tilesets/winter/neutral/buildings/destroyed_site.png")
+    tileset-winter
+  "tilesets/winter/neutral/buildings/destroyed_site.png")
   'size '(64 64)
   'animations 'animations-destroyed-place 'icon 'icon-peasant
   'speed 0
@@ -403,6 +407,7 @@
   'decay-rate 1
   'type-land
   'building
+  'revealer
   'detect-cloak
   'sounds '())
 




reply via email to

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