[Top][All Lists]
[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: |
Thu, 09 Oct 2003 09:52:31 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: demogame
Branch:
Changes by: Martin Renold <address@hidden> 03/10/09 09:52:28
Modified files:
ccl : editor.ccl icons.ccl sound.ccl spells.ccl
upgrade.ccl
ccl/mythical : buttons.ccl constructions.ccl units.ccl
upgrade.ccl
ccl/tilesets : winter.ccl
puds : default.pud.gz
scripts : overview.py
Added files:
scripts : garbagecollector.py
Removed files:
graphics/alliance/units: sniper-icon-rgb.png sniper.png
graphics/mythical/buildings: foundry_construction_site.png
refinery_construction_site.png
shipyard_construction_site.png
graphics/mythical/units: axethrower.png catapult.png
death_knight.png dragon.png
eye_of_vision.png goblin_sappers.png
juggernaught.png mythical_destroyer.png
ogre.png oil_tanker_empty.png
oil_tanker_full.png submarine.png
transport.png zeppelin.png
graphics/neutral/units: skeleton.png
graphics/tilesets/summer/mythical/buildings: alchemist.png
altar_of_storms.png
blacksmith.png
cannon_tower.png
dragon_roost.png
fortress.png
foundry.png
guard_tower.png
mythical_lumber_mill.png
ogre_mound.png
oil_platform.png
oil_well_construction_site.png
refinery.png
shipyard.png
stronghold.png
temple_of_the_damned.png
watch_tower.png
graphics/tilesets/winter/mythical/buildings: alchemist.png
altar_of_storms.png
blacksmith.png
cannon_tower.png
dragon_roost.png
fortress.png
foundry.png
foundry_construction_site.png
guard_tower.png
mythical_lumber_mill.png
ogre_mound.png
oil_platform.png
oil_well_construction_site.png
refinery.png
refinery_construction_site.png
shipyard.png
shipyard_construction_site.png
stronghold.png
temple_of_the_damned.png
watch_tower.png
graphics/tilesets/winter/terrain: winter.png
sounds/alliance: capture.wav.gz
sounds/alliance/units/peasant: work_complete.wav.gz
sounds/misc : click.wav.gz highclick.wav.gz
placement_error.wav.gz placement_success.wav.gz
sounds/missiles: axe_throw.wav.gz fist.wav.gz punch.wav.gz
sounds/mythical: capture.wav.gz
sounds/mythical/buildings: altar_of_storms.wav.gz
dragon_roost.wav.gz ogre_mound.wav.gz
temple_of_the_damned.wav.gz
sounds/mythical/ships: ready.wav.gz
sounds/mythical/ships/acknowledgement: 1.wav.gz 2.wav.gz
3.wav.gz
sounds/mythical/ships/annoyed: 1.wav.gz 2.wav.gz 3.wav.gz
sounds/mythical/ships/selected: 1.wav.gz 2.wav.gz 3.wav.gz
sounds/mythical/units/death_knight: ready.wav.gz
sounds/mythical/units/death_knight/acknowledgement: 1.wav.gz
2.wav.gz
3.wav.gz
sounds/mythical/units/death_knight/annoyed: 1.wav.gz 2.wav.gz
3.wav.gz
sounds/mythical/units/death_knight/selected: 1.wav.gz 2.wav.gz
sounds/mythical/units/dragon: ready.wav.gz
sounds/mythical/units/dragon/acknowledgement: 1.wav.gz 2.wav.gz
sounds/mythical/units/dragon/selected: 1.wav.gz
sounds/mythical/units/goblin_sappers: ready.wav.gz
sounds/mythical/units/goblin_sappers/acknowledgement: 1.wav.gz
2.wav.gz
3.wav.gz
4.wav.gz
sounds/mythical/units/goblin_sappers/annoyed: 1.wav.gz 2.wav.gz
3.wav.gz
sounds/mythical/units/goblin_sappers/selected: 1.wav.gz 2.wav.gz
3.wav.gz 4.wav.gz
sounds/mythical/units/ogre: ready.wav.gz
sounds/mythical/units/ogre/acknowledgement: 1.wav.gz 2.wav.gz
3.wav.gz
sounds/mythical/units/ogre/annoyed: 1.wav.gz 2.wav.gz 3.wav.gz
4.wav.gz 5.wav.gz
sounds/mythical/units/ogre/selected: 1.wav.gz 2.wav.gz 3.wav.gz
4.wav.gz
sounds/mythical/units/ogre-mage: ready.wav.gz
sounds/mythical/units/ogre-mage/acknowledgement: 1.wav.gz
2.wav.gz
3.wav.gz
sounds/mythical/units/ogre-mage/annoyed: 1.wav.gz 2.wav.gz
3.wav.gz
sounds/mythical/units/ogre-mage/selected: 1.wav.gz 2.wav.gz
3.wav.gz 4.wav.gz
sounds/mythical/units/zeppelin: ready.wav.gz
sounds/mythical/units/zeppelin/acknowledgement: 1.wav.gz
sounds/mythical/units/zeppelin/annoyed: 1.wav.gz 2.wav.gz
sounds/spells : touch_of_darkness.wav.gz unholy_armor.wav.gz
Log message:
stripped it down a bit
Patches:
Index: demogame/ccl/editor.ccl
diff -u demogame/ccl/editor.ccl:1.5 demogame/ccl/editor.ccl:1.6
--- demogame/ccl/editor.ccl:1.5 Wed Oct 8 12:47:47 2003
+++ demogame/ccl/editor.ccl Thu Oct 9 09:52:08 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.5 2003/10/08 16:47:47 martinxyz Exp $
+;; $Id: editor.ccl,v 1.6 2003/10/09 13:52:08 martinxyz Exp $
;; Set which icons to display
@@ -97,12 +97,6 @@
'unit-faun
'unit-grunt
- 'unit-ogre
- 'unit-ogre-mage
- 'unit-death-knight
-
-
- 'unit-eye-of-vision
'unit-great-hall
'unit-pig-farm
@@ -116,7 +110,6 @@
'unit-circle-of-power
'unit-runestone
- 'unit-skeleton
'unit-daemon
'unit-critter
Index: demogame/ccl/icons.ccl
diff -u demogame/ccl/icons.ccl:1.4 demogame/ccl/icons.ccl:1.5
--- demogame/ccl/icons.ccl:1.4 Wed Oct 8 12:47:47 2003
+++ demogame/ccl/icons.ccl Thu Oct 9 09:52:09 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.4 2003/10/08 16:47:47 martinxyz Exp $
+;; $Id: icons.ccl,v 1.5 2003/10/09 13:52:09 martinxyz Exp $
;; NOTE:
;; Splitting this file into races is a problem, because all
@@ -55,8 +55,7 @@
;; Summer Tileset
;;=============================================================================
-(define-icon 'icon-sniper 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(0 "alliance/units/sniper-icon.png"))
+
; FIXME: don't repeat filename and size
; could be done with a helper function
@@ -70,66 +69,51 @@
'size '(46 38) 'normal '(3 "tilesets/summer/icons.png"))
(define-icon 'icon-archer 'tileset 'tileset-summer
'size '(46 38) 'normal '(4 "tilesets/summer/icons.png"))
-(define-icon 'icon-axethrower 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(5 "tilesets/summer/icons.png"))
+
(define-icon 'icon-ranger 'tileset 'tileset-summer
'size '(46 38) 'normal '(6 "tilesets/summer/icons.png"))
-(define-icon 'icon-berserker 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(7 "tilesets/summer/icons.png"))
+
(define-icon 'icon-knight 'tileset 'tileset-summer
'size '(46 38) 'normal '(8 "tilesets/summer/icons.png"))
-(define-icon 'icon-ogre 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(9 "tilesets/summer/icons.png"))
+
(define-icon 'icon-paladin 'tileset 'tileset-summer
'size '(46 38) 'normal '(10 "tilesets/summer/icons.png"))
-(define-icon 'icon-ogre-mage 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(11 "tilesets/summer/icons.png"))
+
(define-icon 'icon-dwarves 'tileset 'tileset-summer
'size '(46 38) 'normal '(12 "tilesets/summer/icons.png"))
-(define-icon 'icon-goblin-sappers 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(13 "tilesets/summer/icons.png"))
+
(define-icon 'icon-mage 'tileset 'tileset-summer
'size '(46 38) 'normal '(14 "tilesets/summer/icons.png"))
-(define-icon 'icon-death-knight 'tileset 'tileset-summer
- '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-alliance-oil-tanker 'tileset 'tileset-summer
'size '(46 38) 'normal '(18 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-oil-tanker 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(19 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-transport 'tileset 'tileset-summer
'size '(46 38) 'normal '(20 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-transport 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(21 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-destroyer 'tileset 'tileset-summer
'size '(46 38) 'normal '(22 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-destroyer 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(23 "tilesets/summer/icons.png"))
+
(define-icon 'icon-battleship 'tileset 'tileset-summer
'size '(46 38) 'normal '(24 "tilesets/summer/icons.png"))
-(define-icon 'icon-ogre-juggernaught 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(25 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-submarine 'tileset 'tileset-summer
'size '(46 38) 'normal '(26 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-submarine 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(27 "tilesets/summer/icons.png"))
+
(define-icon 'icon-balloon 'tileset 'tileset-summer
'size '(46 38) 'normal '(28 "tilesets/summer/icons.png"))
-(define-icon 'icon-zeppelin 'tileset 'tileset-summer
- '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-wise-man 'tileset 'tileset-summer
'size '(46 38) 'normal '(32 "tilesets/summer/icons.png"))
-(define-icon 'icon-ice-bringer 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(33 "tilesets/summer/icons.png"))
+
(define-icon 'icon-man-of-light 'tileset 'tileset-summer
'size '(46 38) 'normal '(34 "tilesets/summer/icons.png"))
-(define-icon 'icon-sharp-axe 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(35 "tilesets/summer/icons.png"))
-(define-icon 'icon-double-head 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(36 "tilesets/summer/icons.png"))
+
+
(define-icon 'icon-daemon 'tileset 'tileset-summer
'size '(46 38) 'normal '(37 "tilesets/summer/icons.png"))
(define-icon 'icon-farm 'tileset 'tileset-summer
@@ -146,74 +130,57 @@
'size '(46 38) 'normal '(43 "tilesets/summer/icons.png"))
(define-icon 'icon-elven-lumber-mill 'tileset 'tileset-summer
'size '(46 38) 'normal '(44 "tilesets/summer/icons.png"))
-(define-icon 'icon-troll-lumber-mill 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(45 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-blacksmith 'tileset 'tileset-summer
'size '(46 38) 'normal '(46 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-blacksmith 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(47 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-shipyard 'tileset 'tileset-summer
'size '(46 38) 'normal '(48 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-shipyard 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(49 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-refinery 'tileset 'tileset-summer
'size '(46 38) 'normal '(50 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-refinery 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(51 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-foundry 'tileset 'tileset-summer
'size '(46 38) 'normal '(52 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-foundry 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(53 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-oil-platform 'tileset 'tileset-summer
'size '(46 38) 'normal '(54 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-oil-platform 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(55 "tilesets/summer/icons.png"))
+
(define-icon 'icon-stables 'tileset 'tileset-summer
'size '(46 38) 'normal '(56 "tilesets/summer/icons.png"))
-(define-icon 'icon-ogre-mound 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(57 "tilesets/summer/icons.png"))
+
(define-icon 'icon-inventor 'tileset 'tileset-summer
'size '(46 38) 'normal '(58 "tilesets/summer/icons.png"))
-(define-icon 'icon-alchemist 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(59 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-watch-tower 'tileset 'tileset-summer
'size '(46 38) 'normal '(60 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-watch-tower 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(61 "tilesets/summer/icons.png"))
+
(define-icon 'icon-church 'tileset 'tileset-summer
'size '(46 38) 'normal '(62 "tilesets/summer/icons.png"))
-(define-icon 'icon-altar-of-storms 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(63 "tilesets/summer/icons.png"))
+
(define-icon 'icon-mage-tower 'tileset 'tileset-summer
'size '(46 38) 'normal '(64 "tilesets/summer/icons.png"))
-(define-icon 'icon-temple-of-the-damned 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(65 "tilesets/summer/icons.png"))
+
(define-icon 'icon-keep 'tileset 'tileset-summer
'size '(46 38) 'normal '(66 "tilesets/summer/icons.png"))
-(define-icon 'icon-stronghold 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(67 "tilesets/summer/icons.png"))
+
(define-icon 'icon-castle-upgrade 'tileset 'tileset-summer
'size '(46 38) 'normal '(68 "tilesets/summer/icons.png"))
-(define-icon 'icon-fortress-upgrade 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(69 "tilesets/summer/icons.png"))
+
(define-icon 'icon-castle 'tileset 'tileset-summer
'size '(46 38) 'normal '(70 "tilesets/summer/icons.png"))
-(define-icon 'icon-fortress 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(71 "tilesets/summer/icons.png"))
+
(define-icon 'icon-gryphon-aviary 'tileset 'tileset-summer
'size '(46 38) 'normal '(72 "tilesets/summer/icons.png"))
-(define-icon 'icon-dragon-roost 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(73 "tilesets/summer/icons.png"))
+
(define-icon 'icon-gold-mine 'tileset 'tileset-summer
'size '(46 38) 'normal '(74 "tilesets/summer/icons.png"))
(define-icon 'icon-alliance-guard-tower 'tileset 'tileset-summer
'size '(46 38) 'normal '(75 "tilesets/summer/icons.png"))
(define-icon 'icon-alliance-cannon-tower 'tileset 'tileset-summer
'size '(46 38) 'normal '(76 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-guard-tower 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(77 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-cannon-tower 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(78 "tilesets/summer/icons.png"))
+
+
(define-icon 'icon-oil-patch 'tileset 'tileset-summer
'size '(46 38) 'normal '(79 "tilesets/summer/icons.png"))
(define-icon 'icon-dark-portal 'tileset 'tileset-summer
@@ -248,42 +215,31 @@
'size '(46 38) 'normal '(94 "tilesets/summer/icons.png"))
(define-icon 'icon-invisibility 'tileset 'tileset-summer
'size '(46 38) 'normal '(95 "tilesets/summer/icons.png"))
-(define-icon 'icon-haste 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(96 "tilesets/summer/icons.png"))
-(define-icon 'icon-runes 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(97 "tilesets/summer/icons.png"))
-(define-icon 'icon-unholy-armor 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(98 "tilesets/summer/icons.png"))
+
+
+
(define-icon 'icon-lightning 'tileset 'tileset-summer
'size '(46 38) 'normal '(99 "tilesets/summer/icons.png"))
(define-icon 'icon-flame-shield 'tileset 'tileset-summer
'size '(46 38) 'normal '(100 "tilesets/summer/icons.png"))
(define-icon 'icon-fireball 'tileset 'tileset-summer
'size '(46 38) 'normal '(101 "tilesets/summer/icons.png"))
-(define-icon 'icon-touch-of-darkness 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(102 "tilesets/summer/icons.png"))
-(define-icon 'icon-death-coil 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(103 "tilesets/summer/icons.png"))
-(define-icon 'icon-whirlwind 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(104 "tilesets/summer/icons.png"))
+
+
+
(define-icon 'icon-blizzard 'tileset 'tileset-summer
'size '(46 38) 'normal '(105 "tilesets/summer/icons.png"))
(define-icon 'icon-holy-vision 'tileset 'tileset-summer
'size '(46 38) 'normal '(106 "tilesets/summer/icons.png"))
(define-icon 'icon-heal 'tileset 'tileset-summer
'size '(46 38) 'normal '(107 "tilesets/summer/icons.png"))
-(define-icon 'icon-death-and-decay 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(108 "tilesets/summer/icons.png"))
-(define-icon 'icon-109 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(109 "tilesets/summer/icons.png"))
+
+
(define-icon 'icon-exorcism 'tileset 'tileset-summer
'size '(46 38) 'normal '(110 "tilesets/summer/icons.png"))
-(define-icon 'icon-eye-of-kilrogg 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(111 "tilesets/summer/icons.png"))
-(define-icon 'icon-bloodlust 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(112 "tilesets/summer/icons.png"))
-(define-icon 'icon-unknown113 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(113 "tilesets/summer/icons.png"))
+
+
+
(define-icon 'icon-skeleton 'tileset 'tileset-summer
'size '(46 38) 'normal '(114 "tilesets/summer/icons.png"))
(define-icon 'icon-critter 'tileset 'tileset-summer
@@ -296,42 +252,30 @@
'size '(46 38) 'normal '(118 "tilesets/summer/icons.png"))
(define-icon 'icon-battle-axe1 'tileset 'tileset-summer
'size '(46 38) 'normal '(119 "tilesets/summer/icons.png"))
-(define-icon 'icon-battle-axe2 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(120 "tilesets/summer/icons.png"))
-(define-icon 'icon-battle-axe3 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(121 "tilesets/summer/icons.png"))
-(define-icon 'icon-122 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(122 "tilesets/summer/icons.png"))
-(define-icon 'icon-123 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(123 "tilesets/summer/icons.png"))
+
+
+
+
(define-icon 'icon-arrow1 'tileset 'tileset-summer
'size '(46 38) 'normal '(124 "tilesets/summer/icons.png"))
(define-icon 'icon-arrow2 'tileset 'tileset-summer
'size '(46 38) 'normal '(125 "tilesets/summer/icons.png"))
(define-icon 'icon-arrow3 'tileset 'tileset-summer
'size '(46 38) 'normal '(126 "tilesets/summer/icons.png"))
-(define-icon 'icon-throwing-axe1 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(127 "tilesets/summer/icons.png"))
-(define-icon 'icon-throwing-axe2 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(128 "tilesets/summer/icons.png"))
-(define-icon 'icon-throwing-axe3 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(129 "tilesets/summer/icons.png"))
-(define-icon 'icon-horse1 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(130 "tilesets/summer/icons.png"))
-(define-icon 'icon-horse2 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(131 "tilesets/summer/icons.png"))
+
+
+
+
+
(define-icon 'icon-longbow 'tileset 'tileset-summer
'size '(46 38) 'normal '(132 "tilesets/summer/icons.png"))
(define-icon 'icon-ranger-scouting 'tileset 'tileset-summer
'size '(46 38) 'normal '(133 "tilesets/summer/icons.png"))
(define-icon 'icon-ranger-marksmanship 'tileset 'tileset-summer
'size '(46 38) 'normal '(134 "tilesets/summer/icons.png"))
-(define-icon 'icon-light-axes 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(135 "tilesets/summer/icons.png"))
-(define-icon 'icon-berserker-scouting 'tileset 'tileset-summer
- '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-ballista1 'tileset 'tileset-summer
'size '(46 38) 'normal '(140 "tilesets/summer/icons.png"))
(define-icon 'icon-ballista2 'tileset 'tileset-summer
@@ -346,40 +290,30 @@
'size '(46 38) 'normal '(145 "tilesets/summer/icons.png"))
(define-icon 'icon-alliance-ship-cannon3 'tileset 'tileset-summer
'size '(46 38) 'normal '(146 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-ship-cannon1 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(147 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-ship-cannon2 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(148 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-ship-cannon3 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(149 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-ship-armor1 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(150 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-ship-armor2 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(151 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-ship-armor3 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(152 "tilesets/summer/icons.png"))
+
+
+
+
+
+
(define-icon 'icon-alliance-ship-armor1 'tileset 'tileset-summer
'size '(46 38) 'normal '(153 "tilesets/summer/icons.png"))
(define-icon 'icon-alliance-ship-armor2 'tileset 'tileset-summer
'size '(46 38) 'normal '(154 "tilesets/summer/icons.png"))
(define-icon 'icon-alliance-ship-armor3 'tileset 'tileset-summer
'size '(46 38) 'normal '(155 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-ship-move 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(156 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-ship-move 'tileset 'tileset-summer
'size '(46 38) 'normal '(157 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-ship-return-oil 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(158 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-ship-return-oil 'tileset 'tileset-summer
'size '(46 38) 'normal '(159 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-ship-haul-oil 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(160 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-ship-haul-oil 'tileset 'tileset-summer
'size '(46 38) 'normal '(161 "tilesets/summer/icons.png"))
(define-icon 'icon-alliance-unload 'tileset 'tileset-summer
'size '(46 38) 'normal '(162 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-unload 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(163 "tilesets/summer/icons.png"))
+
(define-icon 'icon-alliance-shield1 'tileset 'tileset-summer
'size '(46 38) 'normal '(164 "tilesets/summer/icons.png"))
(define-icon 'icon-alliance-shield2 'tileset 'tileset-summer
@@ -388,26 +322,16 @@
'size '(46 38) 'normal '(166 "tilesets/summer/icons.png"))
(define-icon 'icon-mythical-shield1 'tileset 'tileset-summer
'size '(46 38) 'normal '(167 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-shield2 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(168 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-shield3 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(169 "tilesets/summer/icons.png"))
-(define-icon 'icon-170 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(170 "tilesets/summer/icons.png"))
-(define-icon 'icon-171 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(171 "tilesets/summer/icons.png"))
-(define-icon 'icon-172 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(172 "tilesets/summer/icons.png"))
-(define-icon 'icon-173 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(173 "tilesets/summer/icons.png"))
-(define-icon 'icon-174 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(174 "tilesets/summer/icons.png"))
-(define-icon 'icon-175 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(175 "tilesets/summer/icons.png"))
-(define-icon 'icon-176 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(176 "tilesets/summer/icons.png"))
-(define-icon 'icon-177 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(177 "tilesets/summer/icons.png"))
+
+
+
+
+
+
+
+
+
+
(define-icon 'icon-alliance-patrol-land 'tileset 'tileset-summer
'size '(46 38) 'normal '(178 "tilesets/summer/icons.png"))
(define-icon 'icon-mythical-patrol-land 'tileset 'tileset-summer
@@ -422,26 +346,20 @@
'size '(46 38) 'normal '(183 "tilesets/summer/icons.png"))
(define-icon 'icon-alliance-patrol-naval 'tileset 'tileset-summer
'size '(46 38) 'normal '(184 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-patrol-naval 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(185 "tilesets/summer/icons.png"))
-(define-icon 'icon-quick-blade 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(186 "tilesets/summer/icons.png"))
+
+
(define-icon 'icon-female-hero 'tileset 'tileset-summer
'size '(46 38) 'normal '(187 "tilesets/summer/icons.png"))
(define-icon 'icon-ugly-guy 'tileset 'tileset-summer
'size '(46 38) 'normal '(188 "tilesets/summer/icons.png"))
-(define-icon 'icon-evil-knight 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(189 "tilesets/summer/icons.png"))
-(define-icon 'icon-beast-cry 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(190 "tilesets/summer/icons.png"))
+
+
(define-icon 'icon-flying-angle 'tileset 'tileset-summer
'size '(46 38) 'normal '(191 "tilesets/summer/icons.png"))
-(define-icon 'icon-fire-breeze 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(192 "tilesets/summer/icons.png"))
+
(define-icon 'icon-white-mage 'tileset 'tileset-summer
'size '(46 38) 'normal '(193 "tilesets/summer/icons.png"))
-(define-icon 'icon-fad-man 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(194 "tilesets/summer/icons.png"))
+
(define-icon 'icon-knight-rider 'tileset 'tileset-summer
'size '(46 38) 'normal '(195 "tilesets/summer/icons.png"))
@@ -459,68 +377,52 @@
'size '(46 38) 'normal '(3 "tilesets/winter/icons.png"))
(define-icon 'icon-archer 'tileset 'tileset-winter
'size '(46 38) 'normal '(4 "tilesets/winter/icons.png"))
-(define-icon 'icon-axethrower 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(5 "tilesets/winter/icons.png"))
+
(define-icon 'icon-ranger 'tileset 'tileset-winter
'size '(46 38) 'normal '(6 "tilesets/winter/icons.png"))
-(define-icon 'icon-berserker 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(7 "tilesets/winter/icons.png"))
+
(define-icon 'icon-knight 'tileset 'tileset-winter
'size '(46 38) 'normal '(8 "tilesets/winter/icons.png"))
-(define-icon 'icon-ogre 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(9 "tilesets/winter/icons.png"))
+
(define-icon 'icon-paladin 'tileset 'tileset-winter
'size '(46 38) 'normal '(10 "tilesets/winter/icons.png"))
-(define-icon 'icon-ogre-mage 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(11 "tilesets/winter/icons.png"))
+
(define-icon 'icon-dwarves 'tileset 'tileset-winter
'size '(46 38) 'normal '(12 "tilesets/winter/icons.png"))
-(define-icon 'icon-goblin-sappers 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(13 "tilesets/winter/icons.png"))
+
(define-icon 'icon-mage 'tileset 'tileset-winter
'size '(46 38) 'normal '(14 "tilesets/winter/icons.png"))
-(define-icon 'icon-death-knight 'tileset 'tileset-winter
- '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-alliance-oil-tanker 'tileset 'tileset-winter
'size '(46 38) 'normal '(18 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-oil-tanker 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(19 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-transport 'tileset 'tileset-winter
'size '(46 38) 'normal '(20 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-transport 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(21 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-destroyer 'tileset 'tileset-winter
'size '(46 38) 'normal '(22 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-destroyer 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(23 "tilesets/winter/icons.png"))
+
(define-icon 'icon-battleship 'tileset 'tileset-winter
'size '(46 38) 'normal '(24 "tilesets/winter/icons.png"))
-(define-icon 'icon-ogre-juggernaught 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(25 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-submarine 'tileset 'tileset-winter
'size '(46 38) 'normal '(26 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-submarine 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(27 "tilesets/winter/icons.png"))
+
(define-icon 'icon-balloon 'tileset 'tileset-winter
'size '(46 38) 'normal '(28 "tilesets/winter/icons.png"))
-(define-icon 'icon-zeppelin 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(29 "tilesets/winter/icons.png"))
+
(define-icon 'icon-gryphon-rider 'tileset 'tileset-winter
'size '(46 38) 'normal '(30 "tilesets/winter/icons.png"))
-(define-icon 'icon-dragon 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(31 "tilesets/winter/icons.png"))
+
(define-icon 'icon-wise-man 'tileset 'tileset-winter
'size '(46 38) 'normal '(32 "tilesets/winter/icons.png"))
-(define-icon 'icon-ice-bringer 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(33 "tilesets/winter/icons.png"))
+
(define-icon 'icon-man-of-light 'tileset 'tileset-winter
'size '(46 38) 'normal '(34 "tilesets/winter/icons.png"))
-(define-icon 'icon-sharp-axe 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(35 "tilesets/winter/icons.png"))
-(define-icon 'icon-double-head 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(36 "tilesets/winter/icons.png"))
+
+
(define-icon 'icon-daemon 'tileset 'tileset-winter
'size '(46 38) 'normal '(37 "tilesets/winter/icons.png"))
(define-icon 'icon-farm 'tileset 'tileset-winter
@@ -537,74 +439,57 @@
'size '(46 38) 'normal '(43 "tilesets/winter/icons.png"))
(define-icon 'icon-elven-lumber-mill 'tileset 'tileset-winter
'size '(46 38) 'normal '(44 "tilesets/winter/icons.png"))
-(define-icon 'icon-troll-lumber-mill 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(45 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-blacksmith 'tileset 'tileset-winter
'size '(46 38) 'normal '(46 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-blacksmith 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(47 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-shipyard 'tileset 'tileset-winter
'size '(46 38) 'normal '(48 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-shipyard 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(49 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-refinery 'tileset 'tileset-winter
'size '(46 38) 'normal '(50 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-refinery 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(51 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-foundry 'tileset 'tileset-winter
'size '(46 38) 'normal '(52 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-foundry 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(53 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-oil-platform 'tileset 'tileset-winter
'size '(46 38) 'normal '(54 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-oil-platform 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(55 "tilesets/winter/icons.png"))
+
(define-icon 'icon-stables 'tileset 'tileset-winter
'size '(46 38) 'normal '(56 "tilesets/winter/icons.png"))
-(define-icon 'icon-ogre-mound 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(57 "tilesets/winter/icons.png"))
+
(define-icon 'icon-inventor 'tileset 'tileset-winter
'size '(46 38) 'normal '(58 "tilesets/winter/icons.png"))
-(define-icon 'icon-alchemist 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(59 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-watch-tower 'tileset 'tileset-winter
'size '(46 38) 'normal '(60 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-watch-tower 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(61 "tilesets/winter/icons.png"))
+
(define-icon 'icon-church 'tileset 'tileset-winter
'size '(46 38) 'normal '(62 "tilesets/winter/icons.png"))
-(define-icon 'icon-altar-of-storms 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(63 "tilesets/winter/icons.png"))
+
(define-icon 'icon-mage-tower 'tileset 'tileset-winter
'size '(46 38) 'normal '(64 "tilesets/winter/icons.png"))
-(define-icon 'icon-temple-of-the-damned 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(65 "tilesets/winter/icons.png"))
+
(define-icon 'icon-keep 'tileset 'tileset-winter
'size '(46 38) 'normal '(66 "tilesets/winter/icons.png"))
-(define-icon 'icon-stronghold 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(67 "tilesets/winter/icons.png"))
+
(define-icon 'icon-castle-upgrade 'tileset 'tileset-winter
'size '(46 38) 'normal '(68 "tilesets/winter/icons.png"))
-(define-icon 'icon-fortress-upgrade 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(69 "tilesets/winter/icons.png"))
+
(define-icon 'icon-castle 'tileset 'tileset-winter
'size '(46 38) 'normal '(70 "tilesets/winter/icons.png"))
-(define-icon 'icon-fortress 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(71 "tilesets/winter/icons.png"))
+
(define-icon 'icon-gryphon-aviary 'tileset 'tileset-winter
'size '(46 38) 'normal '(72 "tilesets/winter/icons.png"))
-(define-icon 'icon-dragon-roost 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(73 "tilesets/winter/icons.png"))
+
(define-icon 'icon-gold-mine 'tileset 'tileset-winter
'size '(46 38) 'normal '(74 "tilesets/winter/icons.png"))
(define-icon 'icon-alliance-guard-tower 'tileset 'tileset-winter
'size '(46 38) 'normal '(75 "tilesets/winter/icons.png"))
(define-icon 'icon-alliance-cannon-tower 'tileset 'tileset-winter
'size '(46 38) 'normal '(76 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-guard-tower 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(77 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-cannon-tower 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(78 "tilesets/winter/icons.png"))
+
+
(define-icon 'icon-oil-patch 'tileset 'tileset-winter
'size '(46 38) 'normal '(79 "tilesets/winter/icons.png"))
(define-icon 'icon-dark-portal 'tileset 'tileset-winter
@@ -639,42 +524,31 @@
'size '(46 38) 'normal '(94 "tilesets/winter/icons.png"))
(define-icon 'icon-invisibility 'tileset 'tileset-winter
'size '(46 38) 'normal '(95 "tilesets/winter/icons.png"))
-(define-icon 'icon-haste 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(96 "tilesets/winter/icons.png"))
-(define-icon 'icon-runes 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(97 "tilesets/winter/icons.png"))
-(define-icon 'icon-unholy-armor 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(98 "tilesets/winter/icons.png"))
+
+
+
(define-icon 'icon-lightning 'tileset 'tileset-winter
'size '(46 38) 'normal '(99 "tilesets/winter/icons.png"))
(define-icon 'icon-flame-shield 'tileset 'tileset-winter
'size '(46 38) 'normal '(100 "tilesets/winter/icons.png"))
(define-icon 'icon-fireball 'tileset 'tileset-winter
'size '(46 38) 'normal '(101 "tilesets/winter/icons.png"))
-(define-icon 'icon-touch-of-darkness 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(102 "tilesets/winter/icons.png"))
-(define-icon 'icon-death-coil 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(103 "tilesets/winter/icons.png"))
-(define-icon 'icon-whirlwind 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(104 "tilesets/winter/icons.png"))
+
+
+
(define-icon 'icon-blizzard 'tileset 'tileset-winter
'size '(46 38) 'normal '(105 "tilesets/winter/icons.png"))
(define-icon 'icon-holy-vision 'tileset 'tileset-winter
'size '(46 38) 'normal '(106 "tilesets/winter/icons.png"))
(define-icon 'icon-heal 'tileset 'tileset-winter
'size '(46 38) 'normal '(107 "tilesets/winter/icons.png"))
-(define-icon 'icon-death-and-decay 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(108 "tilesets/winter/icons.png"))
-(define-icon 'icon-109 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(109 "tilesets/winter/icons.png"))
+
+
(define-icon 'icon-exorcism 'tileset 'tileset-winter
'size '(46 38) 'normal '(110 "tilesets/winter/icons.png"))
-(define-icon 'icon-eye-of-kilrogg 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(111 "tilesets/winter/icons.png"))
-(define-icon 'icon-bloodlust 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(112 "tilesets/winter/icons.png"))
-(define-icon 'icon-unknown113 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(113 "tilesets/winter/icons.png"))
+
+
+
(define-icon 'icon-skeleton 'tileset 'tileset-winter
'size '(46 38) 'normal '(114 "tilesets/winter/icons.png"))
(define-icon 'icon-critter 'tileset 'tileset-winter
@@ -687,42 +561,30 @@
'size '(46 38) 'normal '(118 "tilesets/winter/icons.png"))
(define-icon 'icon-battle-axe1 'tileset 'tileset-winter
'size '(46 38) 'normal '(119 "tilesets/winter/icons.png"))
-(define-icon 'icon-battle-axe2 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(120 "tilesets/winter/icons.png"))
-(define-icon 'icon-battle-axe3 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(121 "tilesets/winter/icons.png"))
-(define-icon 'icon-122 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(122 "tilesets/winter/icons.png"))
-(define-icon 'icon-123 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(123 "tilesets/winter/icons.png"))
+
+
+
+
(define-icon 'icon-arrow1 'tileset 'tileset-winter
'size '(46 38) 'normal '(124 "tilesets/winter/icons.png"))
(define-icon 'icon-arrow2 'tileset 'tileset-winter
'size '(46 38) 'normal '(125 "tilesets/winter/icons.png"))
(define-icon 'icon-arrow3 'tileset 'tileset-winter
'size '(46 38) 'normal '(126 "tilesets/winter/icons.png"))
-(define-icon 'icon-throwing-axe1 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(127 "tilesets/winter/icons.png"))
-(define-icon 'icon-throwing-axe2 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(128 "tilesets/winter/icons.png"))
-(define-icon 'icon-throwing-axe3 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(129 "tilesets/winter/icons.png"))
-(define-icon 'icon-horse1 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(130 "tilesets/winter/icons.png"))
-(define-icon 'icon-horse2 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(131 "tilesets/winter/icons.png"))
+
+
+
+
+
(define-icon 'icon-longbow 'tileset 'tileset-winter
'size '(46 38) 'normal '(132 "tilesets/winter/icons.png"))
(define-icon 'icon-ranger-scouting 'tileset 'tileset-winter
'size '(46 38) 'normal '(133 "tilesets/winter/icons.png"))
(define-icon 'icon-ranger-marksmanship 'tileset 'tileset-winter
'size '(46 38) 'normal '(134 "tilesets/winter/icons.png"))
-(define-icon 'icon-light-axes 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(135 "tilesets/winter/icons.png"))
-(define-icon 'icon-berserker-scouting 'tileset 'tileset-winter
- '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-ballista1 'tileset 'tileset-winter
'size '(46 38) 'normal '(140 "tilesets/winter/icons.png"))
(define-icon 'icon-ballista2 'tileset 'tileset-winter
@@ -737,40 +599,30 @@
'size '(46 38) 'normal '(145 "tilesets/winter/icons.png"))
(define-icon 'icon-alliance-ship-cannon3 'tileset 'tileset-winter
'size '(46 38) 'normal '(146 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-ship-cannon1 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(147 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-ship-cannon2 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(148 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-ship-cannon3 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(149 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-ship-armor1 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(150 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-ship-armor2 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(151 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-ship-armor3 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(152 "tilesets/winter/icons.png"))
+
+
+
+
+
+
(define-icon 'icon-alliance-ship-armor1 'tileset 'tileset-winter
'size '(46 38) 'normal '(153 "tilesets/winter/icons.png"))
(define-icon 'icon-alliance-ship-armor2 'tileset 'tileset-winter
'size '(46 38) 'normal '(154 "tilesets/winter/icons.png"))
(define-icon 'icon-alliance-ship-armor3 'tileset 'tileset-winter
'size '(46 38) 'normal '(155 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-ship-move 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(156 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-ship-move 'tileset 'tileset-winter
'size '(46 38) 'normal '(157 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-ship-return-oil 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(158 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-ship-return-oil 'tileset 'tileset-winter
'size '(46 38) 'normal '(159 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-ship-haul-oil 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(160 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-ship-haul-oil 'tileset 'tileset-winter
'size '(46 38) 'normal '(161 "tilesets/winter/icons.png"))
(define-icon 'icon-alliance-unload 'tileset 'tileset-winter
'size '(46 38) 'normal '(162 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-unload 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(163 "tilesets/winter/icons.png"))
+
(define-icon 'icon-alliance-shield1 'tileset 'tileset-winter
'size '(46 38) 'normal '(164 "tilesets/winter/icons.png"))
(define-icon 'icon-alliance-shield2 'tileset 'tileset-winter
@@ -779,26 +631,16 @@
'size '(46 38) 'normal '(166 "tilesets/winter/icons.png"))
(define-icon 'icon-mythical-shield1 'tileset 'tileset-winter
'size '(46 38) 'normal '(167 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-shield2 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(168 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-shield3 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(169 "tilesets/winter/icons.png"))
-(define-icon 'icon-170 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(170 "tilesets/winter/icons.png"))
-(define-icon 'icon-171 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(171 "tilesets/winter/icons.png"))
-(define-icon 'icon-172 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(172 "tilesets/winter/icons.png"))
-(define-icon 'icon-173 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(173 "tilesets/winter/icons.png"))
-(define-icon 'icon-174 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(174 "tilesets/winter/icons.png"))
-(define-icon 'icon-175 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(175 "tilesets/winter/icons.png"))
-(define-icon 'icon-176 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(176 "tilesets/winter/icons.png"))
-(define-icon 'icon-177 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(177 "tilesets/winter/icons.png"))
+
+
+
+
+
+
+
+
+
+
(define-icon 'icon-alliance-patrol-land 'tileset 'tileset-winter
'size '(46 38) 'normal '(178 "tilesets/winter/icons.png"))
(define-icon 'icon-mythical-patrol-land 'tileset 'tileset-winter
@@ -813,26 +655,20 @@
'size '(46 38) 'normal '(183 "tilesets/winter/icons.png"))
(define-icon 'icon-alliance-patrol-naval 'tileset 'tileset-winter
'size '(46 38) 'normal '(184 "tilesets/winter/icons.png"))
-(define-icon 'icon-mythical-patrol-naval 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(185 "tilesets/winter/icons.png"))
-(define-icon 'icon-quick-blade 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(186 "tilesets/winter/icons.png"))
+
+
(define-icon 'icon-female-hero 'tileset 'tileset-winter
'size '(46 38) 'normal '(187 "tilesets/winter/icons.png"))
(define-icon 'icon-ugly-guy 'tileset 'tileset-winter
'size '(46 38) 'normal '(188 "tilesets/winter/icons.png"))
-(define-icon 'icon-evil-knight 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(189 "tilesets/winter/icons.png"))
-(define-icon 'icon-beast-cry 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(190 "tilesets/winter/icons.png"))
+
+
(define-icon 'icon-flying-angle 'tileset 'tileset-winter
'size '(46 38) 'normal '(191 "tilesets/winter/icons.png"))
-(define-icon 'icon-fire-breeze 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(192 "tilesets/winter/icons.png"))
+
(define-icon 'icon-white-mage 'tileset 'tileset-winter
'size '(46 38) 'normal '(193 "tilesets/winter/icons.png"))
-(define-icon 'icon-fad-man 'tileset 'tileset-winter
- 'size '(46 38) 'normal '(194 "tilesets/winter/icons.png"))
+
(define-icon 'icon-knight-rider 'tileset 'tileset-winter
'size '(46 38) 'normal '(195 "tilesets/winter/icons.png"))
Index: demogame/ccl/mythical/buttons.ccl
diff -u demogame/ccl/mythical/buttons.ccl:1.4
demogame/ccl/mythical/buttons.ccl:1.5
--- demogame/ccl/mythical/buttons.ccl:1.4 Wed Oct 8 12:47:47 2003
+++ demogame/ccl/mythical/buttons.ccl Thu Oct 9 09:52:10 2003
@@ -26,167 +26,44 @@
;; 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.4 2003/10/08 16:47:47 martinxyz Exp $
+;; $Id: buttons.ccl,v 1.5 2003/10/09 13:52:10 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-ogre-mage
- unit-faun
-
-
- unit-skeleton unit-eye-of-vision
- unit-death-knight
- mythical-group unit-daemon))
+ 'for-unit '(unit-grunt unit-faun mythical-group))
(define-button 'pos 2 'level 0 'icon 'icon-mythical-shield1
'action 'stop
'key "s" 'hint "~!STOP"
- '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-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-ogre-mage
-
- ))
+ 'for-unit '(unit-grunt mythical-group))
(define-button 'pos 3 'level 0 'icon 'icon-battle-axe1
'action 'attack
'key "a" 'hint "~!ATTACK"
- '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-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-ogre-mage
-
- ))
+ 'for-unit '(unit-grunt unit-faun mythical-group))
(define-button 'pos 4 'level 0 'icon 'icon-mythical-patrol-land
'action 'patrol
'key "p" 'hint "~!PATROL"
- 'for-unit '(unit-grunt unit-ogre unit-ogre-mage
- unit-skeleton mythical-group unit-daemon
- unit-eye-of-vision))
+ 'for-unit '(unit-grunt mythical-group))
(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-ogre-mage
-
-
- unit-skeleton
- mythical-group unit-daemon))
+ 'for-unit '(unit-grunt mythical-group))
(define-button 'pos 6 'level 0 'icon 'icon-mythical-attack-ground
'action 'attack-ground
'key "g" 'hint "ATTACK ~!GROUND"
- 'for-unit '( 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-ogre-mage
- unit-faun
-
-
- unit-skeleton unit-eye-of-vision
- mythical-group))
-
-;; ogre-mage specific actions -------------------------------------------------
-
-(define-button 'pos 7 'level 0 'icon 'icon-eye-of-kilrogg
- '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 ))
-
-(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 ))
-
-(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 ))
-
-;; 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 ))
-
-(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 ))
-
-(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 ))
-
-(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 ))
-
-(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 ))
-
-(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 ))
-
-(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 ))
+ 'for-unit '(unit-grunt unit-faun mythical-group))
;; faun specific actions ------------------------------------------------------
@@ -212,13 +89,6 @@
'key "b" 'hint "~!BUILD BASIC 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 '(
- )
- 'key "e" 'hint "BUILD SP~!ECIAL STRUCTURE"
- 'for-unit '(unit-faun))
-
;; simple buildings mythical
-------------------------------------------------------
(define-button 'pos 1 'level 1 'icon 'icon-pig-farm
@@ -236,48 +106,11 @@
'key "h" 'hint "BUILD GREAT ~!HALL"
'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"
- 'for-unit '(unit-faun))
-
-(define-button 'pos 8 'level 1 'icon 'icon-mythical-wall
- 'action 'build 'value 'unit-orc-wall
- 'allowed 'check-network
- 'key "w" 'hint "BUILD ~!WALL"
- 'for-unit '(unit-faun))
-
(define-button 'pos 9 'level 1 'icon 'icon-cancel
'action 'button 'value 0
'key "\033" 'hint "~<ESC~> CANCEL"
'for-unit '(unit-faun))
-;; mythical advanced buildings
-----------------------------------------------------
-
-(define-button 'pos 9 'level 2 'icon 'icon-cancel
- 'action 'button 'value 0
- 'key "\033" 'hint "~<ESC~> CANCEL"
- 'for-unit '(unit-faun))
-
-;; mythical special buildings
------------------------------------------------------
-
-(define-button 'pos 1 'level 3 'icon 'icon-dark-portal
- 'action 'build 'value 'unit-dark-portal
- 'allowed 'check-no-network
- 'key "p" 'hint "BUILD DARK ~!PORTAL"
- 'for-unit '(unit-faun))
-
-(define-button 'pos 2 'level 3 'icon 'icon-runestone
- 'action 'build 'value 'unit-runestone
- 'allowed 'check-no-network
- 'key "r" 'hint "BUILD ~!RUNESTONE"
- 'for-unit '(unit-faun))
-
-(define-button 'pos 9 'level 3 'icon 'icon-cancel
- 'action 'button 'value 0
- 'key "\033" 'hint "~<ESC~> CANCEL"
- 'for-unit '(unit-faun))
-
;; mythical buildings commands
-----------------------------------------------------
(define-button 'pos 1 'level 0 'icon 'icon-critter
@@ -289,51 +122,30 @@
'action 'train-unit 'value 'unit-faun
'allowed 'check-no-research
'key "p" 'hint "TRAIN ~!FAUN"
- 'for-unit '(unit-great-hall ))
+ '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 ))
+ '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-mythical-barracks -roost
- ))
+ 'for-unit '(unit-great-hall unit-mythical-barracks))
(define-button 'pos 8 'level 0 'icon 'icon-mythical-shield1
'action 'stop
'key "z" 'hint "SET ~!ZTOP"
- 'for-unit '(unit-great-hall
- unit-mythical-barracks -roost
- ))
+ 'for-unit '(unit-great-hall unit-mythical-barracks))
(define-button 'pos 9 'level 0 'icon 'icon-battle-axe1
'action 'attack
'key "e" 'hint "S~!ET ATTACK"
- 'for-unit '(unit-great-hall
- unit-mythical-barracks -roost
- ))
+ 'for-unit '(unit-great-hall unit-mythical-barracks))
(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 4 'level 0 'icon 'icon-ogre
- 'action 'train-unit 'value 'unit-ogre
- 'key "o" 'hint "TRAIN TWO-HEADED ~!OGRE"
- 'for-unit '(unit-mythical-barracks))
-
-(define-button 'pos 4 'level 0 'icon 'icon-ogre-mage
- 'action 'train-unit 'value 'unit-ogre-mage
- 'key "o" 'hint "TRAIN ~!OGRE MAGE"
- 'for-unit '(unit-mythical-barracks))
-
-(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))
Index: demogame/ccl/mythical/constructions.ccl
diff -u demogame/ccl/mythical/constructions.ccl:1.1
demogame/ccl/mythical/constructions.ccl:1.2
--- demogame/ccl/mythical/constructions.ccl:1.1 Sat Jul 26 09:39:14 2003
+++ demogame/ccl/mythical/constructions.ccl Thu Oct 9 09:52:10 2003
@@ -26,95 +26,6 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: constructions.ccl,v 1.1 2003/07/26 13:39:14 martinxyz Exp $
+;; $Id: constructions.ccl,v 1.2 2003/10/09 13:52:10 martinxyz Exp $
-
-;;=============================================================================
-;; Define a construction.
-;;
-;; (define-construction ident 'files '(tileset-name filename ..)
-;; 'size '(x y))
-
-(define-construction 'construction-mythical-shipyard
- 'file '(
- tileset summer
- file "mythical/buildings/shipyard_construction_site.png"
- size (96 96))
- 'file '(
- tileset winter
- file "tilesets/winter/mythical/buildings/shipyard_construction_site.png"
- size (96 96))
- 'constructions (list
- '(percent 0
- file construction
- frame 0)
- '(percent 25
- file construction
- frame 1)
- '(percent 50
- file main
- frame 1))
-)
-
-(define-construction 'construction-mythical-oil-well
- 'file '(
- tileset summer
- file "tilesets/summer/mythical/buildings/oil_well_construction_site.png"
- size (96 96))
- 'file '(
- tileset winter
- file "tilesets/winter/mythical/buildings/oil_well_construction_site.png"
- size (96 96))
- 'constructions (list
- '(percent 0
- file construction
- frame 0)
- '(percent 25
- file construction
- frame 1)
- '(percent 50
- file main
- frame 1))
-)
-
-(define-construction 'construction-mythical-refinery
- 'file '(
- tileset summer
- file "mythical/buildings/refinery_construction_site.png"
- size (96 96))
- 'file '(
- tileset winter
- file "tilesets/winter/mythical/buildings/refinery_construction_site.png"
- size (96 96))
- 'constructions (list
- '(percent 0
- file construction
- frame 0)
- '(percent 25
- file construction
- frame 1)
- '(percent 50
- file main
- frame 1))
-)
-
-(define-construction 'construction-mythical-foundry
- 'file '(
- tileset summer
- file "mythical/buildings/foundry_construction_site.png"
- size (96 96))
- 'file '(
- tileset winter
- file "tilesets/winter/mythical/buildings/foundry_construction_site.png"
- size (96 96))
- 'constructions (list
- '(percent 0
- file construction
- frame 0)
- '(percent 25
- file construction
- frame 1)
- '(percent 50
- file main
- frame 1))
-)
+;; no constructions
Index: demogame/ccl/mythical/units.ccl
diff -u demogame/ccl/mythical/units.ccl:1.13
demogame/ccl/mythical/units.ccl:1.14
--- demogame/ccl/mythical/units.ccl:1.13 Wed Oct 8 12:47:47 2003
+++ demogame/ccl/mythical/units.ccl Thu Oct 9 09:52:10 2003
@@ -26,11 +26,12 @@
;; 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.13 2003/10/08 16:47:47 martinxyz Exp $
+;; $Id: units.ccl,v 1.14 2003/10/09 13:52:10 martinxyz Exp $
;;=============================================================================
;; Define unit-types.
;;
+
(define-unit-type 'unit-grunt 'name "Black_Knight"
'files '(tileset-summer "mythical/units/black_knight.png")
'size '(72 72)
@@ -110,170 +111,6 @@
dead "basic mythical voices dead"
attack "faun-attack"))
-(define-unit-type 'unit-ogre 'name "Ogre"
- 'files '(tileset-summer "mythical/units/ogre.png")
- 'size '(72 72)
- 'animations 'animations-ogre 'icon 'icon-ogre
- 'costs '(time 90 gold 800 wood 100)
- 'speed 13
- 'hit-points 90
- 'draw-level 40
- 'tile-size '(1 1) 'box-size '(42 42)
- 'sight-range 4 'computer-reaction-range 6 'person-reaction-range 4
- 'armor 4 'basic-damage 8 'piercing-damage 4 'missile 'missile-none
- 'max-attack-range 1
- 'weapons-upgradable 1 'armor-upgradable 1
- 'priority 63
- 'points 100
- 'demand 1
- 'corpse '(unit-dead-body 0)
- 'type-land
- 'right-attack
- 'can-attack
- 'can-target-land
- 'land-unit
- 'organic
- 'selectable-by-rectangle
- 'sounds '(
- selected "ogre-selected"
- acknowledge "ogre-acknowledge"
- ready "ogre-ready"
- help "basic mythical voices help 1"
- dead "basic mythical voices dead"
- attack "ogre-attack"))
-
-(define-unit-type 'unit-death-knight 'name "Death Knight"
- 'files '(tileset-summer "mythical/units/death_knight.png")
- 'size '(72 72)
- 'animations 'animations-death-knight 'icon 'icon-death-knight
- 'costs '(time 120 gold 1200)
- 'speed 8
- 'hit-points 60
- '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
- 'basic-damage 0 'piercing-damage 9 'missile 'missile-touch-of-death
- 'max-attack-range 3
- 'priority 70
- 'points 100
- 'demand 1
- 'type-land
- 'right-attack
- 'can-attack
- 'can-target-land 'can-target-sea 'can-target-air
- 'can-cast-spell '(
- spell-death-coil
- spell-haste
- spell-raise-dead
- spell-whirlwind
- spell-unholy-armor
- spell-death-and-decay)
- 'land-unit
- 'coward
- 'isundead
- 'organic
- 'selectable-by-rectangle
- 'sounds '(
- selected "death-knight-selected"
- acknowledge "death-knight-acknowledge"
- ready "death-knight-ready"
- help "basic mythical voices help 1"
- dead "basic mythical voices dead"
- attack "death-knight-attack"))
-
-(define-unit-type 'unit-ogre-mage 'name "Ogre Mage"
- 'use 'unit-ogre
- 'size '(72 72)
- 'animations 'animations-ogre 'icon 'icon-ogre-mage
- 'costs '(time 90 gold 800 wood 100)
- 'speed 13
- 'hit-points 90
- 'draw-level 40
- 'max-mana 255
- 'tile-size '(1 1) 'box-size '(42 42)
- 'sight-range 5 'computer-reaction-range 7 'person-reaction-range 5
- 'armor 4 'basic-damage 8 'piercing-damage 4 'missile 'missile-none
- 'max-attack-range 1
- 'weapons-upgradable 1 'armor-upgradable 1
- 'priority 65
- 'points 110
- 'demand 1
- 'corpse '(unit-dead-body 0)
- 'type-land
- 'right-attack
- 'can-attack
- 'can-target-land
- 'can-cast-spell '(spell-eye-of-vision spell-runes spell-bloodlust)
- 'land-unit
- 'organic
- 'selectable-by-rectangle
- 'sounds '(
- selected "ogre-mage-selected"
- acknowledge "ogre-mage-acknowledge"
- ready "ogre-mage-ready"
- help "basic mythical voices help 1"
- dead "basic mythical voices dead"
- attack "ogre-mage-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-skeleton 'name "Skeleton"
- 'files '(tileset-summer "neutral/units/skeleton.png")
- 'size '(56 56)
- 'animations 'animations-skeleton 'icon 'icon-skeleton
- 'speed 8
- 'hit-points 40
- 'draw-level 40
- 'tile-size '(1 1) 'box-size '(31 31)
- 'sight-range 3 'computer-reaction-range 4 'person-reaction-range 2
- 'basic-damage 6 'piercing-damage 3 'missile 'missile-none
- 'max-attack-range 1
- 'priority 55
- 'decay-rate 100
- 'demand 1
- 'type-land
- 'right-attack
- 'can-attack
- 'can-target-land
- 'land-unit
- 'isundead
- 'organic
- 'selectable-by-rectangle
- 'sounds '(
- selected "skeleton-selected"
- acknowledge "skeleton-acknowledge"
- ready "skeleton-ready"
- help "basic mythical voices help 1"
- dead "basic mythical voices dead"
- attack "skeleton-attack"))
-
(define-unit-type 'unit-pig-farm 'name "Pig Farm"
'files '(tileset-summer "tilesets/summer/mythical/buildings/farm.png"
tileset-winter "tilesets/winter/mythical/buildings/farm.png")
@@ -333,37 +170,6 @@
dead "building destroyed"
attack "mythical-barracks-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")
- 'size '(64 64)
- 'animations 'animations-building 'icon 'icon-mythical-watch-tower
- 'costs '(time 60 gold 550 wood 200)
- 'repair-hp 4
- 'repair-costs '(gold 1 wood 1)
- 'construction 'construction-land
- 'speed 0
- 'hit-points 100
- 'draw-level 20
- 'tile-size '(2 2) 'box-size '(63 63)
- 'sight-range 9
- 'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
- 'priority 55 'annoy-computer-factor 50
- 'points 95
- 'corpse '(unit-destroyed-2x2-place 0)
- 'explode-when-killed 'missile-explosion
- 'type-land
- 'can-target-land 'can-target-sea 'can-target-air
- 'building
- 'detect-cloak
- 'sounds '(
- selected "mythical-watch-tower-selected"
- acknowledge "mythical-watch-tower-acknowledge"
- ready "mythical-watch-tower-ready"
- help "basic mythical voices help 2"
- dead "building destroyed"
- attack "mythical-watch-tower-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")
@@ -416,39 +222,6 @@
dead "building destroyed"
attack "mythical-start-location-attack"))
-(define-unit-type 'unit-mythical-guard-tower 'name "Guard Tower"
- 'files '(tileset-summer "tilesets/summer/mythical/buildings/guard_tower.png"
- tileset-winter "tilesets/winter/mythical/buildings/guard_tower.png")
- 'size '(64 64)
- 'animations 'animations-alliance-guard-tower 'icon 'icon-mythical-guard-tower
- 'costs '(time 140 gold 500 wood 150)
- 'repair-hp 4
- 'repair-costs '(gold 1 wood 1)
- 'construction 'construction-land
- 'speed 0
- 'hit-points 130
- 'draw-level 40
- 'tile-size '(2 2) 'box-size '(63 63)
- 'sight-range 9 'computer-reaction-range 6 'person-reaction-range 6
- 'armor 20 'basic-damage 4 'piercing-damage 12 'missile 'missile-arrow
- 'max-attack-range 6
- 'priority 40 'annoy-computer-factor 50
- 'points 200
- 'corpse '(unit-destroyed-2x2-place 0)
- 'explode-when-killed 'missile-explosion
- 'type-land
- 'can-attack
- 'can-target-land 'can-target-sea 'can-target-air
- 'building
- 'detect-cloak
- 'sounds '(
- selected "mythical-guard-tower-selected"
- acknowledge "mythical-guard-tower-acknowledge"
- ready "mythical-guard-tower-ready"
- help "basic mythical voices help 2"
- dead "building destroyed"
- attack "mythical-guard-tower-attack"))
-
(define-unit-type 'unit-orc-wall 'name "Wall"
'use 'unit-human-wall
'size '(32 32)
@@ -474,3 +247,4 @@
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.8
demogame/ccl/mythical/upgrade.ccl:1.9
--- demogame/ccl/mythical/upgrade.ccl:1.8 Wed Oct 8 12:47:48 2003
+++ demogame/ccl/mythical/upgrade.ccl Thu Oct 9 09:52:10 2003
@@ -26,22 +26,16 @@
;; 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.8 2003/10/08 16:47:48 martinxyz Exp $
+;; $Id: upgrade.ccl,v 1.9 2003/10/09 13:52:10 martinxyz Exp $
;; NOTE: Save can generate this table.
(define-allow 'unit-grunt "AAAAAAAAAAAAAAAA")
(define-allow 'unit-faun "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-ogre "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-death-knight "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-ogre-mage "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-eye-of-vision "AAAAAAAAAAAAAAAA")
(define-allow 'unit-pig-farm "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-barracks "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-watch-tower "AAAAAAAAAAAAAAAA")
(define-allow 'unit-great-hall "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-start-location "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-guard-tower "AAAAAAAAAAAAAAAA")
(define-allow 'unit-orc-wall "AAAAAAAAAAAAAAAA")
;; No upgrades.
Index: demogame/ccl/sound.ccl
diff -u demogame/ccl/sound.ccl:1.5 demogame/ccl/sound.ccl:1.6
--- demogame/ccl/sound.ccl:1.5 Wed Oct 8 12:47:47 2003
+++ demogame/ccl/sound.ccl Thu Oct 9 09:52:09 2003
@@ -26,9 +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.5 2003/10/08 16:47:47 martinxyz Exp $
-
-(if (with-sound) (begin
+;; $Id: sound.ccl,v 1.6 2003/10/09 13:52:09 martinxyz Exp $
;; Uncomment this to enable threaded sound
;(sound-thread)
@@ -110,25 +108,17 @@
(make-sound "basic mythical voices dead" "mythical/basic_voices/dead.wav")
;;----------------------------------------------------------------------------
-;; Define simple mythical building.
-;;
-
-;;----------------------------------------------------------------------------
;; Define simple misc sounds.
;;
(make-sound "building construction" "misc/building_construction.wav")
(make-sound "ship sinking" "ships/sinking.wav")
-(make-sound "catapult-ballista movement"
- "units/catapult-ballista/acknowledgement/1.wav")
+(make-sound "catapult-ballista movement"
"units/catapult-ballista/acknowledgement/1.wav")
;; building selection sounds
(make-sound "blacksmith" "buildings/blacksmith.wav")
(make-sound "church-selected" "alliance/buildings/church.wav")
-(make-sound "altar-of-storms-selected"
"mythical/buildings/altar_of_storms.wav")
(make-sound "stables-selected" "alliance/buildings/stables.wav")
-(make-sound "ogre-mound-selected" "mythical/buildings/ogre_mound.wav")
(make-sound "farm-selected" "alliance/buildings/farm.wav")
-(make-sound "pig-farm-selected" "mythical/buildings/pig_farm.wav")
(make-sound "gold-mine-selected" "neutral/buildings/gold_mine.wav")
(make-sound "shipyard" "buildings/shipyard.wav")
(make-sound "oil platform" "buildings/oil_platform.wav")
@@ -137,57 +127,31 @@
(make-sound "transport docking" "misc/transport_docking.wav")
(make-sound "burning" "misc/burning.wav")
(make-sound "gryphon-aviary-selected" "alliance/buildings/gryphon_aviary.wav")
-(make-sound "dragon-roost-selected" "mythical/buildings/dragon_roost.wav")
(make-sound "foundry" "buildings/foundry.wav")
-(make-sound "gnomish-inventor-selected"
"alliance/buildings/gnomish_inventor.wav")
-(make-sound "goblin-alchemist-selected"
"mythical/buildings/goblin_alchemist.wav")
(make-sound "mage-tower-selected" "alliance/buildings/mage_tower.wav")
-(make-sound "temple-of-the-damned-selected"
- "mythical/buildings/temple_of_the_damned.wav")
-(make-sound "capture (alliance)" "alliance/capture.wav")
-(make-sound "capture (mythical)" "mythical/capture.wav")
-(make-sound "rescue (alliance)" "alliance/rescue.wav")
-(make-sound "rescue (mythical)" "mythical/rescue.wav")
+
+ ;; spells
(make-sound "bloodlust" "spells/bloodlust.wav")
(make-sound "death and decay" "spells/death_and_decay.wav")
(make-sound "death coil" "spells/death_coil.wav")
-(make-sound "exmythicalism" "spells/exmythicalism.wav")
(make-sound "flame shield" "spells/flame_shield.wav")
(make-sound "haste" "spells/haste.wav")
(make-sound "healing" "spells/healing.wav")
(make-sound "holy vision" "spells/holy_vision.wav")
(make-sound "blizzard" "spells/blizzard.wav")
(make-sound "invisibility" "spells/invisibility.wav")
-(make-sound "eye of vision" "spells/eye_of_kilrogg.wav")
(make-sound "polymorph" "spells/polymorph.wav")
(make-sound "slow" "spells/slow.wav")
-(make-sound "unholy armour" "spells/unholy_armor.wav")
(make-sound "whirlwind" "spells/whirlwind.wav")
;; ready sounds
(make-sound "faun-ready" "mythical/faun/ready.wav")
-(make-sound "death-knight-ready" "mythical/units/death_knight/ready.wav")
-(make-sound "dwarves-ready"
"alliance/units/dwarven_demolition_squad/ready.wav")
-(make-sound "elven archer-ranger ready"
- "alliance/units/elven_archer-ranger/ready.wav")
-(make-sound "gnomish-flying-machine-ready"
- "alliance/units/gnomish_flying_machine/ready.wav")
-(make-sound "goblin-sappers-ready" "mythical/units/goblin_sappers/ready.wav")
-(make-sound "zeppelin-ready" "mythical/units/zeppelin/ready.wav")
(make-sound "knight-ready" "alliance/units/knight/ready.wav")
(make-sound "paladin-ready" "alliance/units/paladin/ready.wav")
-(make-sound "ogre-ready" "mythical/units/ogre/ready.wav")
-(make-sound "ogre-mage-ready" "mythical/units/ogre-mage/ready.wav")
(make-sound "ships alliance ready" "alliance/ships/ready.wav")
-(make-sound "ships mythical ready" "mythical/ships/ready.wav")
-(make-sound "troll axethrower-berserker ready"
- "mythical/units/troll_axethrower-berserker/ready.wav")
(make-sound "mage-ready" "alliance/units/mage/ready.wav")
(make-sound "peasant-ready" "alliance/units/peasant/ready.wav")
-(make-sound "dragon-ready" "mythical/units/dragon/ready.wav")
- ;;------------------------------------------------------------------------
;; selection sounds
-(make-sound "dragon-selected" "mythical/units/dragon/selected/1.wav")
(make-sound "gryphon-rider-selected"
"alliance/units/gryphon_rider/selected/1.wav")
(make-sound "sheep selected" "neutral/units/sheep/selected/1.wav")
(make-sound "seal selected" "neutral/units/seal/selected/1.wav")
@@ -199,19 +163,15 @@
(make-sound "pig annoyed" "neutral/units/pig/annoyed/1.wav")
(make-sound "warthog annoyed" "neutral/units/warthog/annoyed/1.wav")
- ;;------------------------------------------------------------------------
;; attack sounds
(make-sound "catapult-ballista attack" "missiles/catapult-ballista_attack.wav")
-(make-sound "punch" "missiles/punch.wav")
(make-sound "fireball hit" "missiles/fireball_hit.wav")
(make-sound "fireball throw" "missiles/fireball_throw.wav")
(make-sound "bow throw" "missiles/bow_throw.wav")
(make-sound "bow hit" "missiles/bow_hit.wav")
-(make-sound "axe throw" "missiles/axe_throw.wav")
-(make-sound "fist" "missiles/fist.wav")
(make-sound "peasant attack" "alliance/units/peasant/attack.wav")
(make-sound "lightning" "spells/lightning.wav")
-(make-sound "touch of darkness" "spells/touch_of_darkness.wav")
+
;;----------------------------------------------------------------------------
;; Define sound groups.
@@ -238,106 +198,24 @@
"alliance/units/knight/acknowledgement/2.wav"
"alliance/units/knight/acknowledgement/3.wav"
"alliance/units/knight/acknowledgement/4.wav"))
-(make-sound "ogre-acknowledge"
- (list "mythical/units/ogre/acknowledgement/1.wav"
- "mythical/units/ogre/acknowledgement/2.wav"
- "mythical/units/ogre/acknowledgement/3.wav"))
-(make-sound "elven archer-ranger acknowledge"
- (list "alliance/units/elven_archer-ranger/acknowledgement/1.wav"
- "alliance/units/elven_archer-ranger/acknowledgement/2.wav"
- "alliance/units/elven_archer-ranger/acknowledgement/3.wav"
- "alliance/units/elven_archer-ranger/acknowledgement/4.wav"))
-(make-sound "troll axethrower-berserker acknowledge"
- (list "mythical/units/troll_axethrower-berserker/acknowledgement/1.wav"
- "mythical/units/troll_axethrower-berserker/acknowledgement/2.wav"
- "mythical/units/troll_axethrower-berserker/acknowledgement/3.wav"))
(make-sound "mage-acknowledge"
(list "alliance/units/mage/acknowledgement/1.wav"
"alliance/units/mage/acknowledgement/2.wav"
"alliance/units/mage/acknowledgement/3.wav"))
-(make-sound "death-knight-acknowledge"
- (list "mythical/units/death_knight/acknowledgement/1.wav"
- "mythical/units/death_knight/acknowledgement/2.wav"
- "mythical/units/death_knight/acknowledgement/3.wav"))
(make-sound "paladin-acknowledge"
(list "alliance/units/paladin/acknowledgement/1.wav"
"alliance/units/paladin/acknowledgement/2.wav"
"alliance/units/paladin/acknowledgement/3.wav"
"alliance/units/paladin/acknowledgement/4.wav"))
-(make-sound "ogre-mage-acknowledge"
- (list "mythical/units/ogre-mage/acknowledgement/1.wav"
- "mythical/units/ogre-mage/acknowledgement/2.wav"
- "mythical/units/ogre-mage/acknowledgement/3.wav"))
-(make-sound "dwarves-acknowledge"
- (list "alliance/units/dwarven_demolition_squad/acknowledgement/1.wav"
- "alliance/units/dwarven_demolition_squad/acknowledgement/2.wav"
- "alliance/units/dwarven_demolition_squad/acknowledgement/3.wav"
- "alliance/units/dwarven_demolition_squad/acknowledgement/4.wav"
- "alliance/units/dwarven_demolition_squad/acknowledgement/5.wav"))
-(make-sound "goblin-sappers-acknowledge"
- (list "mythical/units/goblin_sappers/acknowledgement/1.wav"
- "mythical/units/goblin_sappers/acknowledgement/2.wav"
- "mythical/units/goblin_sappers/acknowledgement/3.wav"
- "mythical/units/goblin_sappers/acknowledgement/4.wav"))
-(make-sound "alleria-acknowledge"
- (list "alliance/units/alleria/acknowledgement/1.wav"
- "alliance/units/alleria/acknowledgement/2.wav"
- "alliance/units/alleria/acknowledgement/3.wav"))
-(make-sound "teron-gorefiend-acknowledge"
- (list "mythical/units/teron_gorefiend/acknowledgement/1.wav"
- "mythical/units/teron_gorefiend/acknowledgement/2.wav"
- "mythical/units/teron_gorefiend/acknowledgement/3.wav"))
-(make-sound "kurdan-and-sky-ree-acknowledge"
- (list "alliance/units/kurdan/acknowledgement/1.wav"
- "alliance/units/kurdan/acknowledgement/2.wav"
- "alliance/units/kurdan/acknowledgement/3.wav"))
-(make-sound "dentarg-acknowledge"
- (list "mythical/units/dentarg/acknowledgement/1.wav"
- "mythical/units/dentarg/acknowledgement/2.wav"
- "mythical/units/dentarg/acknowledgement/3.wav"))
-(make-sound "khadgar-acknowledge"
- (list "alliance/units/khadgar/acknowledgement/1.wav"
- "alliance/units/khadgar/acknowledgement/2.wav"
- "alliance/units/khadgar/acknowledgement/3.wav"))
-(make-sound "grom-hellscream-acknowledge"
- (list "mythical/units/grom_hellscream/acknowledgement/1.wav"
- "mythical/units/grom_hellscream/acknowledgement/2.wav"
- "mythical/units/grom_hellscream/acknowledgement/3.wav"))
(make-sound "tanker acknowledge"
(list "ships/tanker/acknowledgement/1.wav"))
(make-sound "ships alliance acknowledge"
(list "alliance/ships/acknowledgement/1.wav"
"alliance/ships/acknowledgement/2.wav"
"alliance/ships/acknowledgement/3.wav"))
-(make-sound "ships mythical acknowledge"
- (list "mythical/ships/acknowledgement/1.wav"
- "mythical/ships/acknowledgement/2.wav"
- "mythical/ships/acknowledgement/3.wav"))
-(make-sound "deathwing-acknowledge"
- (list "mythical/units/deathwing/acknowledgement/1.wav"
- "mythical/units/deathwing/acknowledgement/2.wav"
- "mythical/units/deathwing/acknowledgement/3.wav"))
-(make-sound "gnomish-flying-machine-acknowledge"
- (list "alliance/units/gnomish_flying_machine/acknowledgement/1.wav"))
-(make-sound "zeppelin-acknowledge"
- (list "mythical/units/zeppelin/acknowledgement/1.wav"))
(make-sound "gryphon-rider-acknowledge"
(list "alliance/units/gryphon_rider/acknowledgement/2.wav"))
-(make-sound "dragon-acknowledge"
- (list "mythical/units/dragon/acknowledgement/1.wav"
- "mythical/units/dragon/acknowledgement/2.wav"))
-(make-sound "turalyon-acknowledge"
- (list "alliance/units/turalyon/acknowledgement/1.wav"
- "alliance/units/turalyon/acknowledgement/2.wav"
- "alliance/units/turalyon/acknowledgement/3.wav"))
-(make-sound "danath-acknowledge"
- (list "alliance/units/danath/acknowledgement/1.wav"
- "alliance/units/danath/acknowledgement/2.wav"
- "alliance/units/danath/acknowledgement/3.wav"))
-(make-sound "korgath-bladefist-acknowledge"
- (list "mythical/units/korgath_bladefist/acknowledgement/1.wav"
- "mythical/units/korgath_bladefist/acknowledgement/2.wav"
- "mythical/units/korgath_bladefist/acknowledgement/3.wav"))
+
;;
;; Selection sounds -----------------------------------------------------
;;
@@ -355,22 +233,6 @@
"mythical/basic_voices/selected/4.wav"
"mythical/basic_voices/selected/5.wav"
"mythical/basic_voices/selected/6.wav"))
-(make-sound "death knight selected"
- (list "mythical/units/death_knight/selected/1.wav"
- "mythical/units/death_knight/selected/2.wav"))
-(make-sound "dwarven demolition squad selected"
- (list "alliance/units/dwarven_demolition_squad/selected/1.wav"
- "alliance/units/dwarven_demolition_squad/selected/2.wav"))
-(make-sound "elven archer-ranger selected"
- (list "alliance/units/elven_archer-ranger/selected/1.wav"
- "alliance/units/elven_archer-ranger/selected/2.wav"
- "alliance/units/elven_archer-ranger/selected/3.wav"
- "alliance/units/elven_archer-ranger/selected/4.wav"))
-(make-sound "goblin sappers selected"
- (list "mythical/units/goblin_sappers/selected/1.wav"
- "mythical/units/goblin_sappers/selected/2.wav"
- "mythical/units/goblin_sappers/selected/3.wav"
- "mythical/units/goblin_sappers/selected/4.wav"))
(make-sound "knight selected"
(list "alliance/units/knight/selected/1.wav"
"alliance/units/knight/selected/2.wav"
@@ -381,28 +243,10 @@
"alliance/units/paladin/selected/2.wav"
"alliance/units/paladin/selected/3.wav"
"alliance/units/paladin/selected/4.wav"))
-(make-sound "ogre selected"
- (list "mythical/units/ogre/selected/1.wav"
- "mythical/units/ogre/selected/2.wav"
- "mythical/units/ogre/selected/3.wav"
- "mythical/units/ogre/selected/4.wav"))
-(make-sound "ogre-mage selected"
- (list "mythical/units/ogre-mage/selected/1.wav"
- "mythical/units/ogre-mage/selected/2.wav"
- "mythical/units/ogre-mage/selected/3.wav"
- "mythical/units/ogre-mage/selected/4.wav"))
(make-sound "ships alliance selected"
(list "alliance/ships/selected/1.wav"
"alliance/ships/selected/2.wav"
"alliance/ships/selected/3.wav"))
-(make-sound "ships mythical selected"
- (list "mythical/ships/selected/1.wav"
- "mythical/ships/selected/2.wav"
- "mythical/ships/selected/3.wav"))
-(make-sound "troll axethrower-berserker selected"
- (list "mythical/units/troll_axethrower-berserker/selected/1.wav"
- "mythical/units/troll_axethrower-berserker/selected/2.wav"
- "mythical/units/troll_axethrower-berserker/selected/3.wav"))
(make-sound "mage selected"
(list "alliance/units/mage/selected/1.wav"
"alliance/units/mage/selected/2.wav"
@@ -412,46 +256,7 @@
"alliance/units/peasant/selected/2.wav"
"alliance/units/peasant/selected/3.wav"
"alliance/units/peasant/selected/4.wav"))
-(make-sound "alleria selected"
- (list "alliance/units/alleria/selected/1.wav"
- "alliance/units/alleria/selected/2.wav"
- "alliance/units/alleria/selected/3.wav"))
-(make-sound "danath selected"
- (list "alliance/units/danath/selected/1.wav"
- "alliance/units/danath/selected/2.wav"
- "alliance/units/danath/selected/3.wav"))
-(make-sound "khadgar selected"
- (list "alliance/units/khadgar/selected/1.wav"
- "alliance/units/khadgar/selected/2.wav"
- "alliance/units/khadgar/selected/3.wav"))
-(make-sound "kurdan selected"
- (list "alliance/units/kurdan/selected/1.wav"
- "alliance/units/kurdan/selected/2.wav"
- "alliance/units/kurdan/selected/3.wav"))
-(make-sound "turalyon selected"
- (list "alliance/units/turalyon/selected/1.wav"
- "alliance/units/turalyon/selected/2.wav"
- "alliance/units/turalyon/selected/3.wav"))
-(make-sound "deathwing selected"
- (list "mythical/units/deathwing/selected/1.wav"
- "mythical/units/deathwing/selected/2.wav"
- "mythical/units/deathwing/selected/3.wav"))
-(make-sound "dentarg selected"
- (list "mythical/units/dentarg/selected/1.wav"
- "mythical/units/dentarg/selected/2.wav"
- "mythical/units/dentarg/selected/3.wav"))
-(make-sound "grom hellscream selected"
- (list "mythical/units/grom_hellscream/selected/1.wav"
- "mythical/units/grom_hellscream/selected/2.wav"
- "mythical/units/grom_hellscream/selected/3.wav"))
-(make-sound "korgath bladefist selected"
- (list "mythical/units/korgath_bladefist/selected/1.wav"
- "mythical/units/korgath_bladefist/selected/2.wav"
- "mythical/units/korgath_bladefist/selected/3.wav"))
-(make-sound "teron gorefiend selected"
- (list "mythical/units/teron_gorefiend/selected/1.wav"
- "mythical/units/teron_gorefiend/selected/2.wav"
- "mythical/units/teron_gorefiend/selected/3.wav"))
+
;;
;; Annoyed sounds --------------------------------------------------------
;;
@@ -471,31 +276,6 @@
"mythical/basic_voices/annoyed/5.wav"
"mythical/basic_voices/annoyed/6.wav"
"mythical/basic_voices/annoyed/7.wav"))
-(make-sound "death knight annoyed"
- (list "mythical/units/death_knight/annoyed/1.wav"
- "mythical/units/death_knight/annoyed/2.wav"
- "mythical/units/death_knight/annoyed/3.wav"))
-(make-sound "dwarven demolition squad annoyed"
- (list "alliance/units/dwarven_demolition_squad/annoyed/1.wav"
- "alliance/units/dwarven_demolition_squad/annoyed/2.wav"
- "alliance/units/dwarven_demolition_squad/annoyed/3.wav"))
-(make-sound "elven archer-ranger annoyed"
- (list "alliance/units/elven_archer-ranger/annoyed/1.wav"
- "alliance/units/elven_archer-ranger/annoyed/2.wav"
- "alliance/units/elven_archer-ranger/annoyed/3.wav"))
-(make-sound "gnomish flying machine annoyed"
- (list "alliance/units/gnomish_flying_machine/annoyed/1.wav"
- "alliance/units/gnomish_flying_machine/annoyed/2.wav"
- "alliance/units/gnomish_flying_machine/annoyed/3.wav"
- "alliance/units/gnomish_flying_machine/annoyed/4.wav"
- "alliance/units/gnomish_flying_machine/annoyed/5.wav"))
-(make-sound "goblin sappers annoyed"
- (list "mythical/units/goblin_sappers/annoyed/1.wav"
- "mythical/units/goblin_sappers/annoyed/2.wav"
- "mythical/units/goblin_sappers/annoyed/3.wav"))
-(make-sound "goblin zeppelin annoyed"
- (list "mythical/units/zeppelin/annoyed/1.wav"
- "mythical/units/zeppelin/annoyed/2.wav"))
(make-sound "knight annoyed"
(list "alliance/units/knight/annoyed/1.wav"
"alliance/units/knight/annoyed/2.wav"
@@ -504,33 +284,10 @@
(list "alliance/units/paladin/annoyed/1.wav"
"alliance/units/paladin/annoyed/2.wav"
"alliance/units/paladin/annoyed/3.wav"))
-(make-sound "ogre annoyed"
- (list "mythical/units/ogre/annoyed/1.wav"
- "mythical/units/ogre/annoyed/2.wav"
- "mythical/units/ogre/annoyed/3.wav"
- "mythical/units/ogre/annoyed/4.wav"
- "mythical/units/ogre/annoyed/5.wav"))
-(make-sound "ogre-mage annoyed"
- (list "mythical/units/ogre-mage/annoyed/1.wav"
- "mythical/units/ogre-mage/annoyed/2.wav"
- "mythical/units/ogre-mage/annoyed/3.wav"))
(make-sound "ships alliance annoyed"
(list "alliance/ships/annoyed/1.wav"
"alliance/ships/annoyed/2.wav"
"alliance/ships/annoyed/3.wav"))
-(make-sound "ships mythical annoyed"
- (list "mythical/ships/annoyed/1.wav"
- "mythical/ships/annoyed/2.wav"
- "mythical/ships/annoyed/3.wav"))
-(make-sound "ships submarine annoyed"
- (list "alliance/ships/gnomish_submarine/annoyed/1.wav"
- "alliance/ships/gnomish_submarine/annoyed/2.wav"
- "alliance/ships/gnomish_submarine/annoyed/3.wav"
- "alliance/ships/gnomish_submarine/annoyed/4.wav"))
-(make-sound "troll axethrower-berserker annoyed"
- (list "mythical/units/troll_axethrower-berserker/annoyed/1.wav"
- "mythical/units/troll_axethrower-berserker/annoyed/2.wav"
- "mythical/units/troll_axethrower-berserker/annoyed/3.wav"))
(make-sound "mage annoyed"
(list "alliance/units/mage/annoyed/1.wav"
"alliance/units/mage/annoyed/2.wav"
@@ -543,46 +300,7 @@
"alliance/units/peasant/annoyed/5.wav"
"alliance/units/peasant/annoyed/6.wav"
"alliance/units/peasant/annoyed/7.wav"))
-(make-sound "alleria annoyed"
- (list "alliance/units/alleria/annoyed/1.wav"
- "alliance/units/alleria/annoyed/2.wav"
- "alliance/units/alleria/annoyed/3.wav"))
-(make-sound "danath annoyed"
- (list "alliance/units/danath/annoyed/1.wav"
- "alliance/units/danath/annoyed/2.wav"
- "alliance/units/danath/annoyed/3.wav"))
-(make-sound "khadgar annoyed"
- (list "alliance/units/khadgar/annoyed/1.wav"
- "alliance/units/khadgar/annoyed/2.wav"
- "alliance/units/khadgar/annoyed/3.wav"))
-(make-sound "kurdan annoyed"
- (list "alliance/units/kurdan/annoyed/1.wav"
- "alliance/units/kurdan/annoyed/2.wav"
- "alliance/units/kurdan/annoyed/3.wav"))
-(make-sound "turalyon annoyed"
- (list "alliance/units/turalyon/annoyed/1.wav"
- "alliance/units/turalyon/annoyed/2.wav"
- "alliance/units/turalyon/annoyed/3.wav"))
-(make-sound "deathwing annoyed"
- (list "mythical/units/deathwing/annoyed/1.wav"
- "mythical/units/deathwing/annoyed/2.wav"
- "mythical/units/deathwing/annoyed/3.wav"))
-(make-sound "dentarg annoyed"
- (list "mythical/units/dentarg/annoyed/1.wav"
- "mythical/units/dentarg/annoyed/2.wav"
- "mythical/units/dentarg/annoyed/3.wav"))
-(make-sound "grom hellscream annoyed"
- (list "mythical/units/grom_hellscream/annoyed/1.wav"
- "mythical/units/grom_hellscream/annoyed/2.wav"
- "mythical/units/grom_hellscream/annoyed/3.wav"))
-(make-sound "korgath bladefist annoyed"
- (list "mythical/units/korgath_bladefist/annoyed/1.wav"
- "mythical/units/korgath_bladefist/annoyed/2.wav"
- "mythical/units/korgath_bladefist/annoyed/3.wav"))
-(make-sound "teron gorefiend annoyed"
- (list "mythical/units/teron_gorefiend/annoyed/1.wav"
- "mythical/units/teron_gorefiend/annoyed/2.wav"
- "mythical/units/teron_gorefiend/annoyed/3.wav"))
+
;;
;; Other sounds ---------------------------------------------------------
;;
@@ -611,56 +329,16 @@
"peasant selected" "peasant annoyed")
(make-sound-group "knight-selected"
"knight selected" "knight annoyed")
-(make-sound-group "ogre-selected"
- "ogre selected" "ogre annoyed")
(make-sound-group "archer-selected"
"elven archer-ranger selected" "elven archer-ranger annoyed")
-(make-sound-group "axethrower-selected"
- "troll axethrower-berserker selected"
- "troll axethrower-berserker annoyed")
(make-sound-group "mage-selected"
"mage selected" "mage annoyed")
-(make-sound-group "death-knight-selected"
- "death knight selected" "death knight annoyed")
(make-sound-group "paladin-selected"
"paladin selected" "paladin annoyed")
-(make-sound-group "ogre-mage-selected"
- "ogre-mage selected" "ogre-mage annoyed")
(make-sound-group "dwarves-selected"
"dwarven demolition squad selected" "dwarven demolition squad annoyed")
-(make-sound-group "goblin-sappers-selected"
- "goblin sappers selected" "goblin sappers annoyed")
-(make-sound-group "alleria-selected"
- "alleria selected" "alleria annoyed")
-(make-sound-group "teron-gorefiend-selected"
- "teron gorefiend selected"
- "teron gorefiend annoyed")
-(make-sound-group "kurdan-and-sky-ree-selected"
- "kurdan selected" "kurdan annoyed")
-(make-sound-group "dentarg-selected"
- "dentarg selected" "dentarg annoyed")
-(make-sound-group "khadgar-selected"
- "khadgar selected" "khadgar annoyed")
-(make-sound-group "grom-hellscream-selected"
- "grom hellscream selected" "grom hellscream annoyed")
(make-sound-group "alliance-oil-tanker-selected"
"ships alliance selected" "ships alliance annoyed")
-(make-sound-group "mythical-oil-tanker-selected"
- "ships mythical selected" "ships mythical annoyed")
-(make-sound-group "deathwing-selected"
- "deathwing selected" "deathwing annoyed")
-(make-sound-group "gnomish-submarine-selected"
- "ships alliance selected" "ships submarine annoyed")
-(make-sound-group "gnomish-flying-machine-selected"
- "click" "gnomish flying machine annoyed")
-(make-sound-group "zeppelin-selected"
- "click" "goblin zeppelin annoyed")
-(make-sound-group "turalyon-selected"
- "turalyon selected" "turalyon annoyed")
-(make-sound-group "danath-selected"
- "danath selected" "danath annoyed")
-(make-sound-group "korgath-bladefist-selected"
- "korgath bladefist selected" "korgath bladefist annoyed")
;;----------------------------------------------------------------------------
;; Define sound remapping. (FIXME: somebody must clean the order.)
@@ -670,91 +348,46 @@
(map-sound "grunt-acknowledge" "basic mythical voices acknowledge")
(map-sound "faun-acknowledge" "basic mythical voices acknowledge")
(map-sound "ballista-acknowledge" "catapult-ballista movement")
-(map-sound "catapult-acknowledge" "catapult-ballista movement")
(map-sound "archer-acknowledge" "elven archer-ranger acknowledge")
-(map-sound "axethrower-acknowledge" "troll axethrower-berserker acknowledge")
(map-sound "ranger-acknowledge" "elven archer-ranger acknowledge")
-(map-sound "berserker-acknowledge" "troll axethrower-berserker acknowledge")
(map-sound "alliance-oil-tanker-acknowledge" "tanker acknowledge")
-(map-sound "mythical-oil-tanker-acknowledge" "tanker acknowledge")
(map-sound "alliance-transport-acknowledge" "ships alliance acknowledge")
-(map-sound "mythical-transport-acknowledge" "ships mythical acknowledge")
-(map-sound "elven-destroyer-acknowledge" "ships alliance acknowledge")
-(map-sound "troll-destroyer-acknowledge" "ships mythical acknowledge")
(map-sound "battleship-acknowledge" "ships alliance acknowledge")
-(map-sound "ogre-juggernaught-acknowledge" "ships mythical acknowledge")
-(map-sound "gnomish-submarine-acknowledge" "ships alliance acknowledge")
-(map-sound "giant-turtle-acknowledge" "ships mythical acknowledge")
-(map-sound "cho-gall-acknowledge" "ogre-mage-acknowledge")
-(map-sound "lothar-acknowledge" "knight-acknowledge")
-(map-sound "gul-dan-acknowledge" "death-knight-acknowledge")
-(map-sound "uther-lightbringer-acknowledge" "paladin-acknowledge")
-(map-sound "zuljin-acknowledge" "troll axethrower-berserker acknowledge")
+
;; ready sounds
(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 "archer-ready" "elven archer-ranger ready")
-(map-sound "axethrower-ready" "troll axethrower-berserker ready")
(map-sound "ranger-ready" "elven archer-ranger ready")
-(map-sound "berserker-ready" "troll axethrower-berserker ready")
(map-sound "alliance-oil-tanker-ready" "ships alliance ready")
-(map-sound "mythical-oil-tanker-ready" "ships mythical ready")
(map-sound "alliance-transport-ready" "ships alliance ready")
-(map-sound "mythical-transport-ready" "ships mythical ready")
-(map-sound "elven-destroyer-ready" "ships alliance ready")
-(map-sound "troll-destroyer-ready" "ships mythical ready")
(map-sound "battleship-ready" "ships alliance ready")
-(map-sound "ogre-juggernaught-ready" "ships mythical ready")
-(map-sound "gnomish-submarine-ready" "ships alliance ready")
-(map-sound "giant-turtle-ready" "ships mythical ready")
+
;; selection sounds
(map-sound "faun-selected" "grunt-selected")
(map-sound "ballista-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")
-(map-sound "mythical-transport-selected" "mythical-oil-tanker-selected")
-(map-sound "elven-destroyer-selected" "alliance-oil-tanker-selected")
-(map-sound "troll-destroyer-selected" "mythical-oil-tanker-selected")
(map-sound "battleship-selected" "alliance-oil-tanker-selected")
-(map-sound "ogre-juggernaught-selected" "mythical-oil-tanker-selected")
-(map-sound "giant-turtle-selected" "mythical-oil-tanker-selected")
-(map-sound "eye-of-kilrogg-selected" "click")
-(map-sound "cho-gall-selected" "ogre-mage-selected")
-(map-sound "lothar-selected" "knight-selected")
-(map-sound "gul-dan-selected" "death-knight-selected")
-(map-sound "uther-lightbringer-selected" "paladin-selected")
-(map-sound "zuljin-selected" "troll axethrower-berserker selected")
-(map-sound "skeleton-selected" "click")
(map-sound "daemon-selected" "click")
(map-sound "alliance-barracks-selected" "click")
(map-sound "mythical-barracks-selected" "click")
(map-sound "alliance-watch-tower-selected" "click")
-(map-sound "mythical-watch-tower-selected" "click")
(map-sound "alliance-shipyard-selected" "shipyard")
-(map-sound "mythical-shipyard-selected" "shipyard")
(map-sound "town-hall-selected" "click")
(map-sound "great-hall-selected" "click")
(map-sound "elven-lumber-mill-selected" "lumbermill")
-(map-sound "troll-lumber-mill-selected" "lumbermill")
(map-sound "alliance-foundry-selected" "foundry")
-(map-sound "mythical-foundry-selected" "foundry")
(map-sound "alliance-blacksmith-selected" "blacksmith")
-(map-sound "mythical-blacksmith-selected" "blacksmith")
(map-sound "alliance-refinery-selected" "oil refinery")
-(map-sound "mythical-refinery-selected" "oil refinery")
(map-sound "alliance-oil-platform-selected" "oil platform")
-(map-sound "mythical-oil-platform-selected" "oil platform")
(map-sound "keep-selected" "click")
-(map-sound "stronghold-selected" "click")
(map-sound "castle-selected" "click")
-(map-sound "fortress-selected" "click")
(map-sound "oil-patch-selected" "click")
(map-sound "alliance-guard-tower-selected" "click")
-(map-sound "mythical-guard-tower-selected" "click")
(map-sound "alliance-cannon-tower-selected" "click")
-(map-sound "mythical-cannon-tower-selected" "click")
+
;; attack sounds
(map-sound "footman-attack" "sword attack")
(map-sound "grunt-attack" "sword attack")
@@ -762,33 +395,16 @@
(map-sound "faun-attack" "peasant attack")
(map-sound "ballista-attack" "catapult-ballista attack")
(map-sound "knight-attack" "sword attack")
-(map-sound "ogre-attack" "punch")
(map-sound "archer-attack" "bow throw")
-(map-sound "axethrower-attack" "axe throw")
(map-sound "mage-attack" "lightning")
-(map-sound "death-knight-attack" "touch of darkness")
(map-sound "paladin-attack" "sword attack")
-(map-sound "ogre-mage-attack" "punch")
(map-sound "dwarves-attack" "sword attack")
-(map-sound "goblin-sappers-attack" "sword attack")
(map-sound "ranger-attack" "bow throw")
-(map-sound "berserker-attack" "axe throw")
-(map-sound "alleria-attack" "bow throw")
-(map-sound "teron-gorefiend-attack" "touch of darkness")
-(map-sound "kurdan-and-sky-ree-attack" "lightning")
-(map-sound "dentarg-attack" "punch")
-(map-sound "khadgar-attack" "lightning")
-(map-sound "grom-hellscream-attack" "sword attack")
+
;; FIXME: what sound for ships?
-(map-sound "elven-destroyer-attack" "fireball throw")
-(map-sound "troll-destroyer-attack" "fireball throw")
(map-sound "battleship-attack" "fireball throw")
-(map-sound "ogre-juggernaught-attack" "fireball throw")
-(map-sound "gnomish-submarine-attack" "fireball throw")
-(map-sound "giant-turtle-attack" "fireball throw")
-(map-sound "deathwing-attack" "fireball throw")
(map-sound "gryphon-rider-attack" "lightning")
-(map-sound "dragon-attack" "fireball throw")
+
;; FIXME: what sound for those heroes?
;; (map-sound "turalyon-attack")
;; (map-sound "danath-attack")
@@ -798,26 +414,21 @@
;; (map-sound "gul-dan-attack")
;; (map-sound "uther-lightbringer-attack")
;; (map-sound "zuljin-attack")
-(map-sound "skeleton-attack" "fist")
;; (map-sound "daemon-attack")
;; FIXME: what attack sounds for towers?
;; (map-sound "alliance-guard-tower-attack")
;; (map-sound "mythical-guard-tower-attack")
;; (map-sound "alliance-cannon-tower-attack")
;; (map-sound "mythical-cannon-tower-attack")
-
(map-sound "critter-help" "basic mythical voices help 1")
(map-sound "critter-dead" "explosion")
-
;; Define sounds used by game
;;
(define-game-sounds
-
'placement-error (make-sound "placement error" "ui/placement_error.wav")
'placement-success (make-sound "placement success"
"ui/placement_success.wav")
'click sound-click
-
; FIXME: Not ready
; 'tree-chopping (make-sound "tree chopping" "tree_chopping.wav")
; 'transport-docking
@@ -836,4 +447,4 @@
'rescue (list 'mythical (make-sound "mythical rescue"
"mythical/rescue.wav")) )
(define sound-click (make-sound "highclick" "ui/highclick.wav"))
-(define sound-click (make-sound "statsthump" "ui/statsthump.wav")) ))
+(define sound-click (make-sound "statsthump" "ui/statsthump.wav"))
Index: demogame/ccl/spells.ccl
diff -u demogame/ccl/spells.ccl:1.2 demogame/ccl/spells.ccl:1.3
--- demogame/ccl/spells.ccl:1.2 Mon Oct 6 17:10:13 2003
+++ demogame/ccl/spells.ccl Thu Oct 9 09:52:09 2003
@@ -26,7 +26,7 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: spells.ccl,v 1.2 2003/10/06 21:10:13 martinxyz Exp $
+;; $Id: spells.ccl,v 1.3 2003/10/09 13:52:09 martinxyz Exp $
;; For documentation see stratagus/doc/ccl/ccl.html ;; FIXME write and move
doc.
@@ -87,9 +87,7 @@
;; Declare some unit types used in spells. This is quite accetable, the other
;; way would be to define can-cast-spell outside unit definitions, not much
of an improvement.
(define-unit-type 'unit-revealer)
-(define-unit-type 'unit-eye-of-vision)
(define-unit-type 'unit-critter)
-(define-unit-type 'unit-skeleton)
(define-unit-type 'unit-circle-of-power)
(define-spell "spell-holy-vision"
@@ -139,16 +137,6 @@
'autocast '(range 10 condition (coward false alliance false))
)
-(define-spell "spell-eye-of-vision"
- 'showname "eye of vision"
- 'manacost 70
- 'range 6
- 'target 'none
- 'action '(summon unit-type unit-eye-of-vision time-to-live 5000)
- 'sound-when-cast "eye of vision"
- 'missile-when-cast "missile-normal-spell"
-)
-
(define-spell "spell-haste"
'showname "haste"
'manacost 50
@@ -311,17 +299,6 @@
'sound-when-cast "death coil"
'missile-when-cast "missile-death-coil"
; 'autocast '(range 6)
-)
-
-(define-spell "spell-raise-dead"
- 'showname "raise dead"
- 'manacost 50
- 'range 6
- 'target 'none
- 'action '(raise-dead unit-raised unit-skeleton time-to-live 100)
- 'sound-when-cast "raise dead"
- 'missile-when-cast "missile-normal-spell"
-;; 'autocast '(range 6)
)
(define-spell "spell-whirlwind"
Index: demogame/ccl/tilesets/winter.ccl
diff -u demogame/ccl/tilesets/winter.ccl:1.3
demogame/ccl/tilesets/winter.ccl:1.4
--- demogame/ccl/tilesets/winter.ccl:1.3 Wed Oct 8 07:05:35 2003
+++ demogame/ccl/tilesets/winter.ccl Thu Oct 9 09:52:10 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: winter.ccl,v 1.3 2003/10/08 11:05:35 martinxyz Exp $
+;; $Id: winter.ccl,v 1.4 2003/10/09 13:52:10 martinxyz Exp $
;;=============================================================================
;; Define a tileset
@@ -35,7 +35,7 @@
;;
(define-tileset 'tileset-winter 'class "winter"
'name "original wc2 winter tileset"
- 'image "tilesets/winter/terrain/winter.png"
+ 'image "tilesets/winter/terrain.png"
'palette "tilesets/winter/palette.rgb"
;; Slots descriptions
'slots (list 'special (list ;; Can't be in pud
Index: demogame/ccl/upgrade.ccl
diff -u demogame/ccl/upgrade.ccl:1.1 demogame/ccl/upgrade.ccl:1.2
--- demogame/ccl/upgrade.ccl:1.1 Sat Jul 26 09:39:14 2003
+++ demogame/ccl/upgrade.ccl Thu Oct 9 09:52:09 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.1 2003/07/26 13:39:14 martinxyz Exp $
+;; $Id: upgrade.ccl,v 1.2 2003/10/09 13:52:09 martinxyz Exp $
;; Load the different races
(load "ccl/alliance/upgrade.ccl" #f #t)
@@ -50,7 +50,6 @@
(define-allow 'unit-nothing-36 "AAAAAAAAAAAAAAAA")
(define-allow 'unit-critter "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-skeleton "AAAAAAAAAAAAAAAA")
(define-allow 'unit-daemon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-gold-mine "AAAAAAAAAAAAAAAA")
(define-allow 'unit-oil-patch "AAAAAAAAAAAAAAAA")
Index: demogame/puds/default.pud.gz
Index: demogame/scripts/overview.py
diff -u demogame/scripts/overview.py:1.1 demogame/scripts/overview.py:1.2
--- demogame/scripts/overview.py:1.1 Wed Oct 8 12:47:48 2003
+++ demogame/scripts/overview.py Thu Oct 9 09:52:15 2003
@@ -2,7 +2,8 @@
"script to get an overview over a ccl tree"
#datadir = 'test/'
-datadir = '..'
+datadir = '../'
+races = ['alliance', 'mythical']
import ccl
import os, sys
@@ -10,40 +11,44 @@
assert os.path.isfile(join(datadir, 'ccl/stratagus.ccl'))
-class Unit:
- def __init__(self, type, race, string, list):
- self.type = type
- self.race = race
+files = [] # all full filenames scanned
+lists = [] # List() class for all statements (see below)
+units = [] # subset of lists with unittypes only
+
+class List:
+ def __init__(self, filename, string):
+ self.filename = filename
self.string = string
- self.list = list
+ self.list = ccl.list(string)
+ self.command = self.list[0]
def get(self, tag):
+ "get the value of a tag, if it is a tagged list"
i = self.list.index(tag)
return self.list[i+1]
-
-units = []
-files = []
+ def has(self, tag):
+ return tag in self.list
def parsestatements(filename, statements):
global units
print 'parsing', filename
for statement in statements:
- l = ccl.list(statement)
- if l[0] == 'define-unit-type':
- race = ''
- if 'alliance' in filename: race = 'alliance'
- if 'mythical' in filename: race = 'mythical'
- units.append(Unit(l[1].lstrip("'"), race, statement, l[2:]))
+ l = List(filename, statement)
+ lists.append(l)
+ if l.command == 'define-unit-type':
+ l.race = ''
+ for race in races:
+ if race in filename: l.race = race
+ l.type = l.list[1].lstrip("'")
+ units.append(l)
def visit(arg, dirname, names):
global files
for filename in names:
if '#' in filename or '~' in filename: continue
if filename.endswith('.ccl'):
- name = os.path.join(dirname, filename)
- files.append(name)
- if filename == 'units.ccl':
- # only units for now
- parsestatements(name, ccl.readfile(name))
+ filename = os.path.join(dirname, filename)
+ files.append(filename)
+ parsestatements(filename, ccl.readfile(filename))
os.path.walk(join(datadir, 'ccl'), visit, None)