[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus contrib/campaigns/human/level01h.cm c...
|
From: |
Crestez Leonard |
|
Subject: |
[Stratagus-CVS] stratagus contrib/campaigns/human/level01h.cm c... |
|
Date: |
Sat, 09 Aug 2003 16:32:53 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Crestez Leonard <address@hidden> 03/08/09 16:32:52
Modified files:
contrib/campaigns/human: level01h.cm level02h.cm level03h.cm
level04h.cm level05h.cm level06h.cm
level07h.cm level08h.cm level09h.cm
level10h.cm level11h.cm level12h.cm
level13h.cm level14h.cm
contrib/campaigns/human-exp: levelx01h.cm levelx02h.cm
levelx03h.cm levelx04h.cm
levelx05h.cm levelx06h.cm
levelx07h.cm levelx08h.cm
levelx09h.cm levelx10h.cm
levelx11h.cm levelx12h.cm
contrib/campaigns/orc: level01o.cm level02o.cm level03o.cm
level04o.cm level05o.cm level06o.cm
level07o.cm level08o.cm level09o.cm
level10o.cm level11o.cm level12o.cm
level13o.cm level14o.cm
contrib/campaigns/orc-exp: levelx01o.cm levelx02o.cm
levelx03o.cm levelx04o.cm
levelx05o.cm levelx06o.cm
levelx07o.cm levelx08o.cm
levelx09o.cm levelx10o.cm
levelx11o.cm levelx12o.cm
data/ccl : editor.ccl wc2.ccl
data/ccl/human : buttons.ccl units.ccl upgrade.ccl
data/ccl/orc : buttons.ccl units.ccl upgrade.ccl
doc : ChangeLog.html
src/action : action_minegold.c action_resource.c
action_returngoods.c actions.c command.c
src/ai : ai_resource.c
src/clone : unit.c unit_find.c
src/include : unit.h unittype.h upgrade_structs.h
src/ui : mouse.c
src/unit : unittype.c
Log message:
Even more resource stuff.
Removed unit-attack-peasant and unit-attack-peon stuff.
Patches:
Index: stratagus/contrib/campaigns/human-exp/levelx01h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx01h.cm:1.4
stratagus/contrib/campaigns/human-exp/levelx01h.cm:1.5
--- stratagus/contrib/campaigns/human-exp/levelx01h.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx01h.cm Sat Aug 9 16:32:51 2003
@@ -46,12 +46,10 @@
(define-allow 'unit-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "FFFFFFFFFFFFFFFF")
Index: stratagus/contrib/campaigns/human-exp/levelx02h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx02h.cm:1.5
stratagus/contrib/campaigns/human-exp/levelx02h.cm:1.6
--- stratagus/contrib/campaigns/human-exp/levelx02h.cm:1.5 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx02h.cm Sat Aug 9 16:32:51 2003
@@ -36,12 +36,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human-exp/levelx03h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx03h.cm:1.5
stratagus/contrib/campaigns/human-exp/levelx03h.cm:1.6
--- stratagus/contrib/campaigns/human-exp/levelx03h.cm:1.5 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx03h.cm Sat Aug 9 16:32:51 2003
@@ -36,12 +36,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human-exp/levelx04h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx04h.cm:1.5
stratagus/contrib/campaigns/human-exp/levelx04h.cm:1.6
--- stratagus/contrib/campaigns/human-exp/levelx04h.cm:1.5 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx04h.cm Sat Aug 9 16:32:51 2003
@@ -30,12 +30,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human-exp/levelx05h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx05h.cm:1.5
stratagus/contrib/campaigns/human-exp/levelx05h.cm:1.6
--- stratagus/contrib/campaigns/human-exp/levelx05h.cm:1.5 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx05h.cm Sat Aug 9 16:32:51 2003
@@ -32,12 +32,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human-exp/levelx06h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx06h.cm:1.5
stratagus/contrib/campaigns/human-exp/levelx06h.cm:1.6
--- stratagus/contrib/campaigns/human-exp/levelx06h.cm:1.5 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx06h.cm Sat Aug 9 16:32:51 2003
@@ -49,12 +49,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human-exp/levelx07h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx07h.cm:1.5
stratagus/contrib/campaigns/human-exp/levelx07h.cm:1.6
--- stratagus/contrib/campaigns/human-exp/levelx07h.cm:1.5 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx07h.cm Sat Aug 9 16:32:51 2003
@@ -54,12 +54,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human-exp/levelx08h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx08h.cm:1.6
stratagus/contrib/campaigns/human-exp/levelx08h.cm:1.7
--- stratagus/contrib/campaigns/human-exp/levelx08h.cm:1.6 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx08h.cm Sat Aug 9 16:32:51 2003
@@ -30,12 +30,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human-exp/levelx09h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx09h.cm:1.5
stratagus/contrib/campaigns/human-exp/levelx09h.cm:1.6
--- stratagus/contrib/campaigns/human-exp/levelx09h.cm:1.5 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx09h.cm Sat Aug 9 16:32:51 2003
@@ -29,12 +29,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human-exp/levelx10h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx10h.cm:1.5
stratagus/contrib/campaigns/human-exp/levelx10h.cm:1.6
--- stratagus/contrib/campaigns/human-exp/levelx10h.cm:1.5 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx10h.cm Sat Aug 9 16:32:51 2003
@@ -67,12 +67,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human-exp/levelx11h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx11h.cm:1.5
stratagus/contrib/campaigns/human-exp/levelx11h.cm:1.6
--- stratagus/contrib/campaigns/human-exp/levelx11h.cm:1.5 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx11h.cm Sat Aug 9 16:32:51 2003
@@ -51,12 +51,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human-exp/levelx12h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx12h.cm:1.5
stratagus/contrib/campaigns/human-exp/levelx12h.cm:1.6
--- stratagus/contrib/campaigns/human-exp/levelx12h.cm:1.5 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/human-exp/levelx12h.cm Sat Aug 9 16:32:51 2003
@@ -35,12 +35,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level01h.cm
diff -u stratagus/contrib/campaigns/human/level01h.cm:1.4
stratagus/contrib/campaigns/human/level01h.cm:1.5
--- stratagus/contrib/campaigns/human/level01h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level01h.cm Sat Aug 9 16:32:50 2003
@@ -28,12 +28,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level02h.cm
diff -u stratagus/contrib/campaigns/human/level02h.cm:1.4
stratagus/contrib/campaigns/human/level02h.cm:1.5
--- stratagus/contrib/campaigns/human/level02h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level02h.cm Sat Aug 9 16:32:51 2003
@@ -29,12 +29,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level03h.cm
diff -u stratagus/contrib/campaigns/human/level03h.cm:1.4
stratagus/contrib/campaigns/human/level03h.cm:1.5
--- stratagus/contrib/campaigns/human/level03h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level03h.cm Sat Aug 9 16:32:51 2003
@@ -28,12 +28,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level04h.cm
diff -u stratagus/contrib/campaigns/human/level04h.cm:1.4
stratagus/contrib/campaigns/human/level04h.cm:1.5
--- stratagus/contrib/campaigns/human/level04h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level04h.cm Sat Aug 9 16:32:51 2003
@@ -26,12 +26,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level05h.cm
diff -u stratagus/contrib/campaigns/human/level05h.cm:1.4
stratagus/contrib/campaigns/human/level05h.cm:1.5
--- stratagus/contrib/campaigns/human/level05h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level05h.cm Sat Aug 9 16:32:51 2003
@@ -27,12 +27,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level06h.cm
diff -u stratagus/contrib/campaigns/human/level06h.cm:1.4
stratagus/contrib/campaigns/human/level06h.cm:1.5
--- stratagus/contrib/campaigns/human/level06h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level06h.cm Sat Aug 9 16:32:51 2003
@@ -25,12 +25,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level07h.cm
diff -u stratagus/contrib/campaigns/human/level07h.cm:1.4
stratagus/contrib/campaigns/human/level07h.cm:1.5
--- stratagus/contrib/campaigns/human/level07h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level07h.cm Sat Aug 9 16:32:51 2003
@@ -26,12 +26,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level08h.cm
diff -u stratagus/contrib/campaigns/human/level08h.cm:1.4
stratagus/contrib/campaigns/human/level08h.cm:1.5
--- stratagus/contrib/campaigns/human/level08h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level08h.cm Sat Aug 9 16:32:51 2003
@@ -41,12 +41,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level09h.cm
diff -u stratagus/contrib/campaigns/human/level09h.cm:1.4
stratagus/contrib/campaigns/human/level09h.cm:1.5
--- stratagus/contrib/campaigns/human/level09h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level09h.cm Sat Aug 9 16:32:51 2003
@@ -33,12 +33,10 @@
(define-allow 'unit-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "FFFFFFFFFFFFFFFF")
Index: stratagus/contrib/campaigns/human/level10h.cm
diff -u stratagus/contrib/campaigns/human/level10h.cm:1.4
stratagus/contrib/campaigns/human/level10h.cm:1.5
--- stratagus/contrib/campaigns/human/level10h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level10h.cm Sat Aug 9 16:32:51 2003
@@ -26,12 +26,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level11h.cm
diff -u stratagus/contrib/campaigns/human/level11h.cm:1.4
stratagus/contrib/campaigns/human/level11h.cm:1.5
--- stratagus/contrib/campaigns/human/level11h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level11h.cm Sat Aug 9 16:32:51 2003
@@ -31,12 +31,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level12h.cm
diff -u stratagus/contrib/campaigns/human/level12h.cm:1.4
stratagus/contrib/campaigns/human/level12h.cm:1.5
--- stratagus/contrib/campaigns/human/level12h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level12h.cm Sat Aug 9 16:32:51 2003
@@ -28,12 +28,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level13h.cm
diff -u stratagus/contrib/campaigns/human/level13h.cm:1.4
stratagus/contrib/campaigns/human/level13h.cm:1.5
--- stratagus/contrib/campaigns/human/level13h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level13h.cm Sat Aug 9 16:32:51 2003
@@ -29,12 +29,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level14h.cm
diff -u stratagus/contrib/campaigns/human/level14h.cm:1.4
stratagus/contrib/campaigns/human/level14h.cm:1.5
--- stratagus/contrib/campaigns/human/level14h.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/human/level14h.cm Sat Aug 9 16:32:51 2003
@@ -29,12 +29,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx01o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx01o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx01o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx01o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx01o.cm Sat Aug 9 16:32:51 2003
@@ -40,12 +40,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx02o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx02o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx02o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx02o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx02o.cm Sat Aug 9 16:32:51 2003
@@ -47,12 +47,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx03o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx03o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx03o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx03o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx03o.cm Sat Aug 9 16:32:51 2003
@@ -28,12 +28,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx04o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx04o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx04o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx04o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx04o.cm Sat Aug 9 16:32:51 2003
@@ -38,12 +38,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx05o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx05o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx05o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx05o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx05o.cm Sat Aug 9 16:32:51 2003
@@ -28,12 +28,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx06o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx06o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx06o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx06o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx06o.cm Sat Aug 9 16:32:51 2003
@@ -38,12 +38,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx07o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx07o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx07o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx07o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx07o.cm Sat Aug 9 16:32:51 2003
@@ -36,12 +36,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx08o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx08o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx08o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx08o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx08o.cm Sat Aug 9 16:32:51 2003
@@ -28,12 +28,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx09o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx09o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx09o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx09o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx09o.cm Sat Aug 9 16:32:51 2003
@@ -29,12 +29,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx10o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx10o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx10o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx10o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx10o.cm Sat Aug 9 16:32:51 2003
@@ -31,12 +31,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx11o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx11o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx11o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx11o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx11o.cm Sat Aug 9 16:32:51 2003
@@ -31,12 +31,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc-exp/levelx12o.cm
diff -u stratagus/contrib/campaigns/orc-exp/levelx12o.cm:1.4
stratagus/contrib/campaigns/orc-exp/levelx12o.cm:1.5
--- stratagus/contrib/campaigns/orc-exp/levelx12o.cm:1.4 Thu Jul 3
12:35:37 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx12o.cm Sat Aug 9 16:32:51 2003
@@ -29,12 +29,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level01o.cm
diff -u stratagus/contrib/campaigns/orc/level01o.cm:1.4
stratagus/contrib/campaigns/orc/level01o.cm:1.5
--- stratagus/contrib/campaigns/orc/level01o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level01o.cm Sat Aug 9 16:32:51 2003
@@ -28,12 +28,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level02o.cm
diff -u stratagus/contrib/campaigns/orc/level02o.cm:1.7
stratagus/contrib/campaigns/orc/level02o.cm:1.8
--- stratagus/contrib/campaigns/orc/level02o.cm:1.7 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level02o.cm Sat Aug 9 16:32:51 2003
@@ -29,12 +29,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level03o.cm
diff -u stratagus/contrib/campaigns/orc/level03o.cm:1.4
stratagus/contrib/campaigns/orc/level03o.cm:1.5
--- stratagus/contrib/campaigns/orc/level03o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level03o.cm Sat Aug 9 16:32:51 2003
@@ -28,12 +28,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level04o.cm
diff -u stratagus/contrib/campaigns/orc/level04o.cm:1.4
stratagus/contrib/campaigns/orc/level04o.cm:1.5
--- stratagus/contrib/campaigns/orc/level04o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level04o.cm Sat Aug 9 16:32:51 2003
@@ -26,12 +26,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level05o.cm
diff -u stratagus/contrib/campaigns/orc/level05o.cm:1.4
stratagus/contrib/campaigns/orc/level05o.cm:1.5
--- stratagus/contrib/campaigns/orc/level05o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level05o.cm Sat Aug 9 16:32:51 2003
@@ -27,12 +27,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level06o.cm
diff -u stratagus/contrib/campaigns/orc/level06o.cm:1.4
stratagus/contrib/campaigns/orc/level06o.cm:1.5
--- stratagus/contrib/campaigns/orc/level06o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level06o.cm Sat Aug 9 16:32:51 2003
@@ -33,12 +33,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level07o.cm
diff -u stratagus/contrib/campaigns/orc/level07o.cm:1.4
stratagus/contrib/campaigns/orc/level07o.cm:1.5
--- stratagus/contrib/campaigns/orc/level07o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level07o.cm Sat Aug 9 16:32:51 2003
@@ -26,12 +26,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level08o.cm
diff -u stratagus/contrib/campaigns/orc/level08o.cm:1.5
stratagus/contrib/campaigns/orc/level08o.cm:1.6
--- stratagus/contrib/campaigns/orc/level08o.cm:1.5 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level08o.cm Sat Aug 9 16:32:51 2003
@@ -31,12 +31,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level09o.cm
diff -u stratagus/contrib/campaigns/orc/level09o.cm:1.4
stratagus/contrib/campaigns/orc/level09o.cm:1.5
--- stratagus/contrib/campaigns/orc/level09o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level09o.cm Sat Aug 9 16:32:51 2003
@@ -27,12 +27,10 @@
(define-allow 'unit-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "FFFFFFFFFFFFFFFF")
Index: stratagus/contrib/campaigns/orc/level10o.cm
diff -u stratagus/contrib/campaigns/orc/level10o.cm:1.4
stratagus/contrib/campaigns/orc/level10o.cm:1.5
--- stratagus/contrib/campaigns/orc/level10o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level10o.cm Sat Aug 9 16:32:51 2003
@@ -25,12 +25,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level11o.cm
diff -u stratagus/contrib/campaigns/orc/level11o.cm:1.4
stratagus/contrib/campaigns/orc/level11o.cm:1.5
--- stratagus/contrib/campaigns/orc/level11o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level11o.cm Sat Aug 9 16:32:51 2003
@@ -29,12 +29,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level12o.cm
diff -u stratagus/contrib/campaigns/orc/level12o.cm:1.4
stratagus/contrib/campaigns/orc/level12o.cm:1.5
--- stratagus/contrib/campaigns/orc/level12o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level12o.cm Sat Aug 9 16:32:51 2003
@@ -28,12 +28,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level13o.cm
diff -u stratagus/contrib/campaigns/orc/level13o.cm:1.4
stratagus/contrib/campaigns/orc/level13o.cm:1.5
--- stratagus/contrib/campaigns/orc/level13o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level13o.cm Sat Aug 9 16:32:51 2003
@@ -29,12 +29,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level14o.cm
diff -u stratagus/contrib/campaigns/orc/level14o.cm:1.4
stratagus/contrib/campaigns/orc/level14o.cm:1.5
--- stratagus/contrib/campaigns/orc/level14o.cm:1.4 Thu Jul 3 12:35:37 2003
+++ stratagus/contrib/campaigns/orc/level14o.cm Sat Aug 9 16:32:51 2003
@@ -29,12 +29,10 @@
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peasant "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-attack-peon "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/data/ccl/editor.ccl
diff -u stratagus/data/ccl/editor.ccl:1.11 stratagus/data/ccl/editor.ccl:1.12
--- stratagus/data/ccl/editor.ccl:1.11 Thu Jul 3 13:30:01 2003
+++ stratagus/data/ccl/editor.ccl Sat Aug 9 16:32:51 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.11 2003/07/03 17:30:01 ingo Exp $
+;; $Id: editor.ccl,v 1.12 2003/08/09 20:32:51 n0body Exp $
;; Set which icons to display
@@ -89,7 +89,6 @@
'unit-wise-man
'unit-man-of-light
- 'unit-attack-peasant
'unit-peasant-with-gold
'unit-peasant-with-wood
'unit-human-oil-tanker-full
@@ -148,7 +147,6 @@
'unit-double-head
'unit-sharp-axe
- 'unit-attack-peon
'unit-peon-with-gold
'unit-peon-with-wood
'unit-orc-oil-tanker-full
Index: stratagus/data/ccl/human/buttons.ccl
diff -u stratagus/data/ccl/human/buttons.ccl:1.24
stratagus/data/ccl/human/buttons.ccl:1.25
--- stratagus/data/ccl/human/buttons.ccl:1.24 Thu Jul 3 13:30:01 2003
+++ stratagus/data/ccl/human/buttons.ccl Sat Aug 9 16:32:51 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.24 2003/07/03 17:30:01 ingo Exp $
+;; $Id: buttons.ccl,v 1.25 2003/08/09 20:32:51 n0body Exp $
;;----------------------------------------------------------------------------
;; Define unit-button.
@@ -45,7 +45,7 @@
unit-peasant-with-gold unit-peasant-with-wood unit-female-hero
unit-flying-angle unit-arthor-literios unit-knight-rider unit-wise-man
unit-man-of-light unit-white-mage unit-balloon
- unit-gryphon-rider unit-attack-peasant unit-mage unit-critter
+ unit-gryphon-rider unit-mage unit-critter
human-group))
(define-button 'pos 2 'level 0 'icon 'icon-alliance-shield1
@@ -56,7 +56,7 @@
unit-peasant-with-gold unit-peasant-with-wood unit-female-hero
unit-flying-angle unit-arthor-literios unit-knight-rider unit-wise-man
unit-man-of-light unit-white-mage unit-balloon
- unit-gryphon-rider unit-attack-peasant unit-mage unit-critter
+ unit-gryphon-rider unit-mage unit-critter
human-group))
(define-button 'pos 2 'level 0 'icon 'icon-alliance-shield2
Index: stratagus/data/ccl/human/units.ccl
diff -u stratagus/data/ccl/human/units.ccl:1.21
stratagus/data/ccl/human/units.ccl:1.22
--- stratagus/data/ccl/human/units.ccl:1.21 Fri Aug 8 15:31:35 2003
+++ stratagus/data/ccl/human/units.ccl Sat Aug 9 16:32:51 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.21 2003/08/08 19:31:35 n0body Exp $
+;; $Id: units.ccl,v 1.22 2003/08/09 20:32:51 n0body Exp $
;;=============================================================================
;; Define unit-types.
@@ -65,6 +65,8 @@
dead "basic human voices dead"
attack "footman-attack"))
+(define-unit-type 'unit-peasant-with-gold)
+
(define-unit-type 'unit-peasant 'name "Peasant"
'files '(tileset-summer "human/units/peasant.png")
'size '(72 72)
@@ -88,6 +90,9 @@
'can-target-land
'land-unit
'cower-worker
+ 'harvester 'resource-harvested 'gold 'resource-capacity 100
+ 'wait-at-resource 150 'wait-at-depot 150
+ 'transform-when-loaded 'unit-peasant-with-gold
'organic
'selectable-by-rectangle
'sounds '(
@@ -120,6 +125,9 @@
'can-target-land
'land-unit
'cower-worker
+ 'harvester 'resource-harvested 'gold 'resource-capacity 100
+ 'wait-at-resource 150 'wait-at-depot 150
+ 'transform-when-empty 'unit-peasant
'organic
'selectable-by-rectangle
'sounds '(
@@ -161,37 +169,6 @@
help "basic human voices help 1"
dead "basic human voices dead"
attack "peasant-with-wood-attack"))
-
-(define-unit-type 'unit-attack-peasant 'name "Peasant"
- 'use 'unit-peasant
- 'size '(72 72)
- '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-attack
- 'can-attack
- 'can-target-land
- 'land-unit
- 'organic
- 'selectable-by-rectangle
- 'sounds '(
- selected "peasant-selected"
- acknowledge "peasant-acknowledge"
- ready "peasant-ready"
- help "basic human voices help 1"
- dead "basic human voices dead"
- attack "peasant-attack"))
(define-unit-type 'unit-ballista 'name "Ballista"
'files '(tileset-summer "human/units/ballista.png")
Index: stratagus/data/ccl/human/upgrade.ccl
diff -u stratagus/data/ccl/human/upgrade.ccl:1.13
stratagus/data/ccl/human/upgrade.ccl:1.14
--- stratagus/data/ccl/human/upgrade.ccl:1.13 Thu Jul 3 13:30:01 2003
+++ stratagus/data/ccl/human/upgrade.ccl Sat Aug 9 16:32:51 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.13 2003/07/03 17:30:01 ingo Exp $
+;; $Id: upgrade.ccl,v 1.14 2003/08/09 20:32:51 n0body Exp $
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;=============================================================================
@@ -250,7 +250,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")
@@ -260,10 +259,10 @@
(define-allow 'unit-alliance-destroyer "AAAAAAAAAAAAAAAA")
(define-allow 'unit-battleship "AAAAAAAAAAAAAAAA")
(define-allow 'unit-alliance-submarine "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-balloon "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-balloon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-gryphon-rider "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-knight-rider "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-arthor-literios "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-knight-rider "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-arthor-literios "AAAAAAAAAAAAAAAA")
(define-allow 'unit-wise-man "AAAAAAAAAAAAAAAA")
(define-allow 'unit-man-of-light "AAAAAAAAAAAAAAAA")
(define-allow 'unit-farm "AAAAAAAAAAAAAAAA")
Index: stratagus/data/ccl/orc/buttons.ccl
diff -u stratagus/data/ccl/orc/buttons.ccl:1.24
stratagus/data/ccl/orc/buttons.ccl:1.25
--- stratagus/data/ccl/orc/buttons.ccl:1.24 Thu Jul 3 13:30:02 2003
+++ stratagus/data/ccl/orc/buttons.ccl Sat Aug 9 16:32:51 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.24 2003/07/03 17:30:02 ingo Exp $
+;; $Id: buttons.ccl,v 1.25 2003/08/09 20:32:51 n0body Exp $
;;----------------------------------------------------------------------------
;; Define unit-button.
@@ -45,7 +45,7 @@
unit-peon-with-gold unit-peon-with-wood 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
- unit-zeppelin unit-attack-peon unit-death-knight unit-fire-breeze
+ unit-zeppelin unit-death-knight unit-fire-breeze
orc-group unit-daemon))
(define-button 'pos 2 'level 0 'icon 'icon-mythical-shield1
@@ -56,7 +56,7 @@
unit-peon-with-gold unit-peon-with-wood 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
- unit-zeppelin unit-attack-peon unit-death-knight unit-fire-breeze
+ unit-zeppelin unit-death-knight unit-fire-breeze
orc-group unit-daemon))
(define-button 'pos 2 'level 0 'icon 'icon-mythical-shield2
Index: stratagus/data/ccl/orc/units.ccl
diff -u stratagus/data/ccl/orc/units.ccl:1.25
stratagus/data/ccl/orc/units.ccl:1.26
--- stratagus/data/ccl/orc/units.ccl:1.25 Fri Aug 8 15:31:35 2003
+++ stratagus/data/ccl/orc/units.ccl Sat Aug 9 16:32:51 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.25 2003/08/08 19:31:35 n0body Exp $
+;; $Id: units.ccl,v 1.26 2003/08/09 20:32:51 n0body Exp $
;;=============================================================================
;; Define unit-types.
@@ -95,6 +95,70 @@
dead "basic orc voices dead"
attack "peon-attack"))
+(define-unit-type 'unit-peon-with-gold 'name "Peon"
+ 'files '(tileset-summer "orc/units/peon_with_gold.png")
+ 'size '(72 72)
+ '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
+ 'max-attack-range 1
+ 'priority 50
+ 'points 30
+ 'demand 1
+ 'corpse '(unit-dead-body 0)
+ 'type-land
+ 'right-harvest
+ 'can-attack
+ 'can-target-land
+ 'land-unit
+ 'cower-worker
+ 'organic
+ 'selectable-by-rectangle
+ 'sounds '(
+ selected "peon-with-gold-selected"
+ acknowledge "peon-with-gold-acknowledge"
+ ready "peon-with-gold-ready"
+ help "basic orc voices help 1"
+ dead "basic orc voices dead"
+ attack "peon-with-gold-attack"))
+
+(define-unit-type 'unit-peon-with-wood 'name "Peon"
+ 'files '(tileset-summer "orc/units/peon_with_wood.png")
+ 'size '(72 72)
+ '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
+ 'max-attack-range 1
+ 'priority 50
+ 'points 30
+ 'demand 1
+ 'corpse '(unit-dead-body 0)
+ 'type-land
+ 'right-harvest
+ 'can-attack
+ 'can-target-land
+ 'land-unit
+ 'cower-worker
+ 'organic
+ 'selectable-by-rectangle
+ 'sounds '(
+ selected "peon-with-wood-selected"
+ acknowledge "peon-with-wood-acknowledge"
+ ready "peon-with-wood-ready"
+ help "basic orc voices help 1"
+ dead "basic orc voices dead"
+ attack "peon-with-wood-attack"))
+
(define-unit-type 'unit-catapult 'name "Catapult"
'files '(tileset-summer "orc/units/catapult.png")
'size '(64 64)
@@ -291,37 +355,6 @@
dead "explosion"
attack "goblin-sappers-attack"))
-(define-unit-type 'unit-attack-peon 'name "Peon"
- 'use 'unit-peon
- 'size '(72 72)
- '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
- 'max-attack-range 1
- 'priority 50
- 'points 30
- 'demand 1
- 'corpse '(unit-dead-body 0)
- 'type-land
- 'right-attack
- 'can-attack
- 'can-target-land
- 'land-unit
- 'organic
- 'selectable-by-rectangle
- 'sounds '(
- selected "peon-selected"
- acknowledge "peon-acknowledge"
- ready "peon-ready"
- help "basic orc voices help 1"
- dead "basic orc voices dead"
- attack "peon-attack"))
-
(define-unit-type 'unit-berserker 'name "Berserker"
'use 'unit-axethrower
'size '(72 72)
@@ -1520,68 +1553,4 @@
help "basic orc voices help 2"
dead "building destroyed"
attack "orc-wall-attack"))
-
-(define-unit-type 'unit-peon-with-gold 'name "Peon"
- 'files '(tileset-summer "orc/units/peon_with_gold.png")
- 'size '(72 72)
- '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
- 'max-attack-range 1
- 'priority 50
- 'points 30
- 'demand 1
- 'corpse '(unit-dead-body 0)
- 'type-land
- 'right-harvest
- 'can-attack
- 'can-target-land
- 'land-unit
- 'cower-worker
- 'organic
- 'selectable-by-rectangle
- 'sounds '(
- selected "peon-with-gold-selected"
- acknowledge "peon-with-gold-acknowledge"
- ready "peon-with-gold-ready"
- help "basic orc voices help 1"
- dead "basic orc voices dead"
- attack "peon-with-gold-attack"))
-
-(define-unit-type 'unit-peon-with-wood 'name "Peon"
- 'files '(tileset-summer "orc/units/peon_with_wood.png")
- 'size '(72 72)
- '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
- 'max-attack-range 1
- 'priority 50
- 'points 30
- 'demand 1
- 'corpse '(unit-dead-body 0)
- 'type-land
- 'right-harvest
- 'can-attack
- 'can-target-land
- 'land-unit
- 'cower-worker
- 'organic
- 'selectable-by-rectangle
- 'sounds '(
- selected "peon-with-wood-selected"
- acknowledge "peon-with-wood-acknowledge"
- ready "peon-with-wood-ready"
- help "basic orc voices help 1"
- dead "basic orc voices dead"
- attack "peon-with-wood-attack"))
Index: stratagus/data/ccl/orc/upgrade.ccl
diff -u stratagus/data/ccl/orc/upgrade.ccl:1.13
stratagus/data/ccl/orc/upgrade.ccl:1.14
--- stratagus/data/ccl/orc/upgrade.ccl:1.13 Thu Jul 3 13:30:02 2003
+++ stratagus/data/ccl/orc/upgrade.ccl Sat Aug 9 16:32:51 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.13 2003/07/03 17:30:02 ingo Exp $
+;; $Id: upgrade.ccl,v 1.14 2003/08/09 20:32:51 n0body Exp $
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;=============================================================================
@@ -246,44 +246,43 @@
(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-evil-knight "AAAAAAAAAAAAAAAA")
(define-allow 'unit-fad-man "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-beast-cry "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-beast-cry "AAAAAAAAAAAAAAAA")
(define-allow 'unit-orc-oil-tanker "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-transport "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-destroyer "AAAAAAAAAAAAAAAA")
(define-allow 'unit-ogre-juggernaught "AAAAAAAAAAAAAAAA")
(define-allow 'unit-fire-breeze "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-submarine "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-zeppelin "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-zeppelin "AAAAAAAAAAAAAAAA")
(define-allow 'unit-dragon "AAAAAAAAAAAAAAAA")
(define-allow 'unit-eye-of-vision "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-quick-blade "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-quick-blade "AAAAAAAAAAAAAAAA")
(define-allow 'unit-double-head "AAAAAAAAAAAAAAAA")
(define-allow 'unit-ice-bringer "AAAAAAAAAAAAAAAA")
(define-allow 'unit-sharp-axe "AAAAAAAAAAAAAAAA")
(define-allow 'unit-pig-farm "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-barracks "AAAAAAAAAAAAAAAA")
(define-allow 'unit-altar-of-storms "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-watch-tower "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-mythical-watch-tower "AAAAAAAAAAAAAAAA")
(define-allow 'unit-ogre-mound "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-alchemist "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-alchemist "AAAAAAAAAAAAAAAA")
(define-allow 'unit-dragon-roost "AAAAAAAAAAAAAAAA")
(define-allow 'unit-mythical-shipyard "AAAAAAAAAAAAAAAA")
(define-allow 'unit-great-hall "AAAAAAAAAAAAAAAA")
(define-allow 'unit-troll-lumber-mill "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-foundry "AAAAAAAAAAAAAAAA")
+(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-oil-platform "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-mythical-oil-platform "AAAAAAAAAAAAAAAA")
(define-allow 'unit-stronghold "AAAAAAAAAAAAAAAA")
(define-allow 'unit-fortress "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-start-location "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-guard-tower "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-mythical-cannon-tower "AAAAAAAAAAAAAAAA")
+(define-allow 'unit-mythical-start-location "AAAAAAAAAAAAAAAA")
+(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")
Index: stratagus/data/ccl/wc2.ccl
diff -u stratagus/data/ccl/wc2.ccl:1.32 stratagus/data/ccl/wc2.ccl:1.33
--- stratagus/data/ccl/wc2.ccl:1.32 Sat Aug 2 09:37:06 2003
+++ stratagus/data/ccl/wc2.ccl Sat Aug 9 16:32:51 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.32 2003/08/02 13:37:06 grumbel Exp $
+;; $Id: wc2.ccl,v 1.33 2003/08/09 20:32:51 n0body Exp $
;;=============================================================================
;; Define race names
@@ -86,8 +86,8 @@
'unit-footman 'unit-grunt 'unit-peasant 'unit-peon '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-dwarves 'unit-goblin-sappers 'unit-peasant
+ 'unit-peon 'unit-ranger 'unit-berserker 'unit-female-hero
'unit-evil-knight 'unit-flying-angle 'unit-fad-man
'unit-white-mage 'unit-beast-cry 'unit-human-oil-tanker
'unit-orc-oil-tanker 'unit-alliance-transport 'unit-mythical-transport
Index: stratagus/doc/ChangeLog.html
diff -u stratagus/doc/ChangeLog.html:1.509 stratagus/doc/ChangeLog.html:1.510
--- stratagus/doc/ChangeLog.html:1.509 Sat Aug 9 16:08:38 2003
+++ stratagus/doc/ChangeLog.html Sat Aug 9 16:32:51 2003
@@ -2,7 +2,7 @@
<html>
<head>
<!--
----- $Id: ChangeLog.html,v 1.509 2003/08/09 20:08:38 martinxyz Exp $
+---- $Id: ChangeLog.html,v 1.510 2003/08/09 20:32:51 n0body Exp $
---- (c) Copyright 1998-2003 by Lutz Sammer
@@ -36,6 +36,10 @@
<li>Future 1.19 Release<p>
<ul>
<li>++
+ <li>Removed global unit types for tankers, generalized gold mining (from
Crestez Dan Leonard).
+ <li>Removed unit-attack-peon and unit-attack-peasant (from Crestez Dan
Leonard).
+ <li>Fixed minor mac compilation bug (from zratchet).
+ <li>Fixed small bugs from NEW_UI (from Martin Renold).
<li>A lot of progress in resource configurability (from Crestez Dan
Leonard).
<li>Minimap panel can have its own palette now (from Martin Renold).
<li>NEW_UI: Dropped of displaying the current unit action with the buttons
(from Martin Renold).
Index: stratagus/src/action/action_minegold.c
diff -u stratagus/src/action/action_minegold.c:1.77
stratagus/src/action/action_minegold.c:1.78
--- stratagus/src/action/action_minegold.c:1.77 Fri Aug 8 15:31:36 2003
+++ stratagus/src/action/action_minegold.c Sat Aug 9 16:32:51 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: action_minegold.c,v 1.77 2003/08/08 19:31:36 n0body Exp $
+// $Id: action_minegold.c,v 1.78 2003/08/09 20:32:51 n0body Exp $
//@{
@@ -47,6 +47,7 @@
#include "interface.h"
#include "pathfinder.h"
+#if 0
/*----------------------------------------------------------------------------
-- Functions
----------------------------------------------------------------------------*/
@@ -568,5 +569,7 @@
break;
}
}
+
+#endif
//@}
Index: stratagus/src/action/action_resource.c
diff -u stratagus/src/action/action_resource.c:1.43
stratagus/src/action/action_resource.c:1.44
--- stratagus/src/action/action_resource.c:1.43 Fri Aug 8 15:31:36 2003
+++ stratagus/src/action/action_resource.c Sat Aug 9 16:32:51 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: action_resource.c,v 1.43 2003/08/08 19:31:36 n0body Exp $
+// $Id: action_resource.c,v 1.44 2003/08/09 20:32:51 n0body Exp $
//@{
@@ -139,7 +139,7 @@
DebugLevel3Fn("+%d\n" _C_ goal->Data.Resource.Active);
if( !goal->Frame ) { // show resource working
- goal->Frame=2;
+ goal->Frame=1;
CheckUnitToBeDrawn(goal);
}
UnitMarkSeen(goal);
Index: stratagus/src/action/action_returngoods.c
diff -u stratagus/src/action/action_returngoods.c:1.35
stratagus/src/action/action_returngoods.c:1.36
--- stratagus/src/action/action_returngoods.c:1.35 Fri Aug 8 15:31:36 2003
+++ stratagus/src/action/action_returngoods.c Sat Aug 9 16:32:51 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: action_returngoods.c,v 1.35 2003/08/08 19:31:36 n0body Exp $
+// $Id: action_returngoods.c,v 1.36 2003/08/09 20:32:51 n0body Exp $
//@{
@@ -66,11 +66,11 @@
type=unit->Type;
//
// Select target to return goods. FIXME: more races support
- //
- if( type==UnitTypeHumanWorkerWithGold || type==UnitTypeOrcWorkerWithGold )
{
+ //
+ if( type->Harvester ) {
if( !unit->Orders[0].Goal ) {
- if( !(destu=FindDeposit(unit->Player,unit->X,unit->Y,GoldCost)) ) {
- // No deposit -> can't return
+ if(
!(destu=FindDeposit(unit->Player,unit->X,unit->Y,type->ResourceHarvested)) ) {
+ DebugLevel3Fn("No deposit -> can't return\n");
unit->Orders[0].Action=UnitActionStill;
return;
}
@@ -78,18 +78,22 @@
RefsDebugCheck( !destu->Refs );
++destu->Refs;
}
- unit->Orders[0].Action=UnitActionMineGold;
+ DebugLevel3("Return to %d=%d,%d\n"
+ _C_ UnitNumber(unit->Orders[0].Goal)
+ _C_ unit->Orders[0].X _C_ unit->Orders[0].Y);
+ unit->Orders[0].Action=UnitActionResource;
+ // Somewhere on the way the loaded worker changed Arg1.
+ // Bummer, go get the closest resource to the depot
unit->Orders[0].Arg1=(void*)-1;
NewResetPath(unit);
- unit->SubAction=65; // FIXME: hardcoded
- DebugLevel3("Wait: %d\n" _C_ unit->Wait);
+ unit->SubAction=70;
unit->Wait=1;
return;
}
-
- if( type==UnitTypeHumanWorkerWithWood || type==UnitTypeOrcWorkerWithWood )
{
+
+ if( type==UnitTypeHumanWorkerWithGold || type==UnitTypeOrcWorkerWithGold )
{
if( !unit->Orders[0].Goal ) {
- if( !(destu=FindDeposit(unit->Player,unit->X,unit->Y,WoodCost)) ) {
+ if( !(destu=FindDeposit(unit->Player,unit->X,unit->Y,GoldCost)) ) {
// No deposit -> can't return
unit->Orders[0].Action=UnitActionStill;
return;
@@ -98,23 +102,18 @@
RefsDebugCheck( !destu->Refs );
++destu->Refs;
}
- unit->Orders[0].X=unit->X;
- unit->Orders[0].Y=unit->Y; // Return point to continue.
- DebugLevel3("Return to %d=%d,%d\n"
- _C_ UnitNumber(unit->Orders[0].Goal)
- _C_ unit->Orders[0].X _C_ unit->Orders[0].Y);
- unit->Orders[0].Action=UnitActionHarvest;
+ unit->Orders[0].Action=UnitActionMineGold;
unit->Orders[0].Arg1=(void*)-1;
NewResetPath(unit);
- unit->SubAction=128; // FIXME: Hardcoded
+ unit->SubAction=65; // FIXME: hardcoded
DebugLevel3("Wait: %d\n" _C_ unit->Wait);
unit->Wait=1;
return;
}
- if( type->Harvester ) {
+ if( type==UnitTypeHumanWorkerWithWood || type==UnitTypeOrcWorkerWithWood )
{
if( !unit->Orders[0].Goal ) {
- if(
!(destu=FindDeposit(unit->Player,unit->X,unit->Y,type->ResourceHarvested)) ) {
+ if( !(destu=FindDeposit(unit->Player,unit->X,unit->Y,WoodCost)) ) {
// No deposit -> can't return
unit->Orders[0].Action=UnitActionStill;
return;
@@ -123,19 +122,19 @@
RefsDebugCheck( !destu->Refs );
++destu->Refs;
}
+ unit->Orders[0].X=unit->X;
+ unit->Orders[0].Y=unit->Y; // Return point to continue.
DebugLevel3("Return to %d=%d,%d\n"
_C_ UnitNumber(unit->Orders[0].Goal)
_C_ unit->Orders[0].X _C_ unit->Orders[0].Y);
- unit->Orders[0].Action=UnitActionResource;
- // Somewhere on the way the loaded worker changed Arg1.
- // Bummer, go get the closest resource to the depot
+ unit->Orders[0].Action=UnitActionHarvest;
unit->Orders[0].Arg1=(void*)-1;
NewResetPath(unit);
- unit->SubAction=70;
+ unit->SubAction=128; // FIXME: Hardcoded
+ DebugLevel3("Wait: %d\n" _C_ unit->Wait);
unit->Wait=1;
return;
}
-
}
//@}
Index: stratagus/src/action/actions.c
diff -u stratagus/src/action/actions.c:1.84 stratagus/src/action/actions.c:1.85
--- stratagus/src/action/actions.c:1.84 Fri Aug 8 15:31:36 2003
+++ stratagus/src/action/actions.c Sat Aug 9 16:32:51 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: actions.c,v 1.84 2003/08/08 19:31:36 n0body Exp $
+// $Id: actions.c,v 1.85 2003/08/09 20:32:51 n0body Exp $
//@{
@@ -175,7 +175,7 @@
HandleActionBuild,
HandleActionRepair,
HandleActionHarvest,
- HandleActionMineGold,
+ HandleActionResource,
HandleActionNotWritten, // HandleActionMineOre,
HandleActionNotWritten, // HandleActionMineCoal,
HandleActionNotWritten, // HandleActionQuarryStone,
Index: stratagus/src/action/command.c
diff -u stratagus/src/action/command.c:1.96 stratagus/src/action/command.c:1.97
--- stratagus/src/action/command.c:1.96 Fri Aug 8 15:31:36 2003
+++ stratagus/src/action/command.c Sat Aug 9 16:32:51 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: command.c,v 1.96 2003/08/08 19:31:36 n0body Exp $
+// $Id: command.c,v 1.97 2003/08/09 20:32:51 n0body Exp $
//@{
@@ -792,7 +792,7 @@
}
/**
-** Send unit haul oil.
+** Send unit to harvest resources
**
** @param unit pointer to unit.
** @param dest destination unit.
@@ -808,9 +808,7 @@
if( !unit->Removed && unit->Orders[0].Action!=UnitActionDie
&& !dest->Destroyed ) {
// FIXME: more races, could happen with many orders in queue.
- if( !unit->Type->Building
- && unit->Type!=UnitTypeHumanTanker
- && unit->Type!=UnitTypeOrcTanker ) {
+ if( !unit->Type->Building && !unit->Type->Harvester ) {
ClearSavedAction(unit);
return;
}
@@ -854,12 +852,9 @@
if( !unit->Removed && unit->Orders[0].Action!=UnitActionDie ) {
// FIXME: more races, could happen with many orders in queue.
if( !unit->Type->Building
- && unit->Type!=UnitTypeHumanWorkerWithGold
+ && !unit->Type->Harvester
&& unit->Type!=UnitTypeHumanWorkerWithWood
- && unit->Type!=UnitTypeOrcWorkerWithGold
- && unit->Type!=UnitTypeOrcWorkerWithWood
- && unit->Type!=UnitTypeHumanTankerFull
- && unit->Type!=UnitTypeOrcTankerFull ) {
+ && unit->Type!=UnitTypeOrcWorkerWithWood) {
ClearSavedAction(unit);
return;
}
Index: stratagus/src/ai/ai_resource.c
diff -u stratagus/src/ai/ai_resource.c:1.60 stratagus/src/ai/ai_resource.c:1.61
--- stratagus/src/ai/ai_resource.c:1.60 Fri Aug 8 15:31:36 2003
+++ stratagus/src/ai/ai_resource.c Sat Aug 9 16:32:51 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai_resource.c,v 1.60 2003/08/08 19:31:36 n0body Exp $
+// $Id: ai_resource.c,v 1.61 2003/08/09 20:32:51 n0body Exp $
#ifdef NEW_AI // {
@@ -1196,8 +1196,8 @@
_C_ unit->Type->Ident _C_ unit->X _C_ unit->Y);
return 0;
}
- DebugCheck(unit->Type!=UnitTypeHumanTanker
- && unit->Type!=UnitTypeOrcTanker);
+
+ DebugCheck( !unit->Type->Harvester );
CommandResource(unit, dest,FlushCommands);
Index: stratagus/src/clone/unit.c
diff -u stratagus/src/clone/unit.c:1.284 stratagus/src/clone/unit.c:1.285
--- stratagus/src/clone/unit.c:1.284 Sat Aug 9 16:08:38 2003
+++ stratagus/src/clone/unit.c Sat Aug 9 16:32:51 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit.c,v 1.284 2003/08/09 20:08:38 martinxyz Exp $
+// $Id: unit.c,v 1.285 2003/08/09 20:32:51 n0body Exp $
//@{
@@ -2565,299 +2565,6 @@
----------------------------------------------------------------------------*/
/**
- ** Find the nearest gold mine for unit from x,y.
- **
- ** @param unit Pointer for source unit.
- ** @param x X tile position to start.
- ** @param y Y tile position to start.
- **
- ** @return Pointer to the nearest gold mine.
- */
-global Unit* FindGoldMine(const Unit* unit,int x,int y)
-{
- static const int xoffset[]={ 0,-1,+1, 0, -1,+1,-1,+1 };
- static const int yoffset[]={ -1, 0, 0,+1, -1,-1,+1,+1 };
- struct {
- unsigned short X;
- unsigned short Y;
- } * points;
- int size;
- int rx;
- int ry;
- int mask;
- int wp;
- int rp;
- int ep;
- int i;
- int w;
- int n;
- unsigned char* m;
- unsigned char* matrix;
- const Unit* destu;
- Unit* mine;
- Unit* bestmine;
- int destx;
- int desty;
- int bestx;
- int besty;
- int bestd;
-
- destx=x;
- desty=y;
- size=TheMap.Width*TheMap.Height/4;
- points=malloc(size*sizeof(*points));
-
- //
- // Find the nearest gold depot
- //
- if( (destu=FindDeposit(unit->Player,x,y,GoldCost)) ) {
- NearestOfUnit(destu,x,y,&destx,&desty);
- }
- bestd=99999;
- IfDebug( bestx=besty=0; ); // keep the compiler happy
-
- //
- // Make movement matrix. FIXME: can create smaller matrix.
- //
- matrix=CreateMatrix();
- w=TheMap.Width+2;
- matrix+=w+w+2;
-
- //
- // Mark sight range as border. FIXME: matrix didn't need to be bigger.
- //
- n=unit->Stats->SightRange;
- rx=x-n;
- if( rx<0 ) {
- rx=0;
- }
- ep=x+n;
- if( ep>TheMap.Width ) {
- ep=TheMap.Width;
- }
- ry=y-n;
- if( ry<0 ) {
- ry=0;
- }
- wp=y+n;
- if( wp>TheMap.Height ) {
- wp=TheMap.Height;
- }
- for( i=rx; i<ep; ++i ) { // top bottom line
- matrix[i+ry*w]=matrix[i+wp*w]=66;
- }
- for( i=ry+1; i<wp-1; ++i ) {
- matrix[rx+i*w]=matrix[ep+i*w]=66;
- }
-
-#if 0
- matrix[x+n+(y+n)*w]=matrix[x-n+(y+n)*w]=
- matrix[x+n+(y-n)*w]=matrix[x-n+(y-n)*w]=66;
- for( i=n; i--; ) {
- // FIXME: marks out of map area
- DebugCheck( x-i+(y-n)*w<0 || x+i+(y+n)*w>w*TheMap.Hight );
- matrix[x+n+(y+i)*w]=matrix[x-n+(y+i)*w]=
- matrix[x+n+(y-i)*w]=matrix[x-n+(y-i)*w]=
- matrix[x-i+(y+n)*w]=matrix[x+i+(y+n)*w]=
- matrix[x-i+(y-n)*w]=matrix[x+i+(y-n)*w]=66;
- }
-#endif
-
- mask=UnitMovementMask(unit);
-
- points[0].X=x;
- points[0].Y=y;
- rp=0;
- matrix[x+y*w]=1; // mark start point
- ep=wp=1; // start with one point
- bestmine=NoUnitP;
-
- //
- // Pop a point from stack, push all neighbors which could be entered.
- //
- for( ;; ) {
- while( rp!=ep ) {
- rx=points[rp].X;
- ry=points[rp].Y;
- for( i=0; i<8; ++i ) { // mark all neighbors
- x=rx+xoffset[i];
- y=ry+yoffset[i];
- m=matrix+x+y*w;
- if( *m ) { // already checked
- continue;
- }
-
- //
- // Look if there is a mine
- //
- if ( (mine=GoldMineOnMap(x,y)) &&
IsMapFieldExplored(unit->Player,x,y) ) {
- if( destu ) {
- n=max(abs(destx-x),abs(desty-y));
- if( n<bestd ) {
- bestd=n;
- bestx=x;
- besty=y;
- bestmine=mine;
- }
- *m=22;
- } else { // no goal take the first
- free(points);
- return mine;
- }
- }
-
- if( CanMoveToMask(x,y,mask) ) { // reachable
- *m=1;
- points[wp].X=x; // push the point
- points[wp].Y=y;
- if( ++wp>=size ) { // round about
- wp=0;
- }
- } else { // unreachable
- *m=99;
- }
- }
- if( ++rp>=size ) { // round about
- rp=0;
- }
- }
-
- //
- // Take best of this frame, if any.
- //
- if( bestd!=99999 ) {
- free(points);
- return bestmine;
- }
-
- //
- // Continue with next frame.
- //
- if( rp==wp ) { // unreachable, no more points available
- break;
- }
- ep=wp;
- }
-
- DebugLevel3Fn("no mine in sight-range\n");
-
- free(points);
- return NoUnitP;
-}
-
-#if 0
-/**
- ** Find wood in sight range.
- **
- ** @param unit Unit that needs wood.
- ** @param px OUT: Map X position of wood.
- ** @param py OUT: Map Y position of wood.
- **
- ** @return True if wood was found.
- */
-global int FindWoodInSight(Unit* unit,int* px,int* py)
-{
- int x;
- int y;
- int addx;
- int addy;
- int i;
- int n;
- int r;
- int wx;
- int wy;
- int bestx;
- int besty;
- int bestd;
- Unit* destu;
-
- DebugLevel3Fn("%d %d,%d\n" _C_ UnitNumber(unit) _C_ unit->X _C_ unit->Y);
-
- x=unit->X;
- y=unit->Y;
- addx=unit->Type->TileWidth;
- addy=unit->Type->TileHeight;
- r=unit->Stats->SightRange*2;
-
- //
- // This is correct, but can this be written faster???
- //
- if( (destu=FindWoodDeposit(unit->Player,x,y)) ) {
- NearestOfUnit(destu,x,y,&wx,&wy);
- DebugLevel3("To %d,%d\n" _C_ wx _C_ wy);
- } else {
- wx=unit->X;
- wy=unit->Y;
- }
- bestd=99999;
- IfDebug( bestx=besty=0; ); // keep the compiler happy
-
- // FIXME: don't mark outside of the map
- --x;
- while( addx<=r && addy<=r ) {
- for( i=addy; i--; y++ ) {
- if( CheckedForestOnMap(x,y) ) {
- n=max(abs(wx-x),abs(wy-y));
- DebugLevel3("Distance %d,%d %d\n" _C_ x _C_ y _C_ n);
- if( n<bestd ) {
- bestd=n;
- bestx=x;
- besty=y;
- }
- }
- }
- ++addx;
- for( i=addx; i--; x++ ) {
- if( CheckedForestOnMap(x,y) ) {
- n=max(abs(wx-x),abs(wy-y));
- DebugLevel3("Distance %d,%d %d\n" _C_ x _C_ y _C_ n);
- if( n<bestd ) {
- bestd=n;
- bestx=x;
- besty=y;
- }
- }
- }
- ++addy;
- for( i=addy; i--; y-- ) {
- if( CheckedForestOnMap(x,y) ) {
- n=max(abs(wx-x),abs(wy-y));
- DebugLevel3("Distance %d,%d %d\n" _C_ x _C_ y _C_ n);
- if( n<bestd ) {
- bestd=n;
- bestx=x;
- besty=y;
- }
- }
- }
- ++addx;
- for( i=addx; i--; x-- ) {
- if( CheckedForestOnMap(x,y) ) {
- n=max(abs(wx-x),abs(wy-y));
- DebugLevel3("Distance %d,%d %d\n" _C_ x _C_ y _C_ n);
- if( n<bestd ) {
- bestd=n;
- bestx=x;
- besty=y;
- }
- }
- }
- if( bestd!=99999 ) {
- DebugLevel3Fn("wood on %d,%d\n" _C_ x _C_ y);
- *px=bestx;
- *py=besty;
- return 1;
- }
- ++addy;
- }
-
- DebugLevel3Fn("no wood in sight-range\n");
- return 0;
-}
-
-#else
-
-/**
** Find wood in sight range.
**
** @param unit Unit that needs wood.
@@ -3040,8 +2747,6 @@
return 0;
}
-#endif
-
/**
** Find Resource.
**
@@ -4271,7 +3976,7 @@
int InRun, RunStart;
fprintf(file,"\n;;; -----------------------------------------\n");
- fprintf(file,";;; MODULE: units $Id: unit.c,v 1.284 2003/08/09 20:08:38
martinxyz Exp $\n\n");
+ fprintf(file,";;; MODULE: units $Id: unit.c,v 1.285 2003/08/09 20:32:51
n0body Exp $\n\n");
//
// Local variables
Index: stratagus/src/clone/unit_find.c
diff -u stratagus/src/clone/unit_find.c:1.50
stratagus/src/clone/unit_find.c:1.51
--- stratagus/src/clone/unit_find.c:1.50 Tue Jul 22 10:32:21 2003
+++ stratagus/src/clone/unit_find.c Sat Aug 9 16:32:52 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit_find.c,v 1.50 2003/07/22 14:32:21 n0body Exp $
+// $Id: unit_find.c,v 1.51 2003/08/09 20:32:52 n0body Exp $
//@{
@@ -529,14 +529,15 @@
}
/**
-** Oil patch on map tile
+** Resource on map tile
**
** @param tx X position on map, tile-based.
** @param ty Y position on map, tile-based.
+** @param resource resource type.
**
-** @return Returns the oil patch if found, or NoUnitP.
+** @return Returns the deposit if found, or NoUnitP.
*/
-global Unit* OilPatchOnMap(int tx,int ty)
+global Unit* ResourceOnMap(int tx,int ty,int resource)
{
Unit* table[UnitMax];
int i;
@@ -544,33 +545,10 @@
n=SelectUnitsOnTile(tx,ty,table);
for( i=0; i<n; ++i ) {
- if( table[i]->Type->GivesResource==OilCost ) {
- return table[i];
- }
- }
- return NoUnitP;
-}
-
-/**
-** Oil platform on map tile
-**
-** @param tx X position on map, tile-based.
-** @param ty Y position on map, tile-based.
-**
-** @return Returns the oil platform if found, or NoUnitP.
-*/
-global Unit* PlatformOnMap(int tx,int ty)
-{
- Unit* table[UnitMax];
- int i;
- int n;
-
- n=SelectUnitsOnTile(tx,ty,table);
- for( i=0; i<n; ++i ) {
- if( UnitUnusable(table[i]) ) {
+ if( UnitUnusable(table[i]) || !table[i]->Type->CanHarvest ){
continue;
}
- if( table[i]->Type->GivesResource==OilCost ) {
+ if( table[i]->Type->GivesResource==resource ) {
return table[i];
}
}
Index: stratagus/src/include/unit.h
diff -u stratagus/src/include/unit.h:1.202 stratagus/src/include/unit.h:1.203
--- stratagus/src/include/unit.h:1.202 Sat Aug 9 16:08:38 2003
+++ stratagus/src/include/unit.h Sat Aug 9 16:32:52 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit.h,v 1.202 2003/08/09 20:08:38 martinxyz Exp $
+// $Id: unit.h,v 1.203 2003/08/09 20:32:52 n0body Exp $
#ifndef __UNIT_H__
#define __UNIT_H__
@@ -826,6 +826,8 @@
/// FIXME: more docu
extern int CanBuildUnitType(const Unit* unit,const UnitType* type,int x,int y);
+ /// Find resource
+extern Unit* FindResource(const Player* player,int x,int y,int resource);
/// Find nearest deposit
extern Unit* FindDeposit(const Player*,int x,int y,int resource);
/// Find the next idle worker
@@ -833,10 +835,6 @@
/// Find the nearest piece of wood in sight range
extern int FindWoodInSight(const Unit* unit,int* x,int* y);
- /// Find gold mine
-extern Unit* FindGoldMine(const Unit* unit,int x,int y);
- /// Find resource
-extern Unit* FindResource(const Player* player,int x,int y,int resource);
/// FIXME: more docu
extern Unit* UnitOnScreen(Unit* unit,int x,int y);
@@ -983,10 +981,8 @@
extern Unit* UnitTypeOnMap(int tx,int ty,UnitType* type);
/// Return gold mine, if on map tile
extern Unit* GoldMineOnMap(int tx,int ty);
- /// Return oil patch, if on map tile
-extern Unit* OilPatchOnMap(int tx,int ty);
- /// Return oil platform, if on map tile
-extern Unit* PlatformOnMap(int tx,int ty);
+ /// Return resource, if on map tile
+extern Unit* ResourceOnMap(int tx,int ty,int resource);
/// Return resource deposit, if on map tile
extern Unit* ResourceDepositOnMap(int tx,int ty,int resource);
Index: stratagus/src/include/unittype.h
diff -u stratagus/src/include/unittype.h:1.93
stratagus/src/include/unittype.h:1.94
--- stratagus/src/include/unittype.h:1.93 Fri Aug 8 15:31:36 2003
+++ stratagus/src/include/unittype.h Sat Aug 9 16:32:52 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unittype.h,v 1.93 2003/08/08 19:31:36 n0body Exp $
+// $Id: unittype.h,v 1.94 2003/08/09 20:32:52 n0body Exp $
#ifndef __UNITTYPE_H__
#define __UNITTYPE_H__
@@ -649,10 +649,6 @@
extern int NumUnitTypes; /// Number of unit-types made
// FIXME: this hardcoded unit-types must be removed!!
-extern UnitType*UnitTypeHumanTanker; /// Orc tanker unit-type pointer
-extern UnitType*UnitTypeOrcTanker; /// Human tanker unit-type
pointer
-extern UnitType*UnitTypeHumanTankerFull; /// Orc tanker full unit-type
pointer
-extern UnitType*UnitTypeOrcTankerFull; /// Human tanker full unit-type
pointer
extern UnitType*UnitTypeHumanWorker; /// Human worker
extern UnitType*UnitTypeOrcWorker; /// Orc worker
extern UnitType*UnitTypeHumanWorkerWithGold; /// Human worker with gold
Index: stratagus/src/include/upgrade_structs.h
diff -u stratagus/src/include/upgrade_structs.h:1.24
stratagus/src/include/upgrade_structs.h:1.25
--- stratagus/src/include/upgrade_structs.h:1.24 Fri Jul 11 10:35:30 2003
+++ stratagus/src/include/upgrade_structs.h Sat Aug 9 16:32:52 2003
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: upgrade_structs.h,v 1.24 2003/07/11 14:35:30 n0body Exp $
+// $Id: upgrade_structs.h,v 1.25 2003/08/09 20:32:52 n0body Exp $
#ifndef __UPGRADE_STRUCTS_H__
#define __UPGRADE_STRUCTS_H__
@@ -51,7 +51,7 @@
/**
** Indices into costs/resource/income array. (A litte future here :)
*/
-enum _costs_ {
+typedef enum _costs_ {
TimeCost, /// time in game cycles
// standard
Index: stratagus/src/ui/mouse.c
diff -u stratagus/src/ui/mouse.c:1.135 stratagus/src/ui/mouse.c:1.136
--- stratagus/src/ui/mouse.c:1.135 Fri Aug 8 15:31:37 2003
+++ stratagus/src/ui/mouse.c Sat Aug 9 16:32:52 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: mouse.c,v 1.135 2003/08/08 19:31:37 n0body Exp $
+// $Id: mouse.c,v 1.136 2003/08/09 20:32:52 n0body Exp $
//@{
@@ -274,26 +274,28 @@
// Tanker
//
if( action==MouseActionHaulOil ) {
- if( type==UnitTypeOrcTankerFull || type==UnitTypeHumanTankerFull ) {
- if( UnitUnderCursor && (dest=UnitOnMapTile(x,y))
- && dest->Player==unit->Player ) {
- dest->Blink=4;
- if( dest->Type->CanStore[OilCost] ) {
- DebugLevel3("OIL-DEPOSIT\n");
- SendCommandReturnGoods(unit,dest,flush);
- continue;
- }
- }
- } else {
- if( UnitUnderCursor && (dest=PlatformOnMap(x,y))
- && dest->Player==unit->Player ) {
- dest->Blink=4;
- DebugLevel3("PLATFORM\n");
- SendCommandResource(unit,dest,flush);
- continue;
- }
+ // Return to deposit
+ if( (unit->Type->Harvester) &&
+ (unit->Value) &&
+ (UnitUnderCursor) &&
+
(dest=ResourceDepositOnMap(x,y,unit->Type->ResourceHarvested)) &&
+ (dest->Player==unit->Player)) {
+ dest->Blink=4;
+ DebugLevel3Fn("Return to deposit.\n");
+ SendCommandReturnGoods(unit,dest,flush);
+ continue;
+ }
+ // Go and harvest
+ if( (unit->Type->Harvester) &&
+ (unit->Value<unit->Type->ResourceCapacity) &&
+ (UnitUnderCursor) &&
+ (dest=ResourceOnMap(x,y,unit->Type->ResourceHarvested)) &&
+ (dest->Player==unit->Player)) {
+ dest->Blink=4;
+ SendCommandResource(unit,dest,flush);
+ continue;
}
-
+ // Follow another unit
if( UnitUnderCursor && (dest=UnitOnScreenMapPosition(sx,sy)) ) {
if( (dest->Player==unit->Player || IsAllied(unit->Player,dest))
&& dest!=unit ) {
@@ -302,13 +304,7 @@
continue;
}
}
-
-#ifdef NEW_SHIPS
- if( unit->Type->UnitType!=UnitTypeLand ) {
- x&=~1;
- y&=~1; // Ships could only even fields
- }
-#endif
+ // Move
SendCommandMove(unit,x,y,flush);
continue;
}
@@ -413,7 +409,7 @@
#endif
if (type->Building) {
- if( UnitUnderCursor && (dest=PlatformOnMap(x,y)) ) {
+ if( UnitUnderCursor && (dest=ResourceOnMap(x,y,OilCost)) ) {
dest->Blink=4;
DebugLevel3("RALY POINT TO PLATFORM\n");
SendCommandResource(Selected[i],dest,!(KeyModifiers&ModifierShift));
@@ -1044,13 +1040,13 @@
Unit* dest;
for( i=0; i<NumSelected; ++i ) {
- if( UnitUnderCursor && (dest=PlatformOnMap(x,y)) ) {
+ if( UnitUnderCursor && (dest=ResourceOnMap(x,y,OilCost)) ) {
dest->Blink=4;
DebugLevel3("PLATFORM\n");
SendCommandResource(Selected[i],dest,!(KeyModifiers&ModifierShift));
continue;
}
- if( UnitUnderCursor && (dest=GoldMineOnMap(x,y)) ) {
+ if( UnitUnderCursor && (dest=ResourceOnMap(x,y,GoldCost)) ) {
dest->Blink=4;
DebugLevel3("GOLD-MINE\n");
SendCommandMineGold(Selected[i],dest,!(KeyModifiers&ModifierShift));
Index: stratagus/src/unit/unittype.c
diff -u stratagus/src/unit/unittype.c:1.82 stratagus/src/unit/unittype.c:1.83
--- stratagus/src/unit/unittype.c:1.82 Sat Aug 9 16:08:39 2003
+++ stratagus/src/unit/unittype.c Sat Aug 9 16:32:52 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unittype.c,v 1.82 2003/08/09 20:08:39 martinxyz Exp $
+// $Id: unittype.c,v 1.83 2003/08/09 20:32:52 n0body Exp $
//@{
@@ -76,10 +76,12 @@
**
** FIXME: find a way to make it configurable!
*/
+#if 0
global UnitType*UnitTypeOrcTanker; /// Orc tanker unit type pointer
global UnitType*UnitTypeHumanTanker; /// Human tanker unit type
pointer
global UnitType*UnitTypeOrcTankerFull; /// Orc tanker full unit type
pointer
global UnitType*UnitTypeHumanTankerFull; /// Human tanker full unit type
pointer
+#endif
global UnitType*UnitTypeHumanWorker; /// Human worker
global UnitType*UnitTypeOrcWorker; /// Orc worker
global UnitType*UnitTypeHumanWorkerWithGold; /// Human worker with gold
@@ -1028,7 +1030,7 @@
char **sp;
fprintf(file,"\n;;; -----------------------------------------\n");
- fprintf(file,";;; MODULE: unittypes $Id: unittype.c,v 1.82 2003/08/09
20:08:39 martinxyz Exp $\n\n");
+ fprintf(file,";;; MODULE: unittypes $Id: unittype.c,v 1.83 2003/08/09
20:32:52 n0body Exp $\n\n");
// Original number to internal unit-type name.
@@ -1089,6 +1091,7 @@
IfDebug(
if( !NoWarningUnitType ) {
DebugLevel0Fn("Name `%s' not found\n" _C_ ident);
+ DebugCheck(1);
}
);
@@ -1218,10 +1221,6 @@
//
// Setup hardcoded unit types. FIXME: should be moved to some configs.
//
- UnitTypeHumanTanker=UnitTypeByIdent("unit-human-oil-tanker");
- UnitTypeOrcTanker=UnitTypeByIdent("unit-orc-oil-tanker");
- UnitTypeHumanTankerFull=UnitTypeByIdent("unit-human-oil-tanker-full");
- UnitTypeOrcTankerFull=UnitTypeByIdent("unit-orc-oil-tanker-full");
UnitTypeHumanWorker=UnitTypeByIdent("unit-peasant");
UnitTypeOrcWorker=UnitTypeByIdent("unit-peon");
UnitTypeHumanWorkerWithGold=UnitTypeByIdent("unit-peasant-with-gold");
@@ -1447,10 +1446,6 @@
//
// Clean hardcoded unit types.
//
- UnitTypeHumanTanker=NULL;
- UnitTypeOrcTanker=NULL;
- UnitTypeHumanTankerFull=NULL;
- UnitTypeOrcTankerFull=NULL;
UnitTypeHumanWorker=NULL;
UnitTypeOrcWorker=NULL;
UnitTypeHumanWorkerWithGold=NULL;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus contrib/campaigns/human/level01h.cm c...,
Crestez Leonard <=