[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/data/ccl human/units.lua orc/units.lua
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/data/ccl human/units.lua orc/units.lua |
Date: |
16 Dec 2003 17:02:20 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 03/12/16 17:02:20
Modified files:
data/ccl/human : units.lua
data/ccl/orc : units.lua
Log message:
Fixed CanGatherResources
Patches:
Index: stratagus/data/ccl/human/units.lua
diff -u stratagus/data/ccl/human/units.lua:1.3
stratagus/data/ccl/human/units.lua:1.4
--- stratagus/data/ccl/human/units.lua:1.3 Tue Dec 16 08:11:12 2003
+++ stratagus/data/ccl/human/units.lua Tue Dec 16 17:02:19 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.lua,v 1.3 2003/12/15 21:11:12 jsalmon3 Exp $
+-- $Id: units.lua,v 1.4 2003/12/16 06:02:19 jsalmon3 Exp $
--=============================================================================
-- Define unit-types.
@@ -88,22 +88,21 @@
CanTargetLand = true,
LandUnit = true,
Coward = true,
- CanGatherResource = {
- "file-when-loaded", "human/units/peasant_with_gold.png",
+ CanGatherResources = {
+ {"file-when-loaded", "human/units/peasant_with_gold.png",
"resource-id", "gold",
-- "harvest-from-outside",
"resource-capacity", 100,
"wait-at-resource", 150,
"wait-at-depot", 150},
- CanGatherResource = {
- "file-when-loaded", "human/units/peasant_with_wood.png",
+ {"file-when-loaded", "human/units/peasant_with_wood.png",
"resource-id", "wood",
"resource-capacity", 100,
"resource-step", 2,
"wait-at-resource", 24,
"wait-at-depot", 150,
"lose-resources",
- "terrain-harvester"},
+ "terrain-harvester"}},
organic = True,
SelectableByRectangle = true,
Sounds = {
@@ -464,13 +463,13 @@
Type = "naval",
RightMouseAction = "harvest",
SeaUnit = true, Coward = true,
- CanGatherResource = {
- "file-when-empty", "human/units/oil_tanker_empty.png",
+ CanGatherResources = {
+ {"file-when-empty", "human/units/oil_tanker_empty.png",
"file-when-loaded", "human/units/oil_tanker_full.png",
"resource-id", "oil",
"resource-capacity", 100,
"wait-at-resource", 100,
- "wait-at-depot", 100},
+ "wait-at-depot", 100}},
SelectableByRectangle = true,
Sounds = {
"selected", "human-oil-tanker-selected",
Index: stratagus/data/ccl/orc/units.lua
diff -u stratagus/data/ccl/orc/units.lua:1.3
stratagus/data/ccl/orc/units.lua:1.4
--- stratagus/data/ccl/orc/units.lua:1.3 Tue Dec 16 08:11:13 2003
+++ stratagus/data/ccl/orc/units.lua Tue Dec 16 17:02:19 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.lua,v 1.3 2003/12/15 21:11:13 jsalmon3 Exp $
+-- $Id: units.lua,v 1.4 2003/12/16 06:02:19 jsalmon3 Exp $
--=============================================================================
-- Define unit-types.
@@ -84,21 +84,20 @@
CanTargetLand = true,
LandUnit = true,
Coward = true,
- CanGatherResource = {
- "file-when-loaded", "orc/units/peon_with_gold.png",
+ CanGatherResources = {
+ {"file-when-loaded", "orc/units/peon_with_gold.png",
"resource-id", "gold",
"resource-capacity", 100,
"wait-at-resource", 150,
"wait-at-depot", 150},
- CanGatherResource = {
- "file-when-loaded", "orc/units/peon_with_wood.png",
+ {"file-when-loaded", "orc/units/peon_with_wood.png",
"resource-id", "wood",
"resource-capacity", 100,
"resource-step", 2,
"wait-at-resource", 24,
"wait-at-depot", 150,
"lose-resources",
- "terrain-harvester",},
+ "terrain-harvester"}},
organic = True,
SelectableByRectangle = true,
Sounds = {
@@ -463,13 +462,13 @@
Type = "naval",
RightMouseAction = "harvest",
SeaUnit = true, Coward = true,
- CanGatherResource = {
- "file-when-empty", "orc/units/oil_tanker_empty.png",
+ CanGatherResources = {
+ {"file-when-empty", "orc/units/oil_tanker_empty.png",
"file-when-loaded", "orc/units/oil_tanker_full.png",
"resource-id", "oil",
"resource-capacity", 100,
"wait-at-resource", 100,
- "wait-at-depot", 100 },
+ "wait-at-depot", 100 }},
SelectableByRectangle = true,
Sounds = {
"selected", "orc-oil-tanker-selected",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/data/ccl human/units.lua orc/units.lua,
address@hidden <=