stratagus-cvs
[Top][All Lists]
Advanced

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

[Stratagus-CVS] stratagus/data/ccl constructions.lua human/cons...


From: address@hidden
Subject: [Stratagus-CVS] stratagus/data/ccl constructions.lua human/cons...
Date: 15 Dec 2003 16:50:19 +1100

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       03/12/15 16:50:18

Modified files:
        data/ccl       : constructions.lua 
        data/ccl/human : constructions.lua 
        data/ccl/orc   : constructions.lua 

Log message:
        Changed DefineConstruction to use tables

Patches:
Index: stratagus/data/ccl/constructions.lua
diff -u stratagus/data/ccl/constructions.lua:1.1 
stratagus/data/ccl/constructions.lua:1.2
--- stratagus/data/ccl/constructions.lua:1.1    Sun Nov 30 12:20:24 2003
+++ stratagus/data/ccl/constructions.lua        Mon Dec 15 16:50:17 2003
@@ -26,92 +26,87 @@
 --      along with this program; if not, write to the Free Software
 --      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 --
---     $Id: constructions.lua,v 1.1 2003/11/30 01:20:24 jsalmon3 Exp $
+--     $Id: constructions.lua,v 1.2 2003/12/15 05:50:17 jsalmon3 Exp $
 
 Load("ccl/human/constructions.lua")
 Load("ccl/orc/constructions.lua")
 
-DefineConstruction("construction-none",
-  "file", {
-    "tileset", "summer",
-    "file", "neutral/buildings/land_construction_site.png",
-    "size", {64, 64}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/neutral/buildings/land_construction_site.png",
-    "size", {64, 64}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1},
-    {"percent", 50,
-      "file", "main",
-      "frame", 1}}
-)
+DefineConstruction("construction-none", {
+  Files = {
+   {Tileset = "summer",
+    File = "neutral/buildings/land_construction_site.png",
+    Size = {64, 64}},
+   {Tileset = "winter",
+    File = "tilesets/winter/neutral/buildings/land_construction_site.png",
+    Size = {64, 64}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1},
+   {Percent = 50,
+    File = "main",
+    Frame = 1}}
+})
 
-DefineConstruction("construction-land",
-  "file", {
-    "tileset", "summer",
-    "file", "neutral/buildings/land_construction_site.png",
-    "size", {64, 64}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/neutral/buildings/land_construction_site.png",
-    "size", {64, 64}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1},
-    {"percent", 50,
-      "file", "main",
-      "frame", 1}}
-)
+DefineConstruction("construction-land", {
+  Files = {
+   {Tileset = "summer",
+    File = "neutral/buildings/land_construction_site.png",
+    Size = {64, 64}},
+   {Tileset = "winter",
+    File = "tilesets/winter/neutral/buildings/land_construction_site.png",
+    Size = {64, 64}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1},
+   {Percent = 50,
+    File = "main",
+    Frame = 1}}
+})
 
-DefineConstruction("construction-land2",
-  "file", {
-    "tileset", "summer",
-    "file", "neutral/buildings/land_construction_site.png",
-    "size", {64, 64}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/neutral/buildings/land_construction_site.png",
-    "size", {64, 64}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1}}
-)
+DefineConstruction("construction-land2", {
+  Files = {
+   {Tileset = "summer",
+    File = "neutral/buildings/land_construction_site.png",
+    Size = {64, 64}},
+   {Tileset = "winter",
+    File = "tilesets/winter/neutral/buildings/land_construction_site.png",
+    Size = {64, 64}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1}}
+})
 
-DefineConstruction("construction-wall",
-  "file", {
-    "tileset", "summer",
-    "file", "tilesets/summer/neutral/buildings/wall_construction_site.png",
-    "size", {32, 32}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/neutral/buildings/wall_construction_site.png",
-    "size", {32, 32}},
-  "file", {
-    "tileset", "wasteland",
-    "file", "tilesets/wasteland/neutral/buildings/wall_construction_site.png",
-    "size", {32, 32}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1},
-    {"percent", 50,
-      "file", "main",
-      "frame", 1}}
-)
+DefineConstruction("construction-wall", {
+  Files = {
+   {Tileset = "summer",
+    File = "tilesets/summer/neutral/buildings/wall_construction_site.png",
+    Size = {32, 32}},
+   {Tileset = "winter",
+    File = "tilesets/winter/neutral/buildings/wall_construction_site.png",
+    Size = {32, 32}},
+   {Tileset = "wasteland",
+    File = "tilesets/wasteland/neutral/buildings/wall_construction_site.png",
+    Size = {32, 32}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1},
+   {Percent = 50,
+    File = "main",
+    Frame = 1}}
+})
Index: stratagus/data/ccl/human/constructions.lua
diff -u stratagus/data/ccl/human/constructions.lua:1.1 
stratagus/data/ccl/human/constructions.lua:1.2
--- stratagus/data/ccl/human/constructions.lua:1.1      Sun Nov 30 12:20:24 2003
+++ stratagus/data/ccl/human/constructions.lua  Mon Dec 15 16:50:17 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: constructions.lua,v 1.1 2003/11/30 01:20:24 jsalmon3 Exp $
+--     $Id: constructions.lua,v 1.2 2003/12/15 05:50:17 jsalmon3 Exp $
 
 --=============================================================================
 --     Define a construction.
@@ -34,106 +34,97 @@
 --     (define-construction ident 'files '(tileset-name filename ..)
 --         'size '(x y))
 
-DefineConstruction("construction-alliance-shipyard",
-  "file", {
-    "tileset", "summer",
-    "file", "human/buildings/shipyard_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/human/buildings/shipyard_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "swamp",
-    "file", "tilesets/swamp/human/buildings/shipyard_construction_site.png",
-    "size", {96, 96}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1},
-    {"percent", 50,
-      "file", "main",
-      "frame", 1}}
-)
+DefineConstruction("construction-alliance-shipyard", {
+  Files = {
+   {Tileset = "summer",
+    File = "human/buildings/shipyard_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "winter",
+    File = "tilesets/winter/human/buildings/shipyard_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "swamp",
+    File = "tilesets/swamp/human/buildings/shipyard_construction_site.png",
+    Size = {96, 96}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1},
+   {Percent = 50,
+    File = "main",
+    Frame = 1}}
+})
 
-DefineConstruction("construction-alliance-oil-well",
-  "file", {
-    "tileset", "summer",
-    "file", "tilesets/summer/human/buildings/oil_well_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/human/buildings/oil_well_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "wasteland",
-    "file", 
"tilesets/wasteland/human/buildings/oil_well_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "swamp",
-    "file", 
"tilesets/swamp/human/buildings/oil_platform_construction_site.png",
-    "size", {96, 96}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1},
-    {"percent", 50,
-      "file", "main",
-      "frame", 1}}
-)
+DefineConstruction("construction-alliance-oil-well", {
+  Files = {
+   {Tileset = "summer",
+    File = "tilesets/summer/human/buildings/oil_well_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "winter",
+    File = "tilesets/winter/human/buildings/oil_well_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "wasteland",
+    File = "tilesets/wasteland/human/buildings/oil_well_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "swamp",
+    File = "tilesets/swamp/human/buildings/oil_platform_construction_site.png",
+    Size = {96, 96}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1},
+   {Percent = 50,
+    File = "main",
+    Frame = 1}}
+})
 
-DefineConstruction("construction-alliance-refinery",
-  "file", {
-    "tileset", "summer",
-    "file", "human/buildings/refinery_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/human/buildings/refinery_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "swamp",
-    "file", "tilesets/swamp/human/buildings/refinery_construction_site.png",
-    "size", {96, 96}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1},
-    {"percent", 50,
-      "file", "main",
-      "frame", 1}}
-)
+DefineConstruction("construction-alliance-refinery", {
+  Files = {
+   {Tileset = "summer",
+    File = "human/buildings/refinery_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "winter",
+    File = "tilesets/winter/human/buildings/refinery_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "swamp",
+    File = "tilesets/swamp/human/buildings/refinery_construction_site.png",
+    Size = {96, 96}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1},
+   {Percent = 50,
+    File = "main",
+    Frame = 1}}
+})
 
-DefineConstruction("construction-alliance-foundry",
-  "file", {
-    "tileset", "summer",
-    "file", "human/buildings/foundry_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/human/buildings/foundry_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "swamp",
-    "file", "tilesets/swamp/human/buildings/foundry_construction_site.png",
-    "size", {96, 96}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1},
-    {"percent", 50,
-      "file", "main",
-      "frame", 1}}
-)
+DefineConstruction("construction-alliance-foundry", {
+  Files = {
+   {Tileset = "summer",
+    File = "human/buildings/foundry_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "winter",
+    File = "tilesets/winter/human/buildings/foundry_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "swamp",
+    File = "tilesets/swamp/human/buildings/foundry_construction_site.png",
+    Size = {96, 96}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1},
+   {Percent = 50,
+    File = "main",
+    Frame = 1}}
+})
Index: stratagus/data/ccl/orc/constructions.lua
diff -u stratagus/data/ccl/orc/constructions.lua:1.1 
stratagus/data/ccl/orc/constructions.lua:1.2
--- stratagus/data/ccl/orc/constructions.lua:1.1        Sun Nov 30 12:20:24 2003
+++ stratagus/data/ccl/orc/constructions.lua    Mon Dec 15 16:50:18 2003
@@ -26,109 +26,100 @@
 --      along with this program; if not, write to the Free Software
 --      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 --
---     $Id: constructions.lua,v 1.1 2003/11/30 01:20:24 jsalmon3 Exp $
+--     $Id: constructions.lua,v 1.2 2003/12/15 05:50:18 jsalmon3 Exp $
 
 
-DefineConstruction("construction-mythical-shipyard",
-  "file", {
-    "tileset", "summer",
-    "file", "orc/buildings/shipyard_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/orc/buildings/shipyard_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "swamp",
-    "file", "tilesets/swamp/orc/buildings/shipyard_construction_site.png",
-    "size", {96, 96}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1},
-    {"percent", 50,
-      "file", "main",
-      "frame", 1}}
-)
+DefineConstruction("construction-mythical-shipyard", {
+  Files = {
+   {Tileset = "summer",
+    File = "orc/buildings/shipyard_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "winter",
+    File = "tilesets/winter/orc/buildings/shipyard_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "swamp",
+    File = "tilesets/swamp/orc/buildings/shipyard_construction_site.png",
+    Size = {96, 96}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1},
+   {Percent = 50,
+    File = "main",
+    Frame = 1}}
+})
 
-DefineConstruction("construction-mythical-oil-well",
-  "file", {
-    "tileset", "summer",
-    "file", "tilesets/summer/orc/buildings/oil_well_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/orc/buildings/oil_well_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "wasteland",
-    "file", "tilesets/wasteland/orc/buildings/oil_well_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "swamp",
-    "file", "tilesets/swamp/orc/buildings/oil_platform_construction_site.png",
-    "size", {96, 96}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1},
-    {"percent", 50,
-      "file", "main",
-      "frame", 1}}
-)
+DefineConstruction("construction-mythical-oil-well", {
+  Files = {
+   {Tileset = "summer",
+    File = "tilesets/summer/orc/buildings/oil_well_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "winter",
+    File = "tilesets/winter/orc/buildings/oil_well_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "wasteland",
+    File = "tilesets/wasteland/orc/buildings/oil_well_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "swamp",
+    File = "tilesets/swamp/orc/buildings/oil_platform_construction_site.png",
+    Size = {96, 96}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1},
+   {Percent = 50,
+    File = "main",
+    Frame = 1}}
+})
 
-DefineConstruction("construction-mythical-refinery",
-  "file", {
-    "tileset", "summer",
-    "file", "orc/buildings/refinery_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/orc/buildings/refinery_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "swamp",
-    "file", "tilesets/swamp/orc/buildings/refinery_construction_site.png",
-    "size", {96, 96}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1},
-    {"percent", 50,
-      "file", "main",
-      "frame", 1}}
-)
+DefineConstruction("construction-mythical-refinery", {
+  Files = {
+   {Tileset = "summer",
+    File = "orc/buildings/refinery_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "winter",
+    File = "tilesets/winter/orc/buildings/refinery_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "swamp",
+    File = "tilesets/swamp/orc/buildings/refinery_construction_site.png",
+    Size = {96, 96}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1},
+   {Percent = 50,
+    File = "main",
+    Frame = 1}}
+})
 
-DefineConstruction("construction-mythical-foundry",
-  "file", {
-    "tileset", "summer",
-    "file", "orc/buildings/foundry_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "winter",
-    "file", "tilesets/winter/orc/buildings/foundry_construction_site.png",
-    "size", {96, 96}},
-  "file", {
-    "tileset", "swamp",
-    "file", "tilesets/swamp/orc/buildings/foundry_construction_site.png",
-    "size", {96, 96}},
-  "constructions", {
-    {"percent", 0,
-      "file", "construction",
-      "frame", 0},
-    {"percent", 25,
-      "file", "construction",
-      "frame", 1},
-    {"percent", 50,
-      "file", "main",
-      "frame", 1}}
-)
+DefineConstruction("construction-mythical-foundry", {
+  Files = {
+   {Tileset = "summer",
+    File = "orc/buildings/foundry_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "winter",
+    File = "tilesets/winter/orc/buildings/foundry_construction_site.png",
+    Size = {96, 96}},
+   {Tileset = "swamp",
+    File = "tilesets/swamp/orc/buildings/foundry_construction_site.png",
+    Size = {96, 96}}},
+  Constructions = {
+   {Percent = 0,
+    File = "construction",
+    Frame = 0},
+   {Percent = 25,
+    File = "construction",
+    Frame = 1},
+   {Percent = 50,
+    File = "main",
+    Frame = 1}}
+})




reply via email to

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