[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: |
Thu, 11 Sep 2003 18:07:55 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Crestez Leonard <address@hidden> 03/09/11 18:07:53
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
doc/ccl : unittype.html
src/action : action_move.c action_resource.c
action_returngoods.c
src/ai : Module.make ai_resource.c
src/clone : unit.c unit_draw.c
src/include : map.h stratagus.h unit.h
src/map : map_draw.c map_fog.c minimap.c
Log message:
Circular Cloaked unit detection.(no more Submarines)
Fixed campaign files for removal of resource carrier types.
Fixed small resource bug (can't find a deposit if mine is in the way).
Patches:
Index: stratagus/contrib/campaigns/human-exp/levelx01h.cm
diff -u stratagus/contrib/campaigns/human-exp/levelx01h.cm:1.5
stratagus/contrib/campaigns/human-exp/levelx01h.cm:1.6
--- stratagus/contrib/campaigns/human-exp/levelx01h.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx01h.cm Thu Sep 11 18:07:52 2003
@@ -44,12 +44,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.6
stratagus/contrib/campaigns/human-exp/levelx02h.cm:1.7
--- stratagus/contrib/campaigns/human-exp/levelx02h.cm:1.6 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx02h.cm Thu Sep 11 18:07:52 2003
@@ -34,12 +34,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.6
stratagus/contrib/campaigns/human-exp/levelx03h.cm:1.7
--- stratagus/contrib/campaigns/human-exp/levelx03h.cm:1.6 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx03h.cm Thu Sep 11 18:07:52 2003
@@ -34,12 +34,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.6
stratagus/contrib/campaigns/human-exp/levelx04h.cm:1.7
--- stratagus/contrib/campaigns/human-exp/levelx04h.cm:1.6 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx04h.cm Thu Sep 11 18:07:52 2003
@@ -28,12 +28,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.6
stratagus/contrib/campaigns/human-exp/levelx05h.cm:1.7
--- stratagus/contrib/campaigns/human-exp/levelx05h.cm:1.6 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx05h.cm Thu Sep 11 18:07:52 2003
@@ -30,12 +30,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.6
stratagus/contrib/campaigns/human-exp/levelx06h.cm:1.7
--- stratagus/contrib/campaigns/human-exp/levelx06h.cm:1.6 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx06h.cm Thu Sep 11 18:07:52 2003
@@ -47,12 +47,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.6
stratagus/contrib/campaigns/human-exp/levelx07h.cm:1.7
--- stratagus/contrib/campaigns/human-exp/levelx07h.cm:1.6 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx07h.cm Thu Sep 11 18:07:52 2003
@@ -52,12 +52,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.7
stratagus/contrib/campaigns/human-exp/levelx08h.cm:1.8
--- stratagus/contrib/campaigns/human-exp/levelx08h.cm:1.7 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx08h.cm Thu Sep 11 18:07:52 2003
@@ -28,12 +28,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.6
stratagus/contrib/campaigns/human-exp/levelx09h.cm:1.7
--- stratagus/contrib/campaigns/human-exp/levelx09h.cm:1.6 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx09h.cm Thu Sep 11 18:07:52 2003
@@ -27,12 +27,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.6
stratagus/contrib/campaigns/human-exp/levelx10h.cm:1.7
--- stratagus/contrib/campaigns/human-exp/levelx10h.cm:1.6 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx10h.cm Thu Sep 11 18:07:52 2003
@@ -65,12 +65,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.6
stratagus/contrib/campaigns/human-exp/levelx11h.cm:1.7
--- stratagus/contrib/campaigns/human-exp/levelx11h.cm:1.6 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx11h.cm Thu Sep 11 18:07:52 2003
@@ -49,12 +49,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.6
stratagus/contrib/campaigns/human-exp/levelx12h.cm:1.7
--- stratagus/contrib/campaigns/human-exp/levelx12h.cm:1.6 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/human-exp/levelx12h.cm Thu Sep 11 18:07:52 2003
@@ -33,12 +33,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level01h.cm
diff -u stratagus/contrib/campaigns/human/level01h.cm:1.5
stratagus/contrib/campaigns/human/level01h.cm:1.6
--- stratagus/contrib/campaigns/human/level01h.cm:1.5 Sat Aug 9 16:32:50 2003
+++ stratagus/contrib/campaigns/human/level01h.cm Thu Sep 11 18:07:52 2003
@@ -26,12 +26,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level02h.cm
diff -u stratagus/contrib/campaigns/human/level02h.cm:1.5
stratagus/contrib/campaigns/human/level02h.cm:1.6
--- stratagus/contrib/campaigns/human/level02h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level02h.cm Thu Sep 11 18:07:52 2003
@@ -27,12 +27,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level03h.cm
diff -u stratagus/contrib/campaigns/human/level03h.cm:1.5
stratagus/contrib/campaigns/human/level03h.cm:1.6
--- stratagus/contrib/campaigns/human/level03h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level03h.cm Thu Sep 11 18:07:52 2003
@@ -26,12 +26,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level04h.cm
diff -u stratagus/contrib/campaigns/human/level04h.cm:1.5
stratagus/contrib/campaigns/human/level04h.cm:1.6
--- stratagus/contrib/campaigns/human/level04h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level04h.cm Thu Sep 11 18:07:52 2003
@@ -24,12 +24,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level05h.cm
diff -u stratagus/contrib/campaigns/human/level05h.cm:1.5
stratagus/contrib/campaigns/human/level05h.cm:1.6
--- stratagus/contrib/campaigns/human/level05h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level05h.cm Thu Sep 11 18:07:52 2003
@@ -25,12 +25,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level06h.cm
diff -u stratagus/contrib/campaigns/human/level06h.cm:1.5
stratagus/contrib/campaigns/human/level06h.cm:1.6
--- stratagus/contrib/campaigns/human/level06h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level06h.cm Thu Sep 11 18:07:52 2003
@@ -23,12 +23,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level07h.cm
diff -u stratagus/contrib/campaigns/human/level07h.cm:1.5
stratagus/contrib/campaigns/human/level07h.cm:1.6
--- stratagus/contrib/campaigns/human/level07h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level07h.cm Thu Sep 11 18:07:52 2003
@@ -24,12 +24,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level08h.cm
diff -u stratagus/contrib/campaigns/human/level08h.cm:1.5
stratagus/contrib/campaigns/human/level08h.cm:1.6
--- stratagus/contrib/campaigns/human/level08h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level08h.cm Thu Sep 11 18:07:52 2003
@@ -39,12 +39,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level09h.cm
diff -u stratagus/contrib/campaigns/human/level09h.cm:1.5
stratagus/contrib/campaigns/human/level09h.cm:1.6
--- stratagus/contrib/campaigns/human/level09h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level09h.cm Thu Sep 11 18:07:52 2003
@@ -31,12 +31,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "FFFFFFFFFFFFFFFF")
Index: stratagus/contrib/campaigns/human/level10h.cm
diff -u stratagus/contrib/campaigns/human/level10h.cm:1.5
stratagus/contrib/campaigns/human/level10h.cm:1.6
--- stratagus/contrib/campaigns/human/level10h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level10h.cm Thu Sep 11 18:07:52 2003
@@ -24,12 +24,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level11h.cm
diff -u stratagus/contrib/campaigns/human/level11h.cm:1.5
stratagus/contrib/campaigns/human/level11h.cm:1.6
--- stratagus/contrib/campaigns/human/level11h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level11h.cm Thu Sep 11 18:07:52 2003
@@ -29,12 +29,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level12h.cm
diff -u stratagus/contrib/campaigns/human/level12h.cm:1.5
stratagus/contrib/campaigns/human/level12h.cm:1.6
--- stratagus/contrib/campaigns/human/level12h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level12h.cm Thu Sep 11 18:07:52 2003
@@ -26,12 +26,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level13h.cm
diff -u stratagus/contrib/campaigns/human/level13h.cm:1.5
stratagus/contrib/campaigns/human/level13h.cm:1.6
--- stratagus/contrib/campaigns/human/level13h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level13h.cm Thu Sep 11 18:07:52 2003
@@ -27,12 +27,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/human/level14h.cm
diff -u stratagus/contrib/campaigns/human/level14h.cm:1.5
stratagus/contrib/campaigns/human/level14h.cm:1.6
--- stratagus/contrib/campaigns/human/level14h.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/human/level14h.cm Thu Sep 11 18:07:52 2003
@@ -27,12 +27,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx01o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx01o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx01o.cm Thu Sep 11 18:07:52 2003
@@ -38,12 +38,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx02o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx02o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx02o.cm Thu Sep 11 18:07:52 2003
@@ -45,12 +45,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx03o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx03o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx03o.cm Thu Sep 11 18:07:52 2003
@@ -26,12 +26,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx04o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx04o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx04o.cm Thu Sep 11 18:07:52 2003
@@ -36,12 +36,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx05o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx05o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx05o.cm Thu Sep 11 18:07:52 2003
@@ -26,12 +26,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx06o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx06o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx06o.cm Thu Sep 11 18:07:52 2003
@@ -36,12 +36,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx07o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx07o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx07o.cm Thu Sep 11 18:07:52 2003
@@ -34,12 +34,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx08o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx08o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx08o.cm Thu Sep 11 18:07:52 2003
@@ -26,12 +26,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx09o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx09o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx09o.cm Thu Sep 11 18:07:52 2003
@@ -27,12 +27,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx10o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx10o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx10o.cm Thu Sep 11 18:07:52 2003
@@ -29,12 +29,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx11o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx11o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx11o.cm Thu Sep 11 18:07:52 2003
@@ -29,12 +29,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "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.5
stratagus/contrib/campaigns/orc-exp/levelx12o.cm:1.6
--- stratagus/contrib/campaigns/orc-exp/levelx12o.cm:1.5 Sat Aug 9
16:32:51 2003
+++ stratagus/contrib/campaigns/orc-exp/levelx12o.cm Thu Sep 11 18:07:52 2003
@@ -27,12 +27,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level01o.cm
diff -u stratagus/contrib/campaigns/orc/level01o.cm:1.5
stratagus/contrib/campaigns/orc/level01o.cm:1.6
--- stratagus/contrib/campaigns/orc/level01o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level01o.cm Thu Sep 11 18:07:52 2003
@@ -26,12 +26,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level02o.cm
diff -u stratagus/contrib/campaigns/orc/level02o.cm:1.8
stratagus/contrib/campaigns/orc/level02o.cm:1.9
--- stratagus/contrib/campaigns/orc/level02o.cm:1.8 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level02o.cm Thu Sep 11 18:07:52 2003
@@ -27,12 +27,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level03o.cm
diff -u stratagus/contrib/campaigns/orc/level03o.cm:1.5
stratagus/contrib/campaigns/orc/level03o.cm:1.6
--- stratagus/contrib/campaigns/orc/level03o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level03o.cm Thu Sep 11 18:07:52 2003
@@ -26,12 +26,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level04o.cm
diff -u stratagus/contrib/campaigns/orc/level04o.cm:1.5
stratagus/contrib/campaigns/orc/level04o.cm:1.6
--- stratagus/contrib/campaigns/orc/level04o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level04o.cm Thu Sep 11 18:07:52 2003
@@ -24,12 +24,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level05o.cm
diff -u stratagus/contrib/campaigns/orc/level05o.cm:1.5
stratagus/contrib/campaigns/orc/level05o.cm:1.6
--- stratagus/contrib/campaigns/orc/level05o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level05o.cm Thu Sep 11 18:07:52 2003
@@ -25,12 +25,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level06o.cm
diff -u stratagus/contrib/campaigns/orc/level06o.cm:1.5
stratagus/contrib/campaigns/orc/level06o.cm:1.6
--- stratagus/contrib/campaigns/orc/level06o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level06o.cm Thu Sep 11 18:07:52 2003
@@ -31,12 +31,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level07o.cm
diff -u stratagus/contrib/campaigns/orc/level07o.cm:1.5
stratagus/contrib/campaigns/orc/level07o.cm:1.6
--- stratagus/contrib/campaigns/orc/level07o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level07o.cm Thu Sep 11 18:07:52 2003
@@ -24,12 +24,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level08o.cm
diff -u stratagus/contrib/campaigns/orc/level08o.cm:1.6
stratagus/contrib/campaigns/orc/level08o.cm:1.7
--- stratagus/contrib/campaigns/orc/level08o.cm:1.6 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level08o.cm Thu Sep 11 18:07:52 2003
@@ -29,12 +29,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level09o.cm
diff -u stratagus/contrib/campaigns/orc/level09o.cm:1.5
stratagus/contrib/campaigns/orc/level09o.cm:1.6
--- stratagus/contrib/campaigns/orc/level09o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level09o.cm Thu Sep 11 18:07:52 2003
@@ -25,12 +25,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "FFFFFFFFFFFFFFFF")
Index: stratagus/contrib/campaigns/orc/level10o.cm
diff -u stratagus/contrib/campaigns/orc/level10o.cm:1.5
stratagus/contrib/campaigns/orc/level10o.cm:1.6
--- stratagus/contrib/campaigns/orc/level10o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level10o.cm Thu Sep 11 18:07:52 2003
@@ -23,12 +23,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level11o.cm
diff -u stratagus/contrib/campaigns/orc/level11o.cm:1.5
stratagus/contrib/campaigns/orc/level11o.cm:1.6
--- stratagus/contrib/campaigns/orc/level11o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level11o.cm Thu Sep 11 18:07:52 2003
@@ -27,12 +27,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level12o.cm
diff -u stratagus/contrib/campaigns/orc/level12o.cm:1.5
stratagus/contrib/campaigns/orc/level12o.cm:1.6
--- stratagus/contrib/campaigns/orc/level12o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level12o.cm Thu Sep 11 18:07:52 2003
@@ -26,12 +26,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level13o.cm
diff -u stratagus/contrib/campaigns/orc/level13o.cm:1.5
stratagus/contrib/campaigns/orc/level13o.cm:1.6
--- stratagus/contrib/campaigns/orc/level13o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level13o.cm Thu Sep 11 18:07:52 2003
@@ -27,12 +27,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/contrib/campaigns/orc/level14o.cm
diff -u stratagus/contrib/campaigns/orc/level14o.cm:1.5
stratagus/contrib/campaigns/orc/level14o.cm:1.6
--- stratagus/contrib/campaigns/orc/level14o.cm:1.5 Sat Aug 9 16:32:51 2003
+++ stratagus/contrib/campaigns/orc/level14o.cm Thu Sep 11 18:07:52 2003
@@ -27,12 +27,8 @@
;;Townhall - Produces
(define-allow 'unit-peasant "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peasant-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peasant-with-wood "FFFFFFFFFFFFFFFF")
(define-allow 'unit-peon "AAAAAAAAAAAAAAAA")
-(define-allow 'unit-peon-with-gold "FFFFFFFFFFFFFFFF")
-(define-allow 'unit-peon-with-wood "FFFFFFFFFFFFFFFF")
;;Barracks - Produces
(define-allow 'unit-footman "AAAAAAAAAAAAAAAA")
Index: stratagus/doc/ccl/unittype.html
diff -u stratagus/doc/ccl/unittype.html:1.27
stratagus/doc/ccl/unittype.html:1.28
--- stratagus/doc/ccl/unittype.html:1.27 Wed Sep 10 11:33:43 2003
+++ stratagus/doc/ccl/unittype.html Thu Sep 11 18:07:52 2003
@@ -322,6 +322,10 @@
be bigger than one tile. A list of X (width) and Y (height) sizes.
F.E. '( 1 1 ), '( 2 2 ).<p>
</dd>
+<dt>permanent_cloak</dt>
+<dd>Unit is permanently cloaked, and can only be seen by detectors (see
below.)<p></dd>
+<dt>detect_cloak</dt>
+<dd>Unit can detect cloaked units. If an unit is detected other units can
attack it as well<p></dd>
<dt>box_size</dt>
<dd></dd>
<dt>attack_range</dt>
@@ -589,7 +593,7 @@
<h4>Not Used</h4>
<hr>
-Last changed: $Id: unittype.html,v 1.27 2003/09/10 15:33:43 martinxyz Exp $<br>
+Last changed: $Id: unittype.html,v 1.28 2003/09/11 22:07:52 n0body Exp $<br>
All trademarks and copyrights on this page are owned by their respective
owners.
<address>(c) 2002-2003 by <a href="http://stratagus.org";>
The Stratagus Project</a></address></body></html>
Index: stratagus/src/action/action_move.c
diff -u stratagus/src/action/action_move.c:1.65
stratagus/src/action/action_move.c:1.66
--- stratagus/src/action/action_move.c:1.65 Thu Sep 11 06:49:09 2003
+++ stratagus/src/action/action_move.c Thu Sep 11 18:07:52 2003
@@ -21,7 +21,7 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// $Id: action_move.c,v 1.65 2003/09/11 10:49:09 n0body Exp $
+// $Id: action_move.c,v 1.66 2003/09/11 22:07:52 n0body Exp $
//@{
@@ -43,6 +43,7 @@
#include "pathfinder.h"
#include "sound.h"
#include "interface.h"
+#include "map.h"
/*----------------------------------------------------------------------------
-- Variables
@@ -167,9 +168,9 @@
MapMarkUnitOnBoardSight(uninside,unit);
}
- // Reveal Submarines and stuff.
+ // Reveal cloaked units.
if( unit->Type->DetectCloak ) {
- MarkSubmarineSeen(unit->Player,x,y,unit->Stats->SightRange);
+ MapDetectCloakedUnits(unit);
}
unit->IX=-xd*TileSizeX;
Index: stratagus/src/action/action_resource.c
diff -u stratagus/src/action/action_resource.c:1.52
stratagus/src/action/action_resource.c:1.53
--- stratagus/src/action/action_resource.c:1.52 Wed Sep 10 04:44:36 2003
+++ stratagus/src/action/action_resource.c Thu Sep 11 18:07:53 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: action_resource.c,v 1.52 2003/09/10 08:44:36 n0body Exp $
+// $Id: action_resource.c,v 1.53 2003/09/11 22:07:53 n0body Exp $
//@{
@@ -373,7 +373,7 @@
// FIXME: empty harvesters should find another resource.
//
for( i=source->InsideCount; i; --i,uins=uins->NextContained ) {
- if (uins->Value &&
(depot=FindDeposit(uins,uins->X,uins->Y,1000))) {
+ if (uins->Value &&
(depot=FindDeposit(uins,uins->X,uins->Y,1000,unit->CurrentResource))) {
DropOutNearest(uins,depot->X+depot->Type->TileWidth/2
,depot->Y+depot->Type->TileHeight/2
,source->Type->TileWidth,source->Type->TileHeight);
@@ -471,9 +471,14 @@
// Store resource position.
// FIXME: is this the best way?
unit->Orders[0].Arg1=(void*)((unit->X<<16)|unit->Y);
-
+
+ if (!unit->Value) {
+ DebugLevel0Fn("Unit is empty???\n");
+ } else {
+ DebugLevel3Fn("Unit is fine, search for a depot.\n");
+ }
// Find and send to resource deposit.
- if( (!(depot=FindDeposit(unit,unit->X,unit->Y,1000)))
+ if( (!(depot=FindDeposit(unit,unit->X,unit->Y,1000,unit->CurrentResource)))
|| (!unit->Value)) {
if (!(resinfo->HarvestFromOutside||resinfo->TerrainHarvester)) {
DebugCheck(!unit->Container);
Index: stratagus/src/action/action_returngoods.c
diff -u stratagus/src/action/action_returngoods.c:1.38
stratagus/src/action/action_returngoods.c:1.39
--- stratagus/src/action/action_returngoods.c:1.38 Fri Sep 5 14:10:55 2003
+++ stratagus/src/action/action_returngoods.c Thu Sep 11 18:07:53 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: action_returngoods.c,v 1.38 2003/09/05 18:10:55 n0body Exp $
+// $Id: action_returngoods.c,v 1.39 2003/09/11 22:07:53 n0body Exp $
//@{
@@ -68,8 +68,11 @@
// Select target to return goods.
//
DebugCheck(!type->Harvester );
+ if ((!unit->CurrentResource)&&(!unit->Value)) {
+ DebugLevel0("Unit can't return resources, it doesn't carry any.\n");
+ }
if( !unit->Orders[0].Goal ) {
- if( !(destu=FindDeposit(unit,unit->X,unit->Y,1000)) ) {
+ if(
!(destu=FindDeposit(unit,unit->X,unit->Y,1000,unit->CurrentResource)) ) {
DebugLevel3Fn("No deposit -> can't return\n");
unit->Orders[0].Action=UnitActionStill;
return;
Index: stratagus/src/ai/Module.make
diff -u stratagus/src/ai/Module.make:1.1 stratagus/src/ai/Module.make:1.2
--- stratagus/src/ai/Module.make:1.1 Fri Nov 29 15:58:15 2002
+++ stratagus/src/ai/Module.make Thu Sep 11 18:07:53 2003
@@ -1,3 +1,3 @@
SRC += src/ai/ai.c src/ai/ai_building.c src/ai/ai_force.c src/ai/ai_magic.c
src/ai/ai_plan.c src/ai/ai_resource.c src/ai/ccl_ai.c src/ai/new_ai.c
HDRS += src/ai/ai_local.h
-OBJ += src/ai/$(OBJDIR)/ai.o src/ai/$(OBJDIR)/ai_building.o
src/ai/$(OBJDIR)/ai_force.o src/ai/$(OBJDIR)/ai_magic.o
src/ai/$(OBJDIR)/ai_plan.o src/ai/$(OBJDIR)/ai_resource.o
src/ai/$(OBJDIR)/ccl_ai.o src/ai/$(OBJDIR)/new_ai.o
+OBJ += src/ai/$(OBJDIR)/ai.c src/ai/$(OBJDIR)/ai_building.o
src/ai/$(OBJDIR)/ai_force.o src/ai/$(OBJDIR)/ai_magic.o
src/ai/$(OBJDIR)/ai_plan.o src/ai/$(OBJDIR)/ai_resource.o
src/ai/$(OBJDIR)/ccl_ai.o src/ai/$(OBJDIR)/new_ai.o
Index: stratagus/src/ai/ai_resource.c
diff -u stratagus/src/ai/ai_resource.c:1.68 stratagus/src/ai/ai_resource.c:1.69
--- stratagus/src/ai/ai_resource.c:1.68 Thu Sep 11 06:49:09 2003
+++ stratagus/src/ai/ai_resource.c Thu Sep 11 18:07:53 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai_resource.c,v 1.68 2003/09/11 10:49:09 n0body Exp $
+// $Id: ai_resource.c,v 1.69 2003/09/11 22:07:53 n0body Exp $
#ifdef NEW_AI // {
@@ -1158,7 +1158,7 @@
&& unit->Orders[0].Action!=UnitActionUpgradeTo
&& unit->HP<unit->Stats->HitPoints ) {
- DebugLevel2Fn("Have building to repair %d(%s)\n" _C_
+ DebugLevel3Fn("Have building to repair %d(%s)\n" _C_
UnitNumber(unit) _C_ unit->Type->Ident);
//
Index: stratagus/src/clone/unit.c
diff -u stratagus/src/clone/unit.c:1.293 stratagus/src/clone/unit.c:1.294
--- stratagus/src/clone/unit.c:1.293 Thu Sep 11 06:49:10 2003
+++ stratagus/src/clone/unit.c Thu Sep 11 18:07:53 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit.c,v 1.293 2003/09/11 10:49:10 n0body Exp $
+// $Id: unit.c,v 1.294 2003/09/11 22:07:53 n0body Exp $
//@{
@@ -513,7 +513,7 @@
MapMarkUnitSight(unit);
if( type->DetectCloak ) {
- MarkSubmarineSeen(unit->Player,x,y,unit->Stats->SightRange);
+ MapDetectCloakedUnits(unit);
}
}
@@ -932,31 +932,6 @@
}
/**
- ** Mark submarine seen by a submarine detector.
- **
- ** @param player Player pointer that can see the submarine
- ** @param x X map tile center position
- ** @param y Y map tile center position
- ** @param r Range around center
- **
- ** @note
- ** All units are marked as visible, not only submarines.
- */
-global void MarkSubmarineSeen(const Player* player,int x,int y,int r)
-{
- Unit* table[UnitMax];
- int n;
- int i;
- int pm;
-
- n=SelectUnits(x-r,y-r,x+r,y+r,table);
- pm=((1<<player->Player)|player->SharedVision);
- for( i=0; i<n; ++i ) {
- table[i]->Visible|=pm;
- }
-}
-
-/**
** Returns true, if unit is visible for this player on the map.
** An unit is visible, if any field could be seen.
**
@@ -1052,22 +1027,28 @@
{
int n;
Unit* units[UnitMax];
+ Unit* unit;
if( IsMapFieldVisible(ThisPlayer, x, y) ) {
n = SelectUnitsOnTile(x,y,units);
+ DebugLevel3Fn("I can see %d units from here.\n" _C_ n);
// FIXME: need to handle Dead buldings
while( n ) {
- units[n-1]->SeenIY=units[n-1]->IY;
- units[n-1]->SeenIX=units[n-1]->IX;
- units[n-1]->SeenFrame = units[n-1]->Frame;
- units[n-1]->SeenType = units[n-1]->Type;
- units[n-1]->SeenState =
(units[n-1]->Orders[0].Action==UnitActionBuilded) |
- ((units[n-1]->Orders[0].Action==UnitActionUpgradeTo) << 1);
- if( units[n-1]->Orders[0].Action==UnitActionDie ) {
- units[n-1]->SeenState = 3;
+ unit=units[n-1];
+ if (unit->SeenFrame==UnitNotSeen) {
+ DebugLevel3Fn("unit %d at %d,%d first seen at %lu.\n" _C_
unit->Slot _C_ unit->X _C_ unit->Y _C_ GameCycle);
+ }
+ unit->SeenIY=unit->IY;
+ unit->SeenIX=unit->IX;
+ unit->SeenFrame = unit->Frame;
+ unit->SeenType = unit->Type;
+ unit->SeenState = (unit->Orders[0].Action==UnitActionBuilded) |
+ ((unit->Orders[0].Action==UnitActionUpgradeTo) << 1);
+ if( unit->Orders[0].Action==UnitActionDie ) {
+ unit->SeenState = 3;
}
- units[n-1]->SeenConstructed = units[n-1]->Constructed;
- units[n-1]->SeenDestroyed = units[n-1]->Destroyed;
+ unit->SeenConstructed = unit->Constructed;
+ unit->SeenDestroyed = unit->Destroyed;
--n;
}
}
@@ -1093,6 +1074,9 @@
if( IsMapFieldVisible(ThisPlayer,unit->X+x,unit->Y+y) ) {
unit->SeenIY=unit->IY;
unit->SeenIX=unit->IX;
+ if (unit->SeenFrame==UnitNotSeen) {
+ DebugLevel3Fn("unit %d at %d,%d first seen at %lu.\n" _C_
unit->Slot _C_ unit->X _C_ unit->Y _C_ GameCycle);
+ }
unit->SeenFrame = unit->Frame;
unit->SeenType = unit->Type;
unit->SeenState = (unit->Orders[0].Action==UnitActionBuilded) |
@@ -1104,6 +1088,8 @@
unit->SeenDestroyed = unit->Destroyed;
x=unit->Type->TileWidth;
y=unit->Type->TileHeight;
+ // If we found one visible square, END.
+ break;
}
}
}
@@ -1600,8 +1586,7 @@
unit=*table;
if( unit->Type->DetectCloak && !unit->Removed &&
unit->Orders[0].Action!=UnitActionBuilded ) {
- MarkSubmarineSeen(unit->Player,unit->X+unit->Type->TileWidth/2,
- unit->Y+unit->Type->TileHeight/2,unit->Stats->SightRange);
+ MapDetectCloakedUnits(unit);
}
}
}
@@ -2642,7 +2627,7 @@
points=malloc(size*sizeof(*points));
// Find the nearest gold depot
- if( (destu=FindDeposit(unit,x,y,range)) ) {
+ if( (destu=FindDeposit(unit,x,y,range,resource)) ) {
NearestOfUnit(destu,x,y,&destx,&desty);
}
bestd=99999;
@@ -2751,7 +2736,7 @@
**
** @return NoUnitP or oil deposit unit
*/
-global Unit* FindDeposit(const Unit* unit,int x,int y,int range)
+global Unit* FindDeposit(const Unit* unit,int x,int y,int range,int resource)
{
static const int xoffset[]={ 0,-1,+1, 0, -1,+1,-1,+1 };
static const int yoffset[]={ -1, 0, 0,+1, -1,-1,+1,+1 };
@@ -2768,15 +2753,15 @@
int ep;
int i;
int w;
+ int nodes_searched;
unsigned char* m;
unsigned char* matrix;
Unit* depot;
int destx;
int desty;
int cdist;
- int resource;
- resource=unit->CurrentResource;
+ nodes_searched=0;
destx=x;
desty=y;
@@ -2791,7 +2776,7 @@
mask=UnitMovementMask(unit);
// Ignore all units along the way. Might seem wierd, but otherwise
// peasants would lock at a mine with a lot of workers.
- mask&=~(MapFieldLandUnit|MapFieldSeaUnit|MapFieldAirUnit);
+ mask&=~(MapFieldLandUnit|MapFieldSeaUnit|MapFieldAirUnit|MapFieldBuilding);
points[0].X=x;
points[0].Y=y;
rp=0;
@@ -2799,6 +2784,7 @@
ep=wp=1; // start with one point
cdist=0; // current distance is 0
+ DebugLevel3Fn("Searching for a deposit(%d,%d,%d,%d,%s)" _C_
UnitNumber(unit) _C_ x _C_ y _C_ range _C_ DefaultResourceNames[resource]);
//
// Pop a point from stack, push all neighbors which could be entered.
//
@@ -2809,6 +2795,8 @@
for( i=0; i<8; ++i ) { // mark all neighbors
x=rx+xoffset[i];
y=ry+yoffset[i];
+ nodes_searched++;
+ DebugLevel3("(%d,%d) " _C_ x _C_ y);
// Make sure we don't leave the map.
if (x<0||y<0||x>=TheMap.Width||y>=TheMap.Height) {
continue;
@@ -2821,10 +2809,11 @@
//
// Look if there is a mine
//
- if ((depot=ResourceDepositOnMap(x,y,resource))&&
- ((IsAllied(unit->Player,depot)) ||
- (unit->Player==depot->Player))) {
+ if ( (depot=ResourceDepositOnMap(x,y,resource)) &&
+ ( (IsAllied(unit->Player,depot)) ||
+ (unit->Player==depot->Player) ) ) {
free(points);
+ DebugLevel3("Found a resource deposit at %d,%d\n" _C_ x _C_
y);
return depot;
}
if( CanMoveToMask(x,y,mask) ) { // reachable
@@ -2854,7 +2843,7 @@
// Continue with next set.
ep=wp;
}
- DebugLevel3Fn("no resource deposit found\n");
+ DebugLevel3("No resource deposit found, after we searched %d nodes.\n" _C_
nodes_searched);
free(points);
return NoUnitP;
}
@@ -3975,7 +3964,7 @@
int InRun, RunStart;
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: units $Id: unit.c,v 1.293 2003/09/11 10:49:10
n0body Exp $\n\n");
+ CLprintf(file,";;; MODULE: units $Id: unit.c,v 1.294 2003/09/11 22:07:53
n0body Exp $\n\n");
//
// Local variables
Index: stratagus/src/clone/unit_draw.c
diff -u stratagus/src/clone/unit_draw.c:1.158
stratagus/src/clone/unit_draw.c:1.159
--- stratagus/src/clone/unit_draw.c:1.158 Thu Sep 11 06:49:10 2003
+++ stratagus/src/clone/unit_draw.c Thu Sep 11 18:07:53 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit_draw.c,v 1.158 2003/09/11 10:49:10 n0body Exp $
+// $Id: unit_draw.c,v 1.159 2003/09/11 22:07:53 n0body Exp $
//@{
@@ -577,7 +577,7 @@
global void SaveDecorations(CLFile* file)
{
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: decorations $Id: unit_draw.c,v 1.158 2003/09/11
10:49:10 n0body Exp $\n\n");
+ CLprintf(file,";;; MODULE: decorations $Id: unit_draw.c,v 1.159 2003/09/11
22:07:53 n0body Exp $\n\n");
CLprintf(file,"(mana-sprite \"%s\" %d %d %d %d)\n",
ManaSprite.File,ManaSprite.HotX,ManaSprite.HotY,
@@ -1769,8 +1769,7 @@
y+=Map2ViewportY(CurrentViewport,unit->Y);
if( frame==UnitNotSeen ) {
- DebugLevel0Fn("Something is wrong, please send us the log of your
game.\n");
- DrawUnitSelection(unit);
+ DebugLevel0Fn("FIXME: Something is wrong, unit %d not seen time
%lu?.\n"_C_ unit->Slot _C_ GameCycle);
return;
}
Index: stratagus/src/include/map.h
diff -u stratagus/src/include/map.h:1.99 stratagus/src/include/map.h:1.100
--- stratagus/src/include/map.h:1.99 Thu Aug 28 08:20:04 2003
+++ stratagus/src/include/map.h Thu Sep 11 18:07:53 2003
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: map.h,v 1.99 2003/08/28 12:20:04 mr-russ Exp $
+// $Id: map.h,v 1.100 2003/09/11 22:07:53 n0body Exp $
#ifndef __MAP_H__
#define __MAP_H__
@@ -401,10 +401,14 @@
//
// in map_fog.c
//
-extern void MapUnmarkTileSight(const Player* player,int x,int y,unsigned char
*v);
-extern void MapMarkTileSight(const Player* player,int x,int y,unsigned char
*v);
+ /// Mark a tile for normal sight
+extern void MapMarkTileSight(const Player* player,int x,int y);
+ /// Unmark a tile for normal sight
+extern void MapUnmarkTileSight(const Player* player,int x,int y);
+ /// Mark Cloaked units on a tile as detected.
+extern void MapDetectUnitsOnTile(const Player* player,int x,int y);
/// Mark sight changes
-extern void MapSight(const Player* player, int x, int y, int w, int h, int
range, void (*marker)(const Player*,int,int,unsigned char*));
+extern void MapSight(const Player* player, int x, int y, int w, int h, int
range, void (*marker)(const Player*,int,int));
/// Find if a tile is visible (With shared vision)
extern int IsTileVisible(const Player* player, int x, int y);
/// Mark tiles with fog of war to be redrawn
@@ -550,6 +554,8 @@
#define CanMoveToMask(x,y,mask) \
!(TheMap.Fields[(x)+(y)*TheMap.Width].Flags&(mask))
+#define MapDetectCloakedUnits(unit)
MapSight((unit)->Player,(unit)->X,(unit)->Y, \
+
(unit)->Type->TileWidth,(unit)->Type->TileHeight,(unit)->CurrentSightRange,MapDetectUnitsOnTile)
#define MapMarkSight(player,x,y,w,h,range)
MapSight((player),(x),(y),(w),(h),(range),MapMarkTileSight)
#define MapUnmarkSight(player,x,y,w,h,range)
MapSight((player),(x),(y),(w),(h),(range),MapUnmarkTileSight)
#define MapMarkUnitSight(unit) MapSight((unit)->Player,(unit)->X,(unit)->Y, \
Index: stratagus/src/include/stratagus.h
diff -u stratagus/src/include/stratagus.h:1.11
stratagus/src/include/stratagus.h:1.12
--- stratagus/src/include/stratagus.h:1.11 Fri Sep 5 14:10:55 2003
+++ stratagus/src/include/stratagus.h Thu Sep 11 18:07:53 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.h,v 1.11 2003/09/05 18:10:55 n0body Exp $
+// $Id: stratagus.h,v 1.12 2003/09/11 22:07:53 n0body Exp $
#ifndef __STRATAGUS_H__
#define __STRATAGUS_H__
@@ -348,8 +348,6 @@
----------------------------------------------------------------------------*/
// FIXME: this values should go into a general ui structure
-
-#define noGRID 1 /// Map is shown with a grid, if 1
#define DEFAULT_VIDEO_WIDTH 640 /// Default video width
#define DEFAULT_VIDEO_HEIGHT 480 /// Default video height
Index: stratagus/src/include/unit.h
diff -u stratagus/src/include/unit.h:1.212 stratagus/src/include/unit.h:1.213
--- stratagus/src/include/unit.h:1.212 Wed Sep 10 04:44:36 2003
+++ stratagus/src/include/unit.h Thu Sep 11 18:07:53 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit.h,v 1.212 2003/09/10 08:44:36 n0body Exp $
+// $Id: unit.h,v 1.213 2003/09/11 22:07:53 n0body Exp $
#ifndef __UNIT_H__
#define __UNIT_H__
@@ -764,8 +764,6 @@
extern void UpdateForNewUnit(const Unit* unit,int upgrade);
/// FIXME: more docu
extern void NearestOfUnit(const Unit* unit,int tx,int ty,int *dx,int *dy);
- /// Mark submarine as seen
-extern void MarkSubmarineSeen(const Player* player,int x,int y,int range);
/// Returns true, if unit is visible on the map
extern int UnitVisibleOnMap(const Unit* unit);
/// Returns true, if building is known on the map
@@ -822,7 +820,7 @@
/// Find resource
extern Unit* FindResource(const Unit* unit,int x,int y,int range,int resource);
/// Find nearest deposit
-extern Unit* FindDeposit(const Unit* unit,int x,int y,int range);
+extern Unit* FindDeposit(const Unit* unit,int x,int y,int range,int resource);
/// Find the next idle worker
extern Unit* FindIdleWorker(const Player* player,const Unit* last);
Index: stratagus/src/map/map_draw.c
diff -u stratagus/src/map/map_draw.c:1.46 stratagus/src/map/map_draw.c:1.47
--- stratagus/src/map/map_draw.c:1.46 Fri Jul 11 10:35:32 2003
+++ stratagus/src/map/map_draw.c Thu Sep 11 18:07:53 2003
@@ -29,7 +29,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: map_draw.c,v 1.46 2003/07/11 14:35:32 n0body Exp $
+// $Id: map_draw.c,v 1.47 2003/09/11 22:07:53 n0body Exp $
//@{
@@ -89,6 +89,8 @@
#define noUSE_TILECACHE /// defined use tile cache
#define USE_SMART_TILECACHE /// defined use a smart tile cache
+#define noGRID 1 /// Map is shown with a grid, if 1
+
#ifdef DEBUG
#define noTIMEIT /// defined time function
Index: stratagus/src/map/map_fog.c
diff -u stratagus/src/map/map_fog.c:1.100 stratagus/src/map/map_fog.c:1.101
--- stratagus/src/map/map_fog.c:1.100 Thu Aug 28 08:20:04 2003
+++ stratagus/src/map/map_fog.c Thu Sep 11 18:07:53 2003
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: map_fog.c,v 1.100 2003/08/28 12:20:04 mr-russ Exp $
+// $Id: map_fog.c,v 1.101 2003/09/11 22:07:53 n0body Exp $
//@{
@@ -57,8 +57,8 @@
#ifdef DEBUG
-// Uncomment this to see FOW visibility for every tile
-// #define DEBUG_FOG_OF_WAR
+// Use this to see FOW visibility for every tile
+#define noDEBUG_FOG_OF_WAR
#define noTIMEIT /// defined time function
#endif
@@ -222,21 +222,22 @@
** @param player Player to mark sight.
** @param x X tile to mark.
** @param y Y tile to mark.
-** @param v Pointer to visible value.
*/
-global void MapMarkTileSight(const Player* player, int x, int y, unsigned char
*v)
+global void MapMarkTileSight(const Player* player, int x, int y)
{
+ unsigned char v;
Unit* unit;
Unit* remove;
Unit** corpses;
int w;
int h;
+ v=TheMap.Fields[x+y*TheMap.Width].Visible[player->Player];
- switch( *v ) {
+ switch( v ) {
case 0: // Unexplored
case 1: // Unseen
// FIXME: mark for screen update
- *v=2;
+ v=2;
if( player->Type == PlayerPerson ) {
corpses = &DestroyedBuildings;
while( *corpses ) {
@@ -258,30 +259,41 @@
}
}
}
+ TheMap.Fields[x+y*TheMap.Width].Visible[player->Player]=v;
if( IsTileVisible(ThisPlayer,x,y) > 1) {
MapMarkSeenTile(x,y);
UnitsMarkSeen(x,y);
}
- break;
+ return;
case 255: // Overflow
DebugLevel0Fn("Visible overflow (Player): %d\n" _C_ player->Player);
break;
default: // seen -> seen
- *v=*v+1;
+ v++;
break;
}
+ TheMap.Fields[x+y*TheMap.Width].Visible[player->Player]=v;
}
-global void MapUnmarkTileSight(const Player* player,int x,int y,unsigned char
*v)
+/**
+** Unmark a tile's sight. (Explore and make visible.)
+**
+** @param player Player to mark sight.
+** @param x X tile to mark.
+** @param y Y tile to mark.
+*/
+global void MapUnmarkTileSight(const Player* player,int x,int y)
{
- switch( *v ) {
+ unsigned char v;
+ v=TheMap.Fields[x+y*TheMap.Width].Visible[player->Player];
+ switch( v ) {
case 255:
// FIXME: (mr-russ) Lookupsight is broken :(
DebugCheck( 1 );
- *v = LookupSight(player,x,y);
- DebugCheck( *v < 254 );
+ v = LookupSight(player,x,y);
+ DebugCheck( v < 254 );
break;
case 0: // Unexplored
case 1:
@@ -295,9 +307,31 @@
UnitsMarkSeen(x,y);
}
default: // seen -> seen
- *v=*v-1;
+ v--;
break;
}
+ TheMap.Fields[x+y*TheMap.Width].Visible[player->Player]=v;
+}
+
+/**
+** Mark cloacked units on a tile as detected.
+**
+** @param player Player to mark sight.
+** @param x X tile to mark.
+** @param y Y tile to mark.
+*/
+global void MapDetectUnitsOnTile(const Player* player,int x,int y)
+{
+ Unit* table[UnitMax];
+ int n;
+ int i;
+ int pm;
+
+ n=SelectUnitsOnTile(x,y,table);
+ pm=((1<<player->Player)|player->SharedVision);
+ for( i=0; i<n; ++i ) {
+ table[i]->Visible|=pm;
+ }
}
/**
@@ -310,7 +344,7 @@
** @param range Radius to mark.
** @param marker Function to mark or unmark sight
*/
-global void MapSight(const Player* player, int x, int y, int w, int h, int
range, void (*marker)(const Player*,int,int,unsigned char*))
+global void MapSight(const Player* player, int x, int y, int w, int h, int
range, void (*marker)(const Player*,int,int))
{
int mx;
int my;
@@ -332,7 +366,7 @@
for(mx=x-range; mx < x+range+w; mx++) {
for(my=y; my < y+h; my++) {
if( mx >= 0 && mx < TheMap.Width ) {
-
marker(player,mx,my,&TheMap.Fields[mx+my*TheMap.Width].Visible[p]);
+ marker(player,mx,my);
}
}
}
@@ -341,7 +375,7 @@
for(my=y-range; my < y; my++) {
for(mx=x; mx < x+w; mx++) {
if( my >= 0 && my < TheMap.Width ) {
-
marker(player,mx,my,&TheMap.Fields[mx+my*TheMap.Width].Visible[p]);
+ marker(player,mx,my);
}
}
}
@@ -350,7 +384,7 @@
for(my=y+h; my < y+range+h; my++) {
for(mx=x; mx < x+w; mx++) {
if( my >= 0 && my < TheMap.Width ) {
- marker(player,mx,my,&TheMap.Fields[mx+my*TheMap.Width].Visible[p]);
+ marker(player,mx,my);
}
}
}
@@ -385,16 +419,16 @@
cx[3]+=VisionTable[1][steps];
cy[3]-=VisionTable[2][steps];
if( cx[0] < TheMap.Width && cy[0] >= 0) {
-
marker(player,cx[0],cy[0],&TheMap.Fields[cx[0]+cy[0]*TheMap.Width].Visible[p]);
+ marker(player,cx[0],cy[0]);
}
if( cx[1] >= 0 && cy[1] >= 0) {
-
marker(player,cx[1],cy[1],&TheMap.Fields[cx[1]+cy[1]*TheMap.Width].Visible[p]);
+ marker(player,cx[1],cy[1]);
}
if( cx[2] >= 0 && cy[2] < TheMap.Height ) {
-
marker(player,cx[2],cy[2],&TheMap.Fields[cx[2]+cy[2]*TheMap.Width].Visible[p]);
+ marker(player,cx[2],cy[2]);
}
if( cx[3] < TheMap.Width && cy[3] < TheMap.Height ) {
-
marker(player,cx[3],cy[3],&TheMap.Fields[cx[3]+cy[3]*TheMap.Width].Visible[p]);
+ marker(player,cx[3],cy[3]);
}
}
steps++;
@@ -2600,8 +2634,10 @@
char seen[7];
int x=(dx-vp->X)/TileSizeX + vp->MapX;
int y=(dy-vp->Y)/TileSizeY + vp->MapY;
-
//sprintf(seen,"%d(%d)",TheMap.Fields[y*TheMap.Width+x].Visible[ThisPlayer->Player],IsTileVisible(ThisPlayer,x,y));
- sprintf(seen,"%d",TheMap.Fields[y*TheMap.Width+x].Visible[0]);
+ // Really long and ugly:
+
//sprintf(seen,"%d(%d)",TheMap.Fields[y*TheMap.Width+x].Visible[ThisPlayer->Player],IsMapFieldVisible(ThisPlayer,x,y));
+ // Shorter version:
+
sprintf(seen,"%d",TheMap.Fields[y*TheMap.Width+x].Visible[ThisPlayer->Player]);
if( TheMap.Fields[y*TheMap.Width+x].Visible[0] ) {
VideoDrawText(dx,dy, GameFont,seen);
}
Index: stratagus/src/map/minimap.c
diff -u stratagus/src/map/minimap.c:1.61 stratagus/src/map/minimap.c:1.62
--- stratagus/src/map/minimap.c:1.61 Fri Sep 5 14:10:56 2003
+++ stratagus/src/map/minimap.c Thu Sep 11 18:07:53 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: minimap.c,v 1.61 2003/09/05 18:10:56 n0body Exp $
+// $Id: minimap.c,v 1.62 2003/09/11 22:07:53 n0body Exp $
//@{
@@ -342,7 +342,7 @@
continue;
}
if( !(unit->Visible&(1<<ThisPlayer->Player)) ) {
- continue; // Submarine not visible
+ continue; // Cloaked unit not visible
}
if( !UnitKnownOnMap(unit) && !ReplayRevealMap ) {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus contrib/campaigns/human/level01h.cm c...,
Crestez Leonard <=