[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] demogame ccl/anim.ccl ccl/guile.ccl ccl/icons.c...
From: |
Martin Renold |
Subject: |
[Stratagus-CVS] demogame ccl/anim.ccl ccl/guile.ccl ccl/icons.c... |
Date: |
Sun, 16 Nov 2003 05:05:08 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: demogame
Branch:
Changes by: Martin Renold <address@hidden> 03/11/16 05:05:06
Modified files:
ccl : anim.ccl guile.ccl icons.ccl menus.ccl siod.ccl
sound.ccl stratagus.ccl tilesets.ccl ui.ccl
units.ccl
ccl/alliance : units.ccl
ccl/mythical : units.ccl
ccl/tilesets : summer.ccl
Removed files:
graphics/alliance/units: sniper-icon.png
Log message:
merged engine changes
Patches:
Index: demogame/ccl/alliance/units.ccl
diff -u demogame/ccl/alliance/units.ccl:1.13
demogame/ccl/alliance/units.ccl:1.14
--- demogame/ccl/alliance/units.ccl:1.13 Mon Oct 13 11:15:36 2003
+++ demogame/ccl/alliance/units.ccl Sun Nov 16 05:05:05 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.13 2003/10/13 15:15:36 martinxyz Exp $
+;; $Id: units.ccl,v 1.14 2003/11/16 10:05:05 martinxyz Exp $
;;=============================================================================
;; Define unit-types.
@@ -72,12 +72,14 @@
wait-at-depot 150
lose-resources
terrain-harvester )
- 'organic
+ ;'organic
'selectable-by-rectangle
'sounds '(
selected "peasant-selected"
acknowledge "peasant-acknowledge"
ready "peasant-ready"
+; repair "peasant-attack"
+ harvest wood "tree chopping"
help "basic alliance voices help 1"
dead "basic alliance voices dead"
attack "peasant-attack"))
@@ -150,7 +152,7 @@
'corpse '(unit-destroyed-1x1-place 0)
'explode-when-killed 'missile-explosion
'type-land
- 'building
+ 'building 'visible-under-fog
'sounds '(
selected "alliance-wall-selected"
acknowledge "alliance-wall-acknowledge"
Index: demogame/ccl/anim.ccl
diff -u demogame/ccl/anim.ccl:1.9 demogame/ccl/anim.ccl:1.10
--- demogame/ccl/anim.ccl:1.9 Mon Oct 13 11:15:34 2003
+++ demogame/ccl/anim.ccl Sun Nov 16 05:05:04 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: anim.ccl,v 1.9 2003/10/13 15:15:34 martinxyz Exp $
+;; $Id: anim.ccl,v 1.10 2003/11/16 10:05:04 martinxyz Exp $
;;------
;; Footman, Grunt, Grom Hellscream, Arthor_Literios, Korgath Bladefist
@@ -53,6 +53,15 @@
#( 0 3 1 10) #( 0 2 1 0) #( 0 3 2 0) #( 0 3 1 15)
#( 0 3 2 15) #( 0 2 1 20) #( 0 3 1 20) #( 3 2 1 0))
'attack '( ; #25
+ #( 0 0 3 25) #( 0 0 3 30) #( 0 0 3 35) #(12 0 5 40)
+ #( 0 0 3 45) #( 0 0 7 25) #( 3 0 1 25))
+ 'harvest 'wood '( ; #25
+ #( 0 0 3 25) #( 0 0 3 30) #( 0 0 3 35) #(12 0 5 40)
+ #( 0 0 3 45) #( 0 0 7 25) #( 3 0 1 25))
+ 'harvest 'gold '( ; #25
+ #( 0 0 3 25) #( 0 0 3 30) #( 0 0 3 35) #(12 0 5 40)
+ #( 0 0 3 45) #( 0 0 7 25) #( 3 0 1 25))
+ 'repair '( ; #25
#( 0 0 3 25) #( 0 0 3 30) #( 0 0 3 35) #(12 0 5 40)
#( 0 0 3 45) #( 0 0 7 25) #( 3 0 1 25))
'die '( ; #107
Index: demogame/ccl/guile.ccl
diff -u demogame/ccl/guile.ccl:1.1 demogame/ccl/guile.ccl:1.2
--- demogame/ccl/guile.ccl:1.1 Sun Oct 12 16:06:09 2003
+++ demogame/ccl/guile.ccl Sun Nov 16 05:05:04 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: guile.ccl,v 1.1 2003/10/12 20:06:09 martinxyz Exp $
+;; $Id: guile.ccl,v 1.2 2003/11/16 10:05:04 martinxyz Exp $
(define *scheme* 'guile)
@@ -56,6 +56,9 @@
(define (ccl:load filename)
(load (substring filename 4)))
+
+(define (ccl:eval str)
+ (eval str (current-module)))
(display "Using Scheme: Guile\n")
Index: demogame/ccl/icons.ccl
diff -u demogame/ccl/icons.ccl:1.10 demogame/ccl/icons.ccl:1.11
--- demogame/ccl/icons.ccl:1.10 Sat Oct 25 04:31:43 2003
+++ demogame/ccl/icons.ccl Sun Nov 16 05:05:04 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.10 2003/10/25 08:31:43 martinxyz Exp $
+;; $Id: icons.ccl,v 1.11 2003/11/16 10:05:04 martinxyz Exp $
;; NOTE:
;; Splitting this file into races is a problem, because all
@@ -34,8 +34,6 @@
;; FIXME: can be removed: Set the icon size (width height)
(set-icon-size! 46 38)
-;; FIXME: can be removed: Set the number of icons per row
-(set-icons-per-row! 5)
;;=============================================================================
;; Summer Tileset
Index: demogame/ccl/menus.ccl
diff -u demogame/ccl/menus.ccl:1.7 demogame/ccl/menus.ccl:1.8
--- demogame/ccl/menus.ccl:1.7 Sat Oct 25 04:31:43 2003
+++ demogame/ccl/menus.ccl Sun Nov 16 05:05:04 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.7 2003/10/25 08:31:43 martinxyz Exp $
+;; $Id: menus.ccl,v 1.8 2003/11/16 10:05:04 martinxyz Exp $
;;
;; load the keystroke helps
@@ -296,7 +296,6 @@
func replay-game-menu
style gm-full)
'menu 'menu-program-start)
-(if (symbol-bound? 'stratagus-feature-sdl ())
(define-menu-item 'pos (list 208 (+ 109 (* 36 5))) 'font 'large
'button '(size (224 27)
caption "~!Options"
@@ -304,15 +303,6 @@
func global-options-menu
style gm-full)
'menu 'menu-program-start)
-(define-menu-item 'pos (list 208 (+ 109 (* 36 5))) 'font 'large
- 'flags '(disabled)
- 'button '(size (224 27)
- caption "~!Options"
- hotkey "o"
- func global-options-menu
- style gm-full)
- 'menu 'menu-program-start)
-)
(define-menu-item 'pos (list 208 (+ 109 (* 36 6))) 'font 'large
'button '(size (224 27)
caption "~!Editor"
@@ -502,10 +492,7 @@
(define-menu-item 'pos (list 220 (+ 10 300)) 'font 'game
'pulldown (list 'size '(152 20)
'style 'pulldown
- 'func 'game-tss-action
- 'options map-default-tileset-names
- 'default 0
- 'current 0)
+ 'func 'game-tss-action)
'menu 'menu-custom-game)
(define-menu-item 'pos (list (- 640 224 16) (- (+ 10 300) 20)) 'font 'game
'text '(caption "~<Game Type:~>" none)
@@ -857,10 +844,7 @@
(define-menu-item 'pos (list 220 (+ 10 300)) 'font 'game
'pulldown (list 'size '(152 20)
'style 'pulldown
- 'func 'game-tss-action
- 'options map-default-tileset-names
- 'default 0
- 'current 0)
+ 'func 'game-tss-action)
'menu 'menu-multi-setup)
(define-menu-item 'pos (list (- 640 224 16) (- (+ 10 300) 20)) 'font 'game
'text '(caption "~<Game Type:~>" none)
@@ -1274,10 +1258,7 @@
'pulldown (list 'size '(152 20)
'style 'pulldown
'func 'game-tss-action
- 'options
- 'state 'passive
- 'default 0
- 'current 0)
+ 'state 'passive)
'menu 'menu-net-multi-client)
(define-menu-item 'pos (list (- 640 224 16) (- (+ 10 300) 20)) 'font 'game
'text '(caption "~<Game Type:~>" none)
@@ -2466,10 +2447,7 @@
(define-menu-item 'pos (list (+ 176 (- 288 (/ (- 288 260) 2) 152)) (+ 112 (+
11 (* 36 3) 22))) 'font 'game
'pulldown (list 'size '(152 20)
'style 'pulldown
- 'func 'null
- 'options tileset-names
- 'default 0
- 'current 0)
+ 'func 'null)
'menu 'menu-editor-new)
(define-menu-item 'pos (list (- 320 106 23) 328) 'font 'large
'button '(size (106 27)
@@ -2655,10 +2633,7 @@
(define-menu-item 'pos (list (- 288 (/ (- 288 260) 2) 152) (+ 11 (* 36 3) 22))
'font 'game
'pulldown (list 'size '(152 20)
'style 'pulldown
- 'func 'null
- 'options tileset-names
- 'default 0
- 'current 0)
+ 'func 'null)
'menu 'menu-editor-map-properties)
(define-menu-item 'pos (list (/ (- 288 260) 2) (+ 11 (* 36 4) 22)) 'font 'game
'text '(caption "Version:" align left)
Index: demogame/ccl/mythical/units.ccl
diff -u demogame/ccl/mythical/units.ccl:1.17
demogame/ccl/mythical/units.ccl:1.18
--- demogame/ccl/mythical/units.ccl:1.17 Mon Oct 13 11:15:36 2003
+++ demogame/ccl/mythical/units.ccl Sun Nov 16 05:05:05 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.17 2003/10/13 15:15:36 martinxyz Exp $
+;; $Id: units.ccl,v 1.18 2003/11/16 10:05:05 martinxyz Exp $
; To add a new unit type:
; - add icons for all tilesets in ../icons.ccl
@@ -58,7 +58,7 @@
'can-attack
'can-target-land
'land-unit
- 'organic
+ ;'organic
'selectable-by-rectangle
'sounds '(
selected "grunt-selected"
@@ -107,7 +107,7 @@
wait-at-depot 150
lose-resources
terrain-harvester )
- 'organic
+ ;'organic
'selectable-by-rectangle
'sounds '(
selected "faun-selected"
@@ -137,7 +137,7 @@
'corpse '(unit-destroyed-2x2-place 0)
'explode-when-killed 'missile-explosion
'type-land
- 'building
+ 'building 'visible-under-fog
'sounds '(
selected "pig-farm-selected"
acknowledge "pig-farm-acknowledge"
@@ -165,7 +165,7 @@
'corpse '(unit-destroyed-3x3-place 0)
'explode-when-killed 'missile-explosion
'type-land
- 'building
+ 'building 'visible-under-fog
'sounds '(
selected "mythical-barracks-selected"
acknowledge "mythical-barracks-acknowledge"
@@ -242,7 +242,7 @@
'corpse '(unit-destroyed-1x1-place 0)
'explode-when-killed 'missile-explosion
'type-land
- 'building
+ 'building 'visible-under-fog
'sounds '(
selected "mythical-wall-selected"
acknowledge "mythical-wall-acknowledge"
Index: demogame/ccl/siod.ccl
diff -u demogame/ccl/siod.ccl:1.1 demogame/ccl/siod.ccl:1.2
--- demogame/ccl/siod.ccl:1.1 Sun Oct 12 16:06:09 2003
+++ demogame/ccl/siod.ccl Sun Nov 16 05:05:04 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: siod.ccl,v 1.1 2003/10/12 20:06:09 martinxyz Exp $
+;; $Id: siod.ccl,v 1.2 2003/11/16 10:05:04 martinxyz Exp $
;; Helper functions and other stuff to get SIOD a bit more R5RS
;; compatible
@@ -36,6 +36,9 @@
(define (ccl:load filename)
(load filename #f #t))
+
+(define (ccl:eval code)
+ (eval code))
(define else #t)
Index: demogame/ccl/sound.ccl
diff -u demogame/ccl/sound.ccl:1.8 demogame/ccl/sound.ccl:1.9
--- demogame/ccl/sound.ccl:1.8 Mon Oct 13 11:15:35 2003
+++ demogame/ccl/sound.ccl Sun Nov 16 05:05:04 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.8 2003/10/13 15:15:35 martinxyz Exp $
+;; $Id: sound.ccl,v 1.9 2003/11/16 10:05:04 martinxyz Exp $
;; Uncomment this to enable threaded sound
;(sound-thread)
@@ -223,11 +223,6 @@
'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
- ;;'repair (sound-for-name "peasant attack")
- ;;'repair (make-sound "peasant attack" "alliance/units/peasant/attack.wav")
; maxy: rescue what?
'rescue (list 'alliance (make-sound "alliance rescue" "alliance/rescue.wav"))
Index: demogame/ccl/stratagus.ccl
diff -u demogame/ccl/stratagus.ccl:1.13 demogame/ccl/stratagus.ccl:1.14
--- demogame/ccl/stratagus.ccl:1.13 Sat Oct 25 04:31:43 2003
+++ demogame/ccl/stratagus.ccl Sun Nov 16 05:05:04 2003
@@ -26,11 +26,11 @@
;; 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.13 2003/10/25 08:31:43 martinxyz Exp $
+;; $Id: stratagus.ccl,v 1.14 2003/11/16 10:05:04 martinxyz Exp $
;; For documentation see stratagus/doc/ccl/ccl.html
-(verbose 4)
+;(verbose 5)
(cond ((equal? *scheme* 'guile)
(load "guile.ccl"))
@@ -56,12 +56,10 @@
;(set-contrast! 110) (set-brightness! 15) (set-saturation! 100)
;; Enter your default title screen.
-(set-title-screen! "graphics/ui/stratagus.png")
-;(set-title-screen! "graphics/logo_stratagus.avi")
-
-;; Enter your title music.
-;(set-title-music! "music/default.mod")
-;(set-title-music! "music/Matthew_T._Yankovich---_Twilight_March.ogg")
+(set-title-screens!
+ '("graphics/ui/stratagus.png" "music/toccata.mod")
+; '("graphics/logo_stratagus.avi")
+)
;; Enter your default menu background.
(set-menu-background! "graphics/ui/menubackground.png")
@@ -184,10 +182,6 @@
;;-----------------------------------------------------------------------------
;; Game modification
-;; Edit this to enable/disable hit point regeneration for all units
-;(set-hitpoint-regeneration! #t)
-(set-hitpoint-regeneration! #f)
-
;; Edit this to enable/disable XP to add more damage to attacks
;(set-xp-damage! #t)
(set-xp-damage! #f)
@@ -205,10 +199,6 @@
(set-forest-regeneration! 0)
;(set-forest-regeneration! 5)
-;; Set burning building percent and rate. (n percent, h HP/second)
-;; 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)
(set-reveal-attacker! #f)
@@ -367,8 +357,11 @@
;;-----------------------------------------------------------------------------
+;; Maximum number of selectable units
+(set-max-selectable! 18)
+
;; All player food unit limit
-(set-all-players-food-unit-limit! 200)
+(set-all-players-unit-limit! 200)
;; All player building limit
(set-all-players-building-limit! 200)
;; All player total unit limit
Index: demogame/ccl/tilesets.ccl
diff -u demogame/ccl/tilesets.ccl:1.2 demogame/ccl/tilesets.ccl:1.3
--- demogame/ccl/tilesets.ccl:1.2 Mon Oct 13 11:15:35 2003
+++ demogame/ccl/tilesets.ccl Sun Nov 16 05:05:04 2003
@@ -10,7 +10,7 @@
;;
;; tilesets.ccl - Define the used tilesets.
;;
-;; (c) Copyright 1998,2000,2001 by Lutz Sammer
+;; (c) Copyright 1998,2000-2003 by Lutz Sammer and Jimmy Salmon
;;
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -26,10 +26,10 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: tilesets.ccl,v 1.2 2003/10/13 15:15:35 martinxyz Exp $
+;; $Id: tilesets.ccl,v 1.3 2003/11/16 10:05:04 martinxyz Exp $
;;=============================================================================
;; Load the different tileset definitions
-(define-tileset 'tileset-summer 'class "summer"
+(define-tileset 'tileset-summer 'class "summer" 'name "Forest"
'file "ccl/tilesets/summer.ccl")
Index: demogame/ccl/tilesets/summer.ccl
diff -u demogame/ccl/tilesets/summer.ccl:1.2
demogame/ccl/tilesets/summer.ccl:1.3
--- demogame/ccl/tilesets/summer.ccl:1.2 Tue Sep 23 03:05:38 2003
+++ demogame/ccl/tilesets/summer.ccl Sun Nov 16 05:05:05 2003
@@ -10,7 +10,7 @@
;;
;; summer.ccl - Define the summer tileset.
;;
-;; (c) Copyright 2000-2002 by Lutz Sammer
+;; (c) Copyright 2000-2003 by Lutz Sammer and Jimmy Salmon
;;
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -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.2 2003/09/23 07:05:38 martinxyz Exp $
+;; $Id: summer.ccl,v 1.3 2003/11/16 10:05:05 martinxyz Exp $
;;=============================================================================
;; Define a tileset
Index: demogame/ccl/ui.ccl
diff -u demogame/ccl/ui.ccl:1.8 demogame/ccl/ui.ccl:1.9
--- demogame/ccl/ui.ccl:1.8 Sat Oct 25 04:31:43 2003
+++ demogame/ccl/ui.ccl Sun Nov 16 05:05:04 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: ui.ccl,v 1.8 2003/10/25 08:31:43 martinxyz Exp $
-
-(define color-dark-green 149) ; FIXME: move to central position
+;; $Id: ui.ccl,v 1.9 2003/11/16 10:05:04 martinxyz Exp $
(define (make-ui race screen_width screen_height)
; precalculate ui positions
Index: demogame/ccl/units.ccl
diff -u demogame/ccl/units.ccl:1.12 demogame/ccl/units.ccl:1.13
--- demogame/ccl/units.ccl:1.12 Mon Oct 13 11:15:35 2003
+++ demogame/ccl/units.ccl Sun Nov 16 05:05:05 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.12 2003/10/13 15:15:35 martinxyz Exp $
+;; $Id: units.ccl,v 1.13 2003/11/16 10:05:05 martinxyz Exp $
;; Load the animations for the units.
(ccl:load "ccl/anim.ccl")
@@ -41,6 +41,7 @@
'files '(tileset-summer "tilesets/summer/neutral/buildings/gold_mine.png")
'size '(96 96)
'animations 'animations-building 'icon 'icon-gold-mine
+ 'neutral-minimap-color '(255 255 0)
'costs '(time 150)
'construction 'construction-land2
'speed 0
@@ -53,7 +54,7 @@
'corpse '(unit-destroyed-3x3-place 0)
'explode-when-killed 'missile-explosion
'type-land
- 'building
+ 'building 'visible-under-fog
'gives-resource 'gold 'can-harvest
'sounds '(
selected "gold-mine-selected"
@@ -139,7 +140,7 @@
'basic-damage 0 'piercing-damage 0 'missile 'missile-none
'priority 0
'type-land
- 'building
+ 'building 'visible-under-fog
'vanishes
'sounds '())
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] demogame ccl/anim.ccl ccl/guile.ccl ccl/icons.c...,
Martin Renold <=