[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] demogame/ccl alliance/ai.ccl alliance/buttons.c...
|
From: |
Martin Renold |
|
Subject: |
[Stratagus-CVS] demogame/ccl alliance/ai.ccl alliance/buttons.c... |
|
Date: |
Wed, 08 Oct 2003 07:05:35 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: demogame
Branch:
Changes by: Martin Renold <address@hidden> 03/10/08 07:05:35
Modified files:
ccl/alliance : ai.ccl buttons.ccl units.ccl upgrade.ccl
ccl/mythical : buttons.ccl units.ccl upgrade.ccl
ccl/tilesets : winter.ccl
Log message:
renaming and fixes to make the editor work again
Patches:
Index: demogame/ccl/alliance/ai.ccl
diff -u demogame/ccl/alliance/ai.ccl:1.1 demogame/ccl/alliance/ai.ccl:1.2
--- demogame/ccl/alliance/ai.ccl:1.1 Wed Oct 8 05:14:01 2003
+++ demogame/ccl/alliance/ai.ccl Wed Oct 8 07:05:34 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: ai.ccl,v 1.1 2003/10/08 09:14:01 martinxyz Exp $
+;; $Id: ai.ccl,v 1.2 2003/10/08 11:05:34 martinxyz Exp $
;(define (ai:sleep) () #t)
@@ -41,10 +41,10 @@
(list 'build 'unit-peasant
'unit-farm 'unit-alliance-barracks 'unit-town-hall
'unit-elven-lumber-mill
'unit-alliance-blacksmith 'unit-alliance-watch-tower 'unit-human-wall
- 'unit-alliance-shipyard 'unit-alliance-foundry 'unit-human-refinery
+ 'unit-alliance-shipyard 'unit-alliance-foundry 'unit-alliance-refinery
'unit-inventor 'unit-stables 'unit-mage-tower 'unit-church
'unit-gryphon-aviary 'unit-dark-portal 'unit-runestone)
- (list 'build 'unit-human-oil-tanker 'unit-alliance-oil-platform)
+ (list 'build 'unit-alliance-oil-tanker 'unit-alliance-oil-platform)
;;
;; Building can train which units.
;;
@@ -60,7 +60,7 @@
(list 'train 'unit-mage-tower 'unit-mage)
(list 'train 'unit-gryphon-aviary 'unit-gryphon-rider)
(list 'train 'unit-alliance-shipyard
- 'unit-human-oil-tanker 'unit-alliance-destroyer 'unit-alliance-transport
+ 'unit-alliance-oil-tanker 'unit-alliance-destroyer
'unit-alliance-transport
'unit-alliance-submarine 'unit-battleship)
;;
;; Building can upgrade which upgrades.
@@ -94,7 +94,7 @@
'unit-farm 'unit-alliance-barracks 'unit-town-hall 'unit-keep
'unit-castle
'unit-elven-lumber-mill 'unit-alliance-blacksmith
'unit-alliance-watch-tower
'unit-alliance-guard-tower 'unit-alliance-cannon-tower 'unit-human-wall
- 'unit-alliance-shipyard 'unit-alliance-foundry 'unit-human-refinery
+ 'unit-alliance-shipyard 'unit-alliance-foundry 'unit-alliance-refinery
'unit-inventor 'unit-stables 'unit-mage-tower 'unit-church
'unit-gryphon-aviary 'unit-dark-portal 'unit-runestone
'unit-alliance-transport)
@@ -114,7 +114,7 @@
(list 'unit-equiv 'unit-knight
'unit-paladin)
(list 'unit-equiv 'unit-peasant)
- (list 'unit-equiv 'unit-human-oil-tanker)
+ (list 'unit-equiv 'unit-alliance-oil-tanker)
(list 'unit-equiv 'unit-alliance-watch-tower
'unit-alliance-guard-tower 'unit-alliance-cannon-tower) )
@@ -352,7 +352,7 @@
;;
(define (ai:refinery)
(if (eq? (ai:get-race) 'alliance)
- 'unit-human-refinery 'unit-orc-refinery) )
+ 'unit-alliance-refinery 'unit-mythical-refinery) )
;;
;; Foundry of the current race.
@@ -401,7 +401,7 @@
;;
(define (ai:tanker)
(if (eq? (ai:get-race) 'alliance)
- 'unit-human-oil-tanker 'unit-orc-oil-tanker) )
+ 'unit-alliance-oil-tanker 'unit-mythical-oil-tanker) )
;;
;; Submarine of the current race.
Index: demogame/ccl/alliance/buttons.ccl
diff -u demogame/ccl/alliance/buttons.ccl:1.1
demogame/ccl/alliance/buttons.ccl:1.2
--- demogame/ccl/alliance/buttons.ccl:1.1 Tue Oct 7 09:28:00 2003
+++ demogame/ccl/alliance/buttons.ccl Wed Oct 8 07:05:34 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.1 2003/10/07 13:28:00 martinxyz Exp $
+;; $Id: buttons.ccl,v 1.2 2003/10/08 11:05:34 martinxyz Exp $
;;----------------------------------------------------------------------------
;; Define unit-button.
@@ -311,7 +311,7 @@
'for-unit '(unit-peasant))
(define-button 'pos 3 'level 2 'icon 'icon-alliance-refinery
- 'action 'build 'value 'unit-human-refinery
+ 'action 'build 'value 'unit-alliance-refinery
'key "r" 'hint "BUILD ~!REFINERY"
'for-unit '(unit-peasant))
@@ -465,7 +465,7 @@
'for-unit '(unit-gryphon-aviary))
(define-button 'pos 1 'level 0 'icon 'icon-alliance-oil-tanker
- 'action 'train-unit 'value 'unit-human-oil-tanker
+ 'action 'train-unit 'value 'unit-alliance-oil-tanker
'key "o" 'hint "BUILD ~!OIL TANKER"
'for-unit '(unit-alliance-shipyard))
@@ -509,14 +509,14 @@
(define-button 'pos 1 'level 0 'icon 'icon-alliance-ship-move
'action 'move
'key "m" 'hint "~!MOVE"
- 'for-unit '(unit-human-oil-tanker
+ 'for-unit '(unit-alliance-oil-tanker
unit-alliance-submarine unit-battleship unit-alliance-destroyer
unit-alliance-transport))
(define-button 'pos 2 'level 0 'icon 'icon-alliance-ship-armor1
'action 'stop
'key "s" 'hint "~!STOP"
- 'for-unit '(unit-human-oil-tanker
+ 'for-unit '(unit-alliance-oil-tanker
unit-alliance-submarine unit-battleship unit-alliance-destroyer
unit-alliance-transport))
@@ -528,12 +528,12 @@
(define-button 'pos 4 'level 0 'icon 'icon-alliance-oil-platform
'action 'build 'value 'unit-alliance-oil-platform
'key "b" 'hint "~!BUILD OIL PLATFORM"
- 'for-unit '(unit-human-oil-tanker))
+ 'for-unit '(unit-alliance-oil-tanker))
(define-button 'pos 5 'level 0 'icon 'icon-alliance-ship-haul-oil
'action 'harvest
'key "h" 'hint "~!HAUL OIL"
- 'for-unit '(unit-human-oil-tanker))
+ 'for-unit '(unit-alliance-oil-tanker))
(define-button 'pos 6 'level 0 'icon 'icon-alliance-ship-return-oil
'action 'return-goods
Index: demogame/ccl/alliance/units.ccl
diff -u demogame/ccl/alliance/units.ccl:1.10
demogame/ccl/alliance/units.ccl:1.11
--- demogame/ccl/alliance/units.ccl:1.10 Tue Oct 7 09:28:00 2003
+++ demogame/ccl/alliance/units.ccl Wed Oct 8 07:05:34 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.10 2003/10/07 13:28:00 martinxyz Exp $
+;; $Id: units.ccl,v 1.11 2003/10/08 11:05:34 martinxyz Exp $
;;=============================================================================
;; Define unit-types.
@@ -453,7 +453,7 @@
dead "basic alliance voices dead"
attack "white-mage-attack"))
-(define-unit-type 'unit-human-oil-tanker 'name "Oil tanker"
+(define-unit-type 'unit-alliance-oil-tanker 'name "Oil tanker"
'files '(tileset-summer "alliance/units/oil_tanker_empty.png")
'size '(72 72)
'animations 'animations-alliance-oil-tanker 'icon 'icon-alliance-oil-tanker
@@ -1197,7 +1197,7 @@
dead "building destroyed"
attack "alliance-blacksmith-attack"))
-(define-unit-type 'unit-human-refinery 'name "Refinery"
+(define-unit-type 'unit-alliance-refinery 'name "Refinery"
'files '(tileset-summer "tilesets/summer/alliance/buildings/refinery.png"
tileset-winter "tilesets/winter/alliance/buildings/refinery.png")
'size '(96 96)
Index: demogame/ccl/alliance/upgrade.ccl
diff -u demogame/ccl/alliance/upgrade.ccl:1.4
demogame/ccl/alliance/upgrade.ccl:1.5
--- demogame/ccl/alliance/upgrade.ccl:1.4 Tue Oct 7 09:28:00 2003
+++ demogame/ccl/alliance/upgrade.ccl Wed Oct 8 07:05:35 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.4 2003/10/07 13:28:00 martinxyz Exp $
+;; $Id: upgrade.ccl,v 1.5 2003/10/08 11:05:35 martinxyz Exp $
;; NOTE: Save can generate this table.
@@ -218,7 +218,7 @@
(define-allow 'unit-female-hero "AAAAAAAAAAAAAAAA")
(define-allow 'unit-flying-angle "AAAAAAAAAAAAAAAA")
(define-allow 'unit-white-mage "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-human-oil-tanker "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-alliance-oil-tanker "AAAAAAAAAAAAAAAA")
(define-allow 'unit-alliance-transport "AAAAAAAAAAAAAAAA")
(define-allow 'unit-alliance-destroyer "AAAAAAAAAAAAAAAA")
(define-allow 'unit-battleship "AAAAAAAAAAAAAAAA")
@@ -242,7 +242,7 @@
(define-allow 'unit-alliance-foundry "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mage-tower "AAAAAAAAAAAAAAAA")
(define-allow 'unit-alliance-blacksmith "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-human-refinery "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-alliance-refinery "AAAAAAAAAAAAAAAA")
(define-allow 'unit-alliance-oil-platform "AAAAAAAAAAAAAAAA")
(define-allow 'unit-keep "AAAAAAAAAAAAAAAA")
(define-allow 'unit-castle "AAAAAAAAAAAAAAAA")
@@ -318,7 +318,7 @@
'(unit-elven-lumber-mill))
(define-dependency 'unit-alliance-foundry
'(unit-alliance-shipyard))
-(define-dependency 'unit-human-refinery
+(define-dependency 'unit-alliance-refinery
'(unit-alliance-shipyard))
(define-dependency 'unit-keep
'(unit-alliance-barracks))
Index: demogame/ccl/mythical/buttons.ccl
diff -u demogame/ccl/mythical/buttons.ccl:1.2
demogame/ccl/mythical/buttons.ccl:1.3
--- demogame/ccl/mythical/buttons.ccl:1.2 Tue Oct 7 15:18:55 2003
+++ demogame/ccl/mythical/buttons.ccl Wed Oct 8 07:05:35 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.2 2003/10/07 19:18:55 martinxyz Exp $
+;; $Id: buttons.ccl,v 1.3 2003/10/08 11:05:35 martinxyz Exp $
;; general commands -- almost all units have it -------------------------------
@@ -332,7 +332,7 @@
'for-unit '(unit-faun))
(define-button 'pos 3 'level 2 'icon 'icon-mythical-refinery
- 'action 'build 'value 'unit-orc-refinery
+ 'action 'build 'value 'unit-mythical-refinery
'key "r" 'hint "BUILD ~!REFINERY"
'for-unit '(unit-faun))
@@ -489,7 +489,7 @@
'for-unit '(unit-dragon-roost))
(define-button 'pos 1 'level 0 'icon 'icon-mythical-oil-tanker
- 'action 'train-unit 'value 'unit-orc-oil-tanker
+ 'action 'train-unit 'value 'unit-mythical-oil-tanker
'key "o" 'hint "BUILD ~!OIL TANKER"
'for-unit '(unit-mythical-shipyard))
@@ -533,13 +533,13 @@
(define-button 'pos 1 'level 0 'icon 'icon-mythical-ship-move
'action 'move
'key "m" 'hint "~!MOVE"
- 'for-unit '(unit-orc-oil-tanker unit-mythical-submarine
+ 'for-unit '(unit-mythical-oil-tanker unit-mythical-submarine
unit-ogre-juggernaught unit-mythical-destroyer unit-mythical-transport))
(define-button 'pos 2 'level 0 'icon 'icon-mythical-ship-armor1
'action 'stop
'key "s" 'hint "~!STOP"
- 'for-unit '(unit-orc-oil-tanker unit-mythical-submarine
+ 'for-unit '(unit-mythical-oil-tanker unit-mythical-submarine
unit-ogre-juggernaught unit-mythical-destroyer unit-mythical-transport))
(define-button 'pos 3 'level 0 'icon 'icon-mythical-unload
@@ -550,12 +550,12 @@
(define-button 'pos 4 'level 0 'icon 'icon-mythical-oil-platform
'action 'build 'value 'unit-mythical-oil-platform
'key "b" 'hint "~!BUILD OIL PLATFORM"
- 'for-unit '(unit-orc-oil-tanker))
+ 'for-unit '(unit-mythical-oil-tanker))
(define-button 'pos 5 'level 0 'icon 'icon-mythical-ship-haul-oil
'action 'harvest
'key "h" 'hint "~!HAUL OIL"
- 'for-unit '(unit-orc-oil-tanker))
+ 'for-unit '(unit-mythical-oil-tanker))
(define-button 'pos 6 'level 0 'icon 'icon-mythical-ship-return-oil
'action 'return-goods
Index: demogame/ccl/mythical/units.ccl
diff -u demogame/ccl/mythical/units.ccl:1.11
demogame/ccl/mythical/units.ccl:1.12
--- demogame/ccl/mythical/units.ccl:1.11 Tue Oct 7 15:18:55 2003
+++ demogame/ccl/mythical/units.ccl Wed Oct 8 07:05:35 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.11 2003/10/07 19:18:55 martinxyz Exp $
+;; $Id: units.ccl,v 1.12 2003/10/08 11:05:35 martinxyz Exp $
;;=============================================================================
;; Define unit-types.
@@ -447,7 +447,7 @@
dead "basic mythical voices dead"
attack "beast-cry-attack"))
-(define-unit-type 'unit-orc-oil-tanker 'name "Oil tanker"
+(define-unit-type 'unit-mythical-oil-tanker 'name "Oil tanker"
'files '(tileset-summer "mythical/units/oil_tanker_empty.png")
'size '(72 72)
'animations 'animations-alliance-oil-tanker 'icon 'icon-mythical-oil-tanker
@@ -1277,7 +1277,7 @@
dead "building destroyed"
attack "mythical-blacksmith-attack"))
-(define-unit-type 'unit-orc-refinery 'name "Refinery"
+(define-unit-type 'unit-mythical-refinery 'name "Refinery"
'files '(tileset-summer "tilesets/summer/mythical/buildings/refinery.png"
tileset-winter "tilesets/winter/mythical/buildings/refinery.png")
'size '(96 96)
Index: demogame/ccl/mythical/upgrade.ccl
diff -u demogame/ccl/mythical/upgrade.ccl:1.6
demogame/ccl/mythical/upgrade.ccl:1.7
--- demogame/ccl/mythical/upgrade.ccl:1.6 Tue Oct 7 15:18:55 2003
+++ demogame/ccl/mythical/upgrade.ccl Wed Oct 8 07:05:35 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.6 2003/10/07 19:18:55 martinxyz Exp $
+;; $Id: upgrade.ccl,v 1.7 2003/10/08 11:05:35 martinxyz Exp $
;; NOTE: Save can generate this table.
@@ -218,7 +218,7 @@
(define-allow 'unit-evil-knight "AAAAAAAAAAAAAAAA")
(define-allow 'unit-fad-man "AAAAAAAAAAAAAAAA")
(define-allow 'unit-beast-cry "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-orc-oil-tanker "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-mythical-oil-tanker "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-transport "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-destroyer "AAAAAAAAAAAAAAAA")
(define-allow 'unit-ogre-juggernaught "AAAAAAAAAAAAAAAA")
@@ -244,7 +244,7 @@
(define-allow 'unit-mythical-foundry "AAAAAAAAAAAAAAAA")
(define-allow 'unit-temple-of-the-damned "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-blacksmith "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-orc-refinery "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-mythical-refinery "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-oil-platform "AAAAAAAAAAAAAAAA")
(define-allow 'unit-stronghold "AAAAAAAAAAAAAAAA")
(define-allow 'unit-fortress "AAAAAAAAAAAAAAAA")
@@ -317,7 +317,7 @@
'(unit-troll-lumber-mill))
(define-dependency 'unit-mythical-foundry
'(unit-mythical-shipyard))
-(define-dependency 'unit-orc-refinery
+(define-dependency 'unit-mythical-refinery
'(unit-mythical-shipyard))
(define-dependency 'unit-stronghold
'(unit-mythical-barracks))
Index: demogame/ccl/tilesets/winter.ccl
diff -u demogame/ccl/tilesets/winter.ccl:1.2
demogame/ccl/tilesets/winter.ccl:1.3
--- demogame/ccl/tilesets/winter.ccl:1.2 Tue Sep 23 03:05:38 2003
+++ demogame/ccl/tilesets/winter.ccl Wed Oct 8 07:05:35 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.2 2003/09/23 07:05:38 martinxyz Exp $
+;; $Id: winter.ccl,v 1.3 2003/10/08 11:05:35 martinxyz Exp $
;;=============================================================================
;; Define a tileset
@@ -36,7 +36,7 @@
(define-tileset 'tileset-winter 'class "winter"
'name "original wc2 winter tileset"
'image "tilesets/winter/terrain/winter.png"
- 'palette "tilesets/winter/winter.rgb"
+ 'palette "tilesets/winter/palette.rgb"
;; Slots descriptions
'slots (list 'special (list ;; Can't be in pud
'top-one-tree 121 'mid-one-tree 122 'bot-one-tree 123
@@ -62,11 +62,11 @@
#( 125 135 136)) ; 070
'solid (list "rocks" 'land 'rock 'unpassable
#( 160 172 173 174)) ; 080
- 'solid (list "alliance-closed-wall" 'land 'alliance 'wall 'unpassable
+ 'solid (list "alliance-closed-wall" 'land 'human 'wall 'unpassable
#( 16 0 52 0 88)) ; 090
'solid (list "mythical-closed-wall" 'land 'wall 'unpassable
#( 34 0 70 0 88)) ; 0A0
- 'solid (list "alliance-open-wall" 'land 'alliance 'wall 'unpassable
+ 'solid (list "alliance-open-wall" 'land 'human 'wall 'unpassable
#( 33 0 69 0 101)) ; 0B0
'solid (list "mythical-open-wall" 'land 'wall 'unpassable
#( 51 0 87 0 101)) ; 0C0
@@ -195,7 +195,7 @@
#( 105 105)
; 7D0
#()
; 7E0
#()) ; 7F0
- 'mixed (list "alliance-wall" "dark-snow" 'land 'alliance 'wall 'unpassable
+ 'mixed (list "alliance-wall" "dark-snow" 'land 'human 'wall 'unpassable
#( 17 0 53 0 89) ; 800
#( 18 0 54 0 90) ; 810
#( 19 0 55 0 91) ; 820
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] demogame/ccl alliance/ai.ccl alliance/buttons.c...,
Martin Renold <=