[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] demogame/ccl missiles.ccl stratagus.ccl ui.ccl ...
From: |
Martin Renold |
Subject: |
[Stratagus-CVS] demogame/ccl missiles.ccl stratagus.ccl ui.ccl ... |
Date: |
Mon, 13 Oct 2003 10:09:10 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: demogame
Branch:
Changes by: Martin Renold <address@hidden> 03/10/13 10:09:10
Modified files:
ccl : missiles.ccl stratagus.ccl ui.ccl
ccl/alliance : spells.ccl
Log message:
merged engine changes
Patches:
Index: demogame/ccl/alliance/spells.ccl
diff -u demogame/ccl/alliance/spells.ccl:1.1
demogame/ccl/alliance/spells.ccl:1.2
--- demogame/ccl/alliance/spells.ccl:1.1 Thu Oct 9 12:10:35 2003
+++ demogame/ccl/alliance/spells.ccl Mon Oct 13 10:09: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: spells.ccl,v 1.1 2003/10/09 16:10:35 martinxyz Exp $
+;; $Id: spells.ccl,v 1.2 2003/10/13 14:09:10 martinxyz Exp $
;; 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.
@@ -115,7 +115,7 @@
'manacost 50
'range 6
'target 'unit
- 'action '(flame-shield duration 600)
+ 'action '(flame-shield duration 600 damage 1)
;; 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)
Index: demogame/ccl/missiles.ccl
diff -u demogame/ccl/missiles.ccl:1.3 demogame/ccl/missiles.ccl:1.4
--- demogame/ccl/missiles.ccl:1.3 Tue Oct 7 04:41:45 2003
+++ demogame/ccl/missiles.ccl Mon Oct 13 10:09: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: missiles.ccl,v 1.3 2003/10/07 08:41:45 martinxyz Exp $
+;; $Id: missiles.ccl,v 1.4 2003/10/13 14:09:09 martinxyz Exp $
;; NOTE: the missiles could be sorted for races, but did this make sense?
@@ -58,7 +58,8 @@
(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)
+ 'draw-level 50 'class 'missile-class-point-to-point 'sleep 1 'speed 16
'range 1
+ 'impact-missile 'missile-explosion)
(define-missile-type 'missile-flame-shield
'file "missiles/flame_shield.png" 'size '(32 48) 'frames 6
@@ -93,7 +94,8 @@
(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)
+ 'draw-level 20 'class 'missile-class-land-mine 'sleep 5 'speed 16 'range 1
+ 'impact-missile 'missile-explosion)
(define-missile-type 'missile-whirlwind
'file "missiles/tornado.png" 'size '(56 56) 'frames 4
Index: demogame/ccl/stratagus.ccl
diff -u demogame/ccl/stratagus.ccl:1.11 demogame/ccl/stratagus.ccl:1.12
--- demogame/ccl/stratagus.ccl:1.11 Sun Oct 12 16:06:09 2003
+++ demogame/ccl/stratagus.ccl Mon Oct 13 10:09: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: stratagus.ccl,v 1.11 2003/10/12 20:06:09 martinxyz Exp $
+;; $Id: stratagus.ccl,v 1.12 2003/10/13 14:09:10 martinxyz Exp $
;; For documentation see stratagus/doc/ccl/ccl.html
@@ -57,7 +57,7 @@
;; Enter your default title screen.
(set-title-screen! "graphics/ui/stratagus.png")
-;(set-title-screen! "videos/splash2.avi")
+;(set-title-screen! "graphics/logo_stratagus.avi")
;; Enter your title music.
;(set-title-music! "music/default.mod")
Index: demogame/ccl/ui.ccl
diff -u demogame/ccl/ui.ccl:1.6 demogame/ccl/ui.ccl:1.7
--- demogame/ccl/ui.ccl:1.6 Wed Oct 8 05:14:00 2003
+++ demogame/ccl/ui.ccl Mon Oct 13 10:09:10 2003
@@ -26,13 +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: ui.ccl,v 1.6 2003/10/08 09:14:00 martinxyz Exp $
+;; $Id: ui.ccl,v 1.7 2003/10/13 14:09:10 martinxyz Exp $
(define color-dark-green 149) ; FIXME: move to central position
(define (make-ui race screen_width screen_height)
; precalculate ui positions
-
; map area dimensions
(define mapw (* 32 (trunc
(/ screen_width 32))))
@@ -44,14 +43,16 @@
; panels
(define minimapx 0)
(define minimapy (+ 16 maph))
- (define infox (+ minimapx 176))
- (define infoy minimapy)
- (define buttonx (+ infox 176))
- (define buttony infoy)
+ (define info_panel_x (+ minimapx 176))
+ (define info_panel_y minimapy)
+ (define buttonx (+ info_panel_x 176))
+ (define buttony info_panel_y)
(define fillerx (+ buttonx 176))
- (define fillery infoy)
+ (define fillery info_panel_y)
(define statusx 0)
- (define statusy (+ infoy 176))
+ (define statusy (+ info_panel_y 176))
+
+ (define icon_size '(46 38))
(define-ui race screen_width screen_height
'normal-font-color (if (= race 'alliance) 'white 'yellow)
@@ -69,14 +70,6 @@
'score (list 'file "graphics/ui/score.png" 'row 0
'pos (list (- screen_width 16 68) 0) 'size '(14 14) 'text-pos (list (+
(- screen_width 16 68) 18) 1)))
- 'completed-bar (list
- 'color '(48 100 4)
- 'pos (list (+ infox 14) (+ infoy 151))
- 'size '(152 14)
- 'text "% Complete"
- 'font 'game
- 'text-pos (list (+ infox 14 38) (+ infoy 151)))
-
'resource-line (list
(string-append "graphics/ui/" race "/"
(number->string screen_width) "x" (number->string screen_height)
@@ -108,16 +101,90 @@
'font 'game)
'info-panel (list
- (string-append "graphics/ui/" race "/infopanel.png")
- infox infoy 176 176)
+ 'panel (list
+ 'file (string-append "graphics/ui/" race "/infopanel.png")
+ 'pos (list info_panel_x info_panel_y)
+ 'size '(176 176)
+ )
+ 'selected (list
+ 'single (list
+ 'icon (list 'pos (list (+ info_panel_x 9) (+ info_panel_y 8))
'size icon_size))
+ 'multiple (list
+ 'icons (list
+ (list 'pos (list (+ info_panel_x 9) (+ info_panel_y 8)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 65) (+ info_panel_y 8)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 121) (+ info_panel_y 8)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 9) (+ info_panel_y 62)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 65) (+ info_panel_y 62)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 121) (+ info_panel_y 62)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 9) (+ info_panel_y 116)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 65) (+ info_panel_y 116)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 121) (+ info_panel_y 116)) 'size
icon_size) ))
+ )
+ 'training (list
+ 'single (list
+ 'text (list
+ 'text "Training:"
+ 'font 'game
+ 'pos (list (+ info_panel_x 37) (+ info_panel_y 8 78)))
+ 'icon (list
+ 'pos (list (+ info_panel_x 107) (+ info_panel_y 8 70))
+ 'size icon_size) )
+ 'multiple (list
+ 'icons (list
+ (list 'pos (list (+ info_panel_x 9) (+ info_panel_y 62)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 65) (+ info_panel_y 62)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 121) (+ info_panel_y 62)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 9) (+ info_panel_y 116)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 65) (+ info_panel_y 116)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 121) (+ info_panel_y 116)) 'size
icon_size)))
+ )
+ 'upgrading (list
+ 'text (list
+ 'text "Upgrading:"
+ 'font 'game
+ 'pos (list (+ info_panel_x 29) (+ info_panel_y 8 78)))
+ 'icon (list
+ 'pos (list (+ info_panel_x 107) (+ info_panel_y 8 70))
+ 'size icon_size)
+ )
+ 'researching (list
+ 'text (list
+ 'text "Researching:"
+ 'font 'game
+ 'pos (list (+ info_panel_x 16) (+ info_panel_y 8 78)))
+ 'icon (list
+ 'pos (list (+ info_panel_x 107) (+ info_panel_y 8 70))
+ 'size icon_size)
+ )
+ 'transporting (list
+ 'icons (list
+ (list 'pos (list (+ info_panel_x 9) (+ info_panel_y 62)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 65) (+ info_panel_y 62)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 121) (+ info_panel_y 62)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 9) (+ info_panel_y 116)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 65) (+ info_panel_y 116)) 'size
icon_size)
+ (list 'pos (list (+ info_panel_x 121) (+ info_panel_y 116)) 'size
icon_size))
+ )
+ 'completed-bar (list
+ 'color '(48 100 4)
+ 'pos (list (+ info_panel_x 14) (+ info_panel_y 151))
+ 'size '(152 14)
+ 'text (list
+ 'text "% Complete"
+ 'font 'game
+ 'pos (list (+ info_panel_x 14 38) (+ info_panel_y 151)))
+ )
+ )
+
'button-panel (list
- (string-append "graphics/ui/" race "/buttonpanel.png")
- buttonx buttony)
+ (string-append "graphics/ui/" race "/buttonpanel.png") buttonx buttony
+ )
'filler (list
'file (string-append "graphics/ui/" race "/"
(number->string screen_width) "x" (number->string screen_height)
"/filler1.png")
- 'pos (list fillerx fillery))
+ 'pos (list fillerx fillery))
'menu-button (list
'pos (list (+ minimapx 28) (+ minimapy 148))
@@ -137,33 +204,16 @@
caption "Diplomacy"
style network)
- 'info-buttons (list
- (list 'pos (list (+ infox 9) (+ infoy 8)) 'size '(46 38))
- (list 'pos (list (+ infox 65) (+ infoy 8)) 'size '(46 38))
- (list 'pos (list (+ infox 121) (+ infoy 8)) 'size '(46 38))
- (list 'pos (list (+ infox 9) (+ infoy 62)) 'size '(46 38))
- (list 'pos (list (+ infox 65) (+ infoy 62)) 'size '(46 38))
- (list 'pos (list (+ infox 121) (+ infoy 62)) 'size '(46 38))
- (list 'pos (list (+ infox 9) (+ infoy 116)) 'size '(46 38))
- (list 'pos (list (+ infox 65) (+ infoy 116)) 'size '(46 38))
- (list 'pos (list (+ infox 121) (+ infoy 116)) 'size '(46 38)))
- 'training-buttons (list
- (list 'pos (list (+ infox 9) (+ infoy 62)) 'size '(46 38))
- (list 'pos (list (+ infox 65) (+ infoy 62)) 'size '(46 38))
- (list 'pos (list (+ infox 121) (+ infoy 62)) 'size '(46 38))
- (list 'pos (list (+ infox 9) (+ infoy 116)) 'size '(46 38))
- (list 'pos (list (+ infox 65) (+ infoy 116)) 'size '(46 38))
- (list 'pos (list (+ infox 121) (+ infoy 116)) 'size '(46 38)))
'button-buttons (list
- (list 'pos (list (+ buttonx 9) (+ buttony 8)) 'size '(46 38))
- (list 'pos (list (+ buttonx 65) (+ buttony 8)) 'size '(46 38))
- (list 'pos (list (+ buttonx 121) (+ buttony 8)) 'size '(46 38))
- (list 'pos (list (+ buttonx 9) (+ buttony 62)) 'size '(46 38))
- (list 'pos (list (+ buttonx 65) (+ buttony 62)) 'size '(46 38))
- (list 'pos (list (+ buttonx 121) (+ buttony 62)) 'size '(46 38))
- (list 'pos (list (+ buttonx 9) (+ buttony 116)) 'size '(46 38))
- (list 'pos (list (+ buttonx 65) (+ buttony 116)) 'size '(46 38))
- (list 'pos (list (+ buttonx 121) (+ buttony 116)) 'size '(46 38)))
+ (list 'pos (list (+ buttonx 9) (+ buttony 8)) 'size icon_size)
+ (list 'pos (list (+ buttonx 65) (+ buttony 8)) 'size icon_size)
+ (list 'pos (list (+ buttonx 121) (+ buttony 8)) 'size icon_size)
+ (list 'pos (list (+ buttonx 9) (+ buttony 62)) 'size icon_size)
+ (list 'pos (list (+ buttonx 65) (+ buttony 62)) 'size icon_size)
+ (list 'pos (list (+ buttonx 121) (+ buttony 62)) 'size icon_size)
+ (list 'pos (list (+ buttonx 9) (+ buttony 116)) 'size icon_size)
+ (list 'pos (list (+ buttonx 65) (+ buttony 116)) 'size icon_size)
+ (list 'pos (list (+ buttonx 121) (+ buttony 116)) 'size icon_size))
'cursors '(
point cursor-point
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] demogame/ccl missiles.ccl stratagus.ccl ui.ccl ...,
Martin Renold <=