Merge lp:~timfelgentreff/war1gus/war1gus into lp:war1gus

[timfelgentreff]

Just some general steps, extract campaign maps in sms format, fix png extraction and some menu layouts. tilesets and units are still mostly non-functional, just thought I'd share the progress I have.

[Travis (dinky-dye-aussie)]

So is this usable yet? I'd love to test it out but can't compile using VC2012. Any chance when it IS available to test you could send me a win32 exe file?

[timfelgentreff (timfelgentreff)]

I only managed to compile on windows through cygwin. I can send you that binary+cygwin.dll

as to useable: you can launch in 640x400, and start the first two maps of the human campaign (because only the forest tileset works, currently). Objectives don't work, but you can go around and kill all Orcs, you can send your peasant to collect gold. Harvesting trees or attempting to build barracks segfaults for some reason I haven't investigated. You can train new peasants. The forest tileset isn't complete, walls are missing and water can be walked on. however, it is in a state now where one could go through and fix units and building properties and test them in the first few maps. oh, and buildings run away when attacked :)

[Kyran Jackson (erstmap)]

Buildings run away when attacked? I approve.

review: Approve

[lp:~timfelgentreff/war1gus/war1gus]

117. By timfelgentreff on 2013-04-29

compile on windows

118. By timfelgentreff on 2013-04-29

enable some buttons

[timfelgentreff (timfelgentreff)]

> So is this usable yet? I'd love to test it out but can't compile using VC2012.

Hi Travis, I just pushed a CMakeLists.txt and fixed compilation on VC2010.

[Pali (pali)]

Two comments for CMakeLists.txt:
1. Do you really need signed char by default?
2. Install destination for war1tool is bad: install(TARGETS war1tool DESTINATION ".") - It should be "bin" instead "."

[lp:~timfelgentreff/war1gus/war1gus]

119. By timfelgentreff on 2013-04-29

fix CMakeLists according to feedback

[timfelgentreff (timfelgentreff)]

Thanks for the comment, done

[Travis (dinky-dye-aussie)]

OMG it works! It compiles, it extracts! The only thing it doesn't do is run... :(

I used the parameter:

stratagus -d c:\games\war1gus to point it at the directory with the war1gus data in it, but it won't run...I'll try again later, I'm hell tired right now...

Great work tho guys! We're on our way!

[timfelgentreff (timfelgentreff)]

@Travis have you copied the script and 3rd directories into the data directory? Also, use -v 640x400, it's the only working resolution right now

[Travis (dinky-dye-aussie)]

did not copy the "3rd" into the war1gus folder. Just tried it and now the game works. :) I'm stoked this game's beginning to be developed. can't wait to get it going more in terms of scripts.

I'll try to get rid of the moving building bug now.

[Pali (pali)]

In stratagus/wargus there is convention to store 3rd parts in "contrib" folder, so rename 3rd to contrib.
Btw, where did you get those fonts?

[timfelgentreff (timfelgentreff)]

I'll rename it. I made the font graphics in Gimp.

[lp:~timfelgentreff/war1gus/war1gus]

120. By timfelgentreff on 2013-05-01

orc and human ui button layout should be the same

121. By timfelgentreff on 2013-05-01

rename 3rd directory to contrib, extract videos at better quality

122. By timfelgentreff on 2013-05-01

reflect directory rename in scripts

123. By timfelgentreff on 2013-05-01

fix mapping of extracted texts to mission briefings

124. By timfelgentreff on 2013-05-01

play map videos before missions

125. By timfelgentreff on 2013-05-02

refactor unit definitions to be more dry

126. By timfelgentreff on 2013-05-02

unify UI, Unit, and building definitions

127. By timfelgentreff on 2013-05-02

enable sounds

128. By timfelgentreff on 2013-05-02

remove obsolete files, add wc1 cheats

129. By timfelgentreff on 2013-05-02

make attacking work again

130. By timfelgentreff on 2013-05-03

fix tileset forest so water cannot be walked on and we can chop trees. still glitches when chopping trees.

131. By timfelgentreff on 2013-05-03

rename unit type for lumber mills

132. By timfelgentreff on 2013-05-03

fixes for both forest and swamp tilesets

133. By timfelgentreff on 2013-05-03

fix some button positions for orcs

134. By timfelgentreff on 2013-05-03

make sure we define building images for swamp

135. By timfelgentreff on 2013-05-03

fill unit and structure stats with info from wowwiki

136. By timfelgentreff on 2013-05-05

hardcode names, objectives, and tilesets for campaign maps

137. By timfelgentreff on 2013-05-05

fix spaces in hardcoded objectives

138. By timfelgentreff on 2013-05-05

non-segfaulting (but wrong) version of dungeon tileset

139. By timfelgentreff on 2013-05-05

add remaining units required for campaign maps to generate properly, and fixes so all campaign maps launch

140. By timfelgentreff on 2013-05-05

stub animations for elementals

141. By timfelgentreff on 2013-05-05

revert debugging code

[timfelgentreff (timfelgentreff)]

Hi, just a quick update, the current state of the code allows to launch all campaign maps. The units should have the right stats, too. Dungeon tilesets don't work, but forest and swamp do. Most missions have names and proper triggers for their objectives, some triggers aren't quite correct. Victory menu isn't wired up, but you can go and win the first three missions for humans and orcs and end up back in the main menu.

Open issues are finishing/bugfixing all tilesets (e.g. chopping wood uses the wrong tiles), adding all spells,, making sure the tech-tree is restricted in the campaign, and wiring up all the menus and screens properly.

[Travis (dinky-dye-aussie)]

So I've downloaded the latest trunk, compiled wartool.c so as to take advantage of all the fixes, and yet when I try to run the game, it crashes AS SOON as I load the first campaign map. ???????????

Why isn't it working for me? it doesn't give me any error messages or anything to say what it going on. What am I not doing to get this working? I'm sure it must be a script problem...Are you guys having any problems with it crashing?

[timfelgentreff (timfelgentreff)]

@Travis I just did a fresh rebuild, and while it does work on Windows using VS2010, it crashes on Ubuntu. The crash was here:
@@ -817,7 +817,7 @@
        CUnit &unit = this->GetUnit(i);
                if (unit.IsAlive() && unit.Type->Harvester && unit.Type->ResInfo && !unit.Removed) {
                        if (unit.CurrentAction() == UnitActionStill) {
                               FreeWorkers.push_back(&unit);
                        }
                }
        }

What happened was that all units where marked as harvesters (because I set CanGatherResources to default to {}). I pushed a fix in scripts/units.lua

[Travis (dinky-dye-aussie)]

yeah got the fixed scripts and it works now :) I also got the water and swamps color cycling now as well (looks like the liquid is lapping at the shore, and also the resources now change when you mine/harvest.

if you can add this line:

DefineDefaultResourceMaxAmounts(-1, -1, -1, -1, -1, -1, -1)

to the war1gus stratagus.lua file just below the line:

DefineDefaultResourceAmounts("gold", 100000, "oil", 50000)

then the resources behave properly and the game recognizes this.

Also for the Color Cycling, add:

AddColorCyclingRange(114, 118) -- water coast boundry

to the bottom of both forest.lua and swamp.lua files

Let me know if I need to do anything to these parameters man. This is fun stuff. Good work mate keep it up :)

[timfelgentreff (timfelgentreff)]

thanks Travis, I added your fixes

[Travis (dinky-dye-aussie)]

Thankyou Tim, for adding my fixes! :)

I think today I will work on the interfaces for the game. I tested my resolution (1680x1050), with the game last night, and it worked great :) So I will perform the task of creating new interface pieces with the skinner left side piece, to stay true to Warcraft 1 convention of being able to only select 4 units instead of 9.

I will post shots of this on forums.stratagus.com so every can see and comment/critique my work. :)

Peace out fellas, I'm having a ball bringin these games back to the new gamers!

[Pali (pali)]

@timfelgentreff: I think that nobody else working on war1gus now. So go ahead, commit all patches to trunk and use directly war1gus trunk branch for development. If you do not have commit permission to war1gus, join to Stratagus team: https://launchpad.net/~stratagus

review: Approve

[Kyran Jackson (erstmap)]

I was waiting to see what Joris would say, but I'm sure it'll be fine to merge.

[Joris Dauphin (joris-dauphin)]

I don't work actively on war1gus...
I didn't test the merge.
I have no objection.

review: Approve

[lp:~timfelgentreff/war1gus/war1gus]

142. By timfelgentreff on 2013-05-05

fix dungeon tileset

143. By timfelgentreff on 2013-05-07

define some spells and human buttons

144. By timfelgentreff on 2013-05-08

fix cleric spells, summon elemental and rain of fire working

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2013-05-08 07:16:26 +0000
@@ -0,0 +1,40 @@
+#    CMakeLists.txt
+#    Copyright (C) 2013  Tim Felgentreff <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+project(war1gus)
+cmake_minimum_required(VERSION 2.6)
+
+set(war1gus_SRCS
+   war1tool.c
+   xmi2mid.cpp
+)
+
+set(war1gus_HDRS xmi2mid.h)
+
+find_package(PNG REQUIRED)
+find_package(ZLIB REQUIRED)
+
+include_directories(${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
+set(war1gus_LIBS ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
+
+add_executable(war1tool ${war1gus_SRCS} ${war1gus_HDRS})
+target_link_libraries(war1tool ${war1gus_LIBS})
+install(TARGETS war1tool DESTINATION "bin")
+
+if (WIN32 AND MSVC)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE=1)
+	set_target_properties(war1tool PROPERTIES LINK_FLAGS "${LINK_FLAGS} /NODEFAULTLIB:MSVCRT")
+endif()

=== modified file 'build.sh'
--- build.sh	2010-06-22 06:38:48 +0000
+++ build.sh	2013-05-08 07:16:26 +0000
@@ -92,6 +92,9 @@
 rm -Rf `find $DIR/scripts | grep cvsignore`
 rm -Rf `find $DIR/scripts | grep .svn`
 
+# copy our game fonts
+cp -R contrib $DIR/
+
 $BINPATH/war1tool "$DATADIR" "$DIR" || exit
 
 # Copy flv animation and convert to theora
@@ -105,7 +108,7 @@
 		OUTPUT="$DIR/videos/${f%%.war}"
 		OUTPUT=${OUTPUT%%.WAR}.avi
 		OUTPUT="`echo $OUTPUT | tr A-Z a-z`"
-		ffmpeg2theora "$DATADIR/$f" -o "$OUTPUT"
+		ffmpeg2theora "$DATADIR/$f" --resize-method lanczos -v 10 --max_size 640 -o "$OUTPUT"
 	fi
 done
 

=== added directory 'contrib'
=== added directory 'contrib/fonts'
=== added file 'contrib/fonts/game.png'
Binary files contrib/fonts/game.png	1970-01-01 00:00:00 +0000 and contrib/fonts/game.png	2013-05-08 07:16:26 +0000 differ
=== added file 'contrib/fonts/large.png'
Binary files contrib/fonts/large.png	1970-01-01 00:00:00 +0000 and contrib/fonts/large.png	2013-05-08 07:16:26 +0000 differ
=== added file 'contrib/fonts/large_episode_titles.png'
Binary files contrib/fonts/large_episode_titles.png	1970-01-01 00:00:00 +0000 and contrib/fonts/large_episode_titles.png	2013-05-08 07:16:26 +0000 differ
=== added file 'contrib/fonts/small.png'
Binary files contrib/fonts/small.png	1970-01-01 00:00:00 +0000 and contrib/fonts/small.png	2013-05-08 07:16:26 +0000 differ
=== added file 'contrib/fonts/small_episode_titles.png'
Binary files contrib/fonts/small_episode_titles.png	1970-01-01 00:00:00 +0000 and contrib/fonts/small_episode_titles.png	2013-05-08 07:16:26 +0000 differ
=== added file 'scripts/buildings.lua'
--- scripts/buildings.lua	1970-01-01 00:00:00 +0000
+++ scripts/buildings.lua	2013-05-08 07:16:26 +0000
@@ -0,0 +1,206 @@
+--       _________ __                 __                               
+--      /   _____//  |_____________ _/  |______     ____  __ __  ______
+--      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
+--      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
+--     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
+--             \/                  \/          \//_____/            \/ 
+--  ______________________                           ______________________
+--                        T H E   W A R   B E G I N S
+--         Stratagus - A free fantasy real time strategy game engine
+--
+--      constructions.lua - Define the constructions.
+--
+--      (c) Copyright 2001-2004 by Lutz Sammer and Jimmy Salmon
+--
+--      This program is free software; you can redistribute it and/or modify
+--      it under the terms of the GNU General Public License as published by
+--      the Free Software Foundation; either version 2 of the License, or
+--      (at your option) any later version.
+--  
+--      This program is distributed in the hope that it will be useful,
+--      but WITHOUT ANY WARRANTY; without even the implied warranty of
+--      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--      GNU General Public License for more details.
+--  
+--      You should have received a copy of the GNU General Public License
+--      along with this program; if not, write to the Free Software
+--      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+--
+--      $Id$
+
+UnitTypeFiles = {}
+
+if (war1gus.tileset == nil) then
+  war1gus.tileset = "forest"
+end
+
+local buildings = {
+   {Names = {orc = "Farm", human = "Farm"},
+    Costs = {"time", 100, "gold", 500, "wood", 300},
+    HitPoints = 400,
+    Supply = 5,
+    Size = {96, 96}},
+
+   {Names = {orc = "Blacksmith", human = "Blacksmith"},
+    Costs = {"time", 150, "gold", 900, "wood", 400},
+    HitPoints = 800,
+    Size = {96, 96}},
+
+   {Names = {orc = "Tower", human = "Tower"},
+    Costs = {"time", 200, "gold", 1400, "wood", 300},
+    HitPoints = 900,
+    Size = {96, 96}},
+
+   {Names = {orc = "Kennel"},
+    Costs = {"time", 150, "gold", 1000, "wood", 400},
+    HitPoints = 500,
+    Size = {128, 96}},
+
+   {Names = {human = "Stable"},
+    Costs = {"time", 150, "gold", 1000, "wood", 400},
+    HitPoints = 500,
+    Size = {128, 128}},
+
+   {Names = {orc = "Barracks", human = "Barracks"},
+    Costs = {"time", 150, "gold", 600, "wood", 500},
+    HitPoints = 800,
+    Size = {128, 128}},
+
+   {Names = {orc = "Lumber mill", human = "Lumber mill"},
+    Costs = {"time", 150, "gold", 600, "wood", 500},
+    HitPoints = 600,
+    CanStore = {"wood"},
+    Size = {128, 128}},
+
+   {Names = {orc = "Town hall", human = "Town hall"},
+    Costs = {"time", 100, "gold", 400, "wood", 400},
+    HitPoints = 2500,
+    CanStore = {"wood", "gold"},
+    Supply = 5,
+    Size = {128, 128}},
+
+   {Names = {human = "Church", orc = "Temple"},
+    Costs = {"time", 200, "gold", 800, "wood", 500},
+    HitPoints = 700,
+    Size = {128, 128}},
+
+   {Names = {human = "Stormwind keep", orc = "Blackrock spire"},
+    Costs = {"time", 100, "gold", 500, "wood", 250},
+    HitPoints = 5000,
+    Size = {160, 160},
+    NotConstructable = true,
+    Corpse = "unit-destroyed-3x3-place"}}
+
+-- create buildings and their constructions from specs
+for idx,building in ipairs(buildings) do
+   for race,name in pairs(building.Names) do
+      local size = building.Size
+      local filename = string.lower(string.gsub(name, " ", "_"))
+      local fullname = race .. "-" .. string.gsub(filename, "_", "-")
+      local files = {
+	 forest = ("tilesets/forest/" .. race ..
+		      "/buildings/" .. filename .. "_construction.png"),
+	 swamp = ("tilesets/swamp/" .. race ..
+		     "/buildings/" .. filename .. "_construction.png") }
+
+      if not building.NotConstructable then
+	 DefineConstruction(
+	    "construction-" .. fullname,
+	    {Files = {
+		File = files[war1gus.tileset],
+		Size = size},
+	     Constructions = {
+		{Percent = 0,
+		 File = "construction",
+		 Frame = 0},
+		{Percent = 33,
+		 File = "construction",
+		 Frame = 1},
+		{Percent = 67,
+		 File = "construction",
+		 Frame = 2}}})
+      end
+
+      UnitTypeFiles["unit-" .. fullname] = {
+	 forest = ("tilesets/forest/" .. race ..
+		      "/buildings/" .. filename .. ".png"),
+	 swamp = ("tilesets/swamp/" .. race ..
+		     "/buildings/" .. filename .. ".png") }
+
+      local unitType = {
+	 Name = name,
+	 Image = {"size", size},
+	 Animations = "animations-building",
+	 Icon = "icon-" .. fullname,
+	 Costs = building.Costs,
+	 RepairHp = 4,
+	 RepairCosts = {"gold", 1, "wood", 1},
+	 Construction = "construction-" .. fullname,
+	 HitPoints = building.HitPoints,
+	 DrawLevel = 20,
+	 TileSize = { size[1] / 32 - 1, size[2] / 32 - 1 },
+	 BoxSize = { size[1] - 1, size[2] - 1 },
+	 SightRange = 1,
+	 Armor =  20,
+	 BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
+	 RightMouseAction = "none",
+	 Type = "land",
+	 CanAttack = false,
+	 Coward = false,
+	 Priority = 20,
+	 AnnoyComputerFactor = 45,
+	 Points = 100,
+	 Supply = 0,
+	 CanStore = {},
+	 Corpse = "unit-destroyed-2x2-place",
+	 ExplodeWhenKilled = "missile-explosion",
+	 Type = "land",
+	 Building = true,
+	 VisibleUnderFog = true,
+	 Sounds = {
+	    "ready", race .. " work complete",
+	    "selected", fullname .. "-selected",
+	    "help", race .. " help 4",
+	    "dead", "building destroyed"}}
+
+	 for k,v in pairs(building) do
+	    if unitType[k] then
+	       unitType[k] = v
+	    end
+	 end
+	 DefineUnitType("unit-" .. fullname, unitType)
+
+   end
+end
+
+UnitTypeFiles["unit-gold-mine"] = {
+  forest = "tilesets/forest/neutral/buildings/gold_mine.png",
+  swamp = "tilesets/swamp/neutral/buildings/gold_mine.png"
+}
+
+DefineUnitType("unit-gold-mine", { Name = "Gold Mine",
+  Image = {"size", {128, 128}},
+  Animations = "animations-building", Icon = "icon-gold-mine",
+  NeutralMinimapColor = {255, 255, 0},
+  Costs = {"time", 150},
+  Construction = "construction-none",
+--  Speed = 0,
+  HitPoints = 25500,
+  DrawLevel = 40,
+  TileSize = {3, 3}, BoxSize = {95, 95},
+  SightRange = 1,
+  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
+  Priority = 0,
+  Corpse = "unit-destroyed-3x3-place",
+  ExplodeWhenKilled = "missile-explosion",
+  Type = "land",
+  Building = true, VisibleUnderFog = true,
+  GivesResource = "gold", CanHarvest = true,
+  Sounds = {
+    "selected", "gold-mine-selected",
+    "acknowledge", "gold-mine-acknowledge",
+    "ready", "gold-mine-ready",
+    "help", "gold-mine-help",
+    "dead", "building destroyed",
+--    "attack", "gold-mine-attack"
+}} )

=== modified file 'scripts/buttons.lua'
--- scripts/buttons.lua	2009-05-22 16:30:00 +0000
+++ scripts/buttons.lua	2013-05-08 07:16:26 +0000
@@ -34,6 +34,9 @@
 Load("scripts/human/buttons.lua")
 Load("scripts/orc/buttons.lua")
 
+-- general buttons -----------------------------------------------------------
+
+
 ------------------------------------------------------------------------------
 --  Define unit-button.
 --
@@ -45,22 +48,22 @@
 
 -- general cancel button ------------------------------------------------------
 
-DefineButton( { Pos = 6, Level = 9, Icon = "icon-cancel",
+DefineButton( { Pos = 5, Level = 9, Icon = "icon-cancel",
   Action = "cancel",
   Key = "\27", Hint = "~<ESC~> CANCEL",
   ForUnit = {"*"} } )
 
-DefineButton( { Pos = 6, Level = 0, Icon = "icon-cancel",
+DefineButton( { Pos = 5, Level = 0, Icon = "icon-cancel",
   Action = "cancel-upgrade",
   Key = "\27", Hint = "~<ESC~> CANCEL UPGRADE",
   ForUnit = {"cancel-upgrade"} } )
 
-DefineButton( { Pos = 6, Level = 0, Icon = "icon-cancel",
+DefineButton( { Pos = 5, Level = 0, Icon = "icon-cancel",
   Action = "cancel-train-unit",
   Key = "\27", Hint = "~<ESC~> CANCEL UNIT TRAINING",
   ForUnit = {"*"} } )
 
-DefineButton( { Pos = 6, Level = 0, Icon = "icon-cancel",
+DefineButton( { Pos = 5, Level = 0, Icon = "icon-cancel",
   Action = "cancel-build",
   Key = "\27", Hint = "~<ESC~> CANCEL CONSTRUCTION",
   ForUnit = {"cancel-build"} } )

=== removed file 'scripts/campaigns.lua'
--- scripts/campaigns.lua	2010-06-22 06:44:07 +0000
+++ scripts/campaigns.lua	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
---       _________ __                 __                               
---      /   _____//  |_____________ _/  |______     ____  __ __  ______
---      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
---      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
---     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
---             \/                  \/          \//_____/            \/ 
---  ______________________                           ______________________
---                        T H E   W A R   B E G I N S
---         Stratagus - A free fantasy real time strategy game engine
---
---      campaigns.lua - Define the used campaigns.
---
---      (c) Copyright 2002-2004 by Lutz Sammer and Jimmy Salmon
---
---      This program is free software; you can redistribute it and/or modify
---      it under the terms of the GNU General Public License as published by
---      the Free Software Foundation; either version 2 of the License, or
---      (at your option) any later version.
---  
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warranty of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
---  
---      You should have received a copy of the GNU General Public License
---      along with this program; if not, write to the Free Software
---      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
---
---      $Id$
-
---=============================================================================
---  Define all campaigns.
-
---[[
-DefineCampaign("human", "name", "~!Human campaign",
-  "file", "scripts/human/campaign1.lua")
-DefineCampaign("orc", "name", "~!Orc campaign",
-  "file", "scripts/orc/campaign1.lua")
-if (expansion) then
-  DefineCampaign("human-exp", "name", "H~!uman expansion levels",
-    "file", "scripts/human/campaign2.lua")
-  DefineCampaign("orc-exp", "name", "O~!rc expansion levels",
-    "file", "scripts/orc/campaign2.lua")
-end
-]]

=== modified file 'scripts/cheats.lua'
--- scripts/cheats.lua	2009-05-22 16:30:00 +0000
+++ scripts/cheats.lua	2013-05-08 07:16:26 +0000
@@ -34,27 +34,30 @@
 function HandleCheats(str)
   local resources = { "gold", "wood", "oil" }
 
-  if (str == "there is no aliens level") then
-    -- FIXME: no function yet
-    AddMessage("cheat enabled")
+  if (str == "eye of newy") then
+    -- FIXME: no function yet
+    AddMessage("All wizard spells cheat ... not working yet")
+
+  elseif (str == "ides of march") then
+    -- FIXME: no function yet
+    AddMessage("Final campaign sequence cheat ... not working yet")
+
+  elseif (str == "iron forge") then
+    -- FIXME: no function yet
+    AddMessage("Upgraded technology cheat ... not working yet")
 
   elseif (str == "hatchet") then
     SetSpeedResourcesHarvest("wood", 52 / 2)
     AddMessage("Wow -- I got jigsaw!")
 
-  elseif (str == "glittering prizes") then
+  elseif (str == "pot of gold") then
     SetPlayerData(GetThisPlayer(), "Resources", "gold",
-      GetPlayerData(GetThisPlayer(), "Resources", "gold") + 12000)
+      GetPlayerData(GetThisPlayer(), "Resources", "gold") + 10000)
     SetPlayerData(GetThisPlayer(), "Resources", "wood",
       GetPlayerData(GetThisPlayer(), "Resources", "wood") + 5000)
-    SetPlayerData(GetThisPlayer(), "Resources", "oil",
-      GetPlayerData(GetThisPlayer(), "Resources", "oil") + 5000)
     AddMessage("!!! :)")
 
-  elseif (str == "on screen") then
-    RevealMap()
-
-  elseif (str == "showpath") then
+  elseif (str == "sally shears") then
     RevealMap()
 
   elseif (str == "fow on") then
@@ -85,7 +88,7 @@
     SetSpeedResearch(1)
     AddMessage("NORMAL DEBUG SPEED")
 
-  elseif (str == "make it so") then
+  elseif (str == "hurry up guys") then
     if (speedcheat) then
       speedcheat = false
       for i = 1,table.getn(resources) do
@@ -114,13 +117,13 @@
       AddMessage("SO!")
     end
 
-  elseif (str == "unite the clans") then
+  elseif (str == "yours truly") then
     ActionVictory()
 
-  elseif (str == "you pitiful worm") then
+  elseif (str == "crushing defeat") then
     ActionDefeat()
 
-  elseif (str == "it is a good day to die") then
+  elseif (str == "there can be only one") then
     if (godcheat) then
       godcheat = false
       SetGodMode(false)
@@ -131,11 +134,9 @@
       AddMessage("God Mode ON")
     end
 
-  elseif (str == "fill mana") then
-    t = GetUnits("this");
-    for i = 1,table.getn(t) do
-      SetUnitMana(t[i], 255)
-    end
+  elseif (str == "chronus") then
+     SetSpeedUpgrade(10)
+     SetSpeedResearch(10)
 
   else
     return false

=== removed file 'scripts/constructions.lua'
--- scripts/constructions.lua	2010-11-16 22:33:39 +0000
+++ scripts/constructions.lua	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
---       _________ __                 __                               
---      /   _____//  |_____________ _/  |______     ____  __ __  ______
---      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
---      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
---     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
---             \/                  \/          \//_____/            \/ 
---  ______________________                           ______________________
---                        T H E   W A R   B E G I N S
---         Stratagus - A free fantasy real time strategy game engine
---
---      constructions.lua - Define the constructions.
---
---      (c) Copyright 2001-2004 by Lutz Sammer and Jimmy Salmon
---
---      This program is free software; you can redistribute it and/or modify
---      it under the terms of the GNU General Public License as published by
---      the Free Software Foundation; either version 2 of the License, or
---      (at your option) any later version.
---  
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warranty of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
---  
---      You should have received a copy of the GNU General Public License
---      along with this program; if not, write to the Free Software
---      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
---
---      $Id$
-
-Load("scripts/human/constructions.lua")
-Load("scripts/orc/constructions.lua")
---[[
-DefineConstruction("construction-none", {
-  Files = {
-    File = "tilesets/wall_construction_site.png",
-    Size = {32, 32}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
---]]
---[[
-DefineConstruction("construction-wall", {
-  Files = {
-    File = "tilesets/wall_construction_site.png",
-    Size = {32, 32}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "main",
-    Frame = 1}}
-})
---]]
\ No newline at end of file

=== modified file 'scripts/editor.lua'
--- scripts/editor.lua	2010-11-22 10:49:13 +0000
+++ scripts/editor.lua	2013-05-08 07:16:26 +0000
@@ -59,7 +59,7 @@
   "unit-human-stable",
   "unit-human-church",
   "unit-human-tower",
-  "unit-stormwind-keep",
+  "unit-human-stormwind-keep",
 
 --- - - - - - - - - - - - - - - - - - -
 
@@ -83,7 +83,7 @@
   "unit-orc-kennel",
   "unit-orc-temple",
   "unit-orc-tower",
-  "unit-blackrock-spire",
+  "unit-orc-blackrock-spire",
 
 --- - - - - - - - - - - - - - - - - - -
 
@@ -110,4 +110,4 @@
 Editor.UnitTypes:clear()
 for key,value in ipairs(editor_types) do
   Editor.UnitTypes:push_back(value)
-end
\ No newline at end of file
+end

=== modified file 'scripts/fonts.lua'
--- scripts/fonts.lua	2010-11-16 22:33:39 +0000
+++ scripts/fonts.lua	2013-05-08 07:16:26 +0000
@@ -28,11 +28,11 @@
 --
 --      $Id$
 
-CFont:New("small", CGraphic:New("3rd/fonts/small.png", 7, 6))
-CFont:New("game", CGraphic:New("3rd/fonts/game.png", 13, 14))
-CFont:New("large", CGraphic:New("3rd/fonts/large.png", 17, 17))
-CFont:New("small-title", CGraphic:New("3rd/fonts/small_episode_titles.png", 32, 35))
-CFont:New("large-title", CGraphic:New("3rd/fonts/large_episode_titles.png", 52, 50))
+CFont:New("small", CGraphic:New("contrib/fonts/small.png", 7, 6))
+CFont:New("game", CGraphic:New("contrib/fonts/game.png", 13, 14))
+CFont:New("large", CGraphic:New("contrib/fonts/large.png", 17, 17))
+CFont:New("small-title", CGraphic:New("contrib/fonts/small_episode_titles.png", 32, 35))
+CFont:New("large-title", CGraphic:New("contrib/fonts/large_episode_titles.png", 52, 50))
 
 --[[
 DefineFont({
@@ -42,7 +42,7 @@
 DefineFont({
   Name = "game",
   File = "ui/fonts/game.png",
-  Size = {13, 14}})
+  Size = {15, 14}})
 DefineFont({
   Name = "large",
   File = "ui/fonts/large.png",

=== modified file 'scripts/guichan.lua'
--- scripts/guichan.lua	2010-12-13 20:53:19 +0000
+++ scripts/guichan.lua	2013-05-08 07:16:26 +0000
@@ -471,6 +471,26 @@
   menu:run()
 end
 
+function RunSinglePlayerSubMenu()
+  local menu = WarMenu()
+  local offx = (Video.Width - 640) / 2
+  local offy = (Video.Height - 480) / 2
+
+  menu:addFullButton("~!Solo Game", "s", offx + 208, offy + 104 + 36*3,
+    function() RunSinglePlayerGameMenu(); menu:stop(1) end)
+  menu:addFullButton("~!Campaign Game", "c", offx + 208, offy + 104 + 36*4,
+    function() RunCampaignGameMenu(); menu:stop(1) end)
+  menu:addFullButton("~!Load Game", "l", offx + 208, offy + 104 + 36*5,
+    function() RunLoadGameMenu(); menu:stop(1) end)
+  menu:addFullButton("~!Replay Game", "r", offx + 208, offy + 104 + 36*6,
+    function() RunReplayGameMenu(); menu:stop(1) end)
+
+  menu:addFullButton("~!Previous Menu", "p", offx + 208, offy + 104 + 36*8,
+    function() menu:stop() end)
+
+  return menu:run()
+end
+
 function RunSinglePlayerGameMenu()
   local menu = WarMenu()
   local offx = (Video.Width - 640) / 2
@@ -489,7 +509,7 @@
   descriptionl = menu:addLabel("descriptionl", offx + 16 + 70, offy + 360, Fonts["game"], false)
 
   menu:addLabel("~<Single Player Game Setup~>", offx + 640/2 + 12, offy + 192)
-  menu:addFullButton("S~!elect Scenario", "e", offx + 640 - 224 - 16, offy + 360 + 36*0,
+  menu:addFullButton("S~!elect Scenario", "e", offx + 640 - 224 - 16, offy + 360 + 36 * -1,
     function()
       local oldmapname = mapname
       RunSelectScenarioMenu()
@@ -498,7 +518,7 @@
         MapChanged()
       end
     end)
-  menu:addFullButton("~!Start Game", "s", offx + 640 - 224 - 16, offy + 360 + 36*1,
+  menu:addFullButton("~!Start Game", "s", offx + 640 - 224 - 16, offy + 360 + 36*0,
     function()
       GameSettings.Presets[0].Race = race:getSelected()
       GameSettings.Resources = resources:getSelected()
@@ -508,7 +528,7 @@
       RunMap(mapname)
       menu:stop()
     end)
-  menu:addFullButton("~!Cancel Game", "c", offx + 640 - 224 - 16, offy + 360 + 36*2, function() menu:stop() end)
+  menu:addFullButton("~!Cancel Game", "c", offx + 640 - 224 - 16, offy + 360 + 36*1, function() RunSinglePlayerSubMenu(); menu:stop() end)
 
   menu:addLabel("~<Your Race:~>", offx + 40, offy + (10 + 240) - 20, Fonts["game"], false)
   race = menu:addDropDown({"Map Default", "Human", "Orc"}, offx + 40, offy + 10 + 240,
@@ -571,25 +591,17 @@
   local offx = (Video.Width - 640) / 2
   local offy = (Video.Height - 480) / 2
 
-  menu:addLabel(war1gus.Name .. " V" .. war1gus.Version .. "  " .. war1gus.Homepage, offx + 320, offy + 390 + 18*0)
-  menu:addLabel("Stratagus V" .. GetStratagusVersion() .. "  " .. GetStratagusHomepage(), offx + 320, offy + 390 + 18*1)
-  menu:addLabel(war1gus.Copyright, offx + 320, offy + 390 + 18*4)
+  menu:addLabel(war1gus.Name .. " V" .. war1gus.Version .. "  " .. war1gus.Homepage, offx + 440, offy + 390 + 10*3, Fonts["small"])
+  menu:addLabel("Stratagus V" .. GetStratagusVersion() .. "  " .. GetStratagusHomepage(), offx + 440, offy + 390 + 10*2, Fonts["small"])
+  menu:addLabel(war1gus.Copyright, offx + 440, offy + 390 + 10*4, Fonts["small"])
 
-  menu:addFullButton("~!Single Player Game", "s", offx + 208, offy + 104 + 36*0, function() RunSinglePlayerGameMenu(); menu:stop(1) end)
---[[
-  menu:addFullButton("~!Multi Player Game", "m", offx + 208, offy + 104 + 36*1,
+  menu:addFullButton("~!Single Player Game", "s", offx + 208, offy + 104 + 34*3, function() RunSinglePlayerSubMenu(); menu:stop(1) end)
+  menu:addFullButton("~!Multi Player Game", "m", offx + 208, offy + 104 + 34*4,
     function() RunMultiPlayerGameMenu(); menu:stop(1) end)
-  menu:addFullButton("~!Campaign Game", "c", offx + 208, offy + 104 + 36*2,
-    function() RunCampaignGameMenu(); menu:stop(1) end)
-  menu:addFullButton("~!Load Game", "l", offx + 208, offy + 104 + 36*3,
-    function() RunLoadGameMenu(); menu:stop(1) end)
-  menu:addFullButton("~!Replay Game", "r", offx + 208, offy + 104 + 36*4,
-    function() RunReplayGameMenu(); menu:stop(1) end)
---]]
-  menu:addFullButton("~!Options", "o", offx + 208, offy + 104 + 36*5, function() RunOptionsMenu(); menu:stop(1) end)
-  menu:addFullButton("~!Editor", "e", offx + 208, offy + 104 + 36*6, function() RunEditorMenu(); menu:stop(1) end)
-  menu:addFullButton("S~!how Credits", "h", offx + 208, offy + 104 + 36*7, RunShowCreditsMenu)
-  menu:addFullButton("E~!xit Program", "x", offx + 208, offy + 104 + 36*9, function() menu:stop() end)
+  menu:addFullButton("~!Options", "o", offx + 208, offy + 104 + 34*5, function() RunOptionsMenu(); menu:stop(1) end)
+  menu:addFullButton("~!Editor", "e", offx + 208, offy + 104 + 34*6, function() RunEditorMenu(); menu:stop(1) end)
+  menu:addFullButton("S~!how Credits", "h", offx + 208, offy + 104 + 34*7, RunShowCreditsMenu)
+  menu:addFullButton("E~!xit Program", "x", offx + 208, offy + 104 + 34*8, function() menu:stop() end)
 
   return menu:run()
 end
@@ -609,7 +621,7 @@
 end
 
 
---Load("scripts/menus/campaign.lua")
+Load("scripts/menus/campaign.lua")
 Load("scripts/menus/load.lua")
 Load("scripts/menus/save.lua")
 Load("scripts/menus/replay.lua")
@@ -618,14 +630,14 @@
 Load("scripts/menus/editor.lua")
 Load("scripts/menus/credits.lua")
 Load("scripts/menus/game.lua")
---[[
+Load("scripts/menus/endscenario.lua")
+Load("scripts/menus/objectives.lua")
 Load("scripts/menus/help.lua")
-Load("scripts/menus/objectives.lua")
-Load("scripts/menus/endscenario.lua")
 Load("scripts/menus/diplomacy.lua")
 Load("scripts/menus/results.lua")
-Load("scripts/menus/network.lua")
+-- Load("scripts/menus/network.lua")
+Load("scripts/menus/results.lua")
+--[[
 --]]
 
 RunProgramStartMenu()
-

=== modified file 'scripts/human/buttons.lua'
--- scripts/human/buttons.lua	2009-05-22 16:30:00 +0000
+++ scripts/human/buttons.lua	2013-05-08 07:16:26 +0000
@@ -41,22 +41,16 @@
   Action = "move",
   Key = "m", Hint = "~!MOVE",
   ForUnit = {"unit-footman", "unit-knight", "unit-archer",
-    "unit-dwarves", "unit-human-catapult", "unit-peasant",
-    "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-mage",
-    "human-group"} } )
+    "unit-human-catapult", "unit-peasant",
+    "unit-cleric", "unit-conjurer", "unit-midevh",
+    "human-group" } } )
 
 DefineButton( { Pos = 2, Level = 0, Icon = "icon-human-shield1",
   Action = "stop",
   Key = "s", Hint = "~!STOP",
   ForUnit = {"unit-footman", "unit-knight", "unit-archer",
     "unit-dwarves", "unit-human-catapult", "unit-peasant",
-    "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-mage",
+    "unit-cleric", "unit-conjurer", "unit-midevh",
     "human-group"} } )
 
 DefineButton( { Pos = 2, Level = 0, Icon = "icon-human-shield2",
@@ -64,136 +58,107 @@
   Allowed = "check-upgrade", AllowArg = {"upgrade-human-shield1"},
   Key = "s", Hint = "~!STOP",
   ForUnit = {"unit-footman", "unit-knight", "unit-archer",
-    "unit-dwarves", "unit-human-catapult", "unit-arthor-literios", "unit-knight-rider",
-    "unit-wise-man", "unit-man-of-light"} } )
+    "unit-human-catapult"}} )
 
 DefineButton( { Pos = 2, Level = 0, Icon = "icon-human-shield3",
   Action = "stop",
   Allowed = "check-upgrade", AllowArg = {"upgrade-human-shield2"},
   Key = "s", Hint = "~!STOP",
   ForUnit = {"unit-footman", "unit-knight", "unit-archer",
-    "unit-dwarves", "unit-human-catapult", "unit-arthor-literios", "unit-knight-rider",
-    "unit-wise-man", "unit-man-of-light"} } )
+    "unit-human-catapult"}} )
 
 DefineButton( { Pos = 3, Level = 0, Icon = "icon-sword1",
   Action = "attack",
   Key = "a", Hint = "~!ATTACK",
   ForUnit = {"unit-footman", "unit-knight", "unit-archer",
-    "unit-dwarves", "unit-human-catapult", "unit-peasant",
-    "unit-female-hero",
-    "unit-flying-angle", "unit-arthor-literios", "unit-knight-rider", "unit-wise-man",
-    "unit-man-of-light", "unit-white-mage", "unit-gryphon-rider", "human-group"} } )
+    "unit-human-catapult", "human-group"} } )
 
 DefineButton( { Pos = 3, Level = 0, Icon = "icon-sword2",
   Action = "attack",
   Allowed = "check-upgrade", AllowArg = {"upgrade-sword1"},
   Key = "a", Hint = "~!ATTACK",
   ForUnit = {"unit-footman", "unit-knight", "unit-archer",
-    "unit-dwarves", "unit-human-catapult", "unit-arthor-literios", "unit-knight-rider",
-    "unit-wise-man", "unit-man-of-light"} } )
+    "unit-human-catapult"} } )
 
 DefineButton( { Pos = 3, Level = 0, Icon = "icon-sword3",
   Action = "attack",
   Allowed = "check-upgrade", AllowArg = {"upgrade-sword2"},
   Key = "a", Hint = "~!ATTACK",
   ForUnit = {"unit-footman", "unit-knight", "unit-archer",
-    "unit-dwarves", "unit-human-catapult", "unit-arthor-literios", "unit-knight-rider",
-    "unit-wise-man", "unit-man-of-light"} } )
+    "unit-human-catapult"} } )
 
 DefineButton( { Pos = 3, Level = 0, Icon = "icon-arrow1",
   Action = "attack",
   Key = "a", Hint = "~!ATTACK",
-  ForUnit = {"unit-archer", "unit-female-hero"} } )
+  ForUnit = {"unit-archer"} } )
 
 DefineButton( { Pos = 3, Level = 0, Icon = "icon-arrow2",
   Action = "attack",
   Allowed = "check-upgrade", AllowArg = {"upgrade-arrow1"},
   Key = "a", Hint = "~!ATTACK",
-  ForUnit = {"unit-archer", "unit-female-hero"} } )
+  ForUnit = {"unit-archer"} } )
 
 DefineButton( { Pos = 3, Level = 0, Icon = "icon-arrow3",
   Action = "attack",
   Allowed = "check-upgrade", AllowArg = {"upgrade-arrow2"},
   Key = "a", Hint = "~!ATTACK",
-  ForUnit = {"unit-archer", "unit-female-hero"} } )
+  ForUnit = {"unit-archer"} } )
 
 DefineButton( { Pos = 6, Level = 0, Icon = "icon-human-attack-ground",
   Action = "attack-ground",
   Key = "g", Hint = "ATTACK ~!GROUND",
   ForUnit = {"unit-human-catapult", "human-group"} } )
 
--- paladin specific actions ---------------------------------------------------
-
---(if extensions
---DefineButton( { Pos = 6, Level = 0, Icon = "icon-heal
---  Action = "cast-spell", Value = "spell-area-healing
---  Allowed = "check-upgrade", AllowArg = {"upgrade-area-healing)
---  Key = "l", Hint = "AREA HEA~!LING (per 1 HP)",
---  ForUnit = {"unit-paladin", "unit-knight-rider 
---    "unit-man-of-light"} } )
---)
-
---[[
-DefineButton( { Pos = 7, Level = 0, Icon = "icon-holy-vision",
-  Action = "cast-spell", Value = "spell-holy-vision",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-holy-vision"},
-  Key = "v", Hint = "HOLY ~!VISION",
-  ForUnit = {"unit-paladin", "unit-knight-rider",
-    "unit-man-of-light"} } )
-
-DefineButton( { Pos = 8, Level = 0, Icon = "icon-heal",
+-- cleric specific actions ---------------------------------------------------
+
+
+DefineButton( { Pos = 3, Level = 0, Icon = "icon-holy-lance",
+  Action = "attack",
+  Key = "a", Hint = "HOLY LANCE ~!ATTACK",
+  ForUnit = {"unit-cleric"} } )
+
+DefineButton( { Pos = 4, Level = 0, Icon = "icon-healing",
   Action = "cast-spell", Value = "spell-healing",
   Allowed = "check-upgrade", AllowArg = {"upgrade-healing"},
   Key = "h", Hint = "~!HEALING (per 1 HP)",
-  ForUnit = {"unit-paladin", "unit-knight-rider",
-    "unit-man-of-light"} } )
-
-DefineButton( { Pos = 9, Level = 0, Icon = "icon-exorcism",
-  Action = "cast-spell", Value = "spell-exorcism",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-exorcism"},
-  Key = "e", Hint = "~!EXORCISM",
-  ForUnit = {"unit-paladin", "unit-knight-rider",
-    "unit-man-of-light"} } )
-]]
-
--- mage specific actions ------------------------------------------------------
-
-DefineButton( { Pos = 3, Level = 0, Icon = "icon-lightning",
-  Action = "attack",
-  Key = "a", Hint = "LIGHTNING ~!ATTACK",
-  ForUnit = {"unit-mage", "unit-white-mage"} } )
-
---[[
-DefineButton( { Pos = 4, Level = 0, Icon = "icon-fireball",
-  Action = "cast-spell", Value = "spell-fireball",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-fireball"},
-  Key = "f", Hint = "~!FIREBALL",
-  ForUnit = {"unit-mage", "unit-white-mage"} } )
-
-DefineButton( { Pos = 5, Level = 0, Icon = "icon-slow",
-  Action = "cast-spell", Value = "spell-slow",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-slow"},
-  Key = "o", Hint = "SL~!OW",
-  ForUnit = {"unit-mage", "unit-white-mage"} } )
-
-DefineButton( { Pos = 6, Level = 0, Icon = "icon-flame-shield",
-  Action = "cast-spell", Value = "spell-flame-shield",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-flame-shield"},
-  Key = "l", Hint = "F~!LAME SHIELD",
-  ForUnit = {"unit-mage", "unit-white-mage"} } )
-
-DefineButton( { Pos = 7, Level = 0, Icon = "icon-invisibility",
+  ForUnit = {"unit-cleric"} } )
+
+DefineButton( { Pos = 5, Level = 0, Icon = "icon-invisibility",
   Action = "cast-spell", Value = "spell-invisibility",
   Allowed = "check-upgrade", AllowArg = {"upgrade-invisibility"},
   Key = "i", Hint = "~!INVISIBILITY",
-  ForUnit = {"unit-mage", "unit-white-mage"} } )
-
-DefineButton( { Pos = 9, Level = 0, Icon = "icon-blizzard",
-  Action = "cast-spell", Value = "spell-blizzard",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-blizzard"},
-  Key = "b", Hint = "~!BLIZZARD",
-  ForUnit = {"unit-mage", "unit-white-mage"} } )
-]]
+  ForUnit = {"unit-cleric"} } )
+
+DefineButton( { Pos = 6, Level = 0, Icon = "icon-far-seeing",
+  Action = "cast-spell", Value = "spell-far-seeing",
+  Allowed = "check-upgrade", AllowArg = {"upgrade-far-seeing"},
+  Key = "s", Hint = "FAR ~!SEEING",
+  ForUnit = {"unit-cleric"} } )
+
+-- conjurer specific actions ------------------------------------------------------
+
+DefineButton( { Pos = 3, Level = 0, Icon = "icon-fireball",
+  Action = "attack",
+  Key = "a", Hint = "FIREBALL ~!ATTACK",
+  ForUnit = {"unit-conjurer"} } )
+
+DefineButton( { Pos = 4, Level = 0, Icon = "icon-spider",
+  Action = "cast-spell", Value = "spell-summon-spiders",
+  Allowed = "check-upgrade", AllowArg = {"upgrade-spider"},
+  Key = "s", Hint = "SUMMON S~!PIDERS",
+  ForUnit = {"unit-conjurer"} } )
+
+DefineButton( { Pos = 5, Level = 0, Icon = "icon-water-elemental",
+  Action = "cast-spell", Value = "spell-summon-elemental",
+  Allowed = "check-upgrade", AllowArg = {"upgrade-water-elemental"},
+  Key = "e", Hint = "SUMMON E~!LEMENTAL",
+  ForUnit = {"unit-conjurer"} } )
+
+DefineButton( { Pos = 6, Level = 0, Icon = "icon-rain-of-fire",
+  Action = "cast-spell", Value = "spell-rain-of-fire",
+  Allowed = "check-upgrade", AllowArg = {"upgrade-rain-of-fire"},
+  Key = "r", Hint = "~!RAIN OF FIRE",
+  ForUnit = {"unit-conjurer"} } )
 
 -- peasant specific actions ---------------------------------------------------
 
@@ -286,12 +251,12 @@
   Key = "r", Hint = "BUILD ~!ROAD",
   ForUnit = {"unit-human-town-hall"} } )
 ]]
-
+--[[
 DefineButton( { Pos = 3, Level = 0, Icon = "icon-human-wall",
   Action = "build", Value = "unit-human-wall",
   Key = "w", Hint = "BUILD ~!WALL",
   ForUnit = {"unit-human-town-hall"} } )
-
+]]
 
 -- training commands ---------------------------------------------------------
 
@@ -366,13 +331,13 @@
 DefineButton( { Pos = 1, Level = 0, Icon = "icon-horse1",
   Action = "research", Value = "upgrade-horse1",
   Allowed = "check-single-research",
-  Key = "u", Hint = "~!BREED FASTER HORSES",
+  Key = "b", Hint = "~!BREED FASTER HORSES",
   ForUnit = {"unit-human-stable"} } )
 
 DefineButton( { Pos = 1, Level = 0, Icon = "icon-horse2",
   Action = "research", Value = "upgrade-horse2",
   Allowed = "check-single-research",
-  Key = "u", Hint = "~!BREED FASTER HORSES",
+  Key = "b", Hint = "~!BREED FASTER HORSES",
   ForUnit = {"unit-human-stable"} } )
 
 -- spells -------------------------------------------------------------------
@@ -386,30 +351,29 @@
 DefineButton( { Pos = 3, Level = 0, Icon = "icon-far-seeing",
   Action = "research", Value = "upgrade-far-seeing",
   Allowed = "check-single-research",
-  Key = "e", Hint = "RESEARCH ~!FAR SEEING",
+  Key = "f", Hint = "RESEARCH ~!FAR SEEING",
   ForUnit = {"unit-human-church"} } )
 
 DefineButton( { Pos = 4, Level = 0, Icon = "icon-invisibility",
   Action = "research", Value = "upgrade-invisibility",
   Allowed = "check-single-research",
-  Key = "o", Hint = "RESEARCH ~!INVISIBILITY",
+  Key = "i", Hint = "RESEARCH ~!INVISIBILITY",
   ForUnit = {"unit-human-church"} } )
 
 DefineButton( { Pos = 2, Level = 0, Icon = "icon-scorpion",
   Action = "research", Value = "upgrade-scorpion",
   Allowed = "check-single-research",
-  Key = "b", Hint = "RESEARCH ~!MINOR SUMMONING",
+  Key = "s", Hint = "RESEARCH SUMMON ~!SPIDERS",
   ForUnit = {"unit-human-tower"} } )
 
 DefineButton( { Pos = 3, Level = 0, Icon = "icon-rain-of-fire",
   Action = "research", Value = "upgrade-rain-of-fire",
   Allowed = "check-single-research",
-  Key = "b", Hint = "RESEARCH ~!RAIN OF FIRE",
+  Key = "r", Hint = "RESEARCH ~!RAIN OF FIRE",
   ForUnit = {"unit-human-tower"} } )
 
 DefineButton( { Pos = 4, Level = 0, Icon = "icon-water-elemental",
   Action = "research", Value = "upgrade-water-elemental",
   Allowed = "check-single-research",
-  Key = "b", Hint = "RESEARCH ~!MAJOR SUMMONING",
+  Key = "e", Hint = "RESEARCH SUMMON ~!ELEMENTAL",
   ForUnit = {"unit-human-tower"} } )
-

=== modified file 'scripts/human/campaign1.lua'
--- scripts/human/campaign1.lua	2009-05-22 16:30:00 +0000
+++ scripts/human/campaign1.lua	2013-05-08 07:16:26 +0000
@@ -32,104 +32,33 @@
 --	Define the campaign
 --
 --	(define-campagin 'ident 'name "name" 'campaign (list elements)
-DefineCampaign("human", "name", "~!Human campaign",
-  "campaign", {
-	--"play-movie", "movie/splash2.avi" {"full-screen", "zoom-screen"},
-	"show-picture", {
-	  "image", "campaigns/human/interface/Act_I_-_Shores_of_Lordareon.png",
-	  "fade-in",  30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act I"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "The Shores of Lordareon"}},
-	"play-level", "campaigns/human/level01h.cm",
-	"play-level", "campaigns/human/level02h.cm",
-	"play-level", "campaigns/human/level03h.cm",
-	"play-level", "campaigns/human/level04h.cm",
-	"show-picture", {
-	  "image", "campaigns/human/interface/Act_II_-_Khaz_Modan.png",
-	  "fade-in",  30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act II"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Khaz Modan"}},
-	"play-level", "campaigns/human/level05h.cm",
-	"play-level", "campaigns/human/level06h.cm",
-	"play-level", "campaigns/human/level07h.cm",
-	"show-picture", {
-	  "image", "campaigns/human/interface/Act_III_-_The_Northlands.png",
-	  "fade-in",  30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act III"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "The Northlands"}},
-	"play-level", "campaigns/human/level08h.cm",
-	"play-level", "campaigns/human/level09h.cm",
-	"play-level", "campaigns/human/level10h.cm",
-	"show-picture", {
-	  "image", "campaigns/human/interface/Act_IV_-_Return_to_Azeroth.png",
-	  "fade-in",  30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act IV"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Return to Azeroth"}},
-	"play-level", "campaigns/human/level11h.cm",
-	"play-level", "campaigns/human/level12h.cm",
-	"play-level", "campaigns/human/level13h.cm",
-	"play-level", "campaigns/human/level14h.cm" } )
+
+campaign_steps = {
+  CreateVideoStep("videos/hmap01.avi"),
+  CreateMapStep("campaigns/human/01.smp"),
+  CreateVideoStep("videos/hmap02.avi"),
+  CreateMapStep("campaigns/human/02.smp"),
+  CreateVideoStep("videos/hmap03.avi"),
+  CreateMapStep("campaigns/human/03.smp"),
+  CreateVideoStep("videos/hmap04.avi"),
+  CreateMapStep("campaigns/human/04.smp"),
+  CreateVideoStep("videos/hmap05.avi"),
+  CreateMapStep("campaigns/human/05.smp"),
+  CreateVideoStep("videos/hmap06.avi"),
+  CreateMapStep("campaigns/human/06.smp"),
+  CreateVideoStep("videos/hmap07.avi"),
+  CreateMapStep("campaigns/human/07.smp"),
+  CreateVideoStep("videos/hmap08.avi"),
+  CreateMapStep("campaigns/human/08.smp"),
+  CreateVideoStep("videos/hmap09.avi"),
+  CreateMapStep("campaigns/human/09.smp"),
+  CreateVideoStep("videos/hmap10.avi"),
+  CreateMapStep("campaigns/human/10.smp"),
+  CreateVideoStep("videos/hmap11.avi"),
+  CreateMapStep("campaigns/human/11.smp"),
+  CreateVideoStep("videos/hmap12.avi"),
+  CreateMapStep("campaigns/human/12.smp"),
+  CreateVideoStep("videos/ofinale.avi"),
+}
+
+campaign_menu = { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23 }

=== removed file 'scripts/human/campaign2.lua'
--- scripts/human/campaign2.lua	2009-05-22 16:30:00 +0000
+++ scripts/human/campaign2.lua	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
---       _________ __                 __                               
---      /   _____//  |_____________ _/  |______     ____  __ __  ______
---      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
---      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
---     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
---             \/                  \/          \//_____/            \/ 
---  ______________________                           ______________________
---			  T H E   W A R   B E G I N S
---	   Stratagus - A free fantasy real time strategy game engine
---
---	campaign2.ccl	-	Define the human campaign 2.
---
---	(c) Copyright 2002 by Lutz Sammer
---
---      This program is free software; you can redistribute it and/or modify
---      it under the terms of the GNU General Public License as published by
---      the Free Software Foundation; either version 2 of the License, or
---      (at your option) any later version.
---  
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warranty of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
---  
---      You should have received a copy of the GNU General Public License
---      along with this program; if not, write to the Free Software
---      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
---
---	$Id$
-
---=============================================================================
---	Define the campaign
---
---	(define-campagin 'ident 'name "name" 'campaign { elements)
-DefineCampaign("human-exp", "name", "H~!uman expansion levels",
-  "campaign", {
-	"show-picture", {
-	  "image", "campaigns/human-exp/interface/Act_I_-_A_Time_for_Heroes.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act I"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "A Time for Heroes"}},
-	"play-level", "campaigns/human-exp/levelx01h.cm",
-	"play-level", "campaigns/human-exp/levelx02h.cm",
-	"play-level", "campaigns/human-exp/levelx03h.cm",
-	"show-picture", {
-	  "image", "campaigns/human-exp/interface/Act_II_-_Draenor,_the_Red_World.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act II"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Draenor, The Red World"}},
-	"play-level", "campaigns/human-exp/levelx04h.cm",
-	"play-level", "campaigns/human-exp/levelx05h.cm",
-	"play-level", "campaigns/human-exp/levelx06h.cm",
-	"show-picture", {
-	  "image", "campaigns/human-exp/interface/Act_III_-_War_in_the_Shadows.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act III"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "War in the Shadows"}},
-	"play-level", "campaigns/human-exp/levelx07h.cm",
-	"play-level", "campaigns/human-exp/levelx08h.cm",
-	"play-level", "campaigns/human-exp/levelx09h.cm",
-	"show-picture", {
-	  "image", "campaigns/human-exp/interface/Act_IV_-_The_Measure_of_Valor.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act IV"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", 480 / 2 - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "The Measure of Valor"}},
-	"play-level", "campaigns/human-exp/levelx10h.cm",
-	"play-level", "campaigns/human-exp/levelx11h.cm",
-	"play-level", "campaigns/human-exp/levelx12h.cm" } )

=== removed file 'scripts/human/constructions.lua'
--- scripts/human/constructions.lua	2010-06-22 06:41:34 +0000
+++ scripts/human/constructions.lua	1970-01-01 00:00:00 +0000
@@ -1,196 +0,0 @@
---       _________ __                 __                               
---      /   _____//  |_____________ _/  |______     ____  __ __  ______
---      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
---      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
---     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
---             \/                  \/          \//_____/            \/ 
---  ______________________                           ______________________
---                        T H E   W A R   B E G I N S
---         Stratagus - A free fantasy real time strategy game engine
---
---      constructions.lua - Define the human constructions.
---
---      (c) Copyright 2001-2004 by Lutz Sammer and Jimmy Salmon
---
---      This program is free software; you can redistribute it and/or modify
---      it under the terms of the GNU General Public License as published by
---      the Free Software Foundation; either version 2 of the License, or
---      (at your option) any later version.
---  
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warranty of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
---  
---      You should have received a copy of the GNU General Public License
---      along with this program; if not, write to the Free Software
---      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
---
---      $Id$
-
---=============================================================================
---	Define a construction.
---
---	(define-construction ident 'files '(tileset-name filename ..)
---	    'size '(x y))
-
-DefineConstruction("construction-human-barracks", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/human/buildings/barracks_construction.png",
-    Size = {128, 128}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/human/buildings/barracks_construction.png",
---    Size = {128, 128}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-human-blacksmith", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/human/buildings/blacksmith_construction.png",
-    Size = {96, 96}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/human/buildings/blacksmith_construction.png",
---    Size = {96, 96}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-human-church", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/human/buildings/church_construction.png",
-    Size = {128, 128}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/human/buildings/church_construction.png",
---    Size = {128, 128}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-human-farm", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/human/buildings/farm_construction.png",
-    Size = {96, 96}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/human/buildings/farm_construction.png",
---    Size = {96, 96}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-human-lumber-mill", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/human/buildings/lumber_mill_construction.png",
-    Size = {128, 128}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/human/buildings/lumber_mill_construction.png",
---    Size = {128, 128}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-human-stable", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/human/buildings/stable_construction.png",
-    Size = {128, 128}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/human/buildings/stable_construction.png",
---    Size = {128, 128}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-human-tower", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/human/buildings/tower_construction.png",
-    Size = {96, 96}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/human/buildings/tower_construction.png",
---    Size = {96, 96}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-human-town-hall", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/human/buildings/town_hall_construction.png",
-    Size = {128, 128}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/human/buildings/town_hall_construction.png",
---    Size = {128, 128}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-

=== modified file 'scripts/human/sound.lua'
--- scripts/human/sound.lua	2009-05-22 16:30:00 +0000
+++ scripts/human/sound.lua	2013-05-08 07:16:26 +0000
@@ -81,4 +81,5 @@
 
 MakeSound("human-church-selected", "human/church.wav")
 MakeSound("human-stable-selected", "human/stable.wav")
+MakeSound("human-blacksmith-selected", "blacksmith")
 

=== removed file 'scripts/human/ui.lua'
--- scripts/human/ui.lua	2010-11-16 22:33:39 +0000
+++ scripts/human/ui.lua	1970-01-01 00:00:00 +0000
@@ -1,458 +0,0 @@
---       _________ __                 __                               
---      /   _____//  |_____________ _/  |______     ____  __ __  ______
---      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
---      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
---     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
---             \/                  \/          \//_____/            \/ 
---  ______________________                           ______________________
---                        T H E   W A R   B E G I N S
---         Stratagus - A free fantasy real time strategy game engine
---
---      ui.ccl - Define the human user interface
---
---      (c) Copyright 2001-2004 by Lutz Sammer and Jimmy Salmon
---
---      This program is free software; you can redistribute it and/or modify
---      it under the terms of the GNU General Public License as published by
---      the Free Software Foundation; either version 2 of the License, or
---      (at your option) any later version.
---  
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warranty of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
---  
---      You should have received a copy of the GNU General Public License
---      along with this program; if not, write to the Free Software
---      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
---
---      $Id$
-
---;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
---	* Race human.
---;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-function AddFiller(file, x, y)
-        if CanAccessFile(file) == true then
-                b = CFiller:new_local()
-                b.G = CGraphic:New(file)
-                b.X = x 
-                b.Y = y 
-                UI.Fillers:push_back(b)
-        end    
-end
-
-function AddSelectedButton(x, y)
-        b = CUIButton:new_local()
-        b.X = x
-        b.Y = y
-        b.Style = FindButtonStyle("icon")
-        UI.SelectedButtons:push_back(b)
-end
-
-function AddTrainingButton(x, y)
-        b = CUIButton:new_local()
-        b.X = x
-        b.Y = y
-        b.Style = FindButtonStyle("icon")
-        UI.TrainingButtons:push_back(b)
-end
-
-function AddTransportingButton(x, y)
-        b = CUIButton:new_local()
-        b.X = x
-        b.Y = y
-        b.Style = FindButtonStyle("icon")
-        UI.TransportingButtons:push_back(b)
-end
-
-function AddButtonPanelButton(x, y)
-        b = CUIButton:new_local()
-        b.X = x
-        b.Y = y
-        b.Style = FindButtonStyle("icon")
-        UI.ButtonPanel.Buttons:push_back(b)
-end
-
-
-
-function HumanScreen(screen_width, screen_height)
-  info_panel_x = 0
-  info_panel_y = 160
-
---  DefineUI("human", screen_width, screen_height,
-  UI.NormalFontColor = "white";
-  UI.ReverseFontColor = "yellow";
---    "normal-font-color", "white",
---    "reverse-font-color", "yellow",
-
-  UI.Fillers:clear()
-  AddFiller("ui/human/minimap.png", 0, 0)
-  AddFiller("ui/human/left_panel.png", 0, 144)
-  AddFiller("ui/human/top_resource_bar.png", 144, 0)
-  AddFiller("ui/human/right_panel.png", 624, 0)
-  AddFiller("ui/human/bottom_panel.png", 144, 376)
---[[
-    "filler", {
-      File = "ui/human/minimap.png",
-      Pos = {0, 0}},
-    "filler", {
-      File = "ui/human/left_panel.png",
-      Pos = {0, 144}},
-    "filler", {
-      File = "ui/human/top_resource_bar.png",
-      Pos = {144, 0}},
-    "filler", {
-      File = "ui/human/right_panel.png",
-      Pos = {624, 0}},
-    "filler", {
-      File = "ui/human/bottom_panel.png",
-      Pos = {144, 376}},
-]]
-
--- gold
-UI.Resources[1].G = CGraphic:New("ui/gold_icon_1.png", 26, 12)
-UI.Resources[1].IconFrame = 0
-UI.Resources[1].IconX = 176 + 0
-UI.Resources[1].IconY = 0
-UI.Resources[1].TextX = 176 + 0 + 18
-UI.Resources[1].TextY = 1
-
--- wood
-UI.Resources[2].G = CGraphic:New("ui/lumber_icon_1.png", 18, 18)
-UI.Resources[2].IconFrame = 1
-UI.Resources[2].IconX = 176 + 75
-UI.Resources[2].IconY = 0
-UI.Resources[2].TextX = 176 + 75 + 18
-UI.Resources[2].TextY = 1
---[[
--- oil
-UI.Resources[3].G = CGraphic:New("ui/gold,wood,oil,mana.png", 14, 14)
-UI.Resources[3].IconFrame = 2
-UI.Resources[3].IconX = 176 + 150
-UI.Resources[3].IconY = 0
-UI.Resources[3].TextX = 176 + 150 + 18
-UI.Resources[3].TextY = 1
-
--- food
-UI.Resources[FoodCost].G = CGraphic:New("ui/food.png", 14, 14)
-UI.Resources[FoodCost].IconFrame = 0
-UI.Resources[FoodCost].IconX = Video.Width - 16 - 138
-UI.Resources[FoodCost].IconY = 0
-UI.Resources[FoodCost].TextX = Video.Width - 16 - 138 + 18
-UI.Resources[FoodCost].TextY = 1
-
--- score
-UI.Resources[ScoreCost].G = CGraphic:New("ui/score.png", 14, 14)
-UI.Resources[ScoreCost].IconFrame = 0
-UI.Resources[ScoreCost].IconX = Video.Width - 16 - 68
-UI.Resources[ScoreCost].IconY = 0
-UI.Resources[ScoreCost].TextX = Video.Width - 16 - 68 + 18
-UI.Resources[ScoreCost].TextY = 1
---]]
---[[
-    "resources", {
-      "gold", { File = "ui/gold,wood,oil,mana.png", Frame = 0,
-        Pos = { 176 + 0, 0}, Size = {14, 14}, TextPos = { 176 + 0 + 18, 1}},
-      "wood", { File = "ui/gold,wood,oil,mana.png", Frame = 1,
-        Pos = { 176 + 75, 0}, Size = {14, 14}, TextPos = { 176 + 75 + 18, 1}},
-      "oil", { File = "ui/gold,wood,oil,mana.png", Frame = 2,
-        Pos = { 176 + 150, 0}, Size = {14, 14}, TextPos = { 176 + 150 + 18, 1}},
-      "food", { File = "ui/food.png", Frame = 0,
-        Pos = { screen_width - 16 - 138, 0}, Size = {14, 14}, TextPos = { (screen_width - 16 - 138) + 18, 1}},
-      "score", { File = "ui/score.png", Frame = 0,
-        Pos = { screen_width - 16 - 68, 0}, Size = {14, 14}, TextPos = { (screen_width - 16 - 68) + 18, 1}}},
-]]
-
-b = CUIButton:new()
-b.X = 9
-b.Y = 160 + 9
-b.Style = FindButtonStyle("icon")
-UI.SingleSelectedButton = b
-
-UI.SelectedButtons:clear()
-
-AddSelectedButton(6, 160 + 6)
-AddSelectedButton(62, 160 + 6)
-AddSelectedButton(118, 160 + 6)
-AddSelectedButton(6, 160 + 60)
-AddSelectedButton(62, 160 + 60)
-AddSelectedButton(118, 160 + 60)
-AddSelectedButton(6, 160 + 114)
-AddSelectedButton(62, 160 + 114)
-AddSelectedButton(118, 160 + 114)
-
-UI.MaxSelectedFont = Fonts["game"]
-UI.MaxSelectedTextX = info_panel_x + 10
-UI.MaxSelectedTextY = info_panel_y + 10
-
---
-
-b = CUIButton:new()
-b.X = 110
-b.Y = 160 + 11 + 70
-b.Style = FindButtonStyle("icon")
-UI.SingleTrainingButton = b
-
-UI.TrainingButtons:clear()
-
-AddTrainingButton(6, 216)
-AddTrainingButton(62, 216)
-AddTrainingButton(118, 216)
-AddTrainingButton(6, 263)
-AddTrainingButton(62, 263)
-AddTrainingButton(118, 263)
-
---
-
-b = CUIButton:new()
-b.X = 110
-b.Y = 160 + 11 + 70
-b.Style = FindButtonStyle("icon")
-UI.UpgradingButton = b
-
---
-
-b = CUIButton:new()
-b.X = 110
-b.Y = 160 + 11 + 70
-b.Style = FindButtonStyle("icon")
-UI.ResearchingButton = b
-
---
-
-UI.TransportingButtons:clear()
-
-AddTransportingButton(9, 387)
-AddTransportingButton(65, 387)
-AddTransportingButton(121, 387)
-AddTransportingButton(9, 434)
-AddTransportingButton(65, 434)
-AddTransportingButton(121, 434)
-
---
-
-UI.CompletedBarColorRGB = CColor(48, 100, 4)
-UI.CompletedBarShadow = true
-
---    "info-panel", {
---[[
-      "panel", {
-        "file", "ui/human/infopanel.png",
-        "pos", { info_panel_x, info_panel_y},
-        "size", {176, 176}
-      },
-]]
-
---[[
-      "selected", {
-        "single", {
-          "icon", {
-            "pos", {  6, 166}, "style", "icon"}},
-        "multiple", {
-          "icons", {
-            { "pos", {  6, 166}, "style", "icon"},
-            { "pos", { 62, 166}, "style", "icon"},
-            { "pos", {118, 166}, "style", "icon"},
-            { "pos", {  6, 220}, "style", "icon"},
-            { "pos", { 62, 220}, "style", "icon"},
-            { "pos", {118, 220}, "style", "icon"},
-            { "pos", {  6, 274}, "style", "icon"},
-            { "pos", { 62, 274}, "style", "icon"},
-            { "pos", {118, 274}, "style", "icon"}},
-          "max-text", {
-            "font", "game",
-            "pos", { info_panel_x + 10, info_panel_y + 10}}}
-      },
-      "training", {
-        "single", {
-          "text", {
-            "text", "Training:",
-            "font", "game",
-            "pos", { info_panel_x + 37, info_panel_y + 8 + 78}},
-          "icon", {
-            "pos", { info_panel_x + 107, info_panel_y + 8 + 70},
-            "style", "icon"}},
-        "multiple", {
-          "icons", {
-            { "pos", {  6, 216}, "style", "icon"},
-            { "pos", { 62, 216}, "style", "icon"},
-            { "pos", {118, 216}, "style", "icon"},
-            { "pos", {  6, 263}, "style", "icon"},
-            { "pos", { 62, 263}, "style", "icon"},
-            { "pos", {118, 263}, "style", "icon"}}}
-      },
-      "upgrading", {
-        "text", {
-          "text", "Upgrading:",
-          "font", "game",
-          "pos", { info_panel_x + 29, info_panel_y + 8 + 78}},
-        "icon", {
-          "pos", { info_panel_x + 107, info_panel_y + 8 + 70},
-          "style", "icon"},
-      },
-      "researching", {
-        "text", {
-          "text", "Researching:",
-          "font", "game",
-          "pos", { info_panel_x + 16, info_panel_y + 8 + 78}},
-        "icon", {
-          "pos", { info_panel_x + 107, info_panel_y + 8 + 70},
-          "style", "icon"}
-      },
-      "transporting", {
-        "icons", {
-          { "pos", {  6, 220}, "style", "icon"},
-          { "pos", { 62, 220}, "style", "icon"},
-          { "pos", {118, 220}, "style", "icon"},
-          { "pos", {  6, 274}, "style", "icon"},
-          { "pos", { 62, 274}, "style", "icon"},
-          { "pos", {118, 274}, "style", "icon"}}
-      },
-      "completed-bar", {
-        "color", {48, 100, 4},
-        "pos", { 12, 313},
-        "size", {152, 14},
-        "text", {
-          "text", "% Complete",
-          "font", "game",
-          "pos", { 50, 313}}
-      }
-    },
-]]
---    "button-panel", {
---[[
-      "panel", {
-        "file", "ui/human/" ..
-          screen_width .. "x" .. screen_height ..
-          "/buttonpanel.png",
-        "pos", {0, 336}},
-]]
---[[
-      "icons", {
-        {"pos", {  8, 236}, "style", "icon"},
-        {"pos", { 76, 236}, "style", "icon"},
-        {"pos", {  8, 282}, "style", "icon"},
-        {"pos", { 76, 282}, "style", "icon"},
-        {"pos", {  8, 328}, "style", "icon"},
-        {"pos", { 76, 328}, "style", "icon"}},
-      "auto-cast-border-color", {0, 0, 252},
-    },
-
-    "map-area", {
-      Pos = {144, 24},
-      Size = {480, 352}},
-
-    "menu-panel", {
-      "menu-button", {
-        Pos = {6, 376},
-        Style = "menu"},
-      "network-menu-button", {
-        Pos = {6, 376},
-        Caption = "Menu",
-        Style = "network"},
-      "network-diplomacy-button", {
-        Pos = {168, 376},
-        Caption = "Diplomacy",
-        Style = "network"},
-    },
-
-    "minimap", {
-      Pos = {6, 12},
-      Size = {128, 128}},
-
-    "status-line", {
-      TextPos = {148, 385},
-      Font = "game",
-      Width = 480},
-
-    "cursors", {
-      Point = "cursor-point",
-      Glass = "cursor-glass",
-      Cross = "cursor-cross",
-      Yellow = "cursor-yellow-hair",
-      Green = "cursor-green-hair",
-      Red = "cursor-red-hair",
-      Scroll = "cursor-scroll",
-      ArrowE = "cursor-arrow-e",
-      ArrowNE = "cursor-arrow-ne",
-      ArrowN = "cursor-arrow-n",
-      ArrowNW = "cursor-arrow-nw",
-      ArrowW = "cursor-arrow-w",
-      ArrowSW = "cursor-arrow-sw",
-      ArrowS = "cursor-arrow-s",
-      ArrowSE = "cursor-arrow-se"},
-
-    "menu-panels", {
-      "panel1", "ui/human/panel_1.png",
-      "panel2", "ui/human/panel_2.png",
-      "panel3", "ui/human/panel_2.png",
-      "panel4", "ui/human/panel_2.png",
-      "panel5", "ui/human/panel_2.png"},
-]]
-
-UI.ButtonPanel.Buttons:clear()
-
-AddButtonPanelButton(9, 340)
-AddButtonPanelButton(65, 340)
-AddButtonPanelButton(121, 340)
-AddButtonPanelButton(9, 387)
-AddButtonPanelButton(65, 387)
-AddButtonPanelButton(121, 387)
-AddButtonPanelButton(9, 434)
-AddButtonPanelButton(65, 434)
-AddButtonPanelButton(121, 434)
-
-UI.ButtonPanel.X = 0
-UI.ButtonPanel.Y = 336
-UI.ButtonPanel.AutoCastBorderColorRGB = CColor(0, 0, 252)
-
-UI.MapArea.X = 176
-UI.MapArea.Y = 16
-UI.MapArea.EndX = Video.Width - 16 - 1
-UI.MapArea.EndY = Video.Height - 16 - 1
-
-UI.Minimap.X = 24
-UI.Minimap.Y = 24 + 2
-UI.Minimap.W = 128
-UI.Minimap.H = 128
-
-UI.StatusLine.TextX = 2 + 176
-UI.StatusLine.TextY = Video.Height + 2 - 16
-UI.StatusLine.Width = Video.Width - 16 - 2 - 176
-UI.StatusLine.Font = Fonts["game"]
-
-UI.MenuButton.X = 24
-UI.MenuButton.Y = 2
-UI.MenuButton.Text = "Menu (~<F10~>)"
-UI.MenuButton.Style = FindButtonStyle("main")
-UI.MenuButton:SetCallback(
-  function()
-    if (Editor.Running == EditorNotRunning) then
-          RunGameMenu()
-        else
-          RunInEditorMenu()
-        end
-  end)
-
-UI.NetworkMenuButton.X = 6
-UI.NetworkMenuButton.Y = 2
-UI.NetworkMenuButton.Text = "Menu"
-UI.NetworkMenuButton.Style = FindButtonStyle("network")
-UI.NetworkMenuButton:SetCallback(function() RunGameMenu() end)
-
-UI.NetworkDiplomacyButton.X = 90
-UI.NetworkDiplomacyButton.Y = 2
-UI.NetworkDiplomacyButton.Text = "Diplomacy"
-UI.NetworkDiplomacyButton.Style = FindButtonStyle("network")
-UI.NetworkDiplomacyButton:SetCallback(function() RunDiplomacyMenu() end)
-
---    "victory-background", "ui/human/victory.png",
---    "defeat-background", "ui/human/defeat.png")
-end
-
-HumanScreen(640, 480)
-HumanScreen(800, 600)
-HumanScreen(1024, 768)
-HumanScreen(1280, 960)
-HumanScreen(1600, 1200)

=== removed file 'scripts/human/units.lua'
--- scripts/human/units.lua	2010-12-13 20:53:19 +0000
+++ scripts/human/units.lua	1970-01-01 00:00:00 +0000
@@ -1,503 +0,0 @@
---       _________ __                 __
---      /   _____//  |_____________ _/  |______     ____  __ __  ______
---      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
---      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
---     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
---             \/                  \/          \//_____/            \/ 
---  ______________________                           ______________________
---                        T H E   W A R   B E G I N S
---         Stratagus - A free fantasy real time strategy game engine
---
---      units.ccl - Define the human unit-types.
---
---      (c) Copyright 2001-2005 by Lutz Sammer and Jimmy Salmon
---
---      This program is free software; you can redistribute it and/or modify
---      it under the terms of the GNU General Public License as published by
---      the Free Software Foundation; either version 2 of the License, or
---      (at your option) any later version.
---  
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warranty of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
---  
---      You should have received a copy of the GNU General Public License
---      along with this program; if not, write to the Free Software
---      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
---
---      $Id$
-
---=============================================================================
---	Define unit-types.
---
---	NOTE: Save can generate this table.
---
-
-DefineUnitType("unit-archer", { Name = "Archer",
-  Image = {"file", "human/units/archer.png", "size", {64, 64}},
-  Animations = "animations-archer", Icon = "icon-archer",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-human-catapult", { Name = "Catapult",
-  Image = {"file", "human/units/catapult.png", "size", {64, 64}},
-  Animations = "animations-catapult", Icon = "icon-human-catapult",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-cleric", { Name = "Cleric",
-  Image = {"file", "human/units/cleric.png", "size", {64, 64}},
-  Animations = "animations-cleric", Icon = "icon-cleric",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-conjurer", { Name = "Conjurer",
-  Image = {"file", "human/units/conjurer.png", "size", {64, 64}},
-  Animations = "animations-conjurer", Icon = "icon-conjurer",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-footman", { Name = "Footman",
-  Image = {"file", "human/units/footman.png", "size", {96, 96}},
-  Animations = "animations-footman", Icon = "icon-footman",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 1,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-  
-  
-DefineUnitType("unit-knight", { Name = "Knight",
-  Image = {"file", "human/units/knight.png", "size", {64, 64}},
-  Animations = "animations-knight", Icon = "icon-knight",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 1,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-midevh", { Name = "midevh",
-  Image = {"file", "human/units/midevh.png", "size", {64, 64}},
-  Animations = "animations-midevh", Icon = "icon-midevh",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-peasant", { Name = "Peasant",
-  Image = {"file", "human/units/peasant.png", "size", {64, 64}},
-  Animations = "animations-peasant", Icon = "icon-peasant",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 1,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true,
-    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},
-   {"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"}}} )
-
--- 
--- BUILDINGS
---
-
-UnitTypeFiles["unit-human-barracks"] = {forest = "tilesets/forest/human/buildings/barracks.png",
-  swamp = "tilesets/swamp/human/buildings/barracks.png"}
-
-DefineUnitType("unit-human-barracks", { Name = "Barracks",
-  Image = {"size", {128, 128}},
-  Animations = "animations-building", Icon = "icon-human-barracks",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {3, 3}, BoxSize = {95, 95},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic human voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-human-blacksmith"] = {forest = "tilesets/forest/human/buildings/blacksmith.png",
-  swamp = "tilesets/swamp/human/buildings/blacksmith.png"}
-
-DefineUnitType("unit-human-blacksmith", { Name = "Blacksmith",
-  Image = {"size", {96, 96}},
-  Animations = "animations-building", Icon = "icon-human-blacksmith",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {2, 2}, BoxSize = {63, 63},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic human voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-human-church"] = {forest = "tilesets/forest/human/buildings/church.png",
-  swamp = "tilesets/swamp/human/buildings/church.png"}
-
-DefineUnitType("unit-human-church", { Name = "Church",
-  Image = {"size", {128, 128}},
-  Animations = "animations-building", Icon = "icon-human-church",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {3, 3}, BoxSize = {95, 95},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic human voices help 2",
-    "dead", "building destroyed"} } )
-
-	
-	
-UnitTypeFiles["unit-human-farm"] = {forest = "tilesets/forest/human/buildings/farm.png",
-  swamp = "tilesets/swamp/human/buildings/farm.png"}
-
-DefineUnitType("unit-human-farm", { Name = "Farm",
-  Image = {"size", {96, 96}},
-  Animations = "animations-building", Icon = "icon-human-farm",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {2, 2}, BoxSize = {63, 63},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic human voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-human-lumber-mill"] = {forest = "tilesets/forest/human/buildings/lumber_mill.png",
-  swamp = "tilesets/swamp/human/buildings/lumber_mill.png"}
-
-DefineUnitType("unit-human-lumber-mill", { Name = "Lumber mill",
-  Image = {"size", {128, 128}},
-  Animations = "animations-building", Icon = "icon-human-lumber-mill",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {3, 3}, BoxSize = {95, 95},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic human voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-human-stable"] = {forest = "tilesets/forest/human/buildings/stable.png",
-  swamp = "tilesets/swamp/human/buildings/stable.png"}
-
-DefineUnitType("unit-human-stable", { Name = "Stable",
-  Image = {"size", {128, 128}},
-  Animations = "animations-building", Icon = "icon-human-stable",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {3, 3}, BoxSize = {95, 95},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic human voices help 2",
-    "dead", "building destroyed"} } )
-	
-UnitTypeFiles["unit-stormwind-keep"] = {forest = "tilesets/forest/human/buildings/stormwind_keep.png",
-  swamp = "tilesets/swamp/human/buildings/stormwind_keep.png"}
-
-DefineUnitType("unit-stormwind-keep", { Name = "Stormwind keep",
-  Image = {"size", {160, 160}},
-  Animations = "animations-building", Icon = "icon-stormwind-keep",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {5, 5}, BoxSize = {159, 159},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic human voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-human-tower"] = {forest = "tilesets/forest/human/buildings/tower.png",
-  swamp = "tilesets/swamp/human/buildings/tower.png"}
-
-DefineUnitType("unit-human-tower", { Name = "Tower",
-  Image = {"size", {96, 96}},
-  Animations = "animations-building", Icon = "icon-human-tower",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {2, 2}, BoxSize = {63, 63},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic human voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-human-town-hall"] = {forest = "tilesets/forest/human/buildings/town_hall.png",
-  swamp = "tilesets/swamp/human/buildings/town_hall.png"}
-
-DefineUnitType("unit-human-town-hall", { Name = "Town hall",
-  Image = {"size", {128, 128}},
-  Animations = "animations-building", Icon = "icon-human-town-hall",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {3, 3}, BoxSize = {95, 95},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic human voices help 2",
-    "dead", "building destroyed"} } )
-
-	
---[[
-UnitTypeFiles["unit-human-wall"] = {summer = "tilesets/summer/neutral/buildings/wall.png",
-  winter = "tilesets/winter/neutral/buildings/wall.png",
-  wasteland = "tilesets/wasteland/neutral/buildings/wall.png",
-  swamp = "tilesets/summer/neutral/buildings/wall.png"}
-
-DefineUnitType("unit-human-wall", { Name = "Wall",
-  Image = {"size", {32, 32}},
-  Animations = "animations-building", Icon = "icon-human-wall",
-  Costs = {"time", 30, "gold", 20, "wood", 10},
-  Construction = "construction-wall",
-  Speed = 0,
-  HitPoints = 40,
-  DrawLevel = 39,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 0, AnnoyComputerFactor = 45,
-  Points = 1,
-  Corpse = "unit-destroyed-1x1-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
---    "selected", "human-wall-selected",
---    "acknowledge", "human-wall-acknowledge",
---    "ready", "human-wall-ready",
-    "help", "basic human voices help 2",
-    "dead", "building destroyed"} } )
-
---]]

=== modified file 'scripts/human/upgrade.lua'
--- scripts/human/upgrade.lua	2010-06-22 06:41:34 +0000
+++ scripts/human/upgrade.lua	2013-05-08 07:16:26 +0000
@@ -74,31 +74,31 @@
 --	NOTE: Save can generate this table.
 
 DefineModifier("upgrade-sword1",
-  {"piercing-damage", 2},
+  {"PiercingDamage", 2},
   {"apply-to", "unit-footman"}, {"apply-to", "unit-knight"})
 DefineModifier("upgrade-sword2",
-  {"piercing-damage", 2},
+  {"PiercingDamage", 2},
   {"apply-to", "unit-footman"}, {"apply-to", "unit-knight"})
 
 DefineModifier("upgrade-arrow1",
-  {"piercing-damage", 1},
+  {"PiercingDamage", 1},
   {"apply-to", "unit-archer"})
 DefineModifier("upgrade-arrow2",
-  {"piercing-damage", 1},
+  {"PiercingDamage", 1},
   {"apply-to", "unit-archer"})
 
 DefineModifier("upgrade-horse1",
---  {"speed", 1},
+--  {"Speed", 1},
   {"apply-to", "unit-knight"})
 DefineModifier("upgrade-horse2",
---  {"speed", 1},
+--  {"Speed", 1},
   {"apply-to", "unit-knight"})
 
 DefineModifier("upgrade-human-shield1",
-  {"armor", 2},
+  {"Armor", 2},
   {"apply-to", "unit-footman"}, {"apply-to", "unit-knight"})
 DefineModifier("upgrade-human-shield2",
-  {"armor", 2},
+  {"Armor", 2},
   {"apply-to", "unit-footman"}, {"apply-to", "unit-knight"})
 
 DefineModifier("upgrade-healing",

=== modified file 'scripts/icons.lua'
--- scripts/icons.lua	2010-06-22 06:41:34 +0000
+++ scripts/icons.lua	2013-05-08 07:16:26 +0000
@@ -60,8 +60,8 @@
   {"icon-human-church", 28},
   {"icon-orc-temple", 29},
   {"icon-gold-mine", 30},
-  {"icon-stormwind-keep", 31},
-  {"icon-blackrock-spire", 32},
+  {"icon-human-stormwind-keep", 31},
+  {"icon-orc-blackrock-spire", 32},
   {"icon-move-peasant", 33},
   {"icon-move-peon", 34},
   {"icon-repair", 35},
@@ -130,9 +130,8 @@
   {"icon-human-attack-ground", 40},
   {"icon-orc-attack-ground", 40},
 
-  {"icon-holy-vision", 0},
-  {"icon-catapult", 0},
-  {"icon-human-wall", 41},
+  -- {"icon-catapult", 0},
+  -- {"icon-human-wall", 41},
 }
 
 --[[

=== modified file 'scripts/menus/campaign.lua'
--- scripts/menus/campaign.lua	2010-12-13 20:53:19 +0000
+++ scripts/menus/campaign.lua	2013-05-08 07:16:26 +0000
@@ -5,13 +5,13 @@
 
   local menu = WarMenu(nil, bg)
 
-  wargus.playlist = {}
+  war1gus.playlist = {}
   if (currentRace == "human") then
     PlayMusic("music/Human Briefing.ogg")
-    Load("scripts/human/ui.lua")
+    LoadUI("human", Video.Width, Video.Height)
   elseif (currentRace == "orc") then
     PlayMusic("music/Orc Briefing.ogg")
-    Load("scripts/orc/ui.lua")
+    LoadUI("orc", Video.Width, Video.Height)
   else
     StopMusic()
   end
@@ -121,7 +121,7 @@
 function CreatePictureStep(bg, sound, title, text)
   return function()
     SetPlayerData(GetThisPlayer(), "RaceName", currentRace)
-    wargus.playlist = {}
+    war1gus.playlist = {}
     PlayMusic(sound)
     local menu = WarMenu(nil, bg)
     local offx = (Video.Width - 640) / 2
@@ -161,18 +161,10 @@
 
 function CampaignButtonTitle(race, exp, i)
   local name = "campaigns/" .. race
-  if (exp == "exp") then name = name .. "-exp" end
-  name = name .. "/level"
-  if (exp == "exp") then name = name .. "x" end
+  name = name .. "/"
   if (i<10) then name = name .. "0" end
   name = name .. i
 
-  if (race == "orc") then
-    name = name .. "o"
-  else
-    name = name .. "h"
-  end
-
   name = name .. "_c2.sms"
 
   title = "Ending - Victory"
@@ -200,8 +192,9 @@
 function RunCampaignSubmenu(campaign, race, exp)
   Load(campaign)
 
-  wargus.playlist = { "music/Orc Briefing.ogg" }
-  SetPlayerData(GetThisPlayer(), "RaceName", "orc")
+  war1gus.playlist = { "music/Orc Briefing.ogg" }
+  currentRace = race
+  SetPlayerData(GetThisPlayer(), "RaceName", currentRace)
 
   if not (IsMusicPlaying()) then
     PlayMusic("music/Orc Briefing.ogg")
@@ -262,22 +255,13 @@
   local offx = (Video.Width - 640) / 2
   local offy = (Video.Height - 480) / 2
 
-  menu:addLabel("Tides of Darkness", offx + 320, offy + 212 - 25)
   menu:addFullButton("~!Orc campaign", "o", offx + 208, offy + 212 + (36 * 0),
     function() RunCampaignSubmenu("scripts/orc/campaign1.lua", "orc", ""); menu:stop() end)
   menu:addFullButton("~!Human campaign", "h", offx + 208, offy + 212 + (36 * 1),
     function() RunCampaignSubmenu("scripts/human/campaign1.lua", "human", ""); menu:stop() end)
 
-  if (wargus.expansion == true) then
-    menu:addLabel("Beyond the Dark Portal", offx + 320, offy + 212 + (36 * 3) - 25)
-    menu:addFullButton("O~!rc expansion levels", "r", offx + 208, offy + 212 + (36 * 3),
-      function() RunCampaignSubmenu("scripts/orc/campaign2.lua", "orc", "exp"); menu:stop() end)
-    menu:addFullButton("H~!uman expansion levels", "u", offx + 208, offy + 212 + (36 * 4),
-      function() RunCampaignSubmenu("scripts/human/campaign2.lua", "human", "exp"); menu:stop() end)
-  end
-
   menu:addFullButton("~!Previous Menu", "p", offx + 208, offy + 212 + (36 * 5),
-    function() menu:stop() end)
+    function() RunSinglePlayerSubMenu(); menu:stop() end)
 
   menu:run()
 end

=== modified file 'scripts/menus/credits.lua'
--- scripts/menus/credits.lua	2010-11-16 22:33:39 +0000
+++ scripts/menus/credits.lua	2013-05-08 07:16:26 +0000
@@ -116,7 +116,7 @@
     sw:add(Label(f), 0, 24 * (i - 1) + 275)
   end
 
-  menu:addHalfButton("~!Continue", "c", offx + 455, offy + 440,
+  menu:addHalfButton("~!Continue", "c", offx + 455, offy + 400,
     function() menu:stop() end)
 
   local speed = GetGameSpeed()

=== modified file 'scripts/menus/load.lua'
--- scripts/menus/load.lua	2010-12-13 20:53:19 +0000
+++ scripts/menus/load.lua	2013-05-08 07:16:26 +0000
@@ -54,7 +54,7 @@
       end
     end)
   menu:addHalfButton("~!Cancel", "c", 384 - ((384 - 300 - 18) / 2) - 106, 256 - 16 - 27,
-    function() menu:stop() end)
+    function() RunSinglePlayerSubMenu(); menu:stop() end)
 end
 
 function RunLoadGameMenu()

=== modified file 'scripts/menus/options.lua'
--- scripts/menus/options.lua	2010-11-16 22:33:39 +0000
+++ scripts/menus/options.lua	2013-05-08 07:16:26 +0000
@@ -154,28 +154,29 @@
   menu:addLabel("Global Options", offx + 176, offy + 1)
   menu:addLabel("Video Resolution", offx + 16, offy + 34, Fonts["game"], false)
   group = "resolution"
-  b = menu:addRadioButton("640 x 480", group, offx + 16, offy + 55 + 26*0, function() SetVideoSize(640, 480) menu:stop(1) end)
+  b = menu:addRadioButton("640 x 400", group, offx + 16, offy + 55 + 26*4,
+    function() SetVideoSize(640, 400) menu:stop(1) end)
   if (Video.Width == 640) then b:setMarked(true) end
-  b = menu:addRadioButton("800 x 480", group, offx + 16, offy + 55 + 26*1, function() SetVideoSize(800, 480) menu:stop(1) end)
-  if (Video.Width == 800 and Video.Height == 480) then b:setMarked(true) end
-  b = menu:addRadioButton("800 x 600", group, offx + 16, offy + 55 + 26*2, function() SetVideoSize(800, 600) menu:stop(1) end)
-  if (Video.Width == 800 and Video.Height == 600) then b:setMarked(true) end
-  b = menu:addRadioButton("1024 x 768", group, offx + 16, offy + 55 + 26*3, function() SetVideoSize(1024, 768) menu:stop(1) end)
-  if (Video.Width == 1024) then b:setMarked(true) end
-  b = menu:addRadioButton("1280 x 800", group, offx + 16, offy + 55 + 26*4, function() SetVideoSize(1280, 800) menu:stop(1) end)
-  if (Video.Height == 800) then b:setMarked(true) end
-  b = menu:addRadioButton("1280 x 960", group, offx + 16, offy + 55 + 26*5, function() SetVideoSize(1280, 960) menu:stop(1) end)
-  if (Video.Height == 960) then b:setMarked(true) end
-  b = menu:addRadioButton("1280 x 1024", group, offx + 16, offy + 55 + 26*6, function() SetVideoSize(1280, 1024) menu:stop(1) end)
-  if (Video.Height == 1024) then b:setMarked(true) end
-  b = menu:addRadioButton("1400 x 1050", group, offx + 16, offy + 55 + 26*7, function() SetVideoSize(1400, 1050) menu:stop(1) end)
-  if (Video.Width == 1400) then b:setMarked(true) end
-  b = menu:addRadioButton("1600 x 1200", group, offx + 16, offy + 55 + 26*8, function() SetVideoSize(1600, 1200) menu:stop(1) end)
-  if (Video.Width == 1600) then b:setMarked(true) end
-  b = menu:addRadioButton("1680 x 1050", group, offx + 16, offy + 55 + 26*9, function() SetVideoSize(1680, 1050) menu:stop(1) end)
-  if (Video.Width == 1680) then b:setMarked(true) end
+  -- b = menu:addRadioButton("800 x 480", group, offx + 16, offy + 55 + 26*1, function() SetVideoSize(800, 480) menu:stop(1) end)
+  -- if (Video.Width == 800 and Video.Height == 480) then b:setMarked(true) end
+  -- b = menu:addRadioButton("800 x 600", group, offx + 16, offy + 55 + 26*2, function() SetVideoSize(800, 600) menu:stop(1) end)
+  -- if (Video.Width == 800 and Video.Height == 600) then b:setMarked(true) end
+  -- b = menu:addRadioButton("1024 x 768", group, offx + 16, offy + 55 + 26*3, function() SetVideoSize(1024, 768) menu:stop(1) end)
+  -- if (Video.Width == 1024) then b:setMarked(true) end
+  -- b = menu:addRadioButton("1280 x 800", group, offx + 16, offy + 55 + 26*4, function() SetVideoSize(1280, 800) menu:stop(1) end)
+  -- if (Video.Height == 800) then b:setMarked(true) end
+  -- b = menu:addRadioButton("1280 x 960", group, offx + 16, offy + 55 + 26*5, function() SetVideoSize(1280, 960) menu:stop(1) end)
+  -- if (Video.Height == 960) then b:setMarked(true) end
+  -- b = menu:addRadioButton("1280 x 1024", group, offx + 16, offy + 55 + 26*6, function() SetVideoSize(1280, 1024) menu:stop(1) end)
+  -- if (Video.Height == 1024) then b:setMarked(true) end
+  -- b = menu:addRadioButton("1400 x 1050", group, offx + 16, offy + 55 + 26*7, function() SetVideoSize(1400, 1050) menu:stop(1) end)
+  -- if (Video.Width == 1400) then b:setMarked(true) end
+  -- b = menu:addRadioButton("1600 x 1200", group, offx + 16, offy + 55 + 26*8, function() SetVideoSize(1600, 1200) menu:stop(1) end)
+  -- if (Video.Width == 1600) then b:setMarked(true) end
+  -- b = menu:addRadioButton("1680 x 1050", group, offx + 16, offy + 55 + 26*9, function() SetVideoSize(1680, 1050) menu:stop(1) end)
+  -- if (Video.Width == 1680) then b:setMarked(true) end
 
-  b = menu:addCheckBox("Full Screen", offx + 17, offy + 55 + 26*10 + 14,
+  b = menu:addCheckBox("Full Screen", offx + 17, offy + 55 + 26*5 + 14,
     function()
       ToggleFullScreen()
       preferences.VideoFullScreen = Video.FullScreen
@@ -184,7 +185,7 @@
     end)
   b:setMarked(Video.FullScreen)
 
-  checkTexture = menu:addCheckBox("Set Maximum OpenGL Texture to 256", offx + 127, offy + 55 + 26*10 + 14,
+  checkTexture = menu:addCheckBox("Set Maximum OpenGL Texture to 256", offx + 17, offy + 55 + 26*7 + 14,
     function()
       if (checkTexture:isMarked()) then
         preferences.MaxOpenGLTexture = 256
@@ -196,7 +197,7 @@
     end)
   if (preferences.MaxOpenGLTexture == 128) then checkTexture:setMarked(true) end
 
-  checkOpenGL = menu:addCheckBox("Use OpenGL / OpenGL ES 1.1 (restart required)", offx + 17, offy + 55 + 26*11 + 14,
+  checkOpenGL = menu:addCheckBox("OpenGL / OpenGL ES 1.1 (restart required)", offx + 17, offy + 55 + 26*6 + 14,
     function()
 --TODO: Add function for immediately change state of OpenGL
       preferences.UseOpenGL = checkOpenGL:isMarked()
@@ -204,10 +205,8 @@
 --      menu:stop(1) --TODO: Enable if we have an OpenGL function
     end)
   checkOpenGL:setMarked(preferences.UseOpenGL)
---  checkOpenGL:setMarked(UseOpenGL) --TODO: Enable if we have an OpenGL function
 
---  menu:addHalfButton("~!OK", "o", offx + 123, offy + 55 + 26*12 + 14, function() menu:stop() end)
-  menu:addHalfButton("~!OK", "o", offx + 123, offy + 55 + 26*12 + 14, function() menu:stop() end)
+  menu:addHalfButton("~!OK", "o", offx + 123, offy + 55 + 26*8 + 14, function() menu:stop() end)
   return menu:run()
 end
 

=== modified file 'scripts/menus/replay.lua'
--- scripts/menus/replay.lua	2010-12-13 20:53:19 +0000
+++ scripts/menus/replay.lua	2013-05-08 07:16:26 +0000
@@ -22,7 +22,7 @@
       SetPlayerData(GetThisPlayer(), "RaceName", "orc")
       menu:stop()
     end)
-  menu:addHalfButton("~!Cancel", "c", 198, 308, function() menu:stop() end)
+  menu:addHalfButton("~!Cancel", "c", 198, 308, function() RunSinglePlayerSubMenu(); menu:stop() end)
 
   menu:run()
 end

=== modified file 'scripts/menus/results.lua'
--- scripts/menus/results.lua	2010-12-13 20:53:19 +0000
+++ scripts/menus/results.lua	2013-05-08 07:16:26 +0000
@@ -1,38 +1,33 @@
-local hvictory = "ui/human/victory.png"
-local hdefeat =  "ui/human/defeat.png"
-local ovictory = "ui/orc/victory.png"
-local odefeat =  "ui/orc/defeat.png"
+local houtcome = "ui/human/outcome_windows.png"
+local ooutcome =  "ui/orc/outcome_windows.png"
 
 function RunResultsMenu()
   local background
-  local result
+  local result = "Humpf"
   local human = (GetPlayerData(GetThisPlayer(), "RaceName") == "human")
 
+  if (human) then
+     background = houtcome
+  else
+     background = ooutcome
+  end
+
   if (GameResult == GameVictory) then
     result = "Victory!"
     if (human) then
-      background = hvictory
       PlayMusic("music/Human Victory.ogg")
     else
-      background = ovictory
       PlayMusic("music/Orc Victory.ogg")
     end
   elseif (GameResult == GameDefeat) then
     result = "Defeat!"
     if (human) then
-      background = hdefeat
       PlayMusic("music/Human Defeat.ogg")
     else
-      background = odefeat
       PlayMusic("music/Orc Defeat.ogg")
     end
   elseif (GameResult == GameDraw) then
     result = "Draw!"
-    if (human) then
-      background = hdefeat
-    else
-      background = odefeat
-    end
   else
     return -- quit to menu
   end
@@ -40,78 +35,61 @@
   local menu = WarMenu(nil, background)
   local offx = (Video.Width - 640) / 2
   local offy = (Video.Height - 480) / 2
+  local multx = Video.Width / 640
+  local multy = Video.Height / 400
 
   local names_font = Fonts["small-title"]
-  local top_offset = 57
-  local bottom_offset = 178
-  local description_offset = 30
-
-  local c = 0
-  for i=0,7 do
-    if (GetPlayerData(i, "TotalUnits") > 0 ) then
-      c = c + 1
-    end
-  end
-
-  local line_spacing = (432 - bottom_offset - description_offset) / c
-
-  menu:addLabel("Outcome", offx + 106, offy + top_offset)
-  menu:addLabel(result, offx + 106, offy + top_offset + 21, Fonts["large-title"])
-
-  menu:addLabel("Units", offx + 50, offy + bottom_offset, Fonts["large"], true)
-  menu:addLabel("Buildings", offx + 140, offy + bottom_offset, Fonts["large"], true)
-  menu:addLabel("Gold", offx + 230, offy + bottom_offset, Fonts["large"], true)
-  menu:addLabel("Wood", offx + 320, offy + bottom_offset, Fonts["large"], true)
-  menu:addLabel("Oil", offx + 410, offy + bottom_offset, Fonts["large"], true)
-  menu:addLabel("Kills", offx + 500, offy + bottom_offset, Fonts["large"], true)
-  menu:addLabel("Razings", offx + 590, offy + bottom_offset, Fonts["large"], true)
-
-  c = 0
-  for i=0,7 do
-    if (GetPlayerData(i, "TotalUnits") > 0 ) then
-      local name = GetPlayerData(i, "Name")
-      if (ThisPlayer.Index == i) then
-        name = name .. " - You"
-      elseif (ThisPlayer:IsAllied(Players[i])) then
-        name = name .. " - Ally"
+
+  menu:addLabel(result, 125 * multx, 52 * multy, Fonts["small-title"])
+
+  local kills = {you = 0, enemy = 0, neutral = 0}
+  local units = {you = 0, enemy = 0, neutral = 0}
+  local razings = {you = 0, enemy = 0, neutral = 0}
+  local buildings = {you = 0, enemy = 0, neutral = 0}
+  local gold = {you = 0, enemy = 0, neutral = 0}
+  local wood = {you = 0, enemy = 0, neutral = 0}
+
+  for i=0,14 do
+    if (GetPlayerData(i, "TotalUnits") > 0 ) then
+      local name = ""
+      if (ThisPlayer.Index == i) or (ThisPlayer:IsAllied(Players[i])) then
+  	 name = "you"
       elseif (ThisPlayer:IsEnemy(Players[i])) then
-        name = name .. " - Enemy"
+  	 name = "enemy"
       else
-        name = name .. " - Neutral"
+  	-- ignored for now
+        name = "neutral"
       end
-      menu:addLabel(name, offx + 320,
-        offy + bottom_offset + description_offset + 26 + line_spacing * c + 5,
-        names_font, true)
-      menu:addLabel(GetPlayerData(i, "TotalUnits"), offx + 10 + 40,
-        offy + bottom_offset + description_offset + line_spacing * c + 5,
-        Fonts["large"], true)
-      menu:addLabel(GetPlayerData(i, "TotalBuildings"), offx + 100 + 40,
-        offy + bottom_offset + description_offset + line_spacing * c + 5,
-        Fonts["large"], true)
-      menu:addLabel(GetPlayerData(i, "TotalResources", "gold"), offx + 190 + 40,
-        offy + bottom_offset + description_offset + line_spacing * c + 5,
-        Fonts["large"], true)
-      menu:addLabel(GetPlayerData(i, "TotalResources", "wood"), offx + 280 + 40,
-        offy + bottom_offset + description_offset + line_spacing * c + 5,
-        Fonts["large"], true)
-      menu:addLabel(GetPlayerData(i, "TotalResources", "oil"), offx + 370 + 40,
-        offy + bottom_offset + description_offset + line_spacing * c + 5,
-        Fonts["large"], true)
-      menu:addLabel(GetPlayerData(i, "TotalKills"), offx + 460 + 40,
-        offy + bottom_offset + description_offset + line_spacing * c + 5,
-        Fonts["large"], true)
-      menu:addLabel(GetPlayerData(i, "TotalRazings"), offx + 550 + 40,
-        offy + bottom_offset + description_offset + line_spacing * c + 5,
-        Fonts["large"], true)
-
-      c = c + 1
+      kills[name] = kills[name] + GetPlayerData(i, "TotalKills")
+      units[name] = units[name] + GetPlayerData(i, "TotalUnits")
+      razings[name] = razings[name] + GetPlayerData(i, "TotalRazings")
+      buildings[name] = buildings[name] + GetPlayerData(i, "TotalBuildings")
+      gold[name] = gold[name] + GetPlayerData(i, "TotalResources", "gold")
+      wood[name] = wood[name] + GetPlayerData(i, "TotalResources", "wood")        
     end
   end
-
-  menu:addFullButton("~!Save Replay", "s", offx + 150, offy + 440,
+  
+  local lineHeight = 17 * multy
+
+  menu:addLabel(kills.you, 115 * multx, 280 * multy, Fonts["large"], true)
+  menu:addLabel(kills.enemy, 115 * multx, 280 * multy + lineHeight, Fonts["large"], true)
+  menu:addLabel(units.you, 115 * multx, 346 * multy, Fonts["large"], true)
+  menu:addLabel(units.enemy, 115 * multx, 346 * multy + lineHeight, Fonts["large"], true)
+
+  menu:addLabel(razings.you, 315 * multx, 280 * multy, Fonts["large"], true)
+  menu:addLabel(razings.enemy, 315 * multx, 280 * multy + lineHeight, Fonts["large"], true)
+  menu:addLabel(buildings.you, 315 * multx, 346 * multy, Fonts["large"], true)
+  menu:addLabel(buildings.enemy, 315 * multx, 346 * multy + lineHeight, Fonts["large"], true)
+
+  menu:addLabel(gold.you, 515 * multx, 280 * multy, Fonts["large"], true)
+  menu:addLabel(gold.enemy, 515 * multx, 280 * multy + lineHeight, Fonts["large"], true)
+  menu:addLabel(wood.you, 515 * multx, 346 * multy, Fonts["large"], true)
+  menu:addLabel(wood.enemy, 515 * multx, 346 * multy + lineHeight, Fonts["large"], true)
+
+  menu:addFullButton("~!Save Replay", "s", 16 * multx, 180 * multy,
     function() RunSaveReplayMenu() end)
 
-  menu:addFullButton("~!Continue", "c", offx + 400, offy + 440,
+  menu:addFullButton("~!Continue", "c", 16 * multx, 210 * multy,
     function() StopMusic(); menu:stop() end)
 
   menu:run()

=== modified file 'scripts/missiles.lua'
--- scripts/missiles.lua	2009-05-22 16:30:00 +0000
+++ scripts/missiles.lua	2013-05-08 07:16:26 +0000
@@ -30,7 +30,7 @@
 --      $Id$
 
 DefineMissileType("missile-arrow",
-  { File = "missiles/arrow.png", Size = {64, 64}, Frames = 5, NumDirections = 5,
+  { File = "missiles/arrow.png", Size = {64, 64}, Frames = 9, NumDirections = 5,
   DrawLevel = 50, ImpactSound = "bow hit",
   Class = "missile-class-point-to-point", Sleep = 1, Speed = 32, Range = 0 } )
 
@@ -52,6 +52,25 @@
   { File = "missiles/explosion.png", Size = {96, 96}, Frames = 6, NumDirections = 1,
   DrawLevel = 50, Class = "missile-class-stay", Sleep = 1, Speed = 16, Range = 1 } )
 
+DefineMissileType("missile-normal-spell",
+  { File = "missiles/healing.png", Size = {64, 64}, Frames = 6, NumDirections = 1,
+    DrawLevel = 50, Class = "missile-class-stay", Sleep = 5, Speed = 0, Range = 1 } )
+
+DefineMissileType("missile-fireball",
+  { File = "missiles/fireball_2.png", Size = {64, 64}, Frames = 2, NumDirections = 5,
+    DrawLevel = 50, ImpactSound = "bow hit",
+    Class = "missile-class-point-to-point", Sleep = 1, Speed = 32, Range = 0 } )
+
+DefineMissileType("missile-rain-of-fire",
+  { File = "missiles/rain_of_fire.png", Size = {32, 32}, Frames = 7, NumDirections = 1,
+  Class = "missile-class-point-to-point-with-hit", Sleep = 2, Speed = 8, Range = 1,
+  DrawLevel = 100 } )
+
+DefineMissileType("missile-poison-cloud",
+  { File = "missiles/poison_cloud.png", Size = {128, 128}, Frames = 4, NumDirections = 1,
+  Class = "missile-class-point-to-point-with-hit", Sleep = 2, Speed = 8, Range = 1,
+  DrawLevel = 100 } )
+
 DefineMissileType("missile-none",
   { Size = {32, 32}, DrawLevel = 50,
   Class = "missile-class-none", Sleep = 1, Speed = 16, Range = 1 } )

=== modified file 'scripts/orc/buttons.lua'
--- scripts/orc/buttons.lua	2009-05-22 16:30:00 +0000
+++ scripts/orc/buttons.lua	2013-05-08 07:16:26 +0000
@@ -72,7 +72,7 @@
   Action = "attack",
   Key = "a", Hint = "~!ATTACK",
   ForUnit = {"unit-grunt", "unit-ogre", "unit-axethrower", "unit-ogre-mage",
-    "unit-goblin-sappers", "unit-berserker", "unit-catapult", "unit-peon",
+    "unit-goblin-sappers", "unit-berserker", "unit-catapult",
     "unit-fad-man", "unit-double-head",
     "unit-sharp-axe", "unit-beast-cry", "unit-quick-blade", "unit-ice-bringer",
     "unit-evil-knight", "unit-skeleton", "unit-dragon", "unit-fire-breeze",
@@ -123,25 +123,6 @@
   Key = "a", Hint = "~!ATTACK",
   ForUnit = {"unit-catapult"} } )
 
-if (extensions) then
-DefineButton( { Pos = 4, Level = 0, Icon = "icon-orc-patrol-land",
-  Action = "patrol",
-  Key = "p", Hint = "~!PATROL",
-  ForUnit = {"unit-grunt", "unit-ogre", "unit-axethrower", "unit-ogre-mage",
-    "unit-goblin-sappers", "unit-berserker", "unit-catapult", "unit-fad-man",
-    "unit-double-head", "unit-sharp-axe", "unit-beast-cry", "unit-quick-blade",
-    "unit-skeleton", "unit-dragon", "unit-fire-breeze", "orc-group", "unit-daemon",
-    "unit-zeppelin", "unit-eye-of-vision"} } )
-else
-DefineButton( { Pos = 4, Level = 0, Icon = "icon-orc-patrol-land",
-  Action = "patrol",
-  Key = "p", Hint = "~!PATROL",
-  ForUnit = {"unit-grunt", "unit-ogre", "unit-axethrower", "unit-ogre-mage",
-    "unit-goblin-sappers", "unit-berserker", "unit-catapult", "unit-fad-man",
-    "unit-double-head", "unit-sharp-axe", "unit-beast-cry", "unit-quick-blade",
-    "unit-skeleton", "unit-dragon", "unit-fire-breeze", "orc-group", "unit-daemon"} } )
-end
-
 DefineButton( { Pos = 5, Level = 0, Icon = "icon-orc-stand-ground",
   Action = "stand-ground",
   Key = "t", Hint = "S~!TAND GROUND",
@@ -156,116 +137,31 @@
   Key = "g", Hint = "ATTACK ~!GROUND",
   ForUnit = {"unit-catapult", "unit-ogre-juggernaught", "orc-group"} } )
 
---[[
-DefineButton( { Pos = 9, Level = 0, Icon = "icon-orc-demolish",
-  Action = "cast-spell", Value = "spell-suicide-bomber",
-  Allowed = "check-true",
-  Key = "d", Hint = "~!DEMOLISH",
-  ForUnit = {"unit-goblin-sappers"} } )
-]]
-
--- ogre-mage specific actions -------------------------------------------------
-
---[[
-DefineButton( { Pos = 8, Level = 0, Icon = "icon-bloodlust",
-  Action = "cast-spell", Value = "spell-bloodlust",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-bloodlust"},
-  Key = "b", Hint = "~!BLOODLUST",
-  ForUnit = {"unit-ogre-mage", "unit-fad-man"} } )
-
-DefineButton( { Pos = 9, Level = 0, Icon = "icon-runes",
-  Action = "cast-spell", Value = "spell-runes",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-runes"},
-  Key = "r", Hint = "~!RUNES",
-  ForUnit = {"unit-ogre-mage", "unit-fad-man"} } )
-]]
-
--- cho'gall specific actions --- same as ogre mage but it has them always -----
-
---[[
-DefineButton( { Pos = 8, Level = 0, Icon = "icon-bloodlust",
-  Action = "cast-spell", Value = "spell-bloodlust",
-  Allowed = "check-true",
-  Key = "b", Hint = "~!BLOODLUST",
-  ForUnit = {"unit-double-head"} } )
-
-DefineButton( { Pos = 9, Level = 0, Icon = "icon-runes",
-  Action = "cast-spell", Value = "spell-runes",
-  Allowed = "check-true",
-  Key = "r", Hint = "~!RUNES",
-  ForUnit = {"unit-double-head"} } )
-]]
-
--- death-knight specific actions ----------------------------------------------
-
-DefineButton( { Pos = 3, Level = 0, Icon = "icon-touch-of-darkness",
-  Action = "attack",
-  Key = "a", Hint = "TOUCH OF D~!ARKNESS",
-  ForUnit = {"unit-death-knight", "unit-ice-bringer", "unit-evil-knight"} } )
-
---[[
-DefineButton( { Pos = 4, Level = 0, Icon = "icon-death-coil",
-  Action = "cast-spell", Value = "spell-death-coil",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-death-coil"},
-  Key = "c", Hint = "DEATH ~!COIL",
-  ForUnit = {"unit-death-knight", "unit-ice-bringer", "unit-evil-knight"} } )
-
-DefineButton( { Pos = 5, Level = 0, Icon = "icon-haste",
-  Action = "cast-spell", Value = "spell-haste",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-haste"},
-  Key = "h", Hint = "~!HASTE",
-  ForUnit = {"unit-death-knight", "unit-ice-bringer", "unit-evil-knight"} } )
-
-DefineButton( { Pos = 6, Level = 0, Icon = "icon-raise-dead",
-  Action = "cast-spell", Value = "spell-raise-dead",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-raise-dead"},
-  Key = "r", Hint = "~!RAISE DEAD",
-  ForUnit = {"unit-death-knight", "unit-ice-bringer", "unit-evil-knight"} } )
-
-DefineButton( { Pos = 7, Level = 0, Icon = "icon-whirlwind",
-  Action = "cast-spell", Value = "spell-whirlwind",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-whirlwind"},
-  Key = "w", Hint = "~!WHIRLWIND",
-  ForUnit = {"unit-death-knight", "unit-ice-bringer", "unit-evil-knight"} } )
-
-DefineButton( { Pos = 8, Level = 0, Icon = "icon-unholy-armor",
-  Action = "cast-spell", Value = "spell-unholy-armor",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-unholy-armor"},
-  Key = "u", Hint = "~!UNHOLY ARMOR",
-  ForUnit = {"unit-death-knight", "unit-ice-bringer", "unit-evil-knight"} } )
-
-DefineButton( { Pos = 9, Level = 0, Icon = "icon-death-and-decay",
-  Action = "cast-spell", Value = "spell-death-and-decay",
-  Allowed = "check-upgrade", AllowArg = {"upgrade-death-and-decay"},
-  Key = "d", Hint = "~!DEATH AND DECAY",
-  ForUnit = {"unit-death-knight", "unit-ice-bringer", "unit-evil-knight"} } )
-]]
-
 -- peon specific actions ------------------------------------------------------
 
-DefineButton( { Pos = 4, Level = 0, Icon = "icon-repair",
+DefineButton( { Pos = 3, Level = 0, Icon = "icon-repair",
   Action = "repair",
   Key = "r", Hint = "~!REPAIR",
   ForUnit = {"unit-peon"} } )
 
-DefineButton( { Pos = 5, Level = 0, Icon = "icon-harvest",
+DefineButton( { Pos = 4, Level = 0, Icon = "icon-harvest",
   Action = "harvest",
   Key = "h", Hint = "~!HARVEST LUMBER/MINE GOLD",
   ForUnit = {"unit-peon"} } )
 
-DefineButton( { Pos = 6, Level = 0, Icon = "icon-return-goods",
+DefineButton( { Pos = 4, Level = 0, Icon = "icon-return-goods",
   Action = "return-goods",
   Key = "g", Hint = "RETURN WITH ~!GOODS",
   ForUnit = {"unit-peon"} } )
 
 -- build basic/advanced structs -----------------------------------------------
 
-DefineButton( { Pos = 7, Level = 0, Icon = "icon-build-basic",
+DefineButton( { Pos = 5, Level = 0, Icon = "icon-build-basic",
   Action = "button", Value = 1,
   Key = "b", Hint = "~!BUILD BASIC STRUCTURE",
   ForUnit = {"unit-peon"} } )
 
-DefineButton( { Pos = 8, Level = 0, Icon = "icon-build-advanced",
+DefineButton( { Pos = 6, Level = 0, Icon = "icon-build-advanced",
   Action = "button", Value = 2,
   Allowed = "check-units-or", AllowArg = {"unit-orc-lumber-mill"},
   Key = "v", Hint = "BUILD AD~!VANCED STRUCTURE",
@@ -273,8 +169,8 @@
 
 -- simple buildings orc -------------------------------------------------------
 
-DefineButton( { Pos = 1, Level = 1, Icon = "icon-pig-farm",
-  Action = "build", Value = "unit-pig-farm",
+DefineButton( { Pos = 1, Level = 1, Icon = "icon-orc-farm",
+  Action = "build", Value = "unit-orc-farm",
   Key = "f", Hint = "BUILD PIG ~!FARM",
   ForUnit = {"unit-peon"} } )
 
@@ -283,80 +179,19 @@
   Key = "b", Hint = "BUILD ~!BARRACKS",
   ForUnit = {"unit-peon"} } )
 
-DefineButton( { Pos = 3, Level = 1, Icon = "icon-great-hall",
+DefineButton( { Pos = 3, Level = 1, Icon = "icon-orc-town-hall",
   Action = "build", Value = "unit-orc-town-hall",
   Key = "h", Hint = "BUILD GREAT ~!HALL",
   ForUnit = {"unit-peon"} } )
 
-DefineButton( { Pos = 4, Level = 1, Icon = "icon-orc-lumber-mill",
-  Action = "build", Value = "unit-orc-lumber-mill",
-  Key = "l", Hint = "BUILD TROLL ~!LUMBER MILL",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 5, Level = 1, Icon = "icon-orc-blacksmith",
-  Action = "build", Value = "unit-orc-blacksmith",
-  Key = "s", Hint = "BUILD BLACK~!SMITH",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 7, Level = 1, Icon = "icon-orc-watch-tower",
-  Action = "build", Value = "unit-orc-watch-tower",
-  Key = "t", Hint = "BUILD ~!TOWER",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 8, Level = 1, Icon = "icon-orc-wall",
-  Action = "build", Value = "unit-orc-wall",
-  Allowed = "check-network",
-  Key = "w", Hint = "BUILD ~!WALL",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 9, Level = 1, Icon = "icon-cancel",
+DefineButton( { Pos = 6, Level = 1, Icon = "icon-cancel",
   Action = "button", Value = 0,
   Key = "\27", Hint = "~<ESC~> CANCEL",
   ForUnit = {"unit-peon"} } )
 
 -- orc advanced buildings -----------------------------------------------------
 
-DefineButton( { Pos = 1, Level = 2, Icon = "icon-orc-shipyard",
-  Action = "build", Value = "unit-orc-shipyard",
-  Key = "s", Hint = "BUILD ~!SHIPYARD",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 2, Level = 2, Icon = "icon-orc-foundry",
-  Action = "build", Value = "unit-orc-foundry",
-  Key = "f", Hint = "BUILD ~!FOUNDRY",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 3, Level = 2, Icon = "icon-orc-refinery",
-  Action = "build", Value = "unit-orc-refinery",
-  Key = "r", Hint = "BUILD ~!REFINERY",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 4, Level = 2, Icon = "icon-alchemist",
-  Action = "build", Value = "unit-alchemist",
-  Key = "a", Hint = "BUILD GOBLIN ~!ALCHEMIST",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 5, Level = 2, Icon = "icon-ogre-mound",
-  Action = "build", Value = "unit-ogre-mound",
-  Key = "o", Hint = "BUILD ~!OGRE MOUND",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 6, Level = 2, Icon = "icon-temple-of-the-damned",
-  Action = "build", Value = "unit-temple-of-the-damned",
-  Key = "t", Hint = "BUILD ~!TEMPLE OF THE DAMNED",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 7, Level = 2, Icon = "icon-altar-of-storms",
-  Action = "build", Value = "unit-altar-of-storms",
-  Key = "l", Hint = "BUILD A~!LTAR OF STORMS",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 8, Level = 2, Icon = "icon-dragon-roost",
-  Action = "build", Value = "unit-dragon-roost",
-  Key = "d", Hint = "BUILD ~!DRAGON ROOST",
-  ForUnit = {"unit-peon"} } )
-
-DefineButton( { Pos = 9, Level = 2, Icon = "icon-cancel",
+DefineButton( { Pos = 6, Level = 2, Icon = "icon-cancel",
   Action = "button", Value = 0,
   Key = "\27", Hint = "~<ESC~> CANCEL",
   ForUnit = {"unit-peon"} } )
@@ -370,7 +205,7 @@
   ForUnit = {"unit-orc-town-hall"} } )
 
 -- strong hold upgrades -------------------------------------------------------
-
+--[[
 if (extensions) then
 do
 DefineButton( { Pos = 5, Level = 0, Icon = "icon-harvest",
@@ -502,9 +337,9 @@
   ForUnit = {"unit-orc-shipyard"} } )
 end
 end
-
+]]
 -- upgrades -------------------------------------------------------------------
-
+--[[
 DefineButton( { Pos = 1, Level = 0, Icon = "icon-axe2",
   Action = "research", Value = "upgrade-axe1",
   Allowed = "check-single-research",
@@ -648,3 +483,4 @@
   Allowed = "check-single-research",
   Key = "a", Hint = "UPGRADE SHIP ~!ARMOR (Armor +5)",
   ForUnit = {"unit-orc-foundry"} } )
+]]

=== modified file 'scripts/orc/campaign1.lua'
--- scripts/orc/campaign1.lua	2009-05-22 16:30:00 +0000
+++ scripts/orc/campaign1.lua	2013-05-08 07:16:26 +0000
@@ -30,105 +30,34 @@
 
 --=============================================================================
 --	Define the campaign
---
---	(define-campagin 'ident 'name "name" 'campaign (list elements)
-DefineCampaign("orc", "name", "~!Orc campaign",
-  "campaign", {
-	"show-picture", {
-	  "image", "campaigns/orc/interface/Act_I_-_Seas_of_Blood.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act I"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Seas of Blood"}},
-	"play-level", "campaigns/orc/level01o.cm",
-	"play-level", "campaigns/orc/level02o.cm",
-	"play-level", "campaigns/orc/level03o.cm",
-	"play-level", "campaigns/orc/level04o.cm",
-	"show-picture", {
-	  "image", "campaigns/orc/interface/Act_II_-_Khaz_Modan.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act II"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Khaz Modan"}},
-	"play-level", "campaigns/orc/level05o.cm",
-	"play-level", "campaigns/orc/level06o.cm",
-	"play-level", "campaigns/orc/level07o.cm",
-	"show-picture", {
-	  "image", "campaigns/orc/interface/Act_III_-_Quel'Thalas.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act III"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Quel'Thalas"}},
-	"play-level", "campaigns/orc/level08o.cm",
-	"play-level", "campaigns/orc/level09o.cm",
-	"play-level", "campaigns/orc/level10o.cm",
-	"play-level", "campaigns/orc/level11o.cm",
-	"show-picture", {
-	  "image", "campaigns/orc/interface/Act_IV_-_Tides_of_Darkness.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "ACT IV"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Tides of Darkness"}},
-	"play-level", "campaigns/orc/level12o.cm",
-	"play-level", "campaigns/orc/level13o.cm",
-	"play-level", "campaigns/orc/level14o.cm" } )
+
+campaign_steps = {
+  CreateVideoStep("videos/omap01.avi"),
+  CreateMapStep("campaigns/orc/01.smp"),
+  CreateVideoStep("videos/omap02.avi"),
+  CreateMapStep("campaigns/orc/02.smp"),
+  CreateVideoStep("videos/omap03.avi"),
+  CreateMapStep("campaigns/orc/03.smp"),
+  CreateVideoStep("videos/omap04.avi"),
+  CreateMapStep("campaigns/orc/04.smp"),
+  CreateVideoStep("videos/omap05.avi"),
+  CreateMapStep("campaigns/orc/05.smp"),
+  CreateVideoStep("videos/omap06.avi"),
+  CreateMapStep("campaigns/orc/06.smp"),
+  CreateVideoStep("videos/omap07.avi"),
+  CreateMapStep("campaigns/orc/07.smp"),
+  CreateVideoStep("videos/omap08.avi"),
+  CreateMapStep("campaigns/orc/08.smp"),
+  CreateVideoStep("videos/omap09.avi"),
+  CreateMapStep("campaigns/orc/09.smp"),
+  CreateVideoStep("videos/omap10.avi"),
+  CreateMapStep("campaigns/orc/10.smp"),
+  CreateVideoStep("videos/omap11.avi"),
+  CreateMapStep("campaigns/orc/11.smp"),
+  CreateVideoStep("videos/omap12.avi"),
+  CreateMapStep("campaigns/orc/12.smp"),
+  CreateVideoStep("videos/ofinale.avi"),
+}
+
+campaign_menu = { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23 }
+

=== removed file 'scripts/orc/campaign2.lua'
--- scripts/orc/campaign2.lua	2009-05-22 16:30:00 +0000
+++ scripts/orc/campaign2.lua	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
---       _________ __                 __                               
---      /   _____//  |_____________ _/  |______     ____  __ __  ______
---      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
---      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
---     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
---             \/                  \/          \//_____/            \/ 
---  ______________________                           ______________________
---			  T H E   W A R   B E G I N S
---	   Stratagus - A free fantasy real time strategy game engine
---
---	campaign2.ccl	-	Define the orc campaign 2.
---
---	(c) Copyright 2002 by Lutz Sammer
---
---      This program is free software; you can redistribute it and/or modify
---      it under the terms of the GNU General Public License as published by
---      the Free Software Foundation; either version 2 of the License, or
---      (at your option) any later version.
---  
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warranty of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
---  
---      You should have received a copy of the GNU General Public License
---      along with this program; if not, write to the Free Software
---      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
---
---	$Id$
-
-DefineCampaign("orc-exp", "name", "O~!rc expansion levels",
-  "campaign", {
-	"show-picture", {
-	  "image", "campaigns/orc-exp/interface/Act_I_-_Draenor,_the_Red_World.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act I"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Draenor, the Red World"}},
-	"play-level", "campaigns/orc-exp/levelx01o.cm",
-	"play-level", "campaigns/orc-exp/levelx02o.cm",
-	"play-level", "campaigns/orc-exp/levelx03o.cm",
-	"show-picture", {
-	  "image", "campaigns/orc-exp/interface/Act_II_-_The_Burning_of_Azeroth.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act II"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "The Burning of Azeroth"}},
-	"play-level", "campaigns/orc-exp/levelx04o.cm",
-	"play-level", "campaigns/orc-exp/levelx05o.cm",
-	"play-level", "campaigns/orc-exp/levelx06o.cm",
-	"show-picture", {
-	  "image", "campaigns/orc-exp/interface/Act_III_-_The_Great_Sea.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act III"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "The Great Sea"}},
-	"play-level", "campaigns/orc-exp/levelx07o.cm",
-	"play-level", "campaigns/orc-exp/levelx08o.cm",
-	"play-level", "campaigns/orc-exp/levelx09o.cm",
-	"show-picture", {
-	  "image", "campaigns/orc-exp/interface/Act_IV_-_Prelude_to_New_Worlds.png",
-	  "fade-in", 30 * 2,
-	  "fade-out", 30 * 2,
-	  "display-time", 30 * 10,
-	  "text", {
-	    "font", "large-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 67,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Act IV"},
-	  "text", {
-	    "font", "small-title",
-	    "x", 640 / 2,
-	    "y", (480 / 2) - 25,
-	    "width", 640,
-	    "height", 0,
-	    "align", "center",
-	    "text", "Prelude to New Worlds"}},
-	"play-level", "campaigns/orc-exp/levelx10o.cm",
-	"play-level", "campaigns/orc-exp/levelx11o.cm",
-	"play-level", "campaigns/orc-exp/levelx12o.cm" } )

=== removed file 'scripts/orc/constructions.lua'
--- scripts/orc/constructions.lua	2010-06-22 06:41:34 +0000
+++ scripts/orc/constructions.lua	1970-01-01 00:00:00 +0000
@@ -1,196 +0,0 @@
---       _________ __                 __                               
---      /   _____//  |_____________ _/  |______     ____  __ __  ______
---      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
---      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
---     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
---             \/                  \/          \//_____/            \/ 
---  ______________________                           ______________________
---                        T H E   W A R   B E G I N S
---         Stratagus - A free fantasy real time strategy game engine
---
---      constructions.lua - Define the orc constructions.
---
---      (c) Copyright 2001-2004 by Lutz Sammer and Jimmy Salmon
---
---      This program is free software; you can redistribute it and/or modify
---      it under the terms of the GNU General Public License as published by
---      the Free Software Foundation; either version 2 of the License, or
---      (at your option) any later version.
---  
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warranty of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
---  
---      You should have received a copy of the GNU General Public License
---      along with this program; if not, write to the Free Software
---      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
---
---      $Id$
-
---=============================================================================
---	Define a construction.
---
---	(define-construction ident 'files '(tileset-name filename ..)
---	    'size '(x y))
-
-DefineConstruction("construction-orc-barracks", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/orc/buildings/barracks_construction.png",
-    Size = {128, 128}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/orc/buildings/barracks_construction.png",
---    Size = {128, 128}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-orc-blacksmith", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/orc/buildings/blacksmith_construction.png",
-    Size = {96, 96}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/orc/buildings/blacksmith_construction.png",
---    Size = {96, 96}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-orc-temple", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/orc/buildings/temple_construction.png",
-    Size = {128, 128}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/orc/buildings/temple_construction.png",
---    Size = {128, 128}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-orc-farm", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/orc/buildings/farm_construction.png",
-    Size = {96, 96}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/orc/buildings/farm_construction.png",
---    Size = {96, 96}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-orc-lumber-mill", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/orc/buildings/lumber_mill_construction.png",
-    Size = {128, 128}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/orc/buildings/lumber_mill_construction.png",
---    Size = {128, 128}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-orc-kennel", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/orc/buildings/kennel_construction.png",
-    Size = {128, 96}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/orc/buildings/kennel_construction.png",
---    Size = {128, 96}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-orc-tower", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/orc/buildings/tower_construction.png",
-    Size = {96, 96}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/orc/buildings/tower_construction.png",
---    Size = {96, 96}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-
-DefineConstruction("construction-orc-town-hall", {
-  Files = {
---   {Tileset = "forest",
-    File = "tilesets/forest/orc/buildings/town_hall_construction.png",
-    Size = {128, 128}},
---   {Tileset = "swamp",
---    File = "tilesets/swamp/orc/buildings/town_hall_construction.png",
---    Size = {128, 128}}},
-  Constructions = {
-   {Percent = 0,
-    File = "construction",
-    Frame = 0},
-   {Percent = 33,
-    File = "construction",
-    Frame = 1},
-   {Percent = 67,
-    File = "construction",
-    Frame = 2}}
-})
-

=== modified file 'scripts/orc/sound.lua'
--- scripts/orc/sound.lua	2009-05-22 16:30:00 +0000
+++ scripts/orc/sound.lua	2013-05-08 07:16:26 +0000
@@ -81,8 +81,7 @@
 --	Define orc selected sounds.
 --
 
-MakeSound("orc-temple-selected",
-  "orc/temple.wav")
-MakeSound("orc-kennel-selected",
-  "orc/kennel.wav")
+MakeSound("orc-temple-selected", "orc/temple.wav")
+MakeSound("orc-kennel-selected", "orc/kennel.wav")
+MakeSound("orc-blacksmith-selected", "blacksmith")
 

=== removed file 'scripts/orc/ui.lua'
--- scripts/orc/ui.lua	2010-11-16 22:33:39 +0000
+++ scripts/orc/ui.lua	1970-01-01 00:00:00 +0000
@@ -1,458 +0,0 @@
---       _________ __                 __                               
---      /   _____//  |_____________ _/  |______     ____  __ __  ______
---      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
---      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
---     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
---             \/                  \/          \//_____/            \/ 
---  ______________________                           ______________________
---                        T H E   W A R   B E G I N S
---         Stratagus - A free fantasy real time strategy game engine
---
---      ui.ccl - Define the orc user interface
---
---      (c) Copyright 2001-2004 by Lutz Sammer and Jimmy Salmon
---
---      This program is free software; you can redistribute it and/or modify
---      it under the terms of the GNU General Public License as published by
---      the Free Software Foundation; either version 2 of the License, or
---      (at your option) any later version.
---  
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warranty of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
---  
---      You should have received a copy of the GNU General Public License
---      along with this program; if not, write to the Free Software
---      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
---
---      $Id$
-
---;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
---	* Race orc.
---;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-function AddFiller(file, x, y)
-        if CanAccessFile(file) == true then
-                b = CFiller:new_local()
-                b.G = CGraphic:New(file)
-                b.X = x 
-                b.Y = y 
-                UI.Fillers:push_back(b)
-        end    
-end
-
-function AddSelectedButton(x, y)
-        b = CUIButton:new_local()
-        b.X = x
-        b.Y = y
-        b.Style = FindButtonStyle("icon")
-        UI.SelectedButtons:push_back(b)
-end
-
-function AddTrainingButton(x, y)
-        b = CUIButton:new_local()
-        b.X = x
-        b.Y = y
-        b.Style = FindButtonStyle("icon")
-        UI.TrainingButtons:push_back(b)
-end
-
-function AddTransportingButton(x, y)
-        b = CUIButton:new_local()
-        b.X = x
-        b.Y = y
-        b.Style = FindButtonStyle("icon")
-        UI.TransportingButtons:push_back(b)
-end
-
-function AddButtonPanelButton(x, y)
-        b = CUIButton:new_local()
-        b.X = x
-        b.Y = y
-        b.Style = FindButtonStyle("icon")
-        UI.ButtonPanel.Buttons:push_back(b)
-end
-
-
-
-function OrcScreen(screen_width, screen_height)
-  info_panel_x = 0
-  info_panel_y = 160
-
---  DefineUI("orc", screen_width, screen_height,
-  UI.NormalFontColor = "yellow";
-  UI.ReverseFontColor = "white";
---    "normal-font-color", "white",
---    "reverse-font-color", "yellow",
-
-  UI.Fillers:clear()
-  AddFiller("ui/orc/minimap.png", 0, 0)
-  AddFiller("ui/orc/left_panel.png", 0, 144)
-  AddFiller("ui/orc/top_resource_bar.png", 144, 0)
-  AddFiller("ui/orc/right_panel.png", 624, 0)
-  AddFiller("ui/orc/bottom_panel.png", 144, 376)
---[[
-    "filler", {
-      File = "ui/orc/minimap.png",
-      Pos = {0, 0}},
-    "filler", {
-      File = "ui/orc/left_panel.png",
-      Pos = {0, 144}},
-    "filler", {
-      File = "ui/orc/top_resource_bar.png",
-      Pos = {144, 0}},
-    "filler", {
-      File = "ui/orc/right_panel.png",
-      Pos = {624, 0}},
-    "filler", {
-      File = "ui/orc/bottom_panel.png",
-      Pos = {144, 376}},
-]]
-
--- gold
-UI.Resources[1].G = CGraphic:New("ui/gold_icon_1.png", 26, 12)
-UI.Resources[1].IconFrame = 0
-UI.Resources[1].IconX = 176 + 0
-UI.Resources[1].IconY = 0
-UI.Resources[1].TextX = 176 + 0 + 18
-UI.Resources[1].TextY = 1
-
--- wood
-UI.Resources[2].G = CGraphic:New("ui/lumber_icon_1.png", 18, 18)
-UI.Resources[2].IconFrame = 1
-UI.Resources[2].IconX = 176 + 75
-UI.Resources[2].IconY = 0
-UI.Resources[2].TextX = 176 + 75 + 18
-UI.Resources[2].TextY = 1
---[[
--- oil
-UI.Resources[3].G = CGraphic:New("ui/gold,wood,oil,mana.png", 14, 14)
-UI.Resources[3].IconFrame = 2
-UI.Resources[3].IconX = 176 + 150
-UI.Resources[3].IconY = 0
-UI.Resources[3].TextX = 176 + 150 + 18
-UI.Resources[3].TextY = 1
-
--- food
-UI.Resources[FoodCost].G = CGraphic:New("ui/food.png", 14, 14)
-UI.Resources[FoodCost].IconFrame = 0
-UI.Resources[FoodCost].IconX = Video.Width - 16 - 138
-UI.Resources[FoodCost].IconY = 0
-UI.Resources[FoodCost].TextX = Video.Width - 16 - 138 + 18
-UI.Resources[FoodCost].TextY = 1
-
--- score
-UI.Resources[ScoreCost].G = CGraphic:New("ui/score.png", 14, 14)
-UI.Resources[ScoreCost].IconFrame = 0
-UI.Resources[ScoreCost].IconX = Video.Width - 16 - 68
-UI.Resources[ScoreCost].IconY = 0
-UI.Resources[ScoreCost].TextX = Video.Width - 16 - 68 + 18
-UI.Resources[ScoreCost].TextY = 1
---]]
---[[
-    "resources", {
-      "gold", { File = "ui/gold,wood,oil,mana.png", Frame = 0,
-        Pos = { 176 + 0, 0}, Size = {14, 14}, TextPos = { 176 + 0 + 18, 1}},
-      "wood", { File = "ui/gold,wood,oil,mana.png", Frame = 1,
-        Pos = { 176 + 75, 0}, Size = {14, 14}, TextPos = { 176 + 75 + 18, 1}},
-      "oil", { File = "ui/gold,wood,oil,mana.png", Frame = 2,
-        Pos = { 176 + 150, 0}, Size = {14, 14}, TextPos = { 176 + 150 + 18, 1}},
-      "food", { File = "ui/food.png", Frame = 0,
-        Pos = { screen_width - 16 - 138, 0}, Size = {14, 14}, TextPos = { (screen_width - 16 - 138) + 18, 1}},
-      "score", { File = "ui/score.png", Frame = 0,
-        Pos = { screen_width - 16 - 68, 0}, Size = {14, 14}, TextPos = { (screen_width - 16 - 68) + 18, 1}}},
-]]
-
-b = CUIButton:new()
-b.X = 9
-b.Y = 160 + 9
-b.Style = FindButtonStyle("icon")
-UI.SingleSelectedButton = b
-
-UI.SelectedButtons:clear()
-
-AddSelectedButton(6, 160 + 6)
-AddSelectedButton(62, 160 + 6)
-AddSelectedButton(118, 160 + 6)
-AddSelectedButton(6, 160 + 60)
-AddSelectedButton(62, 160 + 60)
-AddSelectedButton(118, 160 + 60)
-AddSelectedButton(6, 160 + 114)
-AddSelectedButton(62, 160 + 114)
-AddSelectedButton(118, 160 + 114)
-
-UI.MaxSelectedFont = Fonts["game"]
-UI.MaxSelectedTextX = info_panel_x + 10
-UI.MaxSelectedTextY = info_panel_y + 10
-
---
-
-b = CUIButton:new()
-b.X = 110
-b.Y = 160 + 11 + 70
-b.Style = FindButtonStyle("icon")
-UI.SingleTrainingButton = b
-
-UI.TrainingButtons:clear()
-
-AddTrainingButton(6, 216)
-AddTrainingButton(62, 216)
-AddTrainingButton(118, 216)
-AddTrainingButton(6, 263)
-AddTrainingButton(62, 263)
-AddTrainingButton(118, 263)
-
---
-
-b = CUIButton:new()
-b.X = 110
-b.Y = 160 + 11 + 70
-b.Style = FindButtonStyle("icon")
-UI.UpgradingButton = b
-
---
-
-b = CUIButton:new()
-b.X = 110
-b.Y = 160 + 11 + 70
-b.Style = FindButtonStyle("icon")
-UI.ResearchingButton = b
-
---
-
-UI.TransportingButtons:clear()
-
-AddTransportingButton(9, 387)
-AddTransportingButton(65, 387)
-AddTransportingButton(121, 387)
-AddTransportingButton(9, 434)
-AddTransportingButton(65, 434)
-AddTransportingButton(121, 434)
-
---
-
-UI.CompletedBarColorRGB = CColor(48, 100, 4)
-UI.CompletedBarShadow = true
-
---    "info-panel", {
---[[
-      "panel", {
-        "file", "ui/orc/infopanel.png",
-        "pos", { info_panel_x, info_panel_y},
-        "size", {176, 176}
-      },
-]]
-
---[[
-      "selected", {
-        "single", {
-          "icon", {
-            "pos", {  6, 166}, "style", "icon"}},
-        "multiple", {
-          "icons", {
-            { "pos", {  6, 166}, "style", "icon"},
-            { "pos", { 62, 166}, "style", "icon"},
-            { "pos", {118, 166}, "style", "icon"},
-            { "pos", {  6, 220}, "style", "icon"},
-            { "pos", { 62, 220}, "style", "icon"},
-            { "pos", {118, 220}, "style", "icon"},
-            { "pos", {  6, 274}, "style", "icon"},
-            { "pos", { 62, 274}, "style", "icon"},
-            { "pos", {118, 274}, "style", "icon"}},
-          "max-text", {
-            "font", "game",
-            "pos", { info_panel_x + 10, info_panel_y + 10}}}
-      },
-      "training", {
-        "single", {
-          "text", {
-            "text", "Training:",
-            "font", "game",
-            "pos", { info_panel_x + 37, info_panel_y + 8 + 78}},
-          "icon", {
-            "pos", { info_panel_x + 107, info_panel_y + 8 + 70},
-            "style", "icon"}},
-        "multiple", {
-          "icons", {
-            { "pos", {  6, 216}, "style", "icon"},
-            { "pos", { 62, 216}, "style", "icon"},
-            { "pos", {118, 216}, "style", "icon"},
-            { "pos", {  6, 263}, "style", "icon"},
-            { "pos", { 62, 263}, "style", "icon"},
-            { "pos", {118, 263}, "style", "icon"}}}
-      },
-      "upgrading", {
-        "text", {
-          "text", "Upgrading:",
-          "font", "game",
-          "pos", { info_panel_x + 29, info_panel_y + 8 + 78}},
-        "icon", {
-          "pos", { info_panel_x + 107, info_panel_y + 8 + 70},
-          "style", "icon"},
-      },
-      "researching", {
-        "text", {
-          "text", "Researching:",
-          "font", "game",
-          "pos", { info_panel_x + 16, info_panel_y + 8 + 78}},
-        "icon", {
-          "pos", { info_panel_x + 107, info_panel_y + 8 + 70},
-          "style", "icon"}
-      },
-      "transporting", {
-        "icons", {
-          { "pos", {  6, 220}, "style", "icon"},
-          { "pos", { 62, 220}, "style", "icon"},
-          { "pos", {118, 220}, "style", "icon"},
-          { "pos", {  6, 274}, "style", "icon"},
-          { "pos", { 62, 274}, "style", "icon"},
-          { "pos", {118, 274}, "style", "icon"}}
-      },
-      "completed-bar", {
-        "color", {48, 100, 4},
-        "pos", { 12, 313},
-        "size", {152, 14},
-        "text", {
-          "text", "% Complete",
-          "font", "game",
-          "pos", { 50, 313}}
-      }
-    },
-]]
---    "button-panel", {
---[[
-      "panel", {
-        "file", "ui/orc/" ..
-          screen_width .. "x" .. screen_height ..
-          "/buttonpanel.png",
-        "pos", {0, 336}},
-]]
---[[
-      "icons", {
-        {"pos", {  8, 236}, "style", "icon"},
-        {"pos", { 76, 236}, "style", "icon"},
-        {"pos", {  8, 282}, "style", "icon"},
-        {"pos", { 76, 282}, "style", "icon"},
-        {"pos", {  8, 328}, "style", "icon"},
-        {"pos", { 76, 328}, "style", "icon"}},
-      "auto-cast-border-color", {0, 0, 252},
-    },
-
-    "map-area", {
-      Pos = {144, 24},
-      Size = {480, 352}},
-
-    "menu-panel", {
-      "menu-button", {
-        Pos = {6, 376},
-        Style = "menu"},
-      "network-menu-button", {
-        Pos = {6, 376},
-        Caption = "Menu",
-        Style = "network"},
-      "network-diplomacy-button", {
-        Pos = {168, 376},
-        Caption = "Diplomacy",
-        Style = "network"},
-    },
-
-    "minimap", {
-      Pos = {6, 12},
-      Size = {128, 128}},
-
-    "status-line", {
-      TextPos = {148, 385},
-      Font = "game",
-      Width = 480},
-
-    "cursors", {
-      Point = "cursor-point",
-      Glass = "cursor-glass",
-      Cross = "cursor-cross",
-      Yellow = "cursor-yellow-hair",
-      Green = "cursor-green-hair",
-      Red = "cursor-red-hair",
-      Scroll = "cursor-scroll",
-      ArrowE = "cursor-arrow-e",
-      ArrowNE = "cursor-arrow-ne",
-      ArrowN = "cursor-arrow-n",
-      ArrowNW = "cursor-arrow-nw",
-      ArrowW = "cursor-arrow-w",
-      ArrowSW = "cursor-arrow-sw",
-      ArrowS = "cursor-arrow-s",
-      ArrowSE = "cursor-arrow-se"},
-
-    "menu-panels", {
-      "panel1", "ui/orc/panel_1.png",
-      "panel2", "ui/orc/panel_2.png",
-      "panel3", "ui/orc/panel_2.png",
-      "panel4", "ui/orc/panel_2.png",
-      "panel5", "ui/orc/panel_2.png"},
-]]
-
-UI.ButtonPanel.Buttons:clear()
-
-AddButtonPanelButton(9, 340)
-AddButtonPanelButton(65, 340)
-AddButtonPanelButton(121, 340)
-AddButtonPanelButton(9, 387)
-AddButtonPanelButton(65, 387)
-AddButtonPanelButton(121, 387)
-AddButtonPanelButton(9, 434)
-AddButtonPanelButton(65, 434)
-AddButtonPanelButton(121, 434)
-
-UI.ButtonPanel.X = 0
-UI.ButtonPanel.Y = 336
-UI.ButtonPanel.AutoCastBorderColorRGB = CColor(0, 0, 252)
-
-UI.MapArea.X = 176
-UI.MapArea.Y = 16
-UI.MapArea.EndX = Video.Width - 16 - 1
-UI.MapArea.EndY = Video.Height - 16 - 1
-
-UI.Minimap.X = 24
-UI.Minimap.Y = 24 + 2
-UI.Minimap.W = 128
-UI.Minimap.H = 128
-
-UI.StatusLine.TextX = 2 + 176
-UI.StatusLine.TextY = Video.Height + 2 - 16
-UI.StatusLine.Width = Video.Width - 16 - 2 - 176
-UI.StatusLine.Font = Fonts["game"]
-
-UI.MenuButton.X = 24
-UI.MenuButton.Y = 2
-UI.MenuButton.Text = "Menu (~<F10~>)"
-UI.MenuButton.Style = FindButtonStyle("main")
-UI.MenuButton:SetCallback(
-  function()
-    if (Editor.Running == EditorNotRunning) then
-          RunGameMenu()
-        else
-          RunInEditorMenu()
-        end
-  end)
-
-UI.NetworkMenuButton.X = 6
-UI.NetworkMenuButton.Y = 2
-UI.NetworkMenuButton.Text = "Menu"
-UI.NetworkMenuButton.Style = FindButtonStyle("network")
-UI.NetworkMenuButton:SetCallback(function() RunGameMenu() end)
-
-UI.NetworkDiplomacyButton.X = 90
-UI.NetworkDiplomacyButton.Y = 2
-UI.NetworkDiplomacyButton.Text = "Diplomacy"
-UI.NetworkDiplomacyButton.Style = FindButtonStyle("network")
-UI.NetworkDiplomacyButton:SetCallback(function() RunDiplomacyMenu() end)
-
---    "victory-background", "ui/orc/victory.png",
---    "defeat-background", "ui/orc/defeat.png")
-end
-
-OrcScreen(640, 480)
-OrcScreen(800, 600)
-OrcScreen(1024, 768)
-OrcScreen(1280, 960)
-OrcScreen(1600, 1200)

=== removed file 'scripts/orc/units.lua'
--- scripts/orc/units.lua	2010-12-13 20:53:19 +0000
+++ scripts/orc/units.lua	1970-01-01 00:00:00 +0000
@@ -1,500 +0,0 @@
---       _________ __                 __
---      /   _____//  |_____________ _/  |______     ____  __ __  ______
---      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
---      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
---     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
---             \/                  \/          \//_____/            \/ 
---  ______________________                           ______________________
---                        T H E   W A R   B E G I N S
---         Stratagus - A free fantasy real time strategy game engine
---
---      units.ccl - Define the orc unit-types.
---
---      (c) Copyright 2001-2005 by Lutz Sammer and Jimmy Salmon
---
---      This program is free software; you can redistribute it and/or modify
---      it under the terms of the GNU General Public License as published by
---      the Free Software Foundation; either version 2 of the License, or
---      (at your option) any later version.
---  
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warranty of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
---  
---      You should have received a copy of the GNU General Public License
---      along with this program; if not, write to the Free Software
---      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
---
---      $Id$
-
---=============================================================================
---	Define unit-types.
---
---	NOTE: Save can generate this table.
---
-
-DefineUnitType("unit-orc-catapult", { Name = "Catapult",
-  Image = {"file", "orc/units/catapult.png", "size", {64, 64}},
-  Animations = "animations-catapult", Icon = "icon-orc-catapult",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-grunt", { Name = "Grunt",
-  Image = {"file", "orc/units/grunt.png", "size", {64, 64}},
-  Animations = "animations-footman", Icon = "icon-grunt",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-lothar", { Name = "Lothar",
-  Image = {"file", "orc/units/lothar.png", "size", {96, 96}},
-  Animations = "animations-midevh", Icon = "icon-lothar",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-necrolyte", { Name = "Necrolyte",
-  Image = {"file", "orc/units/necrolyte.png", "size", {64, 64}},
-  Animations = "animations-necrolyte", Icon = "icon-necrolyte",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-peon", { Name = "Peon",
-  Image = {"file", "orc/units/peon.png", "size", {64, 64}},
-  Animations = "animations-peasant", Icon = "icon-peon",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 1,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true,
-    CanGatherResources = {
-   {"file-when-loaded", "orc/units/peon_with_gold.png",
-    "resource-id", "gold",
---    "harvest-from-outside",
-    "resource-capacity", 100,
-    "wait-at-resource", 150,
-    "wait-at-depot", 150},
-   {"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"}}} )
-
-DefineUnitType("unit-raider", { Name = "Raider",
-  Image = {"file", "orc/units/raider.png", "size", {96, 96}},
-  Animations = "animations-knight", Icon = "icon-raider",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-spearman", { Name = "Spearman",
-  Image = {"file", "orc/units/spearman.png", "size", {64, 64}},
-  Animations = "animations-archer", Icon = "icon-spearman",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
-
-DefineUnitType("unit-warlock", { Name = "Warlock",
-  Image = {"file", "orc/units/warlock.png", "size", {64, 64}},
-  Animations = "animations-footman", Icon = "icon-warlock",
-  Costs = {"time", 70},
-  NeutralMinimapColor = {192, 0, 0},
-  HitPoints = 60,
-  DrawLevel = 60,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 5, ComputerReactionRange = 7, PersonReactionRange = 5,
-  Armor = 3, BasicDamage = 10, PiercingDamage = 2, Missile = "missile-none",
-  MaxAttackRange = 3,
-  Priority = 63,
-  Points = 100,
-  Demand = 1,
-  RightMouseAction = "attack",
-  CanAttack = true,
-  CanTargetLand = true, CanTargetSea = true, CanTargetAir = true,
-  SelectableByRectangle = true} )
--- 
--- BUILDINGS
---
-
-UnitTypeFiles["unit-orc-barracks"] = {forest = "tilesets/forest/orc/buildings/barracks.png",
-  swamp = "tilesets/swamp/orc/buildings/barracks.png"}
-
-DefineUnitType("unit-orc-barracks", { Name = "Barracks",
-  Image = {"size", {128, 128}},
-  Animations = "animations-building", Icon = "icon-orc-barracks",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {3, 3}, BoxSize = {95, 95},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic orc voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-blackrock-spire"] = {forest = "tilesets/forest/orc/buildings/blackrock_spire.png",
-  swamp = "tilesets/swamp/orc/buildings/blackrock_spire.png"}
-
-DefineUnitType("unit-blackrock-spire", { Name = "Blackrock-spire",
-  Image = {"size", {160, 160}},
-  Animations = "animations-building", Icon = "icon-blackrock-spire",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {5, 5}, BoxSize = {159, 159},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic orc voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-orc-blacksmith"] = {forest = "tilesets/forest/orc/buildings/blacksmith.png",
-  swamp = "tilesets/swamp/orc/buildings/blacksmith.png"}
-
-DefineUnitType("unit-orc-blacksmith", { Name = "Blacksmith",
-  Image = {"size", {96, 96}},
-  Animations = "animations-building", Icon = "icon-orc-blacksmith",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {2, 2}, BoxSize = {63, 63},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic orc voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-orc-farm"] = {forest = "tilesets/forest/orc/buildings/farm.png",
-  swamp = "tilesets/swamp/orc/buildings/farm.png"}
-
-DefineUnitType("unit-orc-farm", { Name = "Farm",
-  Image = {"size", {96, 96}},
-  Animations = "animations-building", Icon = "icon-orc-farm",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {2, 2}, BoxSize = {63, 63},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic orc voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-orc-kennel"] = {forest = "tilesets/forest/orc/buildings/kennel.png",
-  swamp = "tilesets/swamp/orc/buildings/kennel.png"}
-
-DefineUnitType("unit-orc-kennel", { Name = "Kennel",
-  Image = {"size", {128, 96}},
-  Animations = "animations-building", Icon = "icon-orc-kennel",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {3, 3}, BoxSize = {95, 95},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic orc voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-orc-lumber-mill"] = {forest = "tilesets/forest/orc/buildings/lumber_mill.png",
-  swamp = "tilesets/swamp/orc/buildings/lumber_mill.png"}
-
-DefineUnitType("unit-orc-lumber-mill", { Name = "Lumber mill",
-  Image = {"size", {128, 128}},
-  Animations = "animations-building", Icon = "icon-orc-lumber-mill",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {3, 3}, BoxSize = {95, 95},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic orc voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-orc-temple"] = {forest = "tilesets/forest/orc/buildings/temple.png",
-  swamp = "tilesets/swamp/orc/buildings/temple.png"}
-
-DefineUnitType("unit-orc-temple", { Name = "Temple",
-  Image = {"size", {128, 128}},
-  Animations = "animations-building", Icon = "icon-orc-temple",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {3, 3}, BoxSize = {95, 95},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic orc voices help 2",
-    "dead", "building destroyed"} } )
-
-
-UnitTypeFiles["unit-orc-tower"] = {forest = "tilesets/forest/orc/buildings/tower.png",
-  swamp = "tilesets/swamp/orc/buildings/tower.png"}
-
-DefineUnitType("unit-orc-tower", { Name = "Tower",
-  Image = {"size", {96, 96}},
-  Animations = "animations-building", Icon = "icon-orc-tower",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {2, 2}, BoxSize = {63, 63},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic orc voices help 2",
-    "dead", "building destroyed"} } )
-
-UnitTypeFiles["unit-orc-town-hall"] = {forest = "tilesets/forest/orc/buildings/town_hall.png",
-  swamp = "tilesets/swamp/orc/buildings/town_hall.png"}
-
-DefineUnitType("unit-orc-town-hall", { Name = "Town hall",
-  Image = {"size", {128, 128}},
-  Animations = "animations-building", Icon = "icon-orc-town-hall",
-  Costs = {"time", 100, "gold", 500, "wood", 250},
-  RepairHp = 4,
-  RepairCosts = {"gold", 1, "wood", 1},
-  Construction = "construction-land",
-  HitPoints = 400,
-  DrawLevel = 20,
-  TileSize = {3, 3}, BoxSize = {95, 95},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 20, AnnoyComputerFactor = 45,
-  Points = 100,
-  Supply = 4,
-  Corpse = "unit-destroyed-2x2-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
-    "selected", "farm-selected",
---    "acknowledge", "farm-acknowledge",
---    "ready", "farm-ready",
-    "help", "basic orc voices help 2",
-    "dead", "building destroyed"} } )
-
---]]	
---[[
-UnitTypeFiles["unit-orc-wall"] = {summer = "tilesets/summer/neutral/buildings/wall.png",
-  winter = "tilesets/winter/neutral/buildings/wall.png",
-  wasteland = "tilesets/wasteland/neutral/buildings/wall.png",
-  swamp = "tilesets/summer/neutral/buildings/wall.png"}
-
-DefineUnitType("unit-orc-wall", { Name = "Wall",
-  Image = {"size", {32, 32}},
-  Animations = "animations-building", Icon = "icon-orc-wall",
-  Costs = {"time", 30, "gold", 20, "wood", 10},
-  Construction = "construction-wall",
-  Speed = 0,
-  HitPoints = 40,
-  DrawLevel = 39,
-  TileSize = {1, 1}, BoxSize = {31, 31},
-  SightRange = 1,
-  Armor = 20, BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
-  Priority = 0, AnnoyComputerFactor = 45,
-  Points = 1,
-  Corpse = "unit-destroyed-1x1-place",
-  ExplodeWhenKilled = "missile-explosion",
-  Type = "land",
-  Building = true, VisibleUnderFog = true, 
-  Sounds = {
---    "selected", "orc-wall-selected",
---    "acknowledge", "orc-wall-acknowledge",
---    "ready", "orc-wall-ready",
-    "help", "basic orc voices help 2",
-    "dead", "building destroyed"} } )
-
---]]

=== modified file 'scripts/orc/upgrade.lua'
--- scripts/orc/upgrade.lua	2010-06-22 06:41:34 +0000
+++ scripts/orc/upgrade.lua	2013-05-08 07:16:26 +0000
@@ -74,31 +74,31 @@
 --	NOTE: Save can generate this table.
 
 DefineModifier("upgrade-axe1",
-  {"piercing-damage", 2},
+  {"PiercingDamage", 2},
   {"apply-to", "unit-grunt"}, {"apply-to", "unit-raider"})
 DefineModifier("upgrade-axe2",
-  {"piercing-damage", 2},
+  {"PiercingDamage", 2},
   {"apply-to", "unit-grunt"}, {"apply-to", "unit-raider"})
 
 DefineModifier("upgrade-spear1",
-  {"piercing-damage", 1},
+  {"PiercingDamage", 1},
   {"apply-to", "unit-spearman"})
 DefineModifier("upgrade-spear2",
-  {"piercing-damage", 1},
+  {"PiercingDamage", 1},
   {"apply-to", "unit-spearman"})
 
 DefineModifier("upgrade-wolves1",
-  {"piercing-damage", 1},
+--  {"Speed", 1},
   {"apply-to", "unit-raider"})
 DefineModifier("upgrade-wolves2",
-  {"piercing-damage", 1},
+--  {"Speed", 1},
   {"apply-to", "unit-raider"})
 
 DefineModifier("upgrade-orc-shield1",
-  {"armor", 2},
+  {"Armor", 2},
   {"apply-to", "unit-grunt"}, {"apply-to", "unit-raider"})
 DefineModifier("upgrade-orc-shield2",
-  {"armor", 2},
+  {"Armor", 2},
   {"apply-to", "unit-grunt"}, {"apply-to", "unit-raider"})
 
 DefineModifier("upgrade-raise-dead",

=== removed file 'scripts/ranks.lua'
--- scripts/ranks.lua	2010-06-22 06:44:07 +0000
+++ scripts/ranks.lua	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
---       _________ __                 __                               
---      /   _____//  |_____________ _/  |______     ____  __ __  ______
---      \_____  \\   __\_  __ \__  \\   __\__  \   / ___\|  |  \/  ___/
---      /        \|  |  |  | \// __ \|  |  / __ \_/ /_/  >  |  /\___ \ 
---     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
---             \/                  \/          \//_____/            \/ 
---  ______________________                           ______________________
---                        T H E   W A R   B E G I N S
---         Stratagus - A free fantasy real time strategy game engine
---
---      ranks.lua - Ranks for all of the races.
---
---      (c) Copyright 2002-2004 by Jimmy Salmon.
---
---      This program is free software; you can redistribute it and/or modify
---      it under the terms of the GNU General Public License as published by
---      the Free Software Foundation; either version 2 of the License, or
---      (at your option) any later version.
---  
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warranty of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
---  
---      You should have received a copy of the GNU General Public License
---      along with this program; if not, write to the Free Software
---      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
---
---      $Id$
-
---=============================================================================
---  Define ranks for a race.
---
---  DefineRanks(race, {score, rank, [score, rank] ...})
---
---  race   The race to define the ranks for.
---  score  If the player's score is greater than or equal to this number then 
---         the rank is displayed.  Scores are expected to be sorted in 
---         increasing order.
---  rank   The rank that gets displayed.
---
-
---[[
-DefineRanks("human", {
-  0, "Human Rank 1",
-})
-
-DefineRanks("orc", {
-  0, "Orc Rank 1",
-})
-]]

=== modified file 'scripts/sound.lua'
--- scripts/sound.lua	2010-11-16 22:33:39 +0000
+++ scripts/sound.lua	2013-05-08 07:16:26 +0000
@@ -84,7 +84,7 @@
     "cd", {"order", "all", "tracks", {16}})
 DefinePlaySections("race", "orc", "type", "stats-defeat",
     "cd", {"order", "all", "tracks", {17}})
-]]
+--]]
 ------------------------------------------------------------------------------
 --	Define simple misc sounds.
 --

=== modified file 'scripts/spells.lua'
--- scripts/spells.lua	2009-05-22 16:30:00 +0000
+++ scripts/spells.lua	2013-05-08 07:16:26 +0000
@@ -31,4 +31,232 @@
 -- For documentation see stratagus/doc/ccl/ccl.html
 
 DefineBoolFlags("isundead", "organic", "hero", "volatile")
-
+DefineVariables("Mana", {Max = 255, Value = 84, Increase = 1, Enable = false}, "Speed", "ShadowFly", {Max = 2}, "Level")
+
+--  Declare some unit types used in spells. This is quite accetable, the other
+--  way would be to define can-cast-spell outside unit definitions, not much of an improvement.
+DefineUnitType(
+   "unit-revealer", {
+      Name = "Dummy unit",
+      Animations = "animations-building", Icon = "icon-far-seeing",
+      HitPoints = 1,
+      TileSize = {1, 1}, BoxSize = {1, 1},
+      SightRange = 12,
+      BasicDamage = 0, PiercingDamage = 0, Missile = "missile-none",
+      Priority = 0,
+      DecayRate = 1,
+      Type = "land",
+      Building = true, VisibleUnderFog = true,
+      Revealer = true,
+      DetectCloak = true,
+      Sounds = {} })
+-- These following units are redefined in units.lua
+DefineUnitType("unit-the-dead", {})
+DefineUnitType("unit-spider", {})
+DefineUnitType("unit-scorpion", {})
+DefineUnitType("unit-daemon", {})
+DefineUnitType("unit-water-elemental", {})
+
+-- And declare upgrade for dependency...
+-- For human
+CUpgrade:New("upgrade-far-seeing")
+CUpgrade:New("upgrade-healing")
+CUpgrade:New("upgrade-invisibility")
+CUpgrade:New("upgrade-scorpion")
+CUpgrade:New("upgrade-water-elemental")
+CUpgrade:New("upgrade-rain-of-fire")
+-- For orc
+CUpgrade:New("upgrade-dark-vision")
+CUpgrade:New("upgrade-raise-dead")
+CUpgrade:New("upgrade-unholy-armor")
+CUpgrade:New("upgrade-spider")
+CUpgrade:New("upgrade-daemon")
+CUpgrade:New("upgrade-poison-cloud")
+
+
+DefineSpell("spell-far-seeing",
+	"showname", "Far Seeing",
+	"manacost", 70,
+	"range", "infinite",
+	"target", "position",
+	"action", {{"summon", "unit-type", "unit-revealer", "time-to-live", 25},
+		{"spawn-missile", "missile", "missile-normal-spell",
+			"start-point", {"base", "target"}}},
+	"sound-when-cast", "vision",
+	"depend-upgrade", "upgrade-far-seeing"
+)
+
+DefineSpell("spell-dark-vision",
+	"showname", "Dark Vision",
+	"manacost", 70,
+	"range", "infinite",
+	"target", "position",
+	"action", {{"summon", "unit-type", "unit-revealer", "time-to-live", 25},
+		{"spawn-missile", "missile", "missile-normal-spell",
+			"start-point", {"base", "target"}}},
+	"sound-when-cast", "vision",
+	"depend-upgrade", "upgrade-dark-vision"
+)
+
+DefineSpell("spell-healing",
+	"showname", "Healing",
+	"manacost", 6,
+	"range", 6,
+	"target", "unit",
+	"action", {{"adjust-vitals", "hit-points", 1},
+		{"spawn-missile", "missile", "missile-normal-spell",
+			"start-point", {"base", "target"}}},
+	"condition", {
+		"organic", "only",
+		"Building", "false",
+		"HitPoints", {MaxValuePercent = 100}
+	},
+	"sound-when-cast", "healing",
+	"depend-upgrade", "upgrade-healing",
+	"autocast", {"range", 6, "condition", {"alliance", "only", "HitPoints", {MaxValuePercent = 90}}}
+)
+
+DefineSpell("spell-raise-dead",
+	"showname", "raise dead",
+	"manacost", 50,
+	"range", 6,
+	"repeat-cast",
+	"target", "position",
+	"action", {{"summon", "unit-type", "unit-the-dead", "time-to-live", 3600, "require-corpse"},
+		{"spawn-missile", "missile", "missile-normal-spell",
+			"start-point", {"base", "target"}}},
+	"sound-when-cast", "raise dead",
+	"depend-upgrade", "upgrade-raise-dead"
+--	"autocast", {"range", 6}
+)
+
+DefineSpell("spell-unholy-armor",
+	"showname", "unholyarmor",
+	"manacost", 100,
+	"range", 6,
+	"target", "unit",
+	"action", {{"adjust-variable", {UnholyArmor = 500}},
+		{"spawn-missile", "missile", "missile-normal-spell",
+			"start-point", {"base", "target"}}},
+	"condition", {
+		"Building", "false",
+		"UnholyArmor", {MaxValue = 10}},
+	"sound-when-cast", "unholy armor",
+	"depend-upgrade", "upgrade-unholy-armor"
+--	"autocast", {range 6 condition (Coward false alliance only)},
+)
+
+DefineSpell("spell-invisibility",
+	"showname", "invisibility",
+	"manacost", 200,
+	"range", 6,
+	"target", "unit",
+	"action", {{"adjust-variable", {Invisible = 2000}},
+		{"spawn-missile", "missile", "missile-normal-spell",
+			"start-point", {"base", "target"}}},
+	"condition", {
+		"Building", "false",
+		"Invisible", {MaxValue = 10}},
+	"sound-when-cast", "invisibility",
+	"depend-upgrade", "upgrade-invisibility"
+--	"autocast", {"range", 6, "condition", {"Coward", "false"}},
+)
+
+DefineSpell("spell-summon-scorpions",
+	"showname", "summon scorpions",
+	"manacost", 50,
+	"range", 6,
+	"repeat-cast",
+	"target", "position",
+	"action", {
+	   {"summon", "unit-type", "unit-scorpion", "time-to-live", 3600},
+	   {"summon", "unit-type", "unit-scorpion", "time-to-live", 3600},
+	   {"summon", "unit-type", "unit-scorpion", "time-to-live", 3600},
+	   {"summon", "unit-type", "unit-scorpion", "time-to-live", 3600},
+	   {"spawn-missile", "missile", "missile-normal-spell", "start-point", {"base", "target"}}
+		  },
+	"sound-when-cast", "raise dead",
+	"depend-upgrade", "upgrade-scorpion"
+--	"autocast", {"range", 6}
+)
+
+DefineSpell("spell-summon-elemental",
+	"showname", "summan elemental",
+	"manacost", 50,
+	"range", 6,
+	"repeat-cast",
+	"target", "position",
+	"action", {
+	   {"summon", "unit-type", "unit-water-elemental", "time-to-live", 3600},
+	   {"spawn-missile", "missile", "missile-normal-spell", "start-point", {"base", "target"}}
+		  },
+	"sound-when-cast", "raise dead",
+	"depend-upgrade", "upgrade-water-elemental"
+--	"autocast", {"range", 6}
+)
+
+DefineSpell("spell-rain-of-fire",
+	"showname", "Rain of Fire",
+	"manacost", 25,
+	"range", 12,
+	"repeat-cast",
+	"target", "position",
+	"action", {{"area-bombardment", "missile", "missile-rain-of-fire",
+		 "fields", 5,
+		 "shards", 10,
+		 "damage", 10}},
+	"sound-when-cast", "blizzard",