[Stratagus-CVS] stratagus/data/ccl human/upgrade.ccl orc/upgrad...

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/10/13 18:45:55

Modified files:
        data/ccl/human : upgrade.ccl 
        data/ccl/orc   : upgrade.ccl 

Log message:
        Moved catapult and ballista upgrades to the right files

Patches:
Index: stratagus/data/ccl/human/upgrade.ccl
diff -u stratagus/data/ccl/human/upgrade.ccl:1.16 
stratagus/data/ccl/human/upgrade.ccl:1.17
--- stratagus/data/ccl/human/upgrade.ccl:1.16   Wed Sep 10 09:53:46 2003
+++ stratagus/data/ccl/human/upgrade.ccl        Mon Oct 13 18:45: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.16 2003/09/10 13:53:46 martinxyz Exp $
+;;     $Id: upgrade.ccl,v 1.17 2003/10/13 22:45:55 jsalmon3 Exp $
 
 ;;     NOTE: Save can generate this table.
 
@@ -53,9 +53,9 @@
 (define-upgrade 'upgrade-human-ship-armor2 'icon 'icon-alliance-ship-armor3
   'costs #(   250  1500   900     0     0     0     0))
 
-(define-upgrade 'upgrade-catapult1 'icon 'icon-catapult1
+(define-upgrade 'upgrade-ballista1 'icon 'icon-ballista1
   'costs #(   250  1500     0     0     0     0     0))
-(define-upgrade 'upgrade-catapult2 'icon 'icon-catapult2
+(define-upgrade 'upgrade-ballista2 'icon 'icon-ballista2
   'costs #(   250  4000     0     0     0     0     0))
 
 (define-upgrade 'upgrade-ranger 'icon 'icon-ranger
@@ -147,13 +147,13 @@
   '(apply-to unit-alliance-destroyer) '(apply-to unit-battleship)
   '(apply-to unit-alliance-transport))
 
-(define-modifier 'upgrade-catapult1
+(define-modifier 'upgrade-ballista1
   '(piercing-damage 15)
-  '(apply-to unit-catapult))
+  '(apply-to unit-ballista))
 
-(define-modifier 'upgrade-catapult2
+(define-modifier 'upgrade-ballista2
   '(piercing-damage 15)
-  '(apply-to unit-catapult))
+  '(apply-to unit-ballista))
 
 (define-modifier 'upgrade-ranger
   '(apply-to unit-archer) '(convert-to unit-ranger))
@@ -267,8 +267,8 @@
 (define-allow 'upgrade-human-ship-cannon2      "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-human-ship-armor1       "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-human-ship-armor2       "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-catapult1               "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-catapult2               "AAAAAAAAAAAAAAAA")
+(define-allow 'upgrade-ballista1               "AAAAAAAAAAAAAAAA")
+(define-allow 'upgrade-ballista2               "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-ranger                  "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-longbow                 "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-ranger-scouting         "AAAAAAAAAAAAAAAA")
@@ -350,8 +350,8 @@
   '(upgrade-arrow1))
 (define-dependency 'upgrade-human-shield2
   '(upgrade-human-shield1))
-(define-dependency 'upgrade-catapult2
-  '(upgrade-catapult1))
+(define-dependency 'upgrade-ballista2
+  '(upgrade-ballista1))
 (define-dependency 'upgrade-human-ship-cannon2
   '(upgrade-human-ship-cannon1))
 (define-dependency 'upgrade-human-ship-armor2
Index: stratagus/data/ccl/orc/upgrade.ccl
diff -u stratagus/data/ccl/orc/upgrade.ccl:1.17 
stratagus/data/ccl/orc/upgrade.ccl:1.18
--- stratagus/data/ccl/orc/upgrade.ccl:1.17     Sun Sep 21 08:13:42 2003
+++ stratagus/data/ccl/orc/upgrade.ccl  Mon Oct 13 18:45: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.17 2003/09/21 12:13:42 mr-russ Exp $
+;;     $Id: upgrade.ccl,v 1.18 2003/10/13 22:45:55 jsalmon3 Exp $
 
 ;;     NOTE: Save can generate this table.
 
@@ -50,9 +50,9 @@
   'costs #(   200   500   500     0     0     0     0))
 (define-upgrade 'upgrade-orc-ship-armor2 'icon 'icon-mythical-ship-armor3
   'costs #(   250  1500   900     0     0     0     0))
-(define-upgrade 'upgrade-ballista1 'icon 'icon-ballista1
+(define-upgrade 'upgrade-catapult1 'icon 'icon-catapult1
   'costs #(   250  1500     0     0     0     0     0))
-(define-upgrade 'upgrade-ballista2 'icon 'icon-ballista2
+(define-upgrade 'upgrade-catapult2 'icon 'icon-catapult2
   'costs #(   250  4000     0     0     0     0     0))
 (define-upgrade 'upgrade-berserker 'icon 'icon-berserker
   'costs #(   250  1500     0     0     0     0     0))
@@ -144,13 +144,13 @@
   '(apply-to unit-mythical-destroyer) '(apply-to unit-ogre-juggernaught)
   '(apply-to unit-mythical-transport))
 
-(define-modifier 'upgrade-ballista1
+(define-modifier 'upgrade-catapult1
   '(piercing-damage 15)
-  '(apply-to unit-ballista))
+  '(apply-to unit-catapult))
 
-(define-modifier 'upgrade-ballista2
+(define-modifier 'upgrade-catapult2
   '(piercing-damage 15)
-  '(apply-to unit-ballista))
+  '(apply-to unit-catapult))
 
 (define-modifier 'upgrade-berserker
   '(apply-to unit-axethrower) '(convert-to unit-berserker))
@@ -265,8 +265,8 @@
 (define-allow 'upgrade-orc-ship-cannon2                "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-orc-ship-armor1         "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-orc-ship-armor2         "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-ballista1               "AAAAAAAAAAAAAAAA")
-(define-allow 'upgrade-ballista2               "AAAAAAAAAAAAAAAA")
+(define-allow 'upgrade-catapult1               "AAAAAAAAAAAAAAAA")
+(define-allow 'upgrade-catapult2               "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-berserker               "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-light-axes              "AAAAAAAAAAAAAAAA")
 (define-allow 'upgrade-berserker-scouting      "AAAAAAAAAAAAAAAA")
@@ -343,8 +343,8 @@
   '(upgrade-throwing-axe1))
 (define-dependency 'upgrade-orc-shield2
   '(upgrade-orc-shield1))
-(define-dependency 'upgrade-ballista2
-  '(upgrade-ballista1))
+(define-dependency 'upgrade-catapult2
+  '(upgrade-catapult1))
 (define-dependency 'upgrade-orc-ship-cannon2
   '(upgrade-orc-ship-cannon1))
 (define-dependency 'upgrade-orc-ship-armor2