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

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