[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] demogame/ccl icons.ccl menus.ccl missiles.ccl s...
|
From: |
Martin Renold |
|
Subject: |
[Stratagus-CVS] demogame/ccl icons.ccl menus.ccl missiles.ccl s... |
|
Date: |
Sat, 25 Oct 2003 04:31:44 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: demogame
Branch:
Changes by: Martin Renold <address@hidden> 03/10/25 04:31:44
Modified files:
ccl : icons.ccl menus.ccl missiles.ccl stratagus.ccl
ui.ccl
ccl/alliance : buttons.ccl
ccl/mythical : buttons.ccl spells.ccl
Log message:
merged engine changes
Patches:
Index: demogame/ccl/alliance/buttons.ccl
diff -u demogame/ccl/alliance/buttons.ccl:1.5
demogame/ccl/alliance/buttons.ccl:1.6
--- demogame/ccl/alliance/buttons.ccl:1.5 Mon Oct 13 11:15:36 2003
+++ demogame/ccl/alliance/buttons.ccl Sat Oct 25 04:31:43 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: buttons.ccl,v 1.5 2003/10/13 15:15:36 martinxyz Exp $
+;; $Id: buttons.ccl,v 1.6 2003/10/25 08:31:43 martinxyz Exp $
;;----------------------------------------------------------------------------
;; Define unit-button.
@@ -65,11 +65,6 @@
(define-button 'pos 6 'level 0 'icon 'icon-alliance-attack-ground
'action 'attack-ground
'key "g" 'hint "ATTACK ~!GROUND"
- 'for-unit '(alliance-group))
-
-(define-button 'pos 9 'level 0 'icon 'icon-alliance-demolish
- 'action 'demolish
- 'key "d" 'hint "~!DEMOLISH"
'for-unit '(alliance-group))
;; peasant specific actions ---------------------------------------------------
Index: demogame/ccl/icons.ccl
diff -u demogame/ccl/icons.ccl:1.9 demogame/ccl/icons.ccl:1.10
--- demogame/ccl/icons.ccl:1.9 Mon Oct 13 11:15:34 2003
+++ demogame/ccl/icons.ccl Sat Oct 25 04:31:43 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.9 2003/10/13 15:15:34 martinxyz Exp $
+;; $Id: icons.ccl,v 1.10 2003/10/25 08:31:43 martinxyz Exp $
;; NOTE:
;; Splitting this file into races is a problem, because all
@@ -88,10 +88,6 @@
'size '(46 38) 'normal '(116 "tilesets/summer/icons.png"))
(define-icon 'icon-battle-axe1 'tileset 'tileset-summer
'size '(46 38) 'normal '(119 "tilesets/summer/icons.png"))
-(define-icon 'icon-alliance-demolish 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(142 "tilesets/summer/icons.png"))
-(define-icon 'icon-mythical-demolish 'tileset 'tileset-summer
- 'size '(46 38) 'normal '(143 "tilesets/summer/icons.png"))
(define-icon 'icon-alliance-shield1 'tileset 'tileset-summer
'size '(46 38) 'normal '(164 "tilesets/summer/icons.png"))
(define-icon 'icon-mythical-shield1 'tileset 'tileset-summer
Index: demogame/ccl/menus.ccl
diff -u demogame/ccl/menus.ccl:1.6 demogame/ccl/menus.ccl:1.7
--- demogame/ccl/menus.ccl:1.6 Mon Oct 13 11:15:35 2003
+++ demogame/ccl/menus.ccl Sat Oct 25 04:31:43 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.6 2003/10/13 15:15:35 martinxyz Exp $
+;; $Id: menus.ccl,v 1.7 2003/10/25 08:31:43 martinxyz Exp $
;;
;; load the keystroke helps
@@ -548,6 +548,32 @@
style gm-half)
'menu 'menu-enter-name)
+;;
+;; menu-internet-create-join-menu
+;;
+(define-menu 'name 'menu-internet-create-join-menu 'geometry '(0 0 640 480)
+ 'panel 'none 'default '2)
+(define-menu-item 'pos (list 208 (+ 320 (* 36 0))) 'font 'large
+ 'button '(size (224 27)
+ caption "~!Join Internet Game"
+ hotkey "j"
+ func menu-multi-master-gem
+ style gm-full)
+ 'menu 'menu-internet-create-join-menu)
+(define-menu-item 'pos (list 208 (+ 320 (* 36 1))) 'font 'large
+ 'button '(size (224 27)
+ caption "~!Create Internet Game"
+ hotkey "c"
+ func net-internet-create-game
+ style gm-full)
+ 'menu 'menu-internet-create-join-menu)
+(define-menu-item 'pos (list 208 (+ 320 (* 36 2))) 'font 'large
+ 'button '(size (224 27)
+ caption "~!Previous Menu"
+ hotkey "p"
+ func end-menu
+ style gm-full)
+ 'menu 'menu-internet-create-join-menu)
;;
;; menu-create-join-menu
@@ -3777,6 +3803,149 @@
func end-menu
style gm-full)
'menu 'menu-exit-confirm)
+
+;;-----------------------------------------------------------------
+;; **** Show master server game list
+;;-----------------------------------------------------------------
+;; menu-metaserver-list
+;;
+(define-menu 'name 'menu-metaserver-list 'geometry '(0 0 640 480)
+ 'panel 'none 'default '3)
+(define-menu-item 'pos (list 0 0) 'font 'game 'init 'menu-metaserver-init
'exit 'menu-metaserver-exit
+ 'menu 'menu-metaserver-list )
+(define-menu-item 'pos (list (+ (/ 640 2) 12) 8) 'font 'large
+ 'text '(caption "~<Online Game List ~>" align center)
+ 'menu 'menu-metaserver-list )
+(define-menu-item 'pos (list (- 640 224 16) (+ 360 (* 36 2))) 'font 'large
+ 'button '(size (224 27)
+ caption "~!Cancel Game"
+ hotkey "c"
+ func end-menu
+ style gm-full)
+ 'menu 'menu-metaserver-list )
+(define-menu-item 'pos (list (- 640 224 16) (+ 360 (* 36 1))) 'font 'large
+ 'button '(size (224 27)
+ caption "~!Refresh"
+ hotkey "c"
+ func menu-metaserver-list ;; refresh game list.
+ style gm-full)
+ 'menu 'menu-metaserver-list )
+
+;;------------------------------------------------- nickname
+(define-menu-item 'pos (list 40 (+ 32 (* 22 0))) 'font 'game
+ 'text '(caption "~<Nickname~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- IP:Port
+(define-menu-item 'pos (list 160 (+ 32 (* 22 0))) 'font 'game
+ 'text '(caption "~<IP:PORT~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- OS
+(define-menu-item 'pos (list 280 (+ 32 (* 22 0))) 'font 'game
+ 'text '(caption "~<OS~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- Other
+(define-menu-item 'pos (list 400 (+ 32 (* 22 0))) 'font 'game
+ 'text '(caption "~<Other Argument~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- checkbox
+(define-menu-item 'pos (list 15 (+ 32 (* 22 0)))
+ 'gem '(size (18 18)
+ state unchecked
+ func select-game-server
+ style gem-square)
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- nickname
+(define-menu-item 'pos (list 40 (+ 32 (* 22 1))) 'font 'game
+ 'text '(caption "~<Nickname~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- IP:Port
+(define-menu-item 'pos (list 160 (+ 32 (* 22 1))) 'font 'game
+ 'text '(caption "~<IP:PORT~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- OS
+(define-menu-item 'pos (list 280 (+ 32 (* 22 1))) 'font 'game
+ 'text '(caption "~<OS~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- Other
+(define-menu-item 'pos (list 400 (+ 32 (* 22 1))) 'font 'game
+ 'text '(caption "~<Other Argument~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- checkbox
+(define-menu-item 'pos (list 15 (+ 32 (* 22 1)))
+ 'gem '(size (18 18)
+ state unchecked
+ func select-game-server
+ style gem-square)
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- nickname
+(define-menu-item 'pos (list 40 (+ 32 (* 22 2))) 'font 'game
+ 'text '(caption "~<Nickname~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- IP:Port
+(define-menu-item 'pos (list 160 (+ 32 (* 22 2))) 'font 'game
+ 'text '(caption "~<IP:PORT~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- OS
+(define-menu-item 'pos (list 280 (+ 32 (* 22 2))) 'font 'game
+ 'text '(caption "~<OS~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- Other
+(define-menu-item 'pos (list 400 (+ 32 (* 22 2))) 'font 'game
+ 'text '(caption "~<Other Argument~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- checkbox
+(define-menu-item 'pos (list 15 (+ 32 (* 22 2)))
+ 'gem '(size (18 18)
+ state unchecked
+ func select-game-server
+ style gem-square)
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- nickname
+(define-menu-item 'pos (list 40 (+ 32 (* 22 3))) 'font 'game
+ 'text '(caption "~<Nickname~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- IP:Port
+(define-menu-item 'pos (list 160 (+ 32 (* 22 3))) 'font 'game
+ 'text '(caption "~<IP:PORT~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- OS
+(define-menu-item 'pos (list 280 (+ 32 (* 22 3))) 'font 'game
+ 'text '(caption "~<OS~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- Other
+(define-menu-item 'pos (list 400 (+ 32 (* 22 3))) 'font 'game
+ 'text '(caption "~<Other Argument~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- checkbox
+(define-menu-item 'pos (list 15 (+ 32 (* 22 3)))
+ 'gem '(size (18 18)
+ state unchecked
+ func select-game-server
+ style gem-square)
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- nickname
+(define-menu-item 'pos (list 40 (+ 32 (* 22 4))) 'font 'game
+ 'text '(caption "~<Nickname~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- IP:Port
+(define-menu-item 'pos (list 160 (+ 32 (* 22 4))) 'font 'game
+ 'text '(caption "~<IP:PORT~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- OS
+(define-menu-item 'pos (list 280 (+ 32 (* 22 4))) 'font 'game
+ 'text '(caption "~<OS~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- Other
+(define-menu-item 'pos (list 400 (+ 32 (* 22 4))) 'font 'game
+ 'text '(caption "~<Other Argument~>" )
+ 'menu 'menu-metaserver-list )
+;;------------------------------------------------- checkbox
+(define-menu-item 'pos (list 15 (+ 32 (* 22 4)))
+ 'gem '(size (18 18)
+ state unchecked
+ func select-game-server
+ style gem-square)
+ 'menu 'menu-metaserver-list )
;;-----------------------------------------------------------------
;; **** Show master server game list
Index: demogame/ccl/missiles.ccl
diff -u demogame/ccl/missiles.ccl:1.5 demogame/ccl/missiles.ccl:1.6
--- demogame/ccl/missiles.ccl:1.5 Mon Oct 13 11:15:35 2003
+++ demogame/ccl/missiles.ccl Sat Oct 25 04:31:43 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.5 2003/10/13 15:15:35 martinxyz Exp $
+;; $Id: missiles.ccl,v 1.6 2003/10/25 08:31:43 martinxyz Exp $
;; NOTE: the missiles could be sorted for races, but did this make sense?
@@ -39,8 +39,8 @@
;;
(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)
+ 'file "missiles/death_and_decay.png" 'size '(32 32) 'frames 8
'num-directions 1
+ 'draw-level 100 'class 'missile-class-stay 'sleep 1 'speed 0 'range 1)
(define-missile-type 'missile-small-fire
'file "missiles/small_fire.png" 'size '(32 48) 'frames 6
@@ -52,11 +52,11 @@
(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)
+ 'draw-level 50 'class 'missile-class-stay '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)
+ 'draw-level 50 'class 'missile-class-stay 'sleep 1 'speed 16 'range 1)
(define-missile-type 'missile-green-cross
'file "missiles/green_cross.png" 'size '(32 32) 'frames 4
@@ -73,10 +73,6 @@
(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-burning-building
'(percent 0 missile missile-big-fire)
Index: demogame/ccl/mythical/buttons.ccl
diff -u demogame/ccl/mythical/buttons.ccl:1.7
demogame/ccl/mythical/buttons.ccl:1.8
--- demogame/ccl/mythical/buttons.ccl:1.7 Mon Oct 13 11:15:36 2003
+++ demogame/ccl/mythical/buttons.ccl Sat Oct 25 04:31:44 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: buttons.ccl,v 1.7 2003/10/13 15:15:36 martinxyz Exp $
+;; $Id: buttons.ccl,v 1.8 2003/10/25 08:31:44 martinxyz Exp $
;; general commands -- almost all units have it -------------------------------
@@ -59,11 +59,6 @@
'action 'attack-ground
'key "g" 'hint "ATTACK ~!GROUND"
'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-faun mythical-group))
;; faun specific actions ------------------------------------------------------
Index: demogame/ccl/mythical/spells.ccl
diff -u demogame/ccl/mythical/spells.ccl:1.2
demogame/ccl/mythical/spells.ccl:1.3
--- demogame/ccl/mythical/spells.ccl:1.2 Thu Oct 9 15:32:41 2003
+++ demogame/ccl/mythical/spells.ccl Sat Oct 25 04:31:44 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/09 19:32:41 martinxyz Exp $
+;; $Id: spells.ccl,v 1.3 2003/10/25 08:31:44 martinxyz Exp $
; Add a new spell:
; - add it here (and maybe add a missile)
@@ -38,7 +38,7 @@
'manacost 25
'range 12
'target 'position
- 'action '(area-bombardment 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)
Index: demogame/ccl/stratagus.ccl
diff -u demogame/ccl/stratagus.ccl:1.12 demogame/ccl/stratagus.ccl:1.13
--- demogame/ccl/stratagus.ccl:1.12 Mon Oct 13 10:09:10 2003
+++ demogame/ccl/stratagus.ccl Sat Oct 25 04:31:43 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.12 2003/10/13 14:09:10 martinxyz Exp $
+;; $Id: stratagus.ccl,v 1.13 2003/10/25 08:31:43 martinxyz Exp $
;; For documentation see stratagus/doc/ccl/ccl.html
@@ -224,12 +224,6 @@
;; uncomment this.
;; FIXME: this option will be renamed
;(right-button-moves)
-
-;; Change next, for the wanted mouse speed. (only SVGALIB)
-(set-mouse-adjust! 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)
Index: demogame/ccl/ui.ccl
diff -u demogame/ccl/ui.ccl:1.7 demogame/ccl/ui.ccl:1.8
--- demogame/ccl/ui.ccl:1.7 Mon Oct 13 10:09:10 2003
+++ demogame/ccl/ui.ccl Sat Oct 25 04:31:43 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.7 2003/10/13 14:09:10 martinxyz Exp $
+;; $Id: ui.ccl,v 1.8 2003/10/25 08:31:43 martinxyz Exp $
(define color-dark-green 149) ; FIXME: move to central position
@@ -82,8 +82,25 @@
; Menu button
'menu-panel (list
- (string-append "graphics/ui/" race "/menubutton.png")
- minimapx (+ minimapy 148))
+ 'panel (list
+ 'file (string-append "graphics/ui/" race "/menubutton.png")
+ 'pos (list minimapx (+ minimapy 148)))
+ 'menu-button (list
+ 'pos (list (+ minimapx 28) (+ minimapy 148))
+ 'size '(128 19)
+ 'caption "Menu (~<F10~>)"
+ 'style 'main)
+ ; FIXME: not yet adapted
+ 'network-menu-button '(
+ pos (6 2)
+ size (80 19)
+ caption "Menu"
+ style network)
+ 'network-diplomacy-button '(
+ pos (90 2)
+ size (80 19)
+ caption "Diplomacy"
+ style network) )
'minimap (list
'file (string-append "graphics/ui/" race "/minimap.png")
@@ -178,42 +195,25 @@
)
'button-panel (list
- (string-append "graphics/ui/" race "/buttonpanel.png") buttonx buttony
+ 'panel (list
+ 'file (string-append "graphics/ui/" race "/buttonpanel.png")
+ 'pos (list buttonx buttony))
+ 'icons (list
+ (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))
)
'filler (list
'file (string-append "graphics/ui/" race "/"
(number->string screen_width) "x" (number->string screen_height)
"/filler1.png")
'pos (list fillerx fillery))
-
- 'menu-button (list
- 'pos (list (+ minimapx 28) (+ minimapy 148))
- 'size '(128 19)
- 'caption "Menu (~<F10~>)"
- 'style 'main)
-
- ; FIXME: not yet adapted
- 'network-menu-button '(
- pos (6 2)
- size (80 19)
- caption "Menu"
- style network)
- 'network-diplomacy-button '(
- pos (90 2)
- size (80 19)
- caption "Diplomacy"
- style network)
-
- 'button-buttons (list
- (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 icons.ccl menus.ccl missiles.ccl s...,
Martin Renold <=