[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] demogame ccl/menus.ccl ccl/missiles.ccl ccl/sou...
|
From: |
Martin Renold |
|
Subject: |
[Stratagus-CVS] demogame ccl/menus.ccl ccl/missiles.ccl ccl/sou... |
|
Date: |
Mon, 06 Oct 2003 17:10:14 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: demogame
Branch:
Changes by: Martin Renold <address@hidden> 03/10/06 17:10:14
Modified files:
ccl : menus.ccl missiles.ccl sound.ccl spells.ccl
stratagus.ccl ui.ccl units.ccl
ccl/mythical : units.ccl
graphics/ui/alliance: minimap-big.png minimap-big.xcf
minimap.png
Log message:
merged engine changes; transparent minimap
Patches:
Index: demogame/ccl/menus.ccl
diff -u demogame/ccl/menus.ccl:1.1 demogame/ccl/menus.ccl:1.2
--- demogame/ccl/menus.ccl:1.1 Sat Jul 26 09:39:14 2003
+++ demogame/ccl/menus.ccl Mon Oct 6 17:10:13 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: menus.ccl,v 1.1 2003/07/26 13:39:14 martinxyz Exp $
+;; $Id: menus.ccl,v 1.2 2003/10/06 21:10:13 martinxyz Exp $
;;
;; load the keystroke helps
@@ -461,10 +461,7 @@
(define-menu-item 'pos (list 40 (+ 10 240)) 'font 'game
'pulldown (list 'size '(152 20)
'style 'pulldown
- 'func 'game-rcs-action
- 'options (append race-names '("Map Default"))
- 'default 2
- 'current 2)
+ 'func 'game-rcs-action)
'menu 'menu-custom-game)
(define-menu-item 'pos (list 220 (- (+ 10 240) 20)) 'font 'game
'text '(caption "~<Resources:~>" none)
@@ -768,10 +765,7 @@
(define-menu-item 'pos (list 40 (+ 10 240)) 'font 'game
'pulldown (list 'size '(152 20)
'style 'pulldown
- 'func 'game-rcs-action
- 'options (append race-names '("Map Default"))
- 'default 2
- 'current 2)
+ 'func 'game-rcs-action)
'menu 'menu-multi-setup)
(define-menu-item 'pos (list 220 (- (+ 10 240) 20)) 'font 'game
'text '(caption "~<Resources:~>" none)
@@ -1196,10 +1190,7 @@
(define-menu-item 'pos (list 40 (+ 10 240)) 'font 'game
'pulldown (list 'size '(152 20)
'style 'pulldown
- 'func 'multi-client-rcs-action
- 'options (append race-names '("Map Default") )
- 'default 2
- 'current 2)
+ 'func 'multi-client-rcs-action)
'menu 'menu-net-multi-client)
(define-menu-item 'pos (list 220 (- (+ 10 240) 20)) 'font 'game
'text '(caption "~<Resources:~>" none)
Index: demogame/ccl/missiles.ccl
diff -u demogame/ccl/missiles.ccl:1.1 demogame/ccl/missiles.ccl:1.2
--- demogame/ccl/missiles.ccl:1.1 Sat Jul 26 09:39:14 2003
+++ demogame/ccl/missiles.ccl Mon Oct 6 17:10:13 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: missiles.ccl,v 1.1 2003/07/26 13:39:14 martinxyz Exp $
+;; $Id: missiles.ccl,v 1.2 2003/10/06 21:10:13 martinxyz Exp $
;; NOTE: the missiles could be sorted for races, but did this make sense?
@@ -42,131 +42,172 @@
'file "missiles/lightning.png" 'size '(32 32) 'frames 30
'class 'missile-class-point-to-point-with-hit 'sleep 1 'speed 16 'range 1
'draw-level 50)
+
(define-missile-type 'missile-griffon-hammer
'file "missiles/gryphon_hammer.png" 'size '(32 32) 'frames 15
'impact-sound "fireball hit"
'class 'missile-class-point-to-point-3bounces 'sleep 1 'speed 16 'range 2
'draw-level 50 'impact-missile 'missile-explosion)
+
(define-missile-type 'missile-dragon-breath
'file "missiles/dragon_breath.png" 'size '(32 32) 'frames 5
'impact-sound "fireball hit"
'class 'missile-class-point-to-point-3bounces 'sleep 1 'speed 16 'range 2
'draw-level 70 'impact-missile 'missile-explosion)
+
(define-missile-type 'missile-fireball
'file "missiles/fireball.png" 'size '(32 32) 'frames 5
'impact-sound "fireball hit"
'draw-level 50 'class 'missile-class-point-to-point 'sleep 1 'speed 16
'range 1)
+
(define-missile-type 'missile-flame-shield
'file "missiles/flame_shield.png" 'size '(32 48) 'frames 6
'draw-level 50 'class 'missile-class-flame-shield 'sleep 2 'speed 4 'range 1)
+
(define-missile-type 'missile-blizzard
'file "missiles/blizzard.png" 'size '(32 32) 'frames 4
'class 'missile-class-blizzard 'sleep 2 'speed 8 'range 1
'draw-level 100 'impact-missile 'missile-blizzard-hit)
+
(define-missile-type 'missile-death-and-decay
'file "missiles/death_and_decay.png" 'size '(32 32) 'frames 8
'draw-level 100 'class 'missile-class-death-decay 'sleep 1 'speed 0 'range 1)
+
(define-missile-type 'missile-big-cannon
'file "missiles/big_cannon.png" 'size '(16 16) 'frames 20
'draw-level 50 'impact-sound "explosion"
'class 'missile-class-point-to-point 'sleep 1 'speed 16 'range 2
'impact-missile 'missile-cannon-tower-explosion)
+
(define-missile-type 'missile-exorcism
'file "missiles/exorcism.png" 'size '(48 48) 'frames 10
'draw-level 50 'class 'missile-class-point-to-point 'sleep 1 'speed 16
'range 1)
+
(define-missile-type 'missile-heal-effect
'file "missiles/heal_effect.png" 'size '(48 48) 'frames 10
'draw-level 50 'class 'missile-class-stay-with-delay 'sleep 1 'speed 16
'range 1)
+
(define-missile-type 'missile-touch-of-death
'file "missiles/touch_of_death.png" 'size '(32 32) 'frames 30
'draw-level 50 'class 'missile-class-point-to-point-with-hit 'sleep 1 'speed
16 'range 1)
+
(define-missile-type 'missile-rune
'file "missiles/rune.png" 'size '(16 16) 'frames 4
'draw-level 20 'class 'missile-class-stay-with-delay 'sleep 5 'speed 16
'range 1)
+
(define-missile-type 'missile-whirlwind
'file "missiles/tornado.png" 'size '(56 56) 'frames 4
'draw-level 50 'class 'missile-class-whirlwind 'sleep 2 'speed 2 'range 1)
+
(define-missile-type 'missile-catapult-rock
'file "missiles/catapult_rock.png" 'size '(32 32) 'frames 15
'impact-sound "explosion"
'draw-level 50 'class 'missile-class-point-to-point-with-delay 'sleep 1
'speed 16 'range 2
'impact-missile 'missile-impact)
+
(define-missile-type 'missile-ballista-bolt
'file "missiles/ballista_bolt.png" 'size '(64 64) 'frames 5
'draw-level 50 'impact-sound "explosion"
'class 'missile-class-point-to-point 'sleep 1 'speed 16 'range 2
'impact-missile 'missile-impact)
+
(define-missile-type 'missile-arrow
'file "missiles/arrow.png" 'size '(40 40) 'frames 5
'draw-level 50 'impact-sound "bow hit"
'class 'missile-class-point-to-point 'sleep 1 'speed 32 'range 0)
+
(define-missile-type 'missile-axe
'file "missiles/axe.png" 'size '(32 32) 'frames 15
'impact-sound "bow hit"
'draw-level 50 'class 'missile-class-point-to-point 'sleep 1 'speed 32
'range 0)
+
(define-missile-type 'missile-submarine-missile
'file "missiles/submarine_missile.png" 'size '(40 40) 'frames 5
'impact-sound "explosion"
'draw-level 50 'class 'missile-class-point-to-point 'sleep 1 'speed 16
'range 1
'impact-missile 'missile-impact)
+
(define-missile-type 'missile-turtle-missile
'file "missiles/turtle_missile.png" 'size '(40 40) 'frames 5
'draw-level 50 'impact-sound "explosion"
'class 'missile-class-point-to-point 'sleep 1 'speed 16 'range 1
'impact-missile 'missile-impact)
+
(define-missile-type 'missile-small-fire
'file "missiles/small_fire.png" 'size '(32 48) 'frames 6
'draw-level 45 'class 'missile-class-fire 'sleep 8 'speed 16 'range 1)
+
(define-missile-type 'missile-big-fire
'file "missiles/big_fire.png" 'size '(48 48) 'frames 10
'draw-level 45 'class 'missile-class-fire 'sleep 8 'speed 16 'range 1)
+
(define-missile-type 'missile-impact
'file "missiles/ballista-catapult_impact.png" 'size '(48 48) 'frames 10
'draw-level 50 'class 'missile-class-stay-with-delay 'sleep 1 'speed 16
'range 1)
+
(define-missile-type 'missile-normal-spell
'file "missiles/normal_spell.png" 'size '(32 32) 'frames 6
'draw-level 50 'class 'missile-class-stay-with-delay 'sleep 5 'speed 0
'range 1)
+
(define-missile-type 'missile-explosion
'file "missiles/explosion.png" 'size '(64 64) 'frames 20
'draw-level 50 'class 'missile-class-stay-with-delay 'sleep 1 'speed 16
'range 1)
+
(define-missile-type 'missile-small-cannon
'file "missiles/cannon.png" 'size '(32 32) 'frames 15
'draw-level 50 'impact-sound "explosion"
'class 'missile-class-point-to-point-with-delay 'sleep 1 'speed 16 'range 1
'impact-missile 'missile-cannon-explosion)
+
(define-missile-type 'missile-cannon-explosion
'file "missiles/cannon_explosion.png" 'size '(32 32) 'frames 4
'draw-level 50 'class 'missile-class-stay-with-delay 'sleep 1 'speed 16
'range 1)
+
(define-missile-type 'missile-cannon-tower-explosion
'file "missiles/cannon-tower_explosion.png" 'size '(32 32) 'frames 4
'draw-level 50 'class 'missile-class-stay-with-delay 'sleep 1 'speed 16
'range 1)
+
(define-missile-type 'missile-daemon-fire
'file "missiles/daemon_fire.png" 'size '(32 32) 'frames 15
'draw-level 70 'impact-sound "fireball hit"
'class 'missile-class-point-to-point 'sleep 1 'speed 16 'range 1)
+
(define-missile-type 'missile-green-cross
'file "missiles/green_cross.png" 'size '(32 32) 'frames 4
'draw-level 150 'class 'missile-class-cycle-once 'sleep 1 'speed 16 'range 1)
+
(define-missile-type 'missile-red-cross
'file "missiles/red_cross.png" 'size '(32 32) 'frames 4
'draw-level 5 'class 'missile-class-cycle-once 'sleep 1 'speed 16 'range 1)
+
(define-missile-type 'missile-none
'size '(32 32) 'draw-level 50
'class 'missile-class-none 'sleep 1 'speed 16 'range 1)
+
(define-missile-type 'missile-blizzard-hit
'file "missiles/blizzard.png" 'size '(32 32) 'frames 4
'draw-level 60 'class 'missile-class-stay-with-delay 'sleep 2 'speed 8
'range 1)
+
(define-missile-type 'missile-death-coil
'file "missiles/touch_of_death.png" 'size '(32 32) 'frames 30
'draw-level 50 'class 'missile-class-point-to-point 'sleep 1 'speed 16
'range 1)
+
(define-missile-type 'missile-hit
'size '(15 15) 'draw-level 150
'class 'missile-class-hit 'sleep 1 'speed 1 'range 16)
+
(define-missile-type 'missile-custom
'size '(32 32) 'draw-level 50
'class 'missile-class-custom 'sleep 1 'speed 16 'range 1)
+
(define-missile-type 'missile-critter-explosion
'file "missiles/catapult_rock.png" 'size '(32 32) 'frames 15
'impact-sound "explosion" 'draw-level 50
'class 'missile-class-hit 'sleep 1 'speed 16 'range 2
'impact-missile 'missile-impact 'can-hit-owner #t)
+
+(define-burning-building
+ '(percent 0 missile missile-big-fire)
+ '(percent 50 missile missile-small-fire)
+ '(percent 75 ) ; no missile
+)
Index: demogame/ccl/mythical/units.ccl
diff -u demogame/ccl/mythical/units.ccl:1.8 demogame/ccl/mythical/units.ccl:1.9
--- demogame/ccl/mythical/units.ccl:1.8 Tue Sep 23 03:05:38 2003
+++ demogame/ccl/mythical/units.ccl Mon Oct 6 17:10:13 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/23 07:05:38 martinxyz Exp $
+;; $Id: units.ccl,v 1.9 2003/10/06 21:10:13 martinxyz Exp $
;;=============================================================================
;; Define unit-types.
@@ -879,7 +879,6 @@
'can-attack
'can-target-land
'land-unit
- 'critter
'isundead
'organic
'selectable-by-rectangle
Index: demogame/ccl/sound.ccl
diff -u demogame/ccl/sound.ccl:1.3 demogame/ccl/sound.ccl:1.4
--- demogame/ccl/sound.ccl:1.3 Thu Sep 11 08:17:57 2003
+++ demogame/ccl/sound.ccl Mon Oct 6 17:10:13 2003
@@ -26,7 +26,7 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: sound.ccl,v 1.3 2003/09/11 12:17:57 martinxyz Exp $
+;; $Id: sound.ccl,v 1.4 2003/10/06 21:10:13 martinxyz Exp $
(if (with-sound) (begin
@@ -92,9 +92,6 @@
;;----------------------------------------------------------------------------
;; Define simple alliance sounds.
;;
-(make-sound "basic alliance voices work complete"
- "alliance/basic_voices/work_complete.wav")
-(make-sound "peasant work complete" "alliance/units/peasant/work_complete.wav")
(make-sound "basic alliance voices ready" "alliance/basic_voices/ready.wav")
(make-sound "basic alliance voices help 1" "alliance/basic_voices/help/1.wav")
(make-sound "basic alliance voices help 2" "alliance/basic_voices/help/2.wav")
@@ -107,8 +104,6 @@
;;----------------------------------------------------------------------------
;; Define simple mythical sounds.
;;
-(make-sound "basic mythical voices work complete"
- "mythical/basic_voices/work_complete.wav")
(make-sound "basic mythical voices ready" "mythical/basic_voices/ready.wav")
(make-sound "basic mythical voices help 1" "mythical/basic_voices/help/1.wav")
(make-sound "basic mythical voices help 2" "mythical/basic_voices/help/2.wav")
@@ -830,9 +825,9 @@
; 'tree-chopping (make-sound "tree chopping" "tree_chopping.wav")
; 'transport-docking
; 'building-construction
-; 'basic-alliance-voices-work-complete
-; 'peasant-work-complete
-; 'basic-mythical-voices-work-complete
+
+ 'work-complete (list 'alliance (make-sound "basic alliance voices work
complete" "alliance/basic_voices/work_complete.wav"))
+ 'work-complete (list 'mythical (make-sound "basic mythical voices work
complete" "mythical/basic_voices/work_complete.wav"))
;; Repair sound is disabled as default
;;'repair #t
Index: demogame/ccl/spells.ccl
diff -u demogame/ccl/spells.ccl:1.1 demogame/ccl/spells.ccl:1.2
--- demogame/ccl/spells.ccl:1.1 Tue Sep 23 03:05:38 2003
+++ demogame/ccl/spells.ccl Mon Oct 6 17:10:13 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.1 2003/09/23 07:05:38 martinxyz Exp $
+;; $Id: spells.ccl,v 1.2 2003/10/06 21:10:13 martinxyz Exp $
;; For documentation see stratagus/doc/ccl/ccl.html ;; FIXME write and move
doc.
@@ -95,12 +95,11 @@
(define-spell "spell-holy-vision"
'showname "Holy Vision"
'manacost 70
- 'range -1
+ 'range 'infinite
'target 'position
- 'action '( HolyVision "unit-revealer" )
+ 'action '(summon unit-type unit-revealer time-to-live 10)
'sound-when-cast "holy vision"
'missile-when-cast "missile-normal-spell"
- 'autocast '(range -1)
)
(define-spell "spell-healing"
@@ -108,18 +107,20 @@
'manacost 6
'range 6
'target 'unit
- 'action '( Healing (HP 1) )
- 'condition '( UnitTypeflag (true organic)
- UnitTypeflag (false building)
- DurationEffect (false flag HP_percent value 100) ;; HP
< 100% HPMAX
- Alliance true
- )
+ 'action '(adjust-vitals hit-points 1)
+ 'condition '(
+ organic only
+ building false
+ max-hp-percent 100)
'sound-when-cast "healing"
'missile-when-cast "missile-heal-effect"
'autocast '(range 6
- condition (UnitTypeflag (false coward)
- )
- )
+ condition (
+ coward false
+ alliance only
+ max-hp-percent 50
+ )
+ )
)
(define-spell "spell-exorcism"
@@ -127,14 +128,15 @@
'manacost 4
'range 10
'target 'unit
- 'action '( Healing (HP -1) )
- 'condition '( UnitTypeflag (true undead)
- UnitTypeflag (false building)
- Alliance false
- )
+ 'action '(adjust-vitals hit-points -1)
+ 'condition '(
+ undead only
+ building false ; any undead buildings?
+ alliance false
+ )
'sound-when-cast "exorcism"
'missile-when-cast "missile-exorcism"
- 'autocast '(range 10 condition (UnitTypeflag (false coward)))
+ 'autocast '(range 10 condition (coward false alliance false))
)
(define-spell "spell-eye-of-vision"
@@ -142,10 +144,9 @@
'manacost 70
'range 6
'target 'none
- 'action '( Summon "unit-eye-of-vision" )
+ 'action '(summon unit-type unit-eye-of-vision time-to-live 5000)
'sound-when-cast "eye of vision"
'missile-when-cast "missile-normal-spell"
- 'autocast '(range 6)
)
(define-spell "spell-haste"
@@ -153,14 +154,15 @@
'manacost 50
'range 6
'target 'unit
- 'action '( Haste (haste 1000 slow 0) )
- 'condition '( UnitTypeflag (false building)
- DurationEffect (false flag haste value 900) ;; haste <
900 / CYCLE_PER_SECOND
- Alliance true
- )
+ 'action '(adjust-buffs haste-ticks 1000 slow-ticks 0)
+ 'condition '(
+ building false
+ max-haste-ticks 10 ;; FIXME: proper value?
+ )
'sound-when-cast "haste"
'missile-when-cast "missile-normal-spell"
- 'autocast '(range 6 condition (UnitTypeflag (false coward)))
+ 'autocast '(range 6 combat only condition (coward false alliance only))
+ 'ai-cast '(range 6 condition (coward false alliance only))
)
(define-spell "spell-slow"
@@ -168,14 +170,14 @@
'manacost 50
'range 10
'target 'unit
- 'action '( Haste (slow 1000 haste 0) )
- 'condition '( UnitTypeflag (false building)
- DurationEffect (false flag slow value 900) ;; slow <
900 / CYCLE_PER_SECOND
- Alliance true
- )
+ 'action '(adjust-buffs slow-ticks 1000 haste-ticks 0)
+ 'condition '(
+ building false
+ max-slow-ticks 10)
'sound-when-cast "slow"
'missile-when-cast "missile-normal-spell"
- 'autocast '(range 10 condition (UnitTypeflag (false coward)))
+ 'autocast '(range 10 combat only condition (coward false alliance
false))
+ 'ai-cast '(range 10 condition (coward false alliance false))
)
(define-spell "spell-bloodlust"
@@ -183,14 +185,14 @@
'manacost 50
'range 6
'target 'unit
- 'action '( Haste (bloodlust 1000) )
- 'condition '( UnitTypeflag (true organic)
- DurationEffect (false flag bloodlust value 900) ;;
bloodlust < 900 / CYCLE_PER_SECOND
- Alliance true
- )
+ 'action '(adjust-buffs bloodlust-ticks 1000)
+ 'condition '(
+ organic only
+ max-bloodlust-ticks 10)
'sound-when-cast "bloodlust"
'missile-when-cast "missile-normal-spell"
- 'autocast '(range 6 condition (UnitTypeflag (false coward)))
+ 'autocast '(range 6 condition (coward false alliance only))
+ 'ai-cast '(range 6 combat only condition (coward false alliance only))
)
(define-spell "spell-invisibility"
@@ -198,14 +200,13 @@
'manacost 200
'range 6
'target 'unit
- 'action '( Invisibility ( flag invisibility value 2000 missile
"missile-explosion" ))
- 'condition '( UnitTypeflag (false building)
- DurationEffect (false flag invisibility value 900) ;;
invisibility < 900 / CYCLE_PER_SECOND
- Alliance true
- )
+ 'action '(adjust-buffs invisibility-ticks 2000)
+ 'condition '(
+ building false
+ max-invisibility-ticks 10)
'sound-when-cast "invisibility"
'missile-when-cast "missile-normal-spell"
- 'autocast '(range 6 condition (UnitTypeflag (false coward)))
+; 'autocast '(range 6 condition (coward false))
)
(define-spell "spell-unholy-armor"
@@ -213,14 +214,13 @@
'manacost 100
'range 6
'target 'unit
- 'action '( Invisibility ( flag unholyarmor value 500 missile
"missile-explosion" ))
- 'condition '(UnitTypeflag (false building)
- DurationEffect (false flag unholyarmor value 900) ;;
unholyarmor < 900 / CYCLE_PER_SECOND
- Alliance true
- )
+ 'action '(adjust-buffs invincibility-ticks 500)
+ 'condition '(
+ building false
+ max-invincibility-ticks 10)
'sound-when-cast "unholyarmor"
'missile-when-cast "missile-normal-spell"
- 'autocast '(range 6 condition (UnitTypeflag (false coward)))
+; 'autocast '(range 6 condition (coward false alliance only))
)
(define-spell "spell-flame-shield"
@@ -228,14 +228,13 @@
'manacost 50
'range 6
'target 'unit
- 'action '( FlameShield (ttl 600))
- 'condition '(UnitTypeflag (false building)
- DurationEffect (false flag flameshield value 500) ;;
flameshield < 900 / CYCLE_PER_SECOND
-;; Alliance false;; On which player (true own , false
opponents)
- );; FIXME
+ 'action '(flame-shield duration 600)
+ ;; I think it's better if we can cast it multiple times and the effects
stack.
+ ;; Can be casted, and is effective on both allies and enemies
+ 'condition '(building false)
'sound-when-cast "flame shield"
-;; 'missile-when-cast "missile-flame-shield" ; NOT use
- 'autocast '(range 6 condition (UnitTypeflag (false coward)))
+ 'missile-when-cast "missile-flame-shield" ; NOT use
+; 'autocast '(range 6 condition (coward false))
)
(define-spell "spell-polymorph"
@@ -243,13 +242,12 @@
'manacost 200
'range 10
'target 'unit
- 'action '( Polymorph "unit-critter")
- 'condition '(UnitTypeflag (true organic)
- Alliance false
- )
+ 'action '(polymorph new-form unit-critter)
+ 'condition '(organic only)
'sound-when-cast "polymorph"
'missile-when-cast "missile-normal-spell"
- 'autocast '(range 10 condition (UnitTypeflag (false coward)))
+ ;; Only cast on the strongest units!!!
+; 'autocast '(range 10 condition (alliance false min-hp-percent 75))
)
@@ -258,7 +256,13 @@
'manacost 25
'range 12
'target 'position
- 'action '( Blizzard (fields 5 shards 10 damage 10) )
+ 'action '(area-bombardment
+ fields 5
+ shards 10
+ damage 10
+ ;; 128=4*32=4 tiles
+ start-offset-x -128
+ start-offset-y -128)
'sound-when-cast "blizzard"
'missile-when-cast "missile-blizzard"
;; 'autocast '(range 12)
@@ -269,7 +273,7 @@
'manacost 25
'range 12
'target 'position
- 'action '( DeathAndDecay (fields 5 shards 10 damage 10) )
+ 'action '(area-bombardment fields 5 shards 10 damage 10)
'sound-when-cast "death and decay"
'missile-when-cast "missile-death-and-decay"
;; 'autocast '(range 12)
@@ -280,7 +284,7 @@
'manacost 100
'range 8
'target 'position
- 'action '( FireBall (ttl 1000 damage 20))
+ 'action '(fireball ttl 1000 damage 20)
'sound-when-cast "fireball throw"
'missile-when-cast "missile-fireball"
;; 'autocast '(range 8)
@@ -291,7 +295,7 @@
'manacost 200
'range 10
'target 'position
- 'action '( Runes (ttl 2000 damage 50))
+ 'action '(runes ttl 2000 damage 50)
'sound-when-cast "runes"
'missile-when-cast "missile-rune"
;; 'autocast '(range 10)
@@ -302,11 +306,11 @@
'manacost 100
'range 10
'target 'position ;; FIXME position or organic target
- 'action '( DeathCoil )
-;; 'condition '(UnitTypeflag (true organic))
+ 'action '(fireball ttl 10000 damage 10000 )
+; 'condition '(UnitTypeflag (true organic))
'sound-when-cast "death coil"
'missile-when-cast "missile-death-coil"
-;; 'autocast '(range 6)
+; 'autocast '(range 6)
)
(define-spell "spell-raise-dead"
@@ -314,7 +318,7 @@
'manacost 50
'range 6
'target 'none
- 'action '( RaiseDead "unit-skeleton" )
+ '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)
@@ -325,7 +329,7 @@
'manacost 100
'range 12
'target 'position
- 'action '( Whirlwind (ttl 801)) ; TODO damage1 4 damage2 1
+ 'action '(whirlwind duration 801) ; TODO damage1 4 damage2 1
'sound-when-cast "whirlwind"
'missile-when-cast "missile-whirlwind"
;; 'autocast '(range 12)
@@ -336,20 +340,9 @@
'manacost 25
'range -1
'target 'position
- 'action '( CircleOfPower "unit-circle-of-power" )
+ 'action '(spawn-portal portal-type unit-circle-of-power)
'sound-when-cast "circle of power"
'missile-when-cast "missile-normal-spell"
;; 'autocast '(range -1)
)
-;(define-caster 'caster "unit-paladin" 'spell "spell-holy-vision"
"spell-healing" "spell-exorcism")
-;(define-caster 'caster "unit-mage"
-; 'spell "spell-fireball" "spell-slow" "spell-flame-shield"
"spell-invisibility"
-; "spell-polymorph" "spell-blizzard")
-;(define-caster 'caster "unit-ogre-mage" 'spell "spell-eye-of-vision"
"spell-bloodlust" "spell-runes")
-;(define-caster 'caster "unit-death-knight"
-; 'spell "spell-death-coil" "spell-haste" "spell-raise-dead"
"spell-whirlwind"
-; "spell-unholy-armor" "spell-death-and-decay")
-
-;(define-caster 'caster ""
-; 'spell "spell-circle-of-power")
Index: demogame/ccl/stratagus.ccl
diff -u demogame/ccl/stratagus.ccl:1.6 demogame/ccl/stratagus.ccl:1.7
--- demogame/ccl/stratagus.ccl:1.6 Tue Sep 23 03:05:38 2003
+++ demogame/ccl/stratagus.ccl Mon Oct 6 17:10:13 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.6 2003/09/23 07:05:38 martinxyz Exp $
+;; $Id: stratagus.ccl,v 1.7 2003/10/06 21:10:13 martinxyz Exp $
;; For documentation see stratagus/doc/ccl/ccl.html
@@ -204,13 +204,9 @@
(set-forest-regeneration! 0)
;(set-forest-regeneration! 5)
-;; Set depleted % for gold-mines. (n percent, 0 = disabled)
-(set-goldmine-depleted! 0)
-;(set-goldmine-depleted! 5)
-
;; Set burning building percent and rate. (n percent, h HP/second)
-;; Buildings with less than n% HP lose h HP every second.
-;(set-burn-buildings! 25 2)
+;; Buildings with less than n% HP lose h HP every wait cycles.
+;(set-burn-buildings! 25 2 6)
;; Edit this to enable/disable the reveal of the attacker.
;(set-reveal-attacker! #t)
Index: demogame/ccl/ui.ccl
diff -u demogame/ccl/ui.ccl:1.4 demogame/ccl/ui.ccl:1.5
--- demogame/ccl/ui.ccl:1.4 Wed Sep 3 07:23:07 2003
+++ demogame/ccl/ui.ccl Mon Oct 6 17:10:13 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: ui.ccl,v 1.4 2003/09/03 11:23:07 martinxyz Exp $
+;; $Id: ui.ccl,v 1.5 2003/10/06 21:10:13 martinxyz Exp $
(define color-dark-green 149) ; FIXME: move to central position
@@ -92,11 +92,12 @@
(string-append "graphics/ui/" race "/menubutton.png")
minimapx (+ minimapy 148))
- 'minimap-panel (list
- (string-append "graphics/ui/" race "/minimap.png")
- minimapx minimapy)
- 'minimap-pos (list
- (+ minimapx 27) (+ minimapy 13))
+ 'minimap (list
+ 'file (string-append "graphics/ui/" race "/minimap.png")
+ 'panel-pos (list minimapx minimapy)
+ 'pos (list (+ minimapx 27) (+ minimapy 13))
+ 'size '(128 128)
+ 'transparent)
'status-line (list
'file (string-append "graphics/ui/" race "/"
Index: demogame/ccl/units.ccl
diff -u demogame/ccl/units.ccl:1.7 demogame/ccl/units.ccl:1.8
--- demogame/ccl/units.ccl:1.7 Tue Sep 23 03:05:38 2003
+++ demogame/ccl/units.ccl Mon Oct 6 17:10:13 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/23 07:05:38 martinxyz Exp $
+;; $Id: units.ccl,v 1.8 2003/10/06 21:10:13 martinxyz Exp $
;; Load the animations for the units.
(load "ccl/anim.ccl" #f #t)
@@ -136,7 +136,6 @@
'can-attack
'can-target-land 'can-target-sea 'can-target-air
'air-unit
- 'critter
'detect-cloak
'organic
'selectable-by-rectangle
@@ -167,7 +166,6 @@
'right-move
'can-target-land
'land-unit
- 'critter
'random-movement-probability 100
'clicks-to-explode 10
'organic
@@ -405,7 +403,6 @@
'decay-rate 1
'type-land
'building
- 'critter
'detect-cloak
'sounds '())
@@ -421,7 +418,6 @@
'decay-rate 1
'type-land
'building
- 'critter
'sounds '())
;; Load the different races
Index: demogame/graphics/ui/alliance/minimap-big.png
Index: demogame/graphics/ui/alliance/minimap-big.xcf
Index: demogame/graphics/ui/alliance/minimap.png
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] demogame ccl/menus.ccl ccl/missiles.ccl ccl/sou...,
Martin Renold <=