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

Merge pull request #10650 from pchote/remove-fragile-diplomacy

Browse Source 
Remove fragile diplomacy.
This commit is contained in:
Oliver Brakmann
2016-02-06 22:55:55 +01:00
parent 870867760a b387e6a19e
commit a6e98620c0
24 changed files with 92 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
mods/cnc/chrome/lobby-options.yaml
View File

@@ -17,106 +17,104 @@ Background@LOBBY_OPTIONS_BIN:
Height: PARENT_BOTTOM-75
Children:
Checkbox@EXPLORED_MAP_CHECKBOX:
Width: 230
Width: 150
Height: 20
Font: Regular
Text: Explored Map
Checkbox@FOG_CHECKBOX:
Y: 35
Width: 230
Width: 150
Height: 20
Font: Regular
Text: Fog of War
Checkbox@CRATES_CHECKBOX:
X: 140
Width: 230
X: 170
Width: 225
Height: 20
Font: Regular
Text: Crates
Checkbox@ALLYBUILDRADIUS_CHECKBOX:
X: 140
X: 170
Y: 35
Width: 230
Width: 225
Height: 20
Font: Regular
Text: Build off Allies' ConYards
Checkbox@SHORTGAME_CHECKBOX:
X: 365
Width: 230
X: 400
Width: 150
Height: 20
Font: Regular
Text: Short Game
Checkbox@ALLOWCHEATS_CHECKBOX:
X: 365
X: 400
Y: 35
Width: 230
Width: 150
Height: 20
Font: Regular
Text: Debug Menu
Label@STARTINGCASH_DESC:
X: 10
Y: 72
Width: 70
Label@DIFFICULTY_DESC:
X: PARENT_RIGHT - WIDTH - 165
Y: 70
Width: 160
Height: 25
Text: Mission Difficulty:
Align: Right
DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
X: PARENT_RIGHT - WIDTH
Y: 70
Width: 160
Height: 25
Font: Regular
Label@STARTINGCASH_DESC:
Y: 110
Width: 80
Height: 25
Text: Starting Cash:
Align: Right
DropDownButton@STARTINGCASH_DROPDOWNBUTTON:
X: 85
Y: 72
Width: 120
Y: 110
Width: 160
Height: 25
Font: Regular
Text: $5000
Label@STARTINGUNITS_DESC:
X: PARENT_RIGHT - WIDTH - 135
Y: 72
X: PARENT_RIGHT - WIDTH - 165
Y: 110
Width: 120
Height: 25
Text: Starting Units:
Align: Right
DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
X: PARENT_RIGHT - WIDTH + 10
Y: 72
Width: 140
X: PARENT_RIGHT - WIDTH
Y: 110
Width: 160
Height: 25
Font: Regular
DropDownButton@TECHLEVEL_DROPDOWNBUTTON:
X: 85
Y: 112
Width: 120
Y: 150
Width: 160
Height: 25
Font: Regular
Text: 10
Label@TECHLEVEL_DESC:
Y: 112
Y: 150
Width: 80
Height: 25
Text: Tech Level:
Align: Right
Label@GAMESPEED_DESC:
X: PARENT_RIGHT - WIDTH - 135
Y: 112
X: PARENT_RIGHT - WIDTH - 165
Y: 150
Width: 120
Height: 25
Text: Game Speed:
Align: Right
DropDownButton@GAMESPEED_DROPDOWNBUTTON:
X: PARENT_RIGHT - WIDTH + 10
Y: 112
Width: 140
Height: 25
Font: Regular
Label@DIFFICULTY_DESC:
X: PARENT_RIGHT - WIDTH - 135
Y: 152
Width: 120
Height: 25
Text: Mission Difficulty:
Align: Right
DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
X: PARENT_RIGHT - WIDTH + 10
Y: 152
Width: 140
X: PARENT_RIGHT - WIDTH
Y: 150
Width: 160
Height: 25
Font: Regular

18
mods/d2k/chrome/ingame-player.yaml
View File

@@ -109,24 +109,6 @@ Container@PLAYER_WIDGETS:
X: 0
Y: 0
ImageCollection: order-icons
MenuButton@DIPLOMACY_BUTTON:
MenuContainer: INGAME_DIPLOMACY_BG
HideIngameUI: false
Pause: false
Key: P
X: 159
Width: 25
Height: 25
Background:
TooltipText: Diplomacy
TooltipContainer: TOOLTIP_CONTAINER
VisualHeight: 0
Children:
Image@ICON:
X: 0
Y: 0
ImageCollection: order-icons
ImageName: diplomacy
MenuButton@OPTIONS_BUTTON:
Key: escape
X: 78

61
mods/d2k/chrome/lobby-options.yaml
View File

@@ -18,58 +18,53 @@ Background@LOBBY_OPTIONS_BIN:
Height: PARENT_BOTTOM-75
Children:
Checkbox@EXPLORED_MAP_CHECKBOX:
Width: 140
Width: 150
Height: 20
Text: Explored Map
Checkbox@FOG_CHECKBOX:
Y: 35
Width: 140
Width: 150
Height: 20
Text: Fog of War
Checkbox@SHORTGAME_CHECKBOX:
X: 150
Width: 140
Height: 20
Text: Short Game
Checkbox@CRATES_CHECKBOX:
X: 150
Y: 35
Width: 140
X: 170
Width: 225
Height: 20
Text: Crates
Checkbox@ALLYBUILDRADIUS_CHECKBOX:
X: 290
Width: 140
X: 170
Y: 35
Width: 225
Height: 20
Text: Build off Allies' ConYards
Checkbox@FRAGILEALLIANCES_CHECKBOX:
X: 290
Y: 35
Width: 140
Checkbox@SHORTGAME_CHECKBOX:
X: 400
Width: 150
Height: 20
Text: Diplomacy Changes
Text: Short Game
Checkbox@ALLOWCHEATS_CHECKBOX:
X: 400
Y: 35
Width: 150
Height: 20
Font: Regular
Text: Debug Menu
Checkbox@CREEPS_CHECKBOX:
Y: 70
Width: 140
Width: 150
Height: 20
Text: Worms
Checkbox@ALLOWCHEATS_CHECKBOX:
X: 150
Y: 70
Width: 140
Height: 20
Text: Debug Menu
Label@DIFFICULTY_DESC:
X: PARENT_RIGHT - WIDTH - 145
X: PARENT_RIGHT - WIDTH - 165
Y: 70
Width: 120
Width: 160
Height: 25
Text: Mission Difficulty:
Align: Right
DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
X: PARENT_RIGHT - WIDTH
Y: 70
Width: 140
Width: 160
Height: 25
Font: Regular
Label@STARTINGCASH_DESC:
@@ -81,12 +76,12 @@ Background@LOBBY_OPTIONS_BIN:
DropDownButton@STARTINGCASH_DROPDOWNBUTTON:
X: 85
Y: 110
Width: 130
Width: 160
Height: 25
Font: Regular
Text: $5000
Label@STARTINGUNITS_DESC:
X: PARENT_RIGHT - WIDTH - 145
X: PARENT_RIGHT - WIDTH - 165
Y: 110
Width: 120
Height: 25
@@ -95,13 +90,13 @@ Background@LOBBY_OPTIONS_BIN:
DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
X: PARENT_RIGHT - WIDTH
Y: 110
Width: 140
Width: 160
Height: 25
Font: Regular
DropDownButton@TECHLEVEL_DROPDOWNBUTTON:
X: 85
Y: 150
Width: 130
Width: 160
Height: 25
Font: Regular
Text: 10
@@ -112,7 +107,7 @@ Background@LOBBY_OPTIONS_BIN:
Text: Tech Level:
Align: Right
Label@GAMESPEED_DESC:
X: PARENT_RIGHT - WIDTH - 145
X: PARENT_RIGHT - WIDTH - 165
Y: 150
Width: 120
Height: 25
@@ -121,6 +116,6 @@ Background@LOBBY_OPTIONS_BIN:
DropDownButton@GAMESPEED_DROPDOWNBUTTON:
X: PARENT_RIGHT - WIDTH
Y: 150
Width: 140
Width: 160
Height: 25
Font: Regular

1
mods/d2k/mod.yaml
View File

@@ -67,7 +67,6 @@ Assemblies:
ChromeLayout:
d2k:chrome/ingame.yaml
./mods/ra/chrome/ingame-chat.yaml
./mods/ra/chrome/ingame-diplomacy.yaml
./mods/ra/chrome/ingame-fmvplayer.yaml
d2k:chrome/ingame-menu.yaml
./mods/ra/chrome/ingame-info.yaml

91
mods/ra/chrome/ingame-diplomacy.yaml
View File

@@ -1,91 +0,0 @@
Background@INGAME_DIPLOMACY_BG:
Logic: DiplomacyLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - HEIGHT)/2
Width: 490
Height: 355
Children:
Label@LABEL_TITLE:
X: (PARENT_RIGHT - WIDTH)/2
Y: 17
Width: 250
Height: 20
Text: Diplomacy
Align: Center
Font: Bold
Container@DIPLOMACY_HEADERS:
X: 20
Y: 40
Width: PARENT_RIGHT-40
Height: PARENT_BOTTOM
Children:
Label@PLAYER_HEADER:
X: 20
Width: 160
Height: 25
Font: Bold
Text: Player
Label@THEIR_STANCE_HEADER:
X: 210
Width: 80
Height: 25
Font: Bold
Text: Their Stance
Align: Center
Label@MY_STANCE_HEADER:
X: 307
Width: 100
Height: 25
Font: Bold
Text: My Stance
Align: Center
ScrollPanel@DIPLOMACY_PANEL:
X: 20
Y: 67
Width: PARENT_RIGHT-40
Height: PARENT_BOTTOM-87-35
TopBottomSpacing: 5
ItemSpacing: 5
Children:
ScrollItem@TEAM_TEMPLATE:
Width: PARENT_RIGHT
Height: 25
Children:
Label@TEAM:
X: 10
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Font: Bold
ScrollItem@PLAYER_TEMPLATE:
Width: PARENT_RIGHT-35
Height: 25
Children:
Image@FLAG:
X: 20
Y: 5
Width: 35
Height: PARENT_BOTTOM-5
ImageName: random
ImageCollection: flags
Label@PLAYER:
X: 55
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Label@THEIR_STANCE:
X: 210
Width: 80
Height: PARENT_BOTTOM
Align: Center
DropDownButton@MY_STANCE:
X: 307
Width: 100
Height: PARENT_BOTTOM
Button@CLOSE:
X: PARENT_RIGHT-145
Y: PARENT_BOTTOM - 45
Width: 120
Height: 25
Text: Close
Key: escape
Font: Bold

19
mods/ra/chrome/ingame-player.yaml
View File

@@ -115,25 +115,6 @@ Container@PLAYER_WIDGETS:
Y: 6
ImageCollection: order-icons
ImageName: debug
MenuButton@DIPLOMACY_BUTTON:
Logic: AddFactionSuffixLogic
MenuContainer: INGAME_DIPLOMACY_BG
HideIngameUI: false
Pause: false
Key: P
X: 160
Width: 28
Height: 28
Background: sidebar-button
TooltipText: Diplomacy
TooltipContainer: TOOLTIP_CONTAINER
VisualHeight: 0
Children:
Image@ICON:
X: 6
Y: 6
ImageCollection: order-icons
ImageName: diplomacy
MenuButton@OPTIONS_BUTTON:
Logic: AddFactionSuffixLogic
Key: escape

33
mods/ra/chrome/lobby-options.yaml
View File

@@ -18,39 +18,34 @@ Background@LOBBY_OPTIONS_BIN:
Height: PARENT_BOTTOM-75
Children:
Checkbox@EXPLORED_MAP_CHECKBOX:
Width: 140
Width: 150
Height: 20
Text: Explored Map
Checkbox@FOG_CHECKBOX:
Y: 35
Width: 140
Width: 150
Height: 20
Text: Fog of War
Checkbox@SHORTGAME_CHECKBOX:
X: 150
Width: 140
Height: 20
Text: Short Game
Checkbox@CRATES_CHECKBOX:
X: 150
Y: 35
Width: 140
X: 170
Width: 225
Height: 20
Text: Crates
Checkbox@ALLYBUILDRADIUS_CHECKBOX:
X: 290
Width: 140
X: 170
Y: 35
Width: 225
Height: 20
Text: Build off Allies' ConYards
Checkbox@FRAGILEALLIANCES_CHECKBOX:
X: 290
Y: 35
Width: 140
Checkbox@SHORTGAME_CHECKBOX:
X: 400
Width: 150
Height: 20
Text: Diplomacy Changes
Text: Short Game
Checkbox@ALLOWCHEATS_CHECKBOX:
Y: 70
Width: 140
X: 400
Y: 35
Width: 150
Height: 20
Text: Debug Menu
Label@DIFFICULTY_DESC:

8
mods/ra/maps/monster-tank-madness/map.yaml
View File

@@ -42,7 +42,7 @@ Players:
Color: ABB7E4
LockSpawn: True
LockTeam: True
Enemies: BadGuy, USSR, Ukraine, Turkey
Enemies: BadGuy, USSR, Ukraine, Turkey, FriendlyMadTanks
PlayerReference@BadGuy:
Name: BadGuy
Faction: soviet
@@ -71,6 +71,12 @@ Players:
Faction: soviet
Color: D1987C
Enemies: Greece, BadGuy, USSR, Ukraine, Outpost
PlayerReference@FriendlyMadTanks:
Name: FriendlyMadTanks
Faction: soviet
Color: D1987C
Allies: Greece
Enemies: BadGuy, USSR, Ukraine
PlayerReference@Outpost:
Name: Outpost
NonCombatant: True

5
mods/ra/maps/monster-tank-madness/monster-tank-madness.lua
View File

@@ -124,11 +124,9 @@ LandingPossible = function()
end
SuperTankDomeInfiltrated = function()
turkey.SetStance(player, "Ally")
turkey.SetStance(neutral, "Ally")
SuperTankAttack = true
Utils.Do(SuperTanks, function(tnk)
tnk.Owner = friendlyMadTanks
if not tnk.IsDead then
Trigger.ClearAll(tnk)
tnk.Stop()
@@ -276,6 +274,7 @@ InitPlayers = function()
ussr = Player.GetPlayer("USSR")
ukraine = Player.GetPlayer("Ukraine")
turkey = Player.GetPlayer("Turkey")
friendlyMadTanks = Player.GetPlayer("FriendlyMadTanks")
player.Cash = 0
ussr.Cash = 2000

1
mods/ra/mod.yaml
View File

@@ -80,7 +80,6 @@ Assemblies:
ChromeLayout:
./mods/ra/chrome/ingame.yaml
./mods/ra/chrome/ingame-chat.yaml
./mods/ra/chrome/ingame-diplomacy.yaml
./mods/ra/chrome/ingame-fmvplayer.yaml
./mods/ra/chrome/ingame-info.yaml
./mods/ra/chrome/ingame-infoscripterror.yaml

20
mods/ts/chrome/ingame-player.yaml
View File

@@ -118,26 +118,6 @@ Container@PLAYER_WIDGETS:
X: 0
Y: 0
ImageCollection: order-icons
MenuButton@DIPLOMACY_BUTTON:
Logic: AddFactionSuffixLogic
MenuContainer: INGAME_DIPLOMACY_BG
HideIngameUI: false
Pause: false
Key: P
X: 163
Width: 30
Height: 31
Background: sidebar-button
TooltipText: Diplomacy
TooltipContainer: TOOLTIP_CONTAINER
VisualHeight: 0
Children:
Image@ICON:
Logic: AddFactionSuffixLogic
X: 0
Y: 0
ImageCollection: order-icons
ImageName: diplomacy
MenuButton@OPTIONS_BUTTON:
Logic: AddFactionSuffixLogic
Key: escape

1
mods/ts/mod.yaml
View File

@@ -132,7 +132,6 @@ Assemblies:
ChromeLayout:
./mods/ra/chrome/ingame.yaml
./mods/ra/chrome/ingame-chat.yaml
./mods/ra/chrome/ingame-diplomacy.yaml
./mods/ra/chrome/ingame-fmvplayer.yaml
./mods/ra/chrome/ingame-menu.yaml
./mods/ts/chrome/ingame-info.yaml