epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6786 from pchote/retire-code

Browse Source 
Retire legacy Lua API and IRC code.
This commit is contained in:
Matthias Mailänder
2014-10-19 09:13:14 +02:00
parent d1ece9001c 6445e78385
commit ae899b603d
54 changed files with 46 additions and 4599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
mods/cnc/chrome/irc.yaml
View File

@@ -1,70 +0,0 @@
Container@SERVERBROWSER_IRC:
Logic: IrcLogic
Width: 700
Height: 250
Children:
Container@IRC_CONTAINER:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
ScrollPanel@HISTORY_PANEL:
Width: 565
Height: PARENT_BOTTOM - 30
ItemSpacing: 5
Label@HISTORY_TEMPLATE:
X: 5
Width: 530
Height: 25
WordWrap: True
TextField@INPUT_BOX:
Y: PARENT_BOTTOM - 25
Width: 565
Height: 25
ScrollPanel@NICKNAME_PANEL:
X: 570
Width: 130
Height: PARENT_BOTTOM - 30
Label@NICKNAME_TEMPLATE:
X: 5
Button@DISCONNECT_BUTTON:
X: 570
Y: PARENT_BOTTOM - 25
Width: 130
Height: 25
Text: Disconnect
Font: Bold
Background@IRC_CONNECT_BG:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Background: scrollpanel-bg
Children:
Label@GLOBAL_CHAT_LABEL:
Y: PARENT_BOTTOM / 4
Width: PARENT_RIGHT
Align: Center
Text: Global Chat
Font: Bold
Label@NICKNAME_LABEL:
X: 200
Y: PARENT_BOTTOM / 4 + 35
Text: Nickname:
TextField@NICKNAME_BOX:
X: 270
Y: PARENT_BOTTOM / 4 + 25
Width: 150
Height: 25
Checkbox@CONNECT_AUTOMATICALLY_CHECKBOX:
X: 270
Y: PARENT_BOTTOM / 4 + 75
Height: 20
Width: 180
Font: Regular
Text: Connect Automatically
Button@CONNECT_BUTTON:
X: 430
Y: PARENT_BOTTOM / 4 + 25
Width: 100
Height: 25
Text: Connect
Font: Bold

41
mods/cnc/maps/gdi03/gdi03.lua
View File

@@ -1,41 +0,0 @@
MissionAccomplished = function()
Mission.MissionOver({ player }, nil, true)
Media.PlayMovieFullscreen("bombaway.vqa")
end
MissionFailed = function()
Mission.MissionOver(nil, { player }, true)
Media.PlayMovieFullscreen("gameover.vqa")
end
AttackPlayer = function()
if not Actor.IsDead(NodBarracks) then
Production.BuildWithPerFactoryQueue(NodBarracks, "e1", 5)
attackSquad = Team.New(Map.FindUnitsInCircle(enemy, NodBarracks, 3))
Team.Do(attackSquad, function(unit)
Actor.AttackMove(unit, waypoint9.location)
Actor.Hunt(unit)
end)
Team.AddEventHandler(attackSquad.OnAllKilled, OpenRA.RunAfterDelay(Utils.Seconds(15), AttackPlayer))
end
end
WorldLoaded = function()
player = OpenRA.GetPlayer("GDI")
enemy = OpenRA.GetPlayer("Nod")
Media.PlayMovieFullscreen("samdie.vqa")
samSites = Team.New({ Sam1, Sam2, Sam3, Sam4 })
Team.AddEventHandler(samSites.OnAllKilled, function() Actor.Create("PowerProxy.AirSupport", { Owner = player }) end)
OpenRA.RunAfterDelay(Utils.Seconds(15), AttackPlayer)
end
Tick = function()
if Mission.RequiredUnitsAreDestroyed(player) then
MissionFailed()
end
if Mission.RequiredUnitsAreDestroyed(enemy) then
MissionAccomplished()
end
end

BIN
mods/cnc/maps/gdi03/map.bin
View File

Binary file not shown.

BIN
mods/cnc/maps/gdi03/map.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

1061
mods/cnc/maps/gdi03/map.yaml
View File

File diff suppressed because it is too large Load Diff

17
mods/cnc/mod.yaml
View File

@@ -103,7 +103,6 @@ ChromeLayout:
./mods/cnc/chrome/credits.yaml
./mods/cnc/chrome/dialogs.yaml
./mods/cnc/chrome/tooltips.yaml
./mods/cnc/chrome/irc.yaml
./mods/cnc/chrome/assetbrowser.yaml
./mods/cnc/chrome/missionbrowser.yaml
@@ -172,28 +171,28 @@ ChromeMetrics:
Fonts:
Small:
Font:./FreeSans.ttf
Font:./mods/common/FreeSans.ttf
Size:12
Regular:
Font:./FreeSans.ttf
Font:./mods/common/FreeSans.ttf
Size:14
Bold:
Font:./FreeSansBold.ttf
Font:./mods/common/FreeSansBold.ttf
Size:14
Title:
Font:./FreeSansBold.ttf
Font:./mods/common/FreeSansBold.ttf
Size:32
MediumBold:
Font:./FreeSansBold.ttf
Font:./mods/common/FreeSansBold.ttf
Size:18
BigBold:
Font:./FreeSansBold.ttf
Font:./mods/common/FreeSansBold.ttf
Size:24
Tiny:
Font:./FreeSans.ttf
Font:./mods/common/FreeSans.ttf
Size:10
TinyBold:
Font:./FreeSansBold.ttf
Font:./mods/common/FreeSansBold.ttf
Size:10
LuaScripts:

16
mods/cnc/rules/defaults.yaml
View File

@@ -40,7 +40,6 @@
CloakSound: trans1.aud
UncloakSound: trans1.aud
Huntable:
LuaScriptEvents:
ScriptTriggers:
GainsStatUpgrades:
SelfHealing@ELITE:
@@ -96,7 +95,6 @@
CloakSound: trans1.aud
UncloakSound: trans1.aud
Huntable:
LuaScriptEvents:
ScriptTriggers:
GainsStatUpgrades:
SelfHealing@ELITE:
@@ -135,7 +133,6 @@
BodyOrientation:
UpdatesPlayerStatistics:
Huntable:
LuaScriptEvents:
ScriptTriggers:
Tooltip:
GenericName: Helicopter
@@ -210,7 +207,6 @@
Prerequisites: hosp
UpdatesPlayerStatistics:
Huntable:
LuaScriptEvents:
DetectCloaked:
Range: 1
ScriptTriggers:
@@ -307,7 +303,6 @@
AttackFrontal:
UpdatesPlayerStatistics:
Huntable:
LuaScriptEvents:
ScriptTriggers:
DeathSounds:
@@ -328,7 +323,6 @@
BodyOrientation:
Huntable:
AttackMove:
LuaScriptEvents:
ScriptTriggers:
GainsStatUpgrades:
SelfHealing@ELITE:
@@ -362,7 +356,6 @@
BodyOrientation:
UpdatesPlayerStatistics:
Huntable:
LuaScriptEvents:
ScriptTriggers:
GainsStatUpgrades:
SelfHealing@ELITE:
@@ -414,7 +407,6 @@
FrozenUnderFog:
UpdatesPlayerStatistics:
Huntable:
LuaScriptEvents:
Demolishable:
ScriptTriggers:
WithMakeAnimation:
@@ -459,7 +451,6 @@
BodyOrientation:
FrozenUnderFog:
StartsRevealed: true
LuaScriptEvents:
ScriptTriggers:
WithMakeAnimation:
@@ -505,7 +496,6 @@
Palette: terrain
FrozenUnderFog:
StartsRevealed: true
LuaScriptEvents:
ScriptTriggers:
WithMakeAnimation:
@@ -539,7 +529,6 @@
Guardable:
BodyOrientation:
FrozenUnderFog:
LuaScriptEvents:
ScriptTriggers:
^Tree:
@@ -564,7 +553,6 @@
BodyOrientation:
FrozenUnderFog:
StartsRevealed: true
LuaScriptEvents:
ScriptTriggers:
WithMakeAnimation:
@@ -583,7 +571,6 @@
BodyOrientation:
FrozenUnderFog:
StartsRevealed: true
LuaScriptEvents:
WithMakeAnimation:
^Rock:
@@ -602,7 +589,6 @@
BodyOrientation:
FrozenUnderFog:
StartsRevealed: true
LuaScriptEvents:
ScriptTriggers:
WithMakeAnimation:
@@ -630,7 +616,6 @@
BodyOrientation:
Tooltip:
GenericName: Destroyed Vehicle
LuaScriptEvents:
DisabledOverlay:
ScriptTriggers:
@@ -660,6 +645,5 @@
DamagedSound: xplos.aud
DestroyedSound: xplobig4.aud
BodyOrientation:
LuaScriptEvents:
ScriptTriggers: