stratagus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Stratagus-CVS] demogame/ccl ai.ccl anim.ccl editor.ccl wc2.ccl...


From: Martin Renold
Subject: [Stratagus-CVS] demogame/ccl ai.ccl anim.ccl editor.ccl wc2.ccl...
Date: Tue, 07 Oct 2003 15:18:55 -0400

CVSROOT:        /cvsroot/stratagus
Module name:    demogame
Branch:         
Changes by:     Martin Renold <address@hidden>  03/10/07 15:18:55

Modified files:
        ccl            : ai.ccl anim.ccl editor.ccl wc2.ccl 
        ccl/mythical   : buttons.ccl units.ccl upgrade.ccl 

Log message:
        renaming peon ==> faun completed

Patches:
Index: demogame/ccl/ai.ccl
diff -u demogame/ccl/ai.ccl:1.4 demogame/ccl/ai.ccl:1.5
--- demogame/ccl/ai.ccl:1.4     Tue Oct  7 09:27:59 2003
+++ demogame/ccl/ai.ccl Tue Oct  7 15:18:54 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.4 2003/10/07 13:27:59 martinxyz Exp $
+;;     $Id: ai.ccl,v 1.5 2003/10/07 19:18:54 martinxyz Exp $
 
 ;(define (ai:sleep) () #t)
 
@@ -141,7 +141,7 @@
     ;;
     ;; Unit can build which buildings.
     ;;
-    (list 'build 'unit-peon
+    (list 'build 'unit-faun
        '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-orc-refinery
@@ -153,9 +153,9 @@
     ;; Building can train which units.
     ;;
     (list 'train 'unit-pig-farm 'unit-critter)
-    (list 'train 'unit-great-hall 'unit-peon)
-    (list 'train 'unit-stronghold 'unit-peon)
-    (list 'train 'unit-fortress 'unit-peon)
+    (list 'train 'unit-great-hall 'unit-faun)
+    (list 'train 'unit-stronghold 'unit-faun)
+    (list 'train 'unit-fortress 'unit-faun)
     (list 'train 'unit-mythical-barracks
        'unit-grunt 'unit-axethrower 'unit-berserker 'unit-catapult 'unit-ogre
        'unit-ogre-mage)
@@ -195,7 +195,7 @@
     ;;
     ;; Unit can build which units.
     ;;
-    (list 'repair 'unit-peon
+    (list 'repair 'unit-faun
        '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
@@ -218,7 +218,7 @@
        'unit-berserker)
     (list 'unit-equiv 'unit-ogre
        'unit-ogre-mage)
-    (list 'unit-equiv 'unit-peon)
+    (list 'unit-equiv 'unit-faun)
     (list 'unit-equiv 'unit-orc-oil-tanker)
     (list 'unit-equiv 'unit-mythical-watch-tower
         'unit-mythical-guard-tower 'unit-mythical-cannon-tower) )
@@ -347,11 +347,11 @@
     ;; Define the main AI script.
     (begin (ai:debug #f) (ai:sleep (ai:get-sleep-cycles)))
     (ai:need (unit-type 'unit-great-hall))
-    (ai:set  'unit-peon 1)
+    (ai:set  'unit-faun 1)
     (ai:wait 'unit-great-hall)
-    (ai:wait 'unit-peon)       ;; start hangs if nothing available
+    (ai:wait 'unit-faun)       ;; start hangs if nothing available
 
-    (ai:set  'unit-peon 10)
+    (ai:set  'unit-faun 10)
     (ai:set  'unit-pig-farm 2)
     (ai:need 'unit-mythical-barracks)
     (ai:need 'unit-mythical-blacksmith)
@@ -366,7 +366,7 @@
     (ai:research 'upgrade-mythical-shield1)
     (ai:research 'upgrade-battle-axe2)
     (ai:research 'upgrade-mythical-shield2)
-    (ai:set  'unit-peon 20)
+    (ai:set  'unit-faun 20)
     (ai:force 1 'unit-grunt 6)
     (ai:wait-force 1)          ;; wait until attack party is completed
     (ai:set 'unit-mythical-barracks 3)
@@ -432,7 +432,7 @@
     (ai:force 0 'unit-grunt 9)
     (ai:force 4 'unit-grunt 9)
 
-    (ai:set  'unit-peon 25)
+    (ai:set  'unit-faun 25)
 
     (ai:set  'unit-pig-farm 20)
     (ai:force 0 'unit-grunt 9 'unit-ogre 1)
@@ -521,7 +521,7 @@
     (ai:upgrade-to 'unit-mythical-cannon-tower)
     (ai:need 'unit-mythical-watch-tower)
     (ai:upgrade-to 'unit-mythical-guard-tower)
-    (ai:set  'unit-peon 25)
+    (ai:set  'unit-faun 25)
 
     ;; Everything researched...
 
@@ -544,18 +544,18 @@
     ;; Define the main AI script.
     (begin (ai:debug #f) (ai:sleep (ai:get-sleep-cycles)))
     (ai:need (unit-type 'unit-great-hall))
-    (ai:set  'unit-peon 1)
+    (ai:set  'unit-faun 1)
     (ai:wait 'unit-great-hall)
-    (ai:wait 'unit-peon)       ;; start hangs if nothing available
+    (ai:wait 'unit-faun)       ;; start hangs if nothing available
 
     (ai:set  'unit-pig-farm 1)
 
-    (ai:set  'unit-peon 5)
-    (ai:wait 'unit-peon)
+    (ai:set  'unit-faun 5)
+    (ai:wait 'unit-faun)
 
     (ai:need 'unit-mythical-barracks)
 
-    (ai:set  'unit-peon 50)
+    (ai:set  'unit-faun 50)
     (ai:script ai:mythical-goldfever-endloop) ))
 
 ;;=============================================================================
@@ -588,7 +588,7 @@
 ;;
 (define (ai:worker)
   (if (eq? (ai:get-race) race1)
-      'unit-peasant 'unit-peon) )
+      'unit-peasant 'unit-faun) )
 
 ;;
 ;;     Lumber mill of the current race.
@@ -1492,11 +1492,11 @@
     ;; Define the main AI script.
     (begin (ai:debug #f) (ai:sleep (ai:get-sleep-cycles)))
     (ai:need (unit-type 'unit-great-hall))
-    (ai:set  'unit-peon 1)
+    (ai:set  'unit-faun 1)
     (ai:wait 'unit-great-hall)
-    (ai:wait 'unit-peon)       ;; start hangs if nothing available
+    (ai:wait 'unit-faun)       ;; start hangs if nothing available
 
-    (ai:set  'unit-peon 4)
+    (ai:set  'unit-faun 4)
     (ai:need 'unit-troll-lumber-mill)
     (ai:need 'unit-mythical-barracks)
     (ai:force 0 'unit-grunt 2)
@@ -1504,7 +1504,7 @@
     (ai:wait-force 1)          ;; wait until attack party is completed
     (ai:attack-with-force 1)
 
-    (ai:set  'unit-peon 9)
+    (ai:set  'unit-faun 9)
     (ai:sleep  500)
     (ai:need 'unit-mythical-blacksmith)
     (ai:force 0 'unit-grunt 2 'unit-axethrower 1)
@@ -1527,7 +1527,7 @@
     (ai:attack-with-force 1)
 
     (ai:sleep  500)
-    (ai:set  'unit-peon 15)
+    (ai:set  'unit-faun 15)
     (ai:force 0 'unit-grunt 3 'unit-axethrower 2)
     (ai:force 1 'unit-grunt 3 'unit-axethrower 1 'unit-catapult 1)
     (ai:wait-force 1)          ;; wait until attack party is completed
@@ -1556,7 +1556,7 @@
     (ai:upgrade-to 'unit-mythical-guard-tower)
     (ai:need 'unit-mythical-barracks)
     (ai:upgrade-to 'unit-fortress)
-    (ai:set  'unit-peon 19)
+    (ai:set  'unit-faun 19)
     (ai:wait 'unit-fortress)
 
     (ai:force 0 'unit-grunt 1 'unit-axethrower 2 'unit-ogre 6 'unit-catapult 1)
@@ -1670,7 +1670,7 @@
     (ai:upgrade-to 'unit-mythical-cannon-tower)
     (ai:need 'unit-mythical-watch-tower)
     (ai:upgrade-to 'unit-mythical-guard-tower)
-    (ai:set  'unit-peon 25)
+    (ai:set  'unit-faun 25)
 
     ;; Everything researched...
 
Index: demogame/ccl/anim.ccl
diff -u demogame/ccl/anim.ccl:1.5 demogame/ccl/anim.ccl:1.6
--- demogame/ccl/anim.ccl:1.5   Thu Sep 11 08:17:57 2003
+++ demogame/ccl/anim.ccl       Tue Oct  7 15:18:54 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.5 2003/09/11 12:17:57 martinxyz Exp $
+;;     $Id: anim.ccl,v 1.6 2003/10/07 19:18:54 martinxyz Exp $
 
 ;;------
 ;;     Footman, Grunt, Grom Hellscream, Arthor_Literios, Korgath Bladefist
@@ -72,22 +72,6 @@
   'attack '(   ; #200
     #( 0 0  25  10) #(12 0  25  15) #( 0 0 100  15) #( 0 0  49   0)
     #( 3 0   1   0)))
-
-;;------
-;;     Catapult
-(define-animations 'animations-catapult
-  'still '(    ; #5
-    #( 0 0   4   0) #( 3 0   1   0))
-  'move '(     ; #32 P32
-    #( 0 0   1   0) #( 0 2   2   5) #( 0 2   2   0) #( 0 2   2   5)
-    #( 0 2   2   0) #( 0 2   2   5) #( 0 2   2   0) #( 0 2   2   5)
-    #( 0 2   2   0) #( 0 2   2   5) #( 0 2   2   0) #( 0 2   2   5)
-    #( 0 2   2   0) #( 0 2   2   5) #( 0 2   2   0) #( 0 2   2   5)
-    #( 3 2   1   0))
-  'attack '(   ; #200
-    #(12 0   4  15) #( 0 0   4  10) #( 0 0   3  15) #( 0 0   2  10)
-    #( 0 0   2  15) #( 0 0  30  10) #( 0 0   4  15) #( 0 0 100  15)
-    #( 0 0  50   0) #( 3 0   1   0)))
 
 ;;------
 ;;     Knight, Paladin, Knight_Rider, Wise_Man, Uther Lightbringer
Index: demogame/ccl/editor.ccl
diff -u demogame/ccl/editor.ccl:1.3 demogame/ccl/editor.ccl:1.4
--- demogame/ccl/editor.ccl:1.3 Thu Sep 11 08:17:57 2003
+++ demogame/ccl/editor.ccl     Tue Oct  7 15:18:54 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.3 2003/09/11 12:17:57 martinxyz Exp $
+;;     $Id: editor.ccl,v 1.4 2003/10/07 19:18:54 martinxyz Exp $
 
 
 ;;     Set which icons to display
@@ -95,7 +95,7 @@
 
    'unit-mythical-start-location
 
-   'unit-peon
+   'unit-faun
    'unit-grunt
    'unit-axethrower
    'unit-berserker
Index: demogame/ccl/mythical/buttons.ccl
diff -u demogame/ccl/mythical/buttons.ccl:1.1 
demogame/ccl/mythical/buttons.ccl:1.2
--- demogame/ccl/mythical/buttons.ccl:1.1       Tue Oct  7 09:28:00 2003
+++ demogame/ccl/mythical/buttons.ccl   Tue Oct  7 15:18:55 2003
@@ -26,15 +26,15 @@
 ;;      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/07 19:18:55 martinxyz Exp $
 
 ;; general commands -- almost all units have it -------------------------------
 
-(define-button 'pos 1 'level 0 'icon 'icon-move-peon
+(define-button 'pos 1 'level 0 'icon 'icon-move-faun
   'action 'move
   'key "m" 'hint "~!MOVE"
   'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-peon
+    unit-goblin-sappers unit-berserker unit-catapult unit-faun
     unit-fad-man unit-double-head
     unit-sharp-axe unit-beast-cry unit-quick-blade unit-ice-bringer
     unit-evil-knight unit-skeleton unit-eye-of-vision unit-dragon
@@ -45,7 +45,7 @@
   'action 'stop
   'key "s" 'hint "~!STOP"
   'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-peon
+    unit-goblin-sappers unit-berserker unit-catapult unit-faun
     unit-fad-man unit-double-head
     unit-sharp-axe unit-beast-cry unit-quick-blade unit-ice-bringer
     unit-evil-knight unit-skeleton unit-eye-of-vision unit-dragon
@@ -72,7 +72,7 @@
   'action 'attack
   'key "a" 'hint "~!ATTACK"
   'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-peon
+    unit-goblin-sappers unit-berserker unit-catapult unit-faun
     unit-fad-man unit-double-head
     unit-sharp-axe unit-beast-cry unit-quick-blade unit-ice-bringer
     unit-evil-knight unit-skeleton unit-dragon unit-fire-breeze
@@ -150,7 +150,7 @@
   'action 'demolish
   'key "d" 'hint "~!DEMOLISH"
   'for-unit '(unit-grunt unit-ogre unit-axethrower unit-ogre-mage
-    unit-goblin-sappers unit-berserker unit-catapult unit-peon
+    unit-goblin-sappers unit-berserker unit-catapult unit-faun
     unit-fad-man unit-double-head
     unit-sharp-axe unit-beast-cry unit-quick-blade unit-ice-bringer
     unit-evil-knight unit-skeleton unit-eye-of-vision unit-dragon
@@ -239,132 +239,132 @@
   'key "d" 'hint "~!DEATH AND DECAY"
   'for-unit '(unit-death-knight unit-ice-bringer unit-evil-knight))
 
-;; peon specific actions ------------------------------------------------------
+;; faun specific actions ------------------------------------------------------
 
 (define-button 'pos 4 'level 0 'icon 'icon-repair
   'action 'repair
   'key "r" 'hint "~!REPAIR"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 5 'level 0 'icon 'icon-harvest
   'action 'harvest
   'key "h" 'hint "~!HARVEST LUMBER/MINE GOLD"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
-(define-button 'pos 6 'level 0 'icon 'icon-return-goods-peon
+(define-button 'pos 6 'level 0 'icon 'icon-return-goods-faun
   'action 'return-goods
   'key "g" 'hint "RETURN WITH ~!GOODS"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 ;; build basic/advanced structs -----------------------------------------------
 
 (define-button 'pos 7 'level 0 'icon 'icon-build-basic
   'action 'button 'value 1
   'key "b" 'hint "~!BUILD BASIC STRUCTURE"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 8 'level 0 'icon 'icon-build-advanced
   'action 'button 'value 2
   'allowed 'check-units-or 'allow-arg '(unit-troll-lumber-mill unit-stronghold)
   'key "v" 'hint "BUILD AD~!VANCED STRUCTURE"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 9 'level 0 'icon 'icon-build-advanced
   'action 'button 'value 3
   'allowed 'check-units-and 'allow-arg '(unit-fortress 
unit-temple-of-the-damned
     unit-altar-of-storms)
   'key "e" 'hint "BUILD SP~!ECIAL STRUCTURE"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 ;; simple buildings mythical 
-------------------------------------------------------
 
 (define-button 'pos 1 'level 1 'icon 'icon-pig-farm
   'action 'build 'value 'unit-pig-farm
   'key "f" 'hint "BUILD PIG ~!FARM"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 2 'level 1 'icon 'icon-mythical-barracks
   'action 'build 'value 'unit-mythical-barracks
   'key "b" 'hint "BUILD ~!BARRACKS"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 3 'level 1 'icon 'icon-great-hall
   'action 'build 'value 'unit-great-hall
   'key "h" 'hint "BUILD GREAT ~!HALL"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 4 'level 1 'icon 'icon-troll-lumber-mill
   'action 'build 'value 'unit-troll-lumber-mill
   'key "l" 'hint "BUILD TROLL ~!LUMBER MILL"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 5 'level 1 'icon 'icon-mythical-blacksmith
   'action 'build 'value 'unit-mythical-blacksmith
   'key "s" 'hint "BUILD BLACK~!SMITH"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 7 'level 1 'icon 'icon-mythical-watch-tower
   'action 'build 'value 'unit-mythical-watch-tower
   'key "t" 'hint "BUILD ~!TOWER"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 8 'level 1 'icon 'icon-mythical-wall
   'action 'build 'value 'unit-orc-wall
   'allowed 'check-network
   'key "w" 'hint "BUILD ~!WALL"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 9 'level 1 'icon 'icon-cancel
   'action 'button 'value 0
   'key "\033" 'hint "~<ESC~> CANCEL"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 ;; mythical advanced buildings 
-----------------------------------------------------
 
 (define-button 'pos 1 'level 2 'icon 'icon-mythical-shipyard
   'action 'build 'value 'unit-mythical-shipyard
   'key "s" 'hint "BUILD ~!SHIPYARD"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 2 'level 2 'icon 'icon-mythical-foundry
   'action 'build 'value 'unit-mythical-foundry
   'key "f" 'hint "BUILD ~!FOUNDRY"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 3 'level 2 'icon 'icon-mythical-refinery
   'action 'build 'value 'unit-orc-refinery
   'key "r" 'hint "BUILD ~!REFINERY"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 4 'level 2 'icon 'icon-alchemist
   'action 'build 'value 'unit-alchemist
   'key "a" 'hint "BUILD GOBLIN ~!ALCHEMIST"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 5 'level 2 'icon 'icon-ogre-mound
   'action 'build 'value 'unit-ogre-mound
   'key "o" 'hint "BUILD ~!OGRE MOUND"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 6 'level 2 'icon 'icon-temple-of-the-damned
   'action 'build 'value 'unit-temple-of-the-damned
   'key "t" 'hint "BUILD ~!TEMPLE OF THE DAMNED"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 7 'level 2 'icon 'icon-altar-of-storms
   'action 'build 'value 'unit-altar-of-storms
   'key "l" 'hint "BUILD A~!LTAR OF STORMS"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 8 'level 2 'icon 'icon-dragon-roost
   'action 'build 'value 'unit-dragon-roost
   'key "d" 'hint "BUILD ~!DRAGON ROOST"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 9 'level 2 'icon 'icon-cancel
   'action 'button 'value 0
   'key "\033" 'hint "~<ESC~> CANCEL"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 ;; mythical special buildings 
------------------------------------------------------
 
@@ -372,18 +372,18 @@
   'action 'build 'value 'unit-dark-portal
   'allowed 'check-no-network
   'key "p" 'hint "BUILD DARK ~!PORTAL"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 2 'level 3 'icon 'icon-runestone
   'action 'build 'value 'unit-runestone
   'allowed 'check-no-network
   'key "r" 'hint "BUILD ~!RUNESTONE"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 (define-button 'pos 9 'level 3 'icon 'icon-cancel
   'action 'button 'value 0
   'key "\033" 'hint "~<ESC~> CANCEL"
-  'for-unit '(unit-peon))
+  'for-unit '(unit-faun))
 
 ;; mythical buildings commands 
-----------------------------------------------------
 
@@ -393,9 +393,9 @@
   'for-unit '(unit-pig-farm))
 
 (define-button 'pos 1 'level 0 'icon 'icon-faun
-  'action 'train-unit 'value 'unit-peon
+  'action 'train-unit 'value 'unit-faun
   'allowed 'check-no-research
-  'key "p" 'hint "TRAIN ~!PEON"
+  'key "p" 'hint "TRAIN ~!FAUN"
   'for-unit '(unit-great-hall unit-stronghold unit-fortress))
 
 ;; strong hold upgrades -------------------------------------------------------
@@ -417,7 +417,7 @@
   'key "h" 'hint "SET ~!HARVEST LUMBER/MINE GOLD"
   'for-unit '(unit-great-hall unit-stronghold unit-fortress))
 
-(define-button 'pos 7 'level 0 'icon 'icon-move-peon
+(define-button 'pos 7 'level 0 'icon 'icon-move-faun
   'action 'move
   'key "m" 'hint "SET ~!MOVE"
   'for-unit '(unit-great-hall unit-stronghold unit-fortress
Index: demogame/ccl/mythical/units.ccl
diff -u demogame/ccl/mythical/units.ccl:1.10 
demogame/ccl/mythical/units.ccl:1.11
--- demogame/ccl/mythical/units.ccl:1.10        Tue Oct  7 09:28:00 2003
+++ demogame/ccl/mythical/units.ccl     Tue Oct  7 15:18:55 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/07 19:18:55 martinxyz Exp $
 
 ;;=============================================================================
 ;;     Define unit-types.
@@ -63,7 +63,7 @@
     dead "basic mythical voices dead"
     attack "grunt-attack"))
 
-(define-unit-type 'unit-peon 'name "Faun"
+(define-unit-type 'unit-faun 'name "Faun"
   'files '(tileset-summer "mythical/units/faun.png")
   'size '(72 72)
   'animations 'animations-peasant 'icon 'icon-faun
@@ -103,12 +103,12 @@
   'organic
   'selectable-by-rectangle
   'sounds '(
-    selected "peon-selected"
-    acknowledge "peon-acknowledge"
-    ready "peon-ready"
+    selected "faun-selected"
+    acknowledge "faun-acknowledge"
+    ready "faun-ready"
     help "basic mythical voices help 1"
     dead "basic mythical voices dead"
-    attack "peon-attack"))
+    attack "faun-attack"))
 
 (define-unit-type 'unit-catapult 'name "Catapult"
   'files '(tileset-summer "mythical/units/catapult.png")
Index: demogame/ccl/mythical/upgrade.ccl
diff -u demogame/ccl/mythical/upgrade.ccl:1.5 
demogame/ccl/mythical/upgrade.ccl:1.6
--- demogame/ccl/mythical/upgrade.ccl:1.5       Tue Oct  7 09:28:01 2003
+++ demogame/ccl/mythical/upgrade.ccl   Tue Oct  7 15:18:55 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.5 2003/10/07 13:28:01 martinxyz Exp $
+;;     $Id: upgrade.ccl,v 1.6 2003/10/07 19:18:55 martinxyz Exp $
 
 ;;     NOTE: Save can generate this table.
 
@@ -207,7 +207,7 @@
 ;;     NOTE: Save can generate this table.
 
 (define-allow 'unit-grunt                      "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon                       "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-faun                       "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-catapult                   "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-ogre                       "AAAAAAAAAAAAAAAA")
 (define-allow 'unit-axethrower                 "AAAAAAAAAAAAAAAA")
Index: demogame/ccl/wc2.ccl
diff -u demogame/ccl/wc2.ccl:1.2 demogame/ccl/wc2.ccl:1.3
--- demogame/ccl/wc2.ccl:1.2    Mon Aug 11 01:57:05 2003
+++ demogame/ccl/wc2.ccl        Tue Oct  7 15:18:54 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: wc2.ccl,v 1.2 2003/08/11 05:57:05 martinxyz Exp $
+;;     $Id: wc2.ccl,v 1.3 2003/10/07 19:18:54 martinxyz Exp $
 
 ; FIXME: get rid of this W*rCr*ft stuff
 
@@ -58,11 +58,11 @@
 ;;     (define-unittype-wc-names footman grunt ... )
 
 (define-unittype-wc-names
-    'unit-footman 'unit-grunt 'unit-peasant 'unit-peon 'unit-ballista
+    'unit-footman 'unit-grunt 'unit-peasant 'unit-faun 'unit-ballista
     'unit-catapult 'unit-knight 'unit-ogre 'unit-archer 'unit-axethrower
     'unit-mage 'unit-death-knight 'unit-paladin 'unit-ogre-mage
     'unit-dwarves 'unit-goblin-sappers 'unit-attack-peasant
-    'unit-attack-peon 'unit-ranger 'unit-berserker 'unit-female-hero
+    'unit-attack-faun 'unit-ranger 'unit-berserker 'unit-female-hero
     'unit-evil-knight 'unit-flying-angle 'unit-fad-man
     'unit-white-mage 'unit-beast-cry 'unit-alliance-oil-tanker
     'unit-mythical-oil-tanker 'unit-alliance-transport 'unit-mythical-transport
@@ -91,8 +91,8 @@
     'unit-runestone 'unit-alliance-wall 'unit-mythical-wall 'unit-dead-body
     'unit-destroyed-1x1-place 'unit-destroyed-2x2-place
     'unit-destroyed-3x3-place 'unit-destroyed-4x4-place
-    'unit-peasant-with-gold 'unit-peon-with-gold 'unit-peasant-with-wood
-    'unit-peon-with-wood 'unit-alliance-oil-tanker-full
+    'unit-peasant-with-gold 'unit-faun-with-gold 'unit-peasant-with-wood
+    'unit-faun-with-wood 'unit-alliance-oil-tanker-full
     'unit-mythical-oil-tanker-full)
 
 ;;=============================================================================




reply via email to

[Prev in Thread] Current Thread [Next in Thread]