[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] demogame ccl/ai.ccl ccl/anim.ccl ccl/editor.ccl...
|
From: |
Martin Renold |
|
Subject: |
[Stratagus-CVS] demogame ccl/ai.ccl ccl/anim.ccl ccl/editor.ccl... |
|
Date: |
Thu, 11 Sep 2003 08:18:00 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: demogame
Branch:
Changes by: Martin Renold <address@hidden> 03/09/11 08:17:59
Modified files:
ccl : ai.ccl anim.ccl editor.ccl icons.ccl sound.ccl
units.ccl
ccl/alliance : units.ccl upgrade.ccl
ccl/mythical : units.ccl upgrade.ccl
Added files:
graphics/alliance/units: README sniper-icon-rgb.png
sniper-icon.png sniper.png
Log message:
merged engine changes into demogame; turned archer into sniper
Patches:
Index: demogame/ccl/ai.ccl
diff -u demogame/ccl/ai.ccl:1.2 demogame/ccl/ai.ccl:1.3
--- demogame/ccl/ai.ccl:1.2 Mon Aug 11 01:57:05 2003
+++ demogame/ccl/ai.ccl Thu Sep 11 08:17:57 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.2 2003/08/11 05:57:05 martinxyz Exp $
+;; $Id: ai.ccl,v 1.3 2003/09/11 12:17:57 martinxyz Exp $
;(define (ai:sleep) () #t)
@@ -59,20 +59,7 @@
'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-peasant-with-gold
- '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-alliance-refinery
- 'unit-inventor 'unit-stables 'unit-mage-tower 'unit-church
- 'unit-gryphon-aviary 'unit-dark-portal 'unit-runestone)
- (list 'build 'unit-peasant-with-wood
- '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-alliance-refinery
- 'unit-inventor 'unit-stables 'unit-mage-tower 'unit-church
- 'unit-gryphon-aviary 'unit-dark-portal 'unit-runestone)
(list 'build 'unit-alliance-oil-tanker 'unit-alliance-oil-platform)
- (list 'build 'unit-alliance-oil-tanker-full 'unit-alliance-oil-platform)
;;
;; Building can train which units.
;;
@@ -126,33 +113,6 @@
'unit-inventor 'unit-stables 'unit-mage-tower 'unit-church
'unit-gryphon-aviary 'unit-dark-portal 'unit-runestone
'unit-alliance-transport)
- (list 'repair 'unit-peasant-with-gold
- '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-alliance-refinery
- 'unit-inventor 'unit-stables 'unit-mage-tower 'unit-church
- 'unit-gryphon-aviary 'unit-dark-portal 'unit-runestone
- 'unit-alliance-transport)
- (list 'repair 'unit-peasant-with-wood
- '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-alliance-refinery
- 'unit-inventor 'unit-stables 'unit-mage-tower 'unit-church
- 'unit-gryphon-aviary 'unit-dark-portal 'unit-runestone
- 'unit-alliance-transport)
- ;;
- ;; Workers can collect which resource.
- ;;
- (list 'collect 'unit-peasant 'gold 'wood 'ore 'stone 'coal)
- (list 'collect 'unit-alliance-oil-tanker 'oil )
- ;;
- ;; Workers with resource.
- ;;
- (list 'with-goods 'unit-peasant-with-gold 'gold)
- (list 'with-goods 'unit-peasant-with-wood 'wood)
- (list 'with-goods 'unit-alliance-oil-tanker-full 'oil )
;;
;; Reduce unit limits.
;;
@@ -168,10 +128,8 @@
'unit-ranger)
(list 'unit-equiv 'unit-knight
'unit-paladin)
- (list 'unit-equiv 'unit-peasant
- 'unit-peasant-with-gold 'unit-peasant-with-wood)
- (list 'unit-equiv 'unit-alliance-oil-tanker
- 'unit-alliance-oil-tanker-full)
+ (list 'unit-equiv 'unit-peasant)
+ (list 'unit-equiv 'unit-alliance-oil-tanker)
(list 'unit-equiv 'unit-alliance-watch-tower
'unit-alliance-guard-tower 'unit-alliance-cannon-tower) )
@@ -186,26 +144,12 @@
(list 'build 'unit-peon
'unit-pig-farm 'unit-mythical-barracks 'unit-great-hall
'unit-troll-lumber-mill 'unit-mythical-blacksmith
'unit-mythical-watch-tower
- 'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry
'unit-mythical-refinery
- 'unit-alchemist 'unit-ogre-mound 'unit-temple-of-the-damned
- 'unit-altar-of-storms
- 'unit-dragon-roost 'unit-dark-portal 'unit-runestone)
- (list 'build 'unit-peon-with-gold
- 'unit-pig-farm 'unit-mythical-barracks 'unit-great-hall
- 'unit-troll-lumber-mill 'unit-mythical-blacksmith
'unit-mythical-watch-tower
- 'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry
'unit-mythical-refinery
- 'unit-alchemist 'unit-ogre-mound 'unit-temple-of-the-damned
- 'unit-altar-of-storms
- 'unit-dragon-roost 'unit-dark-portal 'unit-runestone)
- (list 'build 'unit-peon-with-wood
- 'unit-pig-farm 'unit-mythical-barracks 'unit-great-hall
- 'unit-troll-lumber-mill 'unit-mythical-blacksmith
'unit-mythical-watch-tower
- 'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry
'unit-mythical-refinery
+ 'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry
+ 'unit-mythical-refinery
'unit-alchemist 'unit-ogre-mound 'unit-temple-of-the-damned
'unit-altar-of-storms
'unit-dragon-roost 'unit-dark-portal 'unit-runestone)
(list 'build 'unit-mythical-oil-tanker 'unit-mythical-oil-platform)
- (list 'build 'unit-mythical-oil-tanker-full 'unit-mythical-oil-platform)
;;
;; Building can train which units.
;;
@@ -256,37 +200,11 @@
'unit-pig-farm 'unit-mythical-barracks 'unit-great-hall 'unit-stronghold
'unit-fortress 'unit-troll-lumber-mill 'unit-mythical-blacksmith
'unit-mythical-watch-tower 'unit-mythical-guard-tower
'unit-mythical-cannon-tower
- 'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry
'unit-mythical-refinery
+ 'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry
+ 'unit-mythical-refinery
'unit-alchemist 'unit-ogre-mound 'unit-temple-of-the-damned
'unit-altar-of-storms 'unit-dragon-roost 'unit-dark-portal
'unit-runestone 'unit-mythical-transport)
- (list 'repair 'unit-peon-with-gold
- 'unit-pig-farm 'unit-mythical-barracks 'unit-great-hall 'unit-stronghold
- 'unit-fortress 'unit-troll-lumber-mill 'unit-mythical-blacksmith
- 'unit-mythical-watch-tower 'unit-mythical-guard-tower
'unit-mythical-cannon-tower
- 'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry
'unit-mythical-refinery
- 'unit-alchemist 'unit-ogre-mound 'unit-temple-of-the-damned
- 'unit-altar-of-storms 'unit-dragon-roost 'unit-dark-portal
- 'unit-runestone 'unit-mythical-transport)
- (list 'repair 'unit-peon-with-wood
- 'unit-pig-farm 'unit-mythical-barracks 'unit-great-hall 'unit-stronghold
- 'unit-fortress 'unit-troll-lumber-mill 'unit-mythical-blacksmith
- 'unit-mythical-watch-tower 'unit-mythical-guard-tower
'unit-mythical-cannon-tower
- 'unit-orc-wall 'unit-mythical-shipyard 'unit-mythical-foundry
'unit-mythical-refinery
- 'unit-alchemist 'unit-ogre-mound 'unit-temple-of-the-damned
- 'unit-altar-of-storms 'unit-dragon-roost 'unit-dark-portal
- 'unit-runestone 'unit-mythical-transport)
- ;;
- ;; Workers can collect which resource.
- ;;
- (list 'collect 'unit-peon 'gold 'wood 'ore 'stone 'coal)
- (list 'collect 'unit-mythical-oil-tanker 'oil )
- ;;
- ;; Workers with resource.
- ;;
- (list 'with-goods 'unit-peon-with-gold 'gold)
- (list 'with-goods 'unit-peon-with-wood 'wood)
- (list 'with-goods 'unit-mythical-oil-tanker-full 'oil )
;;
;; Reduce unit limits.
;;
@@ -302,10 +220,8 @@
'unit-berserker)
(list 'unit-equiv 'unit-ogre
'unit-ogre-mage)
- (list 'unit-equiv 'unit-peon
- 'unit-peon-with-gold 'unit-peon-with-wood)
- (list 'unit-equiv 'unit-mythical-oil-tanker
- 'unit-mythical-oil-tanker-full)
+ (list 'unit-equiv 'unit-peon)
+ (list 'unit-equiv 'unit-mythical-oil-tanker)
(list 'unit-equiv 'unit-mythical-watch-tower
'unit-mythical-guard-tower 'unit-mythical-cannon-tower) )
Index: demogame/ccl/alliance/units.ccl
diff -u demogame/ccl/alliance/units.ccl:1.6 demogame/ccl/alliance/units.ccl:1.7
--- demogame/ccl/alliance/units.ccl:1.6 Wed Sep 3 09:16:46 2003
+++ demogame/ccl/alliance/units.ccl Thu Sep 11 08:17:58 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.6 2003/09/03 13:16:46 martinxyz Exp $
+;; $Id: units.ccl,v 1.7 2003/09/11 12:17:58 martinxyz Exp $
;;=============================================================================
;; Define unit-types.
@@ -36,12 +36,12 @@
(define-unit-type 'unit-footman 'name "Footman"
'files '(tileset-summer "alliance/units/footman.png")
'size '(72 72)
+ 'tile-size '(1 1) 'box-size '(31 31)
'animations 'animations-footman 'icon 'icon-footman
'costs '(time 60 gold 600)
'speed 40
'hit-points 60
'draw-level 40
- 'tile-size '(1 1) 'box-size '(31 31)
'sight-range 4 'computer-reaction-range 6 'person-reaction-range 4
'armor 2 'basic-damage 6 'piercing-damage 3 'missile 'missile-none
'max-attack-range 1
@@ -66,7 +66,56 @@
dead "basic alliance voices dead"
attack "footman-attack"))
-; common buttons for peasant, peasant-with-gold, ...
+(define-unit-type 'unit-peasant 'name "Peasant"
+ 'files '(tileset-summer "alliance/units/peasant.png")
+ 'size '(72 72)
+ 'draw-level 19
+ 'animations 'animations-peasant 'icon 'icon-peasant
+ 'costs '(time 45 gold 400)
+ 'speed 10
+ 'hit-points 30
+ 'draw-level 40
+ 'tile-size '(1 1) 'box-size '(31 31)
+ 'sight-range 4 'computer-reaction-range 6 'person-reaction-range 4
+ 'basic-damage 3 'piercing-damage 2 'missile 'missile-none
+ 'max-attack-range 1
+ 'priority 50
+ 'points 30
+ 'demand 1
+ 'corpse '(unit-dead-body 6)
+ 'type-land
+ 'right-harvest
+ 'can-attack 'repair-range 1
+ 'can-target-land
+ 'land-unit
+ 'coward
+ 'harvester
+ 'can-gather-resource '(
+ file-when-loaded "alliance/units/peasant-with-gold.png"
+ resource-id gold
+ resource-capacity 100
+ wait-at-resource 150
+ wait-at-depot 150 )
+ 'can-gather-resource '(
+ file-when-loaded "alliance/units/peasant-with-wood.png"
+ resource-id wood
+ resource-capacity 100
+ resource-step 2
+ wait-at-resource 24
+ wait-at-depot 150
+ lose-resources
+ terrain-harvester )
+ 'organic
+ 'selectable-by-rectangle
+ 'add-buttons '(peasant-buttons nil)
+ 'sounds '(
+ selected "peasant-selected"
+ acknowledge "peasant-acknowledge"
+ ready "peasant-ready"
+ help "basic alliance voices help 1"
+ dead "basic alliance voices dead"
+ attack "peasant-attack"))
+
(define (peasant-buttons with-goods)
(if (= (get-global 'button-level) 0) (begin
(add-button 'pos 4 'icon 'icon-repair
@@ -103,82 +152,6 @@
'hint (string-append "BUILD ELVEN ~!LUMBER MILL" " " (get-cost-string
'unit-elven-lumber-mill))
'action (lambda() (command-build 'unit-elven-lumber-mill))))))
-; pre-declare all peasants (because they transform into each other)
-(define-unit-type 'unit-peasant)
-(define-unit-type 'unit-peasant-with-gold)
-(define-unit-type 'unit-peasant-with-wood)
-; this one seems to be for scenarios
-(define-unit-type 'unit-attack-peasant)
-
-(define peasant-common-args (list
- 'name "Peasant"
- 'size '(72 72)
- 'draw-level 40
- 'animations 'animations-peasant 'icon 'icon-peasant
- 'costs '(time 45 gold 400)
- 'speed 10
- 'hit-points 30
- 'tile-size '(1 1) 'box-size '(31 31)
- 'sight-range 4 'computer-reaction-range 6 'person-reaction-range 4
- 'basic-damage 3 'piercing-damage 2 'missile 'missile-none
- 'max-attack-range 1
- 'priority 50
- 'points 30
- 'demand 1
- 'corpse '(unit-dead-body 6)
- 'type-land
- 'can-attack
- 'can-target-land
- 'repair-range 1
- 'land-unit
- 'organic
- 'selectable-by-rectangle
- 'sounds '(
- selected "peasant-selected"
- acknowledge "peasant-acknowledge"
- ready "peasant-ready"
- help "basic alliance voices help 1"
- dead "basic alliance voices dead"
- attack "peasant-attack")))
-
-(apply define-unit-type (append (list
- 'unit-peasant
- 'files '(tileset-summer "alliance/units/peasant.png")
- 'right-harvest
- 'harvester 'resource-harvested 'gold 'resource-capacity 100
- 'resource-step 10 'wait-at-resource 150 'wait-at-depot 150
- 'transform-when-loaded 'unit-peasant-with-gold
- 'coward
- 'add-buttons '(peasant-buttons nil)
- ) peasant-common-args))
-
-(apply define-unit-type (append (list
- 'unit-peasant-with-gold
- 'files '(tileset-summer "alliance/units/peasant-with-gold.png")
- 'right-harvest
- 'harvester 'resource-harvested 'gold 'resource-capacity 100
- 'resource-step 10 'wait-at-resource 150 'wait-at-depot 150
- 'transform-when-empty 'unit-peasant
- 'coward
- 'add-buttons '(peasant-buttons 't)
- ) peasant-common-args))
-
-(apply define-unit-type (append (list
- 'unit-peasant-with-wood
- 'files '(tileset-summer "alliance/units/peasant-with-wood.png")
- 'right-harvest
- 'coward
- 'add-buttons '(peasant-buttons 't)
- ) peasant-common-args))
-
-(apply define-unit-type (append (list
- 'unit-attack-peasant
- 'use 'unit-peasant
- 'right-attack
- ; FIXME: this one will need special buttons
- 'add-buttons '(peasant-buttons nil)
- ) peasant-common-args))
-
(define-unit-type 'unit-ballista 'name "Ballista"
'files '(tileset-summer "alliance/units/ballista.png")
'size '(64 64)
@@ -243,18 +216,21 @@
dead "basic alliance voices dead"
attack "knight-attack"))
-(define-unit-type 'unit-archer 'name "Archer"
- 'files '(tileset-summer "alliance/units/archer.png")
+(define-unit-type 'unit-archer 'name "Sniper"
+ ;'files '(tileset-summer "alliance/units/archer.png")
+ 'files '(tileset-summer "alliance/units/sniper.png")
'size '(72 72)
- 'animations 'animations-archer 'icon 'icon-archer
+ ;'animations 'animations-archer 'icon 'icon-archer
+ 'animations 'animations-archer 'icon 'icon-sniper
'costs '(time 70 gold 500 wood 50)
'speed 10
'hit-points 40
'draw-level 40
'tile-size '(1 1) 'box-size '(33 33)
'sight-range 5 'computer-reaction-range 7 'person-reaction-range 5
- 'basic-damage 3 'piercing-damage 6 'missile 'missile-arrow
- 'max-attack-range 4
+ 'basic-damage 12 'piercing-damage 24
+ 'missile 'missile-none
+ 'max-attack-range 5
'weapons-upgradable 1
'priority 55
'points 60
@@ -462,7 +438,7 @@
'can-attack
'can-target-land 'can-target-sea 'can-target-air
'air-unit
- 'can-see-submarine
+ 'detect-cloak
'organic
'selectable-by-rectangle
'sounds '(
@@ -507,9 +483,6 @@
dead "basic alliance voices dead"
attack "white-mage-attack"))
-; declaration
-(define-unit-type 'unit-alliance-oil-tanker-full)
-
(define-unit-type 'unit-alliance-oil-tanker 'name "Oil tanker"
'files '(tileset-summer "alliance/units/oil_tanker_empty.png")
'size '(72 72)
@@ -529,41 +502,16 @@
'type-naval
'right-harvest
'sea-unit 'coward
- 'harvester 'resource-harvested 'oil 'resource-capacity 100
- 'wait-at-resource 100 'wait-at-depot 100
- 'transform-when-loaded 'unit-alliance-oil-tanker-full
- 'selectable-by-rectangle
- 'sounds '(
- selected "alliance-oil-tanker-selected"
- acknowledge "alliance-oil-tanker-acknowledge"
- ready "alliance-oil-tanker-ready"
- help "basic alliance voices help 1"
- dead "ship sinking"
- attack "alliance-oil-tanker-attack"))
-
-(define-unit-type 'unit-alliance-oil-tanker-full 'name "Oil tanker"
- 'files '(tileset-summer "alliance/units/oil_tanker_full.png")
- 'size '(72 72)
- 'animations 'animations-alliance-oil-tanker 'icon 'icon-alliance-oil-tanker
- 'costs '(time 50 gold 400 wood 200)
- 'speed 10
- 'hit-points 90
- 'draw-level 40
- 'tile-size '(1 1) 'box-size '(63 63)
- 'sight-range 4
- 'armor 10 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
- 'max-attack-range 1
- 'priority 50 'annoy-computer-factor 10
- 'points 40
- 'demand 1
- 'corpse '(unit-dead-body 12)
- 'type-naval
- 'right-harvest
- 'sea-unit 'coward
- 'harvester 'resource-harvested 'oil 'resource-capacity 100
- 'wait-at-resource 100 'wait-at-depot 100
- 'transform-when-empty 'unit-alliance-oil-tanker
+ 'harvester
+ 'can-gather-resource '(
+ file-when-empty "alliance/units/oil_tanker_empty.png"
+ file-when-loaded "alliance/units/oil_tanker_full.png"
+ resource-id oil
+ resource-capacity 100
+ wait-at-resource 100
+ wait-at-depot 100)
'selectable-by-rectangle
+ ; FIXME: buttons
'sounds '(
selected "alliance-oil-tanker-selected"
acknowledge "alliance-oil-tanker-acknowledge"
@@ -689,8 +637,8 @@
'can-attack
'can-target-sea
'sea-unit
- 'submarine
- 'can-see-submarine
+ 'permanent-cloak
+ 'detect-cloak
'selectable-by-rectangle
'sounds '(
selected "alliance-submarine-selected"
@@ -718,7 +666,7 @@
'type-fly
'right-move
'air-unit 'coward
- 'can-see-submarine
+ 'detect-cloak
'selectable-by-rectangle
'sounds '(
selected "balloon-selected"
@@ -749,7 +697,7 @@
'can-attack
'can-target-land 'can-target-sea 'can-target-air
'air-unit
- 'can-see-submarine
+ 'detect-cloak
'organic
'selectable-by-rectangle
'sounds '(
@@ -1007,7 +955,7 @@
'type-land
'can-target-land 'can-target-sea 'can-target-air
'building
- 'can-see-submarine
+ 'detect-cloak
'sounds '(
selected "alliance-watch-tower-selected"
acknowledge "alliance-watch-tower-acknowledge"
@@ -1455,7 +1403,7 @@
'can-attack
'can-target-land 'can-target-sea 'can-target-air
'building
- 'can-see-submarine
+ 'detect-cloak
'tower
'sounds '(
selected "alliance-guard-tower-selected"
@@ -1488,7 +1436,7 @@
'can-attack
'can-target-land 'can-target-sea
'building
- 'can-see-submarine
+ 'detect-cloak
'tower
'sounds '(
selected "alliance-cannon-tower-selected"
Index: demogame/ccl/alliance/upgrade.ccl
diff -u demogame/ccl/alliance/upgrade.ccl:1.2
demogame/ccl/alliance/upgrade.ccl:1.3
--- demogame/ccl/alliance/upgrade.ccl:1.2 Mon Aug 11 01:57:05 2003
+++ demogame/ccl/alliance/upgrade.ccl Thu Sep 11 08:17:58 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.2 2003/08/11 05:57:05 martinxyz Exp $
+;; $Id: upgrade.ccl,v 1.3 2003/09/11 12:17:58 martinxyz Exp $
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;=============================================================================
@@ -247,7 +247,6 @@
(define-allow 'unit-mage "AAAAAAAAAAAAAAAA")
(define-allow 'unit-paladin "AAAAAAAAAAAAAAAA")
(define-allow 'unit-dwarves "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-attack-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-ranger "AAAAAAAAAAAAAAAA")
(define-allow 'unit-female-hero "AAAAAAAAAAAAAAAA")
(define-allow 'unit-flying-angle "AAAAAAAAAAAAAAAA")
@@ -284,9 +283,6 @@
(define-allow 'unit-alliance-guard-tower "AAAAAAAAAAAAAAAA")
(define-allow 'unit-alliance-cannon-tower "AAAAAAAAAAAAAAAA")
(define-allow 'unit-human-wall "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-wood "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-alliance-oil-tanker-full "AAAAAAAAAAAAAAAA")
;; - upgrades
Index: demogame/ccl/anim.ccl
diff -u demogame/ccl/anim.ccl:1.4 demogame/ccl/anim.ccl:1.5
--- demogame/ccl/anim.ccl:1.4 Wed Sep 3 07:23:06 2003
+++ demogame/ccl/anim.ccl Thu Sep 11 08:17:57 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.4 2003/09/03 11:23:06 martinxyz Exp $
+;; $Id: anim.ccl,v 1.5 2003/09/11 12:17:57 martinxyz Exp $
;;------
;; Footman, Grunt, Grom Hellscream, Arthor_Literios, Korgath Bladefist
@@ -123,15 +123,16 @@
;;------
;; Archer, Ranger, Female_Hero
+;; hacked for sniper (maxy)
(define-animations 'animations-archer
'still '( ; #5
#( 0 0 4 0) #( 3 0 1 0))
'move '( ; #16 P32
- #( 0 3 2 0) #( 0 3 1 5) #( 0 3 2 5) #( 0 2 1 10)
- #( 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))
+ #( 0 3 2 0) #( 0 3 2 5) #( 0 3 2 5) #( 0 2 2 10)
+ #( 0 3 2 10) #( 0 2 2 0) #( 0 3 2 0) #( 0 3 2 15)
+ #( 0 3 2 15) #( 0 2 2 20) #( 0 3 2 20) #( 3 2 2 0))
'attack '( ; #65
- #( 0 0 10 25) #(12 0 10 30) #( 0 0 44 0) #( 3 0 1 0))
+ #( 0 0 10 25) #(12 0 10 30) #( 0 0 150 0) #( 3 0 1 0))
'die '( ; #107
#( 0 0 3 35) #( 0 0 3 40) #( 0 0 100 45) #( 3 0 1 45)))
Index: demogame/ccl/editor.ccl
diff -u demogame/ccl/editor.ccl:1.2 demogame/ccl/editor.ccl:1.3
--- demogame/ccl/editor.ccl:1.2 Mon Aug 11 01:57:05 2003
+++ demogame/ccl/editor.ccl Thu Sep 11 08:17:57 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: editor.ccl,v 1.2 2003/08/11 05:57:05 martinxyz Exp $
+;; $Id: editor.ccl,v 1.3 2003/09/11 12:17:57 martinxyz Exp $
;; Set which icons to display
@@ -91,11 +91,6 @@
'unit-wise-man
'unit-man-of-light
- 'unit-attack-peasant
- 'unit-peasant-with-gold
- 'unit-peasant-with-wood
- 'unit-alliance-oil-tanker-full
-
;- - - - - - - - - - - - - - - - - - -
'unit-mythical-start-location
@@ -119,11 +114,6 @@
'unit-great-hall
'unit-pig-farm
'unit-mythical-barracks
-
- 'unit-attack-peon
- 'unit-peon-with-gold
- 'unit-peon-with-wood
- 'unit-mythical-oil-tanker-full
;- - - - - - - - - - - - - - - - - - -
Index: demogame/ccl/icons.ccl
diff -u demogame/ccl/icons.ccl:1.2 demogame/ccl/icons.ccl:1.3
--- demogame/ccl/icons.ccl:1.2 Mon Aug 11 01:57:05 2003
+++ demogame/ccl/icons.ccl Thu Sep 11 08:17:57 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.2 2003/08/11 05:57:05 martinxyz Exp $
+;; $Id: icons.ccl,v 1.3 2003/09/11 12:17:57 martinxyz Exp $
;; NOTE:
;; Splitting this file into races is a problem, because all
@@ -54,6 +54,9 @@
;;=============================================================================
;; Summer Tileset
;;=============================================================================
+
+(define-icon 'icon-sniper 'tileset 'tileset-summer
+ 'size '(46 38) 'normal '(0 "alliance/units/sniper-icon.png"))
; FIXME: don't repeat filename and size
; could be done with a helper function
Index: demogame/ccl/mythical/units.ccl
diff -u demogame/ccl/mythical/units.ccl:1.5 demogame/ccl/mythical/units.ccl:1.6
--- demogame/ccl/mythical/units.ccl:1.5 Wed Sep 3 09:16:46 2003
+++ demogame/ccl/mythical/units.ccl Thu Sep 11 08:17:59 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.5 2003/09/03 13:16:46 martinxyz Exp $
+;; $Id: units.ccl,v 1.6 2003/09/11 12:17:59 martinxyz Exp $
;;=============================================================================
;; Define unit-types.
@@ -63,22 +63,14 @@
dead "basic mythical voices dead"
attack "grunt-attack"))
-; pre-declare all fauns (because they transform into each other)
-; FIXME: magic name "unit-peon-*" hardcoded in the engine
-(define-unit-type 'unit-peon)
-(define-unit-type 'unit-peon-with-gold)
-(define-unit-type 'unit-peon-with-wood)
-; this one seems to be for scenarios
-(define-unit-type 'unit-attack-peon)
-
-(define faun-common-args (list
- 'name "Faun"
+(define-unit-type 'unit-peon 'name "Faun"
+ 'files '(tileset-summer "mythical/units/faun.png")
'size '(72 72)
- 'draw-level 40
- 'animations 'animations-peasant 'icon 'icon-faun
+ 'animations 'animations-peasant 'icon 'icon-peon
'costs '(time 45 gold 400)
'speed 10
'hit-points 30
+ 'draw-level 40
'tile-size '(1 1) 'box-size '(31 31)
'sight-range 4 'computer-reaction-range 6 'person-reaction-range 4
'basic-damage 3 'piercing-damage 2 'missile 'missile-none
@@ -86,60 +78,38 @@
'priority 50
'points 30
'demand 1
- 'corpse '(unit-dead-body 6)
+ 'corpse '(unit-dead-body 0)
'type-land
- 'can-attack
+ 'right-harvest
+ 'can-attack 'repair-range 1
'can-target-land
- 'repair-range 1
'land-unit
+ 'coward
+ 'harvester
+ 'can-gather-resource '(
+ file-when-loaded "mythical/units/faun-with-gold.png"
+ resource-id gold
+ resource-capacity 100
+ wait-at-resource 150
+ wait-at-depot 150)
+ 'can-gather-resource '(
+ file-when-loaded "mythical/units/faun-with-wood.png"
+ resource-id wood
+ resource-capacity 100
+ resource-step 2
+ wait-at-resource 24
+ wait-at-depot 150
+ lose-resources
+ terrain-harvester )
'organic
'selectable-by-rectangle
'sounds '(
- selected "faun-selected"
- acknowledge "faun-acknowledge"
- ready "faun-ready"
+ selected "peon-selected"
+ acknowledge "peon-acknowledge"
+ ready "peon-ready"
help "basic mythical voices help 1"
dead "basic mythical voices dead"
- attack "faun-attack")))
-
-(apply define-unit-type (append (list
- 'unit-peon
- 'icon 'icon-faun
- 'files '(tileset-summer "mythical/units/faun.png")
- 'right-harvest
- 'harvester 'resource-harvested 'gold 'resource-capacity 100
- 'wait-at-resource 150 'wait-at-depot 150
- 'transform-when-loaded 'unit-peon-with-gold
- 'coward
- 'add-buttons '(faun-buttons nil)
- ) faun-common-args))
-
-(apply define-unit-type (append (list
- 'unit-peon-with-gold
- 'files '(tileset-summer "mythical/units/faun-with-gold.png")
- 'right-harvest
- 'harvester 'resource-harvested 'gold 'resource-capacity 100
- 'wait-at-resource 150 'wait-at-depot 150
- 'transform-when-empty 'unit-peon
- 'coward
- 'add-buttons '(faun-buttons 't)
- ) faun-common-args))
-
-(apply define-unit-type (append (list
- 'unit-peon-with-wood
- 'files '(tileset-summer "mythical/units/faun-with-wood.png")
- 'right-harvest
- 'coward
- 'add-buttons '(faun-buttons 't)
- ) faun-common-args))
-
-(apply define-unit-type (append (list
- 'unit-attack-peon
- 'use 'unit-peon
- 'right-attack
- ; FIXME: this one will need special buttons
- 'add-buttons '(faun-buttons nil)
- ) faun-common-args))
+ attack "peon-attack"))
(define-unit-type 'unit-catapult 'name "Catapult"
'files '(tileset-summer "mythical/units/catapult.png")
@@ -472,9 +442,6 @@
dead "basic mythical voices dead"
attack "beast-cry-attack"))
-; declaration
-(define-unit-type 'unit-mythical-oil-tanker-full)
-
(define-unit-type 'unit-mythical-oil-tanker 'name "Oil tanker"
'files '(tileset-summer "mythical/units/oil_tanker_empty.png")
'size '(72 72)
@@ -494,9 +461,14 @@
'type-naval
'right-harvest
'sea-unit 'coward
- 'harvester 'resource-harvested 'oil 'resource-capacity 100
- 'wait-at-resource 100 'wait-at-depot 100
- 'transform-when-loaded 'unit-mythical-oil-tanker-full
+ 'harvester
+ 'can-gather-resource '(
+ file-when-empty "alliance/units/oil_tanker_empty.png"
+ file-when-loaded "alliance/units/oil_tanker_full.png"
+ resource-id oil
+ resource-capacity 100
+ wait-at-resource 100
+ wait-at-depot 100 )
'selectable-by-rectangle
'sounds '(
selected "mythical-oil-tanker-selected"
@@ -506,37 +478,6 @@
dead "ship sinking"
attack "mythical-oil-tanker-attack"))
-(define-unit-type 'unit-mythical-oil-tanker-full 'name "Oil tanker"
- 'files '(tileset-summer "mythical/units/oil_tanker_full.png")
- 'size '(72 72)
- 'animations 'animations-alliance-oil-tanker 'icon 'icon-mythical-oil-tanker
- 'costs '(time 50 gold 400 wood 200)
- 'speed 10
- 'hit-points 90
- 'draw-level 40
- 'tile-size '(1 1) 'box-size '(63 63)
- 'sight-range 4
- 'armor 10 'basic-damage 0 'piercing-damage 0 'missile 'missile-none
- 'max-attack-range 1
- 'priority 50 'annoy-computer-factor 10
- 'points 40
- 'demand 1
- 'corpse '(unit-dead-body 12)
- 'type-naval
- 'right-harvest
- 'sea-unit 'coward
- 'harvester 'resource-harvested 'oil 'resource-capacity 100
- 'wait-at-resource 100 'wait-at-depot 100
- 'transform-when-empty 'unit-mythical-oil-tanker
- 'selectable-by-rectangle
- 'sounds '(
- selected "mythical-oil-tanker-full-selected"
- acknowledge "mythical-oil-tanker-full-acknowledge"
- ready "mythical-oil-tanker-full-ready"
- help "basic mythical voices help 1"
- dead "ship sinking"
- attack "mythical-oil-tanker-full-attack"))
-
(define-unit-type 'unit-mythical-transport 'name "Transport"
'files '(tileset-summer "mythical/units/transport.png")
'size '(72 72)
@@ -653,7 +594,7 @@
'can-attack
'can-target-land 'can-target-sea 'can-target-air
'air-unit
- 'can-see-submarine
+ 'detect-cloak
'organic
'selectable-by-rectangle
'sounds '(
@@ -685,8 +626,8 @@
'can-attack
'can-target-sea
'sea-unit
- 'submarine
- 'can-see-submarine
+ 'permanent-cloak
+ 'detect-cloak
'selectable-by-rectangle
'sounds '(
selected "mythical-submarine-selected"
@@ -714,7 +655,7 @@
'type-fly
'right-move
'air-unit 'coward
- 'can-see-submarine
+ 'detect-cloak
'selectable-by-rectangle
'sounds '(
selected "zeppelin-selected"
@@ -744,7 +685,7 @@
'can-attack
'can-target-land 'can-target-sea 'can-target-air
'air-unit
- 'can-see-submarine
+ 'detect-cloak
'organic
'selectable-by-rectangle
'sounds '(
@@ -772,7 +713,7 @@
'type-fly
'right-move
'air-unit
- 'can-see-submarine
+ 'detect-cloak
'selectable-by-rectangle
'sounds '(
selected "eye-of-vision-selected"
@@ -1054,7 +995,7 @@
'type-land
'can-target-land 'can-target-sea 'can-target-air
'building
- 'can-see-submarine
+ 'detect-cloak
'sounds '(
selected "mythical-watch-tower-selected"
acknowledge "mythical-watch-tower-acknowledge"
@@ -1488,7 +1429,7 @@
'can-attack
'can-target-land 'can-target-sea 'can-target-air
'building
- 'can-see-submarine
+ 'detect-cloak
'tower
'sounds '(
selected "mythical-guard-tower-selected"
@@ -1521,7 +1462,7 @@
'can-attack
'can-target-land 'can-target-sea
'building
- 'can-see-submarine
+ 'detect-cloak
'tower
'sounds '(
selected "mythical-cannon-tower-selected"
Index: demogame/ccl/mythical/upgrade.ccl
diff -u demogame/ccl/mythical/upgrade.ccl:1.2
demogame/ccl/mythical/upgrade.ccl:1.3
--- demogame/ccl/mythical/upgrade.ccl:1.2 Mon Aug 11 01:57:05 2003
+++ demogame/ccl/mythical/upgrade.ccl Thu Sep 11 08:17:59 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.2 2003/08/11 05:57:05 martinxyz Exp $
+;; $Id: upgrade.ccl,v 1.3 2003/09/11 12:17:59 martinxyz Exp $
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;=============================================================================
@@ -246,7 +246,6 @@
(define-allow 'unit-death-knight "AAAAAAAAAAAAAAAA")
(define-allow 'unit-ogre-mage "AAAAAAAAAAAAAAAA")
(define-allow 'unit-goblin-sappers "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-attack-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-berserker "AAAAAAAAAAAAAAAA")
(define-allow 'unit-evil-knight "AAAAAAAAAAAAAAAA")
(define-allow 'unit-fad-man "AAAAAAAAAAAAAAAA")
@@ -285,9 +284,6 @@
(define-allow 'unit-mythical-guard-tower "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-cannon-tower "AAAAAAAAAAAAAAAA")
(define-allow 'unit-orc-wall "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-wood "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-oil-tanker-full "AAAAAAAAAAAAAAAA")
;; - upgrades
Index: demogame/ccl/sound.ccl
diff -u demogame/ccl/sound.ccl:1.2 demogame/ccl/sound.ccl:1.3
--- demogame/ccl/sound.ccl:1.2 Mon Aug 11 01:57:05 2003
+++ demogame/ccl/sound.ccl Thu Sep 11 08:17:57 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.2 2003/08/11 05:57:05 martinxyz Exp $
+;; $Id: sound.ccl,v 1.3 2003/09/11 12:17:57 martinxyz Exp $
(if (with-sound) (begin
@@ -695,12 +695,6 @@
(map-sound "gul-dan-acknowledge" "death-knight-acknowledge")
(map-sound "uther-lightbringer-acknowledge" "paladin-acknowledge")
(map-sound "zuljin-acknowledge" "troll axethrower-berserker acknowledge")
-(map-sound "faun-with-gold-acknowledge" "basic mythical voices acknowledge")
-(map-sound "peasant-with-gold-acknowledge" "peasant-acknowledge")
-(map-sound "faun-with-wood-acknowledge" "basic mythical voices acknowledge")
-(map-sound "peasant-with-wood-acknowledge" "peasant-acknowledge")
-(map-sound "alliance-oil-tanker-full-acknowledge" "tanker acknowledge")
-(map-sound "mythical-oil-tanker-full-acknowledge" "tanker acknowledge")
;; ready sounds
(map-sound "footman-ready" "basic alliance voices ready")
(map-sound "grunt-ready" "basic mythical voices ready")
@@ -768,12 +762,6 @@
(map-sound "mythical-guard-tower-selected" "click")
(map-sound "alliance-cannon-tower-selected" "click")
(map-sound "mythical-cannon-tower-selected" "click")
-(map-sound "faun-with-gold-selected" "faun-selected")
-(map-sound "peasant-with-gold-selected" "peasant-selected")
-(map-sound "faun-with-wood-selected" "faun-selected")
-(map-sound "peasant-with-wood-selected" "peasant-selected")
-(map-sound "alliance-oil-tanker-full-selected" "alliance-oil-tanker-selected")
-(map-sound "mythical-oil-tanker-full-selected" "mythical-oil-tanker-selected")
;; attack sounds
(map-sound "footman-attack" "sword attack")
(map-sound "grunt-attack" "sword attack")
@@ -825,10 +813,6 @@
;; (map-sound "mythical-guard-tower-attack")
;; (map-sound "alliance-cannon-tower-attack")
;; (map-sound "mythical-cannon-tower-attack")
-(map-sound "faun-with-gold-attack" "peasant-attack")
-(map-sound "peasant-with-gold-attack" "peasant-attack")
-(map-sound "faun-with-wood-attack" "peasant-attack")
-(map-sound "peasant-with-wood-attack" "peasant-attack")
(map-sound "critter-help" "basic mythical voices help 1")
(map-sound "critter-dead" "explosion")
Index: demogame/ccl/units.ccl
diff -u demogame/ccl/units.ccl:1.4 demogame/ccl/units.ccl:1.5
--- demogame/ccl/units.ccl:1.4 Wed Sep 3 07:23:07 2003
+++ demogame/ccl/units.ccl Thu Sep 11 08:17:58 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.4 2003/09/03 11:23:07 martinxyz Exp $
+;; $Id: units.ccl,v 1.5 2003/09/11 12:17:58 martinxyz Exp $
;; Load the animations for the units.
(load "ccl/anim.ccl" #f #t)
@@ -137,7 +137,7 @@
'can-target-land 'can-target-sea 'can-target-air
'air-unit
'critter
- 'can-see-submarine
+ 'detect-cloak
'organic
'selectable-by-rectangle
'sounds '(
@@ -402,7 +402,7 @@
'type-land
'building
'critter
- 'can-see-submarine
+ 'detect-cloak
'sounds '())
(define-unit-type 'unit-reveal-attacker 'name "Dummy unit"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] demogame ccl/ai.ccl ccl/anim.ccl ccl/editor.ccl...,
Martin Renold <=