From 2433b6d6dfed9f23b9f6f08bae64d90dd3d0eec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 19 Jan 2014 11:04:28 +0100 Subject: [PATCH 1/2] added mods/common/lua scripts --- OpenRA.sln | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/OpenRA.sln b/OpenRA.sln index be7b5e62af..f5aee92a88 100644 --- a/OpenRA.sln +++ b/OpenRA.sln @@ -41,6 +41,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Irc", "OpenRA.Irc\Op EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Renderer.Sdl2", "OpenRA.Renderer.Sdl2\OpenRA.Renderer.Sdl2.csproj", "{33D03738-C154-4028-8EA8-63A3C488A651}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common Lua scripts", "Common Lua scripts", "{FCA943AB-E622-415E-8A61-639D97F62EEC}" + ProjectSection(SolutionItems) = preProject + mods\common\lua\utils.lua = mods\common\lua\utils.lua + mods\common\lua\team.lua = mods\common\lua\team.lua + mods\common\lua\supportpowers.lua = mods\common\lua\supportpowers.lua + mods\common\lua\rules.lua = mods\common\lua\rules.lua + mods\common\lua\reinforcements.lua = mods\common\lua\reinforcements.lua + mods\common\lua\openra.lua = mods\common\lua\openra.lua + mods\common\lua\mission.lua = mods\common\lua\mission.lua + mods\common\lua\media.lua = mods\common\lua\media.lua + mods\common\lua\map.lua = mods\common\lua\map.lua + mods\common\lua\actor.lua = mods\common\lua\actor.lua + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU From 18d8034153728afd6f7f326f7845d6110cbcc07b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 19 Jan 2014 11:11:57 +0100 Subject: [PATCH 2/2] added mods/cnc Lua scripts --- OpenRA.sln | 10 ++++++++++ mods/cnc/maps/gdi01/{mission.lua => gdi01.lua} | 0 mods/cnc/maps/gdi01/map.yaml | 2 +- mods/cnc/maps/gdi02/{mission.lua => gdi02.lua} | 0 mods/cnc/maps/gdi02/map.yaml | 2 +- mods/cnc/maps/nod01/map.yaml | 2 +- mods/cnc/maps/nod01/{mission.lua => nod01.lua} | 0 mods/cnc/maps/nod03a/map.yaml | 2 +- mods/cnc/maps/nod03a/{mission.lua => nod03a.lua} | 0 mods/cnc/maps/nod03b/map.yaml | 2 +- mods/cnc/maps/nod03b/{mission.lua => nod03b.lua} | 0 11 files changed, 15 insertions(+), 5 deletions(-) rename mods/cnc/maps/gdi01/{mission.lua => gdi01.lua} (100%) rename mods/cnc/maps/gdi02/{mission.lua => gdi02.lua} (100%) rename mods/cnc/maps/nod01/{mission.lua => nod01.lua} (100%) rename mods/cnc/maps/nod03a/{mission.lua => nod03a.lua} (100%) rename mods/cnc/maps/nod03b/{mission.lua => nod03b.lua} (100%) diff --git a/OpenRA.sln b/OpenRA.sln index f5aee92a88..50bf002750 100644 --- a/OpenRA.sln +++ b/OpenRA.sln @@ -55,6 +55,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common Lua scripts", "Commo mods\common\lua\actor.lua = mods\common\lua\actor.lua EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tiberian Dawn Lua scripts", "Tiberian Dawn Lua scripts", "{62FCD0D0-6D24-435D-9DD8-3CCADCF7ECAB}" + ProjectSection(SolutionItems) = preProject + mods\cnc\maps\shellmap\shellmap.lua = mods\cnc\maps\shellmap\shellmap.lua + mods\cnc\maps\gdi01\gdi01.lua = mods\cnc\maps\gdi01\gdi01.lua + mods\cnc\maps\gdi02\gdi02.lua = mods\cnc\maps\gdi02\gdi02.lua + mods\cnc\maps\nod01\nod01.lua = mods\cnc\maps\nod01\nod01.lua + mods\cnc\maps\nod03a\nod03a.lua = mods\cnc\maps\nod03a\nod03a.lua + mods\cnc\maps\nod03b\nod03b.lua = mods\cnc\maps\nod01\nod03b.lua + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/mods/cnc/maps/gdi01/mission.lua b/mods/cnc/maps/gdi01/gdi01.lua similarity index 100% rename from mods/cnc/maps/gdi01/mission.lua rename to mods/cnc/maps/gdi01/gdi01.lua diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index 47a37fd712..93a70a9c55 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -458,7 +458,7 @@ Rules: Music: aoi Loop: false LuaScriptInterface: - LuaScripts: mission.lua + LuaScripts: gdi01.lua Player: -ConquestVictoryConditions: ^Infantry: diff --git a/mods/cnc/maps/gdi02/mission.lua b/mods/cnc/maps/gdi02/gdi02.lua similarity index 100% rename from mods/cnc/maps/gdi02/mission.lua rename to mods/cnc/maps/gdi02/gdi02.lua diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index 31467f6884..fcb94193cc 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -733,7 +733,7 @@ Rules: -MPStartLocations: -CrateSpawner: LuaScriptInterface: - LuaScripts: mission.lua + LuaScripts: gdi02.lua Player: -ConquestVictoryConditions: PROC: diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index 7882b6dd08..a152fa964a 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/mods/cnc/maps/nod01/map.yaml @@ -304,7 +304,7 @@ Rules: -SpawnMPUnits: -MPStartLocations: LuaScriptInterface: - LuaScripts: mission.lua + LuaScripts: nod01.lua C10: Tooltip: Name: Nikoomba diff --git a/mods/cnc/maps/nod01/mission.lua b/mods/cnc/maps/nod01/nod01.lua similarity index 100% rename from mods/cnc/maps/nod01/mission.lua rename to mods/cnc/maps/nod01/nod01.lua diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index 7c532ca922..8e0c4aff27 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -570,7 +570,7 @@ Rules: -SpawnMPUnits: -MPStartLocations: LuaScriptInterface: - LuaScripts: mission.lua + LuaScripts: nod03a.lua NUK2: Buildable: Owner: None diff --git a/mods/cnc/maps/nod03a/mission.lua b/mods/cnc/maps/nod03a/nod03a.lua similarity index 100% rename from mods/cnc/maps/nod03a/mission.lua rename to mods/cnc/maps/nod03a/nod03a.lua diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index 91a6399b29..effaf9bff8 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -661,7 +661,7 @@ Rules: -SpawnMPUnits: -MPStartLocations: LuaScriptInterface: - LuaScripts: mission.lua + LuaScripts: nod03b.lua NUK2: Buildable: Owner: None diff --git a/mods/cnc/maps/nod03b/mission.lua b/mods/cnc/maps/nod03b/nod03b.lua similarity index 100% rename from mods/cnc/maps/nod03b/mission.lua rename to mods/cnc/maps/nod03b/nod03b.lua