[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] demogame/ccl stratagus.ccl units.ccl alliance/u...
From: |
Martin Renold |
Subject: |
[Stratagus-CVS] demogame/ccl stratagus.ccl units.ccl alliance/u... |
Date: |
Tue, 23 Sep 2003 03:05:39 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: demogame
Branch:
Changes by: Martin Renold <address@hidden> 03/09/23 03:05:38
Modified files:
ccl : stratagus.ccl units.ccl
ccl/alliance : units.ccl
ccl/mythical : units.ccl upgrade.ccl
ccl/tilesets : summer.ccl winter.ccl
Added files:
ccl : spells.ccl
Log message:
merged engine changes
Patches:
Index: demogame/ccl/alliance/units.ccl
diff -u demogame/ccl/alliance/units.ccl:1.8 demogame/ccl/alliance/units.ccl:1.9
--- demogame/ccl/alliance/units.ccl:1.8 Sun Sep 14 07:51:58 2003
+++ demogame/ccl/alliance/units.ccl Tue Sep 23 03:05:38 2003
@@ -26,7 +26,7 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: units.ccl,v 1.8 2003/09/14 11:51:58 martinxyz Exp $
+;; $Id: units.ccl,v 1.9 2003/09/23 07:05:38 martinxyz Exp $
;;=============================================================================
;; Define unit-types.
@@ -169,7 +169,7 @@
'priority 70
'points 100
'demand 1
- 'explode-when-killed
+ 'explode-when-killed 'missile-explosion
'type-land
'right-attack
'can-ground-attack
@@ -274,9 +274,15 @@
'right-attack
'can-attack
'can-target-land 'can-target-sea 'can-target-air
+ 'can-cast-spell '(
+ spell-fireball
+ spell-slow
+ spell-flame-shield
+ spell-invisibility
+ spell-polymorph
+ spell-blizzard)
'land-unit
'coward
- 'can-cast-spell
'organic
'selectable-by-rectangle
'sounds '(
@@ -309,8 +315,8 @@
'right-attack
'can-attack
'can-target-land
+ 'can-cast-spell '(spell-holy-vision spell-healing spell-exorcism)
'land-unit
- 'can-cast-spell
'organic
'selectable-by-rectangle
'sounds '(
@@ -473,9 +479,15 @@
'right-attack
'can-attack
'can-target-land 'can-target-sea 'can-target-air
+ 'can-cast-spell '(
+ spell-fireball
+ spell-slow
+ spell-flame-shield
+ spell-invisibility
+ spell-polymorph
+ spell-blizzard)
'land-unit
'coward
- 'can-cast-spell
'organic
'selectable-by-rectangle
'sounds '(
@@ -733,7 +745,6 @@
'can-attack
'can-target-land
'land-unit
- 'can-cast-spell
'organic
'selectable-by-rectangle
'sounds '(
@@ -834,7 +845,6 @@
'can-target-land
'land-unit
'hero
- 'can-cast-spell
'organic
'selectable-by-rectangle
'sounds '(
@@ -864,6 +874,7 @@
'points 100
'supply 4
'corpse '(unit-destroyed-2x2-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building 'builder-outside
'sounds '(
@@ -892,6 +903,7 @@
'priority 30 'annoy-computer-factor 35
'points 160
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'add-buttons '(begin
@@ -926,6 +938,7 @@
'priority 15 'annoy-computer-factor 35
'points 240
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -954,6 +967,7 @@
'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
@@ -984,6 +998,7 @@
'priority 15 'annoy-computer-factor 15
'points 210
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -1012,6 +1027,7 @@
'priority 15 'annoy-computer-factor 20
'points 230
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -1040,6 +1056,7 @@
'priority 15 'annoy-computer-factor 20
'points 280
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -1068,6 +1085,7 @@
'priority 30 'annoy-computer-factor 20
'points 170
'corpse '(unit-destroyed-3x3-place 3)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'shore-building
@@ -1099,6 +1117,7 @@
'priority 25 'annoy-computer-factor 15
'points 150
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'can-store '(wood)
@@ -1134,6 +1153,7 @@
'priority 15 'annoy-computer-factor 20
'points 200
'corpse '(unit-destroyed-3x3-place 3)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'shore-building
@@ -1164,6 +1184,7 @@
'points 200
'supply 1
'corpse '(unit-destroyed-4x4-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'can-store '(wood gold)
@@ -1202,6 +1223,7 @@
'priority 35 'annoy-computer-factor 20
'points 240
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -1230,6 +1252,7 @@
'priority 15 'annoy-computer-factor 20
'points 170
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -1259,6 +1282,7 @@
'priority 25 'annoy-computer-factor 20
'points 200
'corpse '(unit-destroyed-3x3-place 3)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'shore-building
@@ -1287,6 +1311,7 @@
'priority 20 'annoy-computer-factor 20
'points 160
'corpse '(unit-destroyed-3x3-place 3)
+ 'explode-when-killed 'missile-explosion
'type-naval
'building
'must-build-on-top 'unit-oil-patch
@@ -1319,6 +1344,7 @@
'points 600
'supply 1
'corpse '(unit-destroyed-4x4-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'can-store '(gold wood)
@@ -1350,6 +1376,7 @@
'points 1500
'supply 1
'corpse '(unit-destroyed-4x4-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'can-store '(gold wood)
@@ -1401,12 +1428,12 @@
'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
- 'tower
'sounds '(
selected "alliance-guard-tower-selected"
acknowledge "alliance-guard-tower-acknowledge"
@@ -1434,12 +1461,12 @@
'priority 40 'annoy-computer-factor 50
'points 250
'corpse '(unit-destroyed-2x2-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'can-attack
'can-target-land 'can-target-sea
'building
'detect-cloak
- 'tower
'sounds '(
selected "alliance-cannon-tower-selected"
acknowledge "alliance-cannon-tower-acknowledge"
@@ -1465,6 +1492,7 @@
'priority 0 'annoy-computer-factor 45
'points 1
'corpse '(unit-destroyed-1x1-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
Index: demogame/ccl/mythical/units.ccl
diff -u demogame/ccl/mythical/units.ccl:1.7 demogame/ccl/mythical/units.ccl:1.8
--- demogame/ccl/mythical/units.ccl:1.7 Sun Sep 14 07:51:58 2003
+++ demogame/ccl/mythical/units.ccl Tue Sep 23 03:05:38 2003
@@ -26,7 +26,7 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: units.ccl,v 1.7 2003/09/14 11:51:58 martinxyz Exp $
+;; $Id: units.ccl,v 1.8 2003/09/23 07:05:38 martinxyz Exp $
;;=============================================================================
;; Define unit-types.
@@ -66,7 +66,7 @@
(define-unit-type 'unit-peon 'name "Faun"
'files '(tileset-summer "mythical/units/faun.png")
'size '(72 72)
- 'animations 'animations-peasant 'icon 'icon-peon
+ 'animations 'animations-peasant 'icon 'icon-faun
'costs '(time 45 gold 400)
'speed 10
'hit-points 30
@@ -126,7 +126,7 @@
'priority 70
'points 100
'demand 1
- 'explode-when-killed
+ 'explode-when-killed 'missile-explosion
'type-land
'right-attack
'can-ground-attack
@@ -226,10 +226,16 @@
'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
- 'can-cast-spell
'organic
'selectable-by-rectangle
'sounds '(
@@ -262,8 +268,8 @@
'right-attack
'can-attack
'can-target-land
+ 'can-cast-spell '(spell-eye-of-vision spell-runes spell-bloodlust)
'land-unit
- 'can-cast-spell
'organic
'selectable-by-rectangle
'sounds '(
@@ -365,7 +371,6 @@
'land-unit
'coward
'isundead
- 'can-cast-spell
'organic
'selectable-by-rectangle
'sounds '(
@@ -400,7 +405,6 @@
'can-attack
'can-target-land
'land-unit
- 'can-cast-spell
'organic
'selectable-by-rectangle
'sounds '(
@@ -779,7 +783,6 @@
'can-target-land
'land-unit
'hero
- 'can-cast-spell
'organic
'selectable-by-rectangle
'sounds '(
@@ -814,7 +817,6 @@
'land-unit
'hero
'isundead
- 'can-cast-spell
'organic
'selectable-by-rectangle
'sounds '(
@@ -908,6 +910,7 @@
'points 100
'supply 4
'corpse '(unit-destroyed-2x2-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -936,6 +939,7 @@
'priority 30 'annoy-computer-factor 35
'points 160
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -964,6 +968,7 @@
'priority 15 'annoy-computer-factor 35
'points 240
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -992,6 +997,7 @@
'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
@@ -1022,6 +1028,7 @@
'priority 15 'annoy-computer-factor 15
'points 210
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -1050,6 +1057,7 @@
'priority 15 'annoy-computer-factor 20
'points 230
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -1078,6 +1086,7 @@
'priority 15 'annoy-computer-factor 20
'points 280
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -1106,6 +1115,7 @@
'priority 30 'annoy-computer-factor 20
'points 170
'corpse '(unit-destroyed-3x3-place 3)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'shore-building
@@ -1137,6 +1147,7 @@
'points 200
'supply 1
'corpse '(unit-destroyed-4x4-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'builder-outside
@@ -1168,6 +1179,7 @@
'priority 25 'annoy-computer-factor 15
'points 150
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'can-store '(wood)
@@ -1197,6 +1209,7 @@
'priority 15 'annoy-computer-factor 20
'points 200
'corpse '(unit-destroyed-3x3-place 3)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'shore-building
@@ -1226,6 +1239,7 @@
'priority 35 'annoy-computer-factor 20
'points 240
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -1254,6 +1268,7 @@
'priority 15 'annoy-computer-factor 20
'points 170
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -1283,6 +1298,7 @@
'priority 25 'annoy-computer-factor 20
'points 200
'corpse '(unit-destroyed-3x3-place 3)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'shore-building
@@ -1311,6 +1327,7 @@
'priority 20 'annoy-computer-factor 20
'points 160
'corpse '(unit-destroyed-3x3-place 3)
+ 'explode-when-killed 'missile-explosion
'type-naval
'building
'must-build-on-top 'unit-oil-patch
@@ -1343,6 +1360,7 @@
'points 600
'supply 1
'corpse '(unit-destroyed-4x4-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'can-store '(gold wood)
@@ -1374,6 +1392,7 @@
'points 1500
'supply 1
'corpse '(unit-destroyed-4x4-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'can-store '(gold wood)
@@ -1425,12 +1444,12 @@
'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
- 'tower
'sounds '(
selected "mythical-guard-tower-selected"
acknowledge "mythical-guard-tower-acknowledge"
@@ -1458,12 +1477,12 @@
'priority 40 'annoy-computer-factor 50
'points 250
'corpse '(unit-destroyed-2x2-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'can-attack
'can-target-land 'can-target-sea
'building
'detect-cloak
- 'tower
'sounds '(
selected "mythical-cannon-tower-selected"
acknowledge "mythical-cannon-tower-acknowledge"
@@ -1488,6 +1507,7 @@
'priority 0 'annoy-computer-factor 45
'points 1
'corpse '(unit-destroyed-1x1-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
Index: demogame/ccl/mythical/upgrade.ccl
diff -u demogame/ccl/mythical/upgrade.ccl:1.3
demogame/ccl/mythical/upgrade.ccl:1.4
--- demogame/ccl/mythical/upgrade.ccl:1.3 Thu Sep 11 08:17:59 2003
+++ demogame/ccl/mythical/upgrade.ccl Tue Sep 23 03:05:38 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.3 2003/09/11 12:17:59 martinxyz Exp $
+;; $Id: upgrade.ccl,v 1.4 2003/09/23 07:05:38 martinxyz Exp $
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;=============================================================================
@@ -187,6 +187,7 @@
'(apply-to unit-axethrower) '(apply-to unit-berserker))
(define-modifier 'upgrade-berserker-regeneration
+ '(regeneration-rate 1)
'(apply-to unit-axethrower) '(apply-to unit-berserker))
(define-modifier 'upgrade-ogre-mage
Index: demogame/ccl/stratagus.ccl
diff -u demogame/ccl/stratagus.ccl:1.5 demogame/ccl/stratagus.ccl:1.6
--- demogame/ccl/stratagus.ccl:1.5 Sun Sep 14 07:51:58 2003
+++ demogame/ccl/stratagus.ccl Tue Sep 23 03:05:38 2003
@@ -26,7 +26,7 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: stratagus.ccl,v 1.5 2003/09/14 11:51:58 martinxyz Exp $
+;; $Id: stratagus.ccl,v 1.6 2003/09/23 07:05:38 martinxyz Exp $
;; For documentation see stratagus/doc/ccl/ccl.html
@@ -234,6 +234,15 @@
;; Change next, for the wanted mouse scale. (only SVGALIB)
(set-mouse-scale! 1)
+;; Set the name of the missile to use when clicking
+(set-click-missile! 'missile-green-cross)
+
+;; Set the name of the missile to use when clicking
+(set-click-missile! 'missile-green-cross)
+
+;; Set the name of the missile to use when displaying damage
+(set-damage-missile! 'missile-hit)
+
;; Edit this to enable/disable grabbing the mouse.
(set-grab-mouse! #f)
@@ -422,6 +431,7 @@
(load "ccl/sound.ccl" #f #t)
(load "ccl/missiles.ccl" #f #t)
(load "ccl/constructions.ccl" #f #t)
+(load "ccl/spells.ccl" #f #t)
(load "ccl/buttons.ccl" #f #t)
(load "ccl/units.ccl" #f #t)
(load "ccl/upgrade.ccl" #f #t)
Index: demogame/ccl/tilesets/summer.ccl
diff -u demogame/ccl/tilesets/summer.ccl:1.1
demogame/ccl/tilesets/summer.ccl:1.2
--- demogame/ccl/tilesets/summer.ccl:1.1 Sat Jul 26 09:39:14 2003
+++ demogame/ccl/tilesets/summer.ccl Tue Sep 23 03:05:38 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: summer.ccl,v 1.1 2003/07/26 13:39:14 martinxyz Exp $
+;; $Id: summer.ccl,v 1.2 2003/09/23 07:05:38 martinxyz Exp $
;;=============================================================================
;; Define a tileset
@@ -39,11 +39,9 @@
'palette "tilesets/summer/palette.rgb"
;; Slots descriptions
'slots (list 'special (list ;; Can't be in pud
- 'extra-trees #( 115 116 117 118 119 120 )
'top-one-tree 121 'mid-one-tree 122 'bot-one-tree 123
'removed-tree 126
'growing-tree #( -1 -1 )
- 'extra-rocks #( 153 154 155 156 157 158 )
'top-one-rock 161 'mid-one-rock 162 'bot-one-rock 163
'removed-rock 166 )
'solid (list "unused"
Index: demogame/ccl/tilesets/winter.ccl
diff -u demogame/ccl/tilesets/winter.ccl:1.1
demogame/ccl/tilesets/winter.ccl:1.2
--- demogame/ccl/tilesets/winter.ccl:1.1 Sat Jul 26 09:39:14 2003
+++ demogame/ccl/tilesets/winter.ccl Tue Sep 23 03:05:38 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.1 2003/07/26 13:39:14 martinxyz Exp $
+;; $Id: winter.ccl,v 1.2 2003/09/23 07:05:38 martinxyz Exp $
;;=============================================================================
;; Define a tileset
@@ -39,11 +39,9 @@
'palette "tilesets/winter/winter.rgb"
;; Slots descriptions
'slots (list 'special (list ;; Can't be in pud
- 'extra-trees #( 115 116 117 118 119 120 )
'top-one-tree 121 'mid-one-tree 122 'bot-one-tree 123
'removed-tree 126
'growing-tree #( -1 -1 )
- 'extra-rocks #( 148 149 150 151 152 153 )
'top-one-rock 156 'mid-one-rock 157 'bot-one-rock 158
'removed-rock 161 )
'solid (list "unused"
Index: demogame/ccl/units.ccl
diff -u demogame/ccl/units.ccl:1.6 demogame/ccl/units.ccl:1.7
--- demogame/ccl/units.ccl:1.6 Sun Sep 14 07:51:58 2003
+++ demogame/ccl/units.ccl Tue Sep 23 03:05:38 2003
@@ -26,7 +26,7 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: units.ccl,v 1.6 2003/09/14 11:51:58 martinxyz Exp $
+;; $Id: units.ccl,v 1.7 2003/09/23 07:05:38 martinxyz Exp $
;; Load the animations for the units.
(load "ccl/anim.ccl" #f #t)
@@ -194,6 +194,7 @@
'armor 20 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
'priority 0
'corpse '(unit-destroyed-3x3-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'gives-resource 'gold 'can-harvest
@@ -239,6 +240,7 @@
'basic-damage 0 'piercing-damage 0 'missile 'missile-none
'priority 0
'corpse '(unit-destroyed-2x2-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building
'sounds '(
@@ -267,9 +269,9 @@
'basic-damage 0 'piercing-damage 0 'missile 'missile-none
'priority 0
'corpse '(unit-destroyed-4x4-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building 'builder-outside
- 'can-cast-spell
'teleporter
'sounds '(
selected "dark-portal-selected"
@@ -298,9 +300,9 @@
'priority 15 'annoy-computer-factor 35
'points 150
'corpse '(unit-destroyed-2x2-place 0)
+ 'explode-when-killed 'missile-explosion
'type-land
'building 'builder-outside
- 'can-cast-spell
'sounds '(
selected "runestone-selected"
acknowledge "runestone-acknowledge"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] demogame/ccl stratagus.ccl units.ccl alliance/u...,
Martin Renold <=