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

Remove Developer Settings from Settings > Debug. Adjust Widget layout in DeveloperMode. In preparation for DeveloperMode trait.

Browse Source
This commit is contained in:
alzeih
2010-07-24 17:35:38 +12:00
parent d8d731b321
commit 2d916e60d9
6 changed files with 69 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs
View File

@@ -29,10 +29,6 @@ namespace OpenRA.Widgets.Delegates
public class DeveloperModeDelegate : IWidgetDelegate public class DeveloperModeDelegate : IWidgetDelegate
{ {
float oldBuildSpeed = 0;
bool slowed = false;
public DeveloperModeDelegate () public DeveloperModeDelegate ()
{ {
var devmodeBG = Widget.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG"); var devmodeBG = Widget.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG");
@@ -77,26 +73,28 @@ namespace OpenRA.Widgets.Delegates
return true; return true;
}; };
devmodeBG.GetWidget<ButtonWidget>("SETTINGS_GIVE_CASH").OnMouseUp = mi => devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_GIVE_CASH").Checked =
() => true;
devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_GIVE_CASH").OnMouseDown = mi =>
{ {
Game.world.AddFrameEndTask(w =>
{
Game.world.LocalPlayer.PlayerActor.traits.Get<PlayerResources>().GiveCash(5000);
});
TriggerCheatingMessage();
return true; return true;
}; };
devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_BUILD_SPEED").OnMouseDown = mi => devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_BUILD_SPEED").OnMouseDown = mi =>
{ {
oldBuildSpeed = (!slowed)? Game.world.LocalPlayer.PlayerActor.Info.Traits.Get<ProductionQueueInfo>().BuildSpeed : oldBuildSpeed; return true;
Game.world.LocalPlayer.PlayerActor.Info.Traits.Get<ProductionQueueInfo>().BuildSpeed = (slowed)? oldBuildSpeed : 0; };
slowed ^= true;
TriggerCheatingMessage();
return true;
};
devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_BUILD_SPEED").Checked = devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_BUILD_SPEED").Checked =
() => {return slowed;}; () => true;
devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_CHARGE_TIME").OnMouseDown = mi =>
{
return true;
};
devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_CHARGE_TIME").Checked =
() => true;
devModeButton.IsVisible = () => { return Game.Settings.DeveloperMode; }; devModeButton.IsVisible = () => { return Game.Settings.DeveloperMode; };
} }

32
OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs
View File

@@ -132,30 +132,6 @@ namespace OpenRA.Widgets.Delegates
return true; return true;
}; };
var unitdebug = debug.GetWidget<CheckboxWidget>("UNITDEBUG_CHECKBOX");
unitdebug.Checked = () => {return Game.Settings.UnitDebug;};
unitdebug.OnMouseDown = mi =>
{
Game.Settings.UnitDebug ^= true;
return true;
};
var pathdebug = debug.GetWidget<CheckboxWidget>("PATHDEBUG_CHECKBOX");
pathdebug.Checked = () => {return Game.Settings.PathDebug;};
pathdebug.OnMouseDown = mi =>
{
Game.Settings.PathDebug ^= true;
return true;
};
var indexdebug = debug.GetWidget<CheckboxWidget>("INDEXDEBUG_CHECKBOX");
indexdebug.Checked = () => {return Game.Settings.IndexDebug;};
indexdebug.OnMouseDown = mi =>
{
Game.Settings.IndexDebug ^= true;
return true;
};
var timedebug = debug.GetWidget<CheckboxWidget>("GAMETIME_CHECKBOX"); var timedebug = debug.GetWidget<CheckboxWidget>("GAMETIME_CHECKBOX");
timedebug.Checked = () => {return Game.Settings.ShowGameTimer;}; timedebug.Checked = () => {return Game.Settings.ShowGameTimer;};
timedebug.OnMouseDown = mi => timedebug.OnMouseDown = mi =>
@@ -164,6 +140,14 @@ namespace OpenRA.Widgets.Delegates
return true; return true;
}; };
var devmode = debug.GetWidget<CheckboxWidget>("DEV_MODE_ENABLED");
devmode.Checked = () => Game.Settings.DeveloperMode;
devmode.OnMouseDown = mi =>
{
Game.Settings.DeveloperMode ^= true;
return true;
};
bg.GetWidget("BUTTON_CLOSE").OnMouseUp = mi => { bg.GetWidget("BUTTON_CLOSE").OnMouseUp = mi => {
Game.Settings.Save(); Game.Settings.Save();
Widget.RootWidget.CloseWindow(); Widget.RootWidget.CloseWindow();

27
mods/cnc/chrome/ingame.yaml
View File

@@ -203,7 +203,7 @@ Container@ROOT:
Delegate:DeveloperModeDelegate Delegate:DeveloperModeDelegate
X:(WINDOW_RIGHT - WIDTH)/2 X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:300 Width:350
Height:300 Height:300
Visible:false Visible:false
Children: Children:
@@ -220,45 +220,52 @@ Container@ROOT:
X:30 X:30
Y:50 Y:50
Height:20 Height:20
Width:20 Width:PARENT_RIGHT - 30
Text:Disable Shroud Text:Disable Shroud
Checkbox@SETTINGS_CHECKBOX_UNITDEBUG: Checkbox@SETTINGS_CHECKBOX_UNITDEBUG:
Id:SETTINGS_CHECKBOX_UNITDEBUG Id:SETTINGS_CHECKBOX_UNITDEBUG
X:30 X:30
Y:80 Y:80
Width:300 Width:PARENT_RIGHT - 30
Height:20 Height:20
Text:Show Occupied Cells Text:Show Occupied Cells
Checkbox@SETTINGS_CHECKBOX_PATHDEBUG: Checkbox@SETTINGS_CHECKBOX_PATHDEBUG:
Id:SETTINGS_CHECKBOX_PATHDEBUG Id:SETTINGS_CHECKBOX_PATHDEBUG
X:30 X:30
Y:110 Y:110
Width:300 Width:PARENT_RIGHT - 30
Height:20 Height:20
Text:Show Unit Paths Text:Show Unit Paths
Checkbox@SETTINGS_CHECKBOX_INDEXDEBUG: Checkbox@SETTINGS_CHECKBOX_INDEXDEBUG:
Id:SETTINGS_CHECKBOX_INDEXDEBUG Id:SETTINGS_CHECKBOX_INDEXDEBUG
X:30 X:30
Y:140 Y:140
Width:300 Width:PARENT_RIGHT - 30
Height:20 Height:20
Text:Show Spatial Index Debug Text:Show Spatial Index Debug
Label@LABEL_MP_WARNING Label@LABEL_MP_WARNING
Id:LABEL_MP_WARNING Id:LABEL_MP_WARNING
X:30 X:30
Y:180 Y:180
Text:May cause errors under multiplayer: Text:Must be identical for all multiplayer players:
Button@SETTINGS_GIVE_CASH Checkbox@SETTINGS_GIVE_CASH
Id:SETTINGS_GIVE_CASH Id:SETTINGS_GIVE_CASH
X:30 X:30
Y:200 Y:200
Width:150 Width:PARENT_RIGHT - 30
Height:20 Height:20
Text: Give Cash Text: Give Cash
Checkbox@SETTINGS_BUILD_SPEED Checkbox@SETTINGS_BUILD_SPEED
Id:SETTINGS_BUILD_SPEED Id:SETTINGS_BUILD_SPEED
X:30 X:30
Y:230 Y:230
Width:20 Width:PARENT_RIGHT - 30
Height:20 Height:20
Text:Instant Build Speed Text:Instant Build Speed
Checkbox@SETTINGS_CHARGE_TIME
Id:SETTINGS_CHARGE_TIME
X:30
Y:260
Width:PARENT_RIGHT - 30
Height:20
Text:Instant Charge Time (Special Powers)

26
mods/cnc/chrome/settings.yaml
View File

@@ -193,31 +193,17 @@ Container@ROOT:
Width:300 Width:300
Height:20 Height:20
Text:Collect Sync Reports Text:Collect Sync Reports
Checkbox@UNITDEBUG_CHECKBOX: Checkbox@GAMETIME_CHECKBOX:
Id:UNITDEBUG_CHECKBOX Id:GAMETIME_CHECKBOX
X:0 X:0
Y:60 Y:60
Width:300 Width:300
Height:20 Height:20
Text:Show Occupied Cells Text:Show Game Time Counter
Checkbox@PATHDEBUG_CHECKBOX: Checkbox:DEV_MODE_ENABLED
Id:PATHDEBUG_CHECKBOX Id:DEV_MODE_ENABLED
X:0 X:0
Y:90 Y:90
Width:300 Width:300
Height:20 Height:20
Text:Show Unit Paths Text:Enable Developer Mode
Checkbox@INDEXDEBUG_CHECKBOX:
Id:INDEXDEBUG_CHECKBOX
X:0
Y:120
Width:300
Height:20
Text:Show Spatial Index Debug
Checkbox@GAMETIME_CHECKBOX:
Id:GAMETIME_CHECKBOX
X:0
Y:150
Width:300
Height:20
Text:Show Game Time Counter

27
mods/ra/chrome/ingame.yaml
View File

@@ -212,7 +212,7 @@ Container@ROOT:
Delegate:DeveloperModeDelegate Delegate:DeveloperModeDelegate
X:(WINDOW_RIGHT - WIDTH)/2 X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:300 Width:350
Height:300 Height:300
Visible:false Visible:false
Children: Children:
@@ -229,45 +229,52 @@ Container@ROOT:
X:30 X:30
Y:50 Y:50
Height:20 Height:20
Width:20 Width:PARENT_RIGHT - 30
Text:Disable Shroud Text:Disable Shroud
Checkbox@SETTINGS_CHECKBOX_UNITDEBUG: Checkbox@SETTINGS_CHECKBOX_UNITDEBUG:
Id:SETTINGS_CHECKBOX_UNITDEBUG Id:SETTINGS_CHECKBOX_UNITDEBUG
X:30 X:30
Y:80 Y:80
Width:300 Width:PARENT_RIGHT - 30
Height:20 Height:20
Text:Show Occupied Cells Text:Show Occupied Cells
Checkbox@SETTINGS_CHECKBOX_PATHDEBUG: Checkbox@SETTINGS_CHECKBOX_PATHDEBUG:
Id:SETTINGS_CHECKBOX_PATHDEBUG Id:SETTINGS_CHECKBOX_PATHDEBUG
X:30 X:30
Y:110 Y:110
Width:300 Width:PARENT_RIGHT - 30
Height:20 Height:20
Text:Show Unit Paths Text:Show Unit Paths
Checkbox@SETTINGS_CHECKBOX_INDEXDEBUG: Checkbox@SETTINGS_CHECKBOX_INDEXDEBUG:
Id:SETTINGS_CHECKBOX_INDEXDEBUG Id:SETTINGS_CHECKBOX_INDEXDEBUG
X:30 X:30
Y:140 Y:140
Width:300 Width:PARENT_RIGHT - 30
Height:20 Height:20
Text:Show Spatial Index Debug Text:Show Spatial Index Debug
Label@LABEL_MP_WARNING Label@LABEL_MP_WARNING
Id:LABEL_MP_WARNING Id:LABEL_MP_WARNING
X:30 X:30
Y:180 Y:180
Text:May cause errors under multiplayer: Text:Must be identical for all multiplayer players:
Button@SETTINGS_GIVE_CASH Checkbox@SETTINGS_GIVE_CASH
Id:SETTINGS_GIVE_CASH Id:SETTINGS_GIVE_CASH
X:30 X:30
Y:200 Y:200
Width:150 Width:PARENT_RIGHT - 30
Height:20 Height:20
Text: Give Cash Text: Give Cash
Checkbox@SETTINGS_BUILD_SPEED Checkbox@SETTINGS_BUILD_SPEED
Id:SETTINGS_BUILD_SPEED Id:SETTINGS_BUILD_SPEED
X:30 X:30
Y:230 Y:230
Width:20 Width:PARENT_RIGHT - 30
Height:20 Height:20
Text:Instant Build Speed Text:Instant Build Speed
Checkbox@SETTINGS_CHARGE_TIME
Id:SETTINGS_CHARGE_TIME
X:30
Y:260
Width:PARENT_RIGHT - 30
Height:20
Text:Instant Charge Time (Special Powers)

26
mods/ra/chrome/settings.yaml
View File

@@ -193,31 +193,17 @@ Container@ROOT:
Width:300 Width:300
Height:20 Height:20
Text:Collect Sync Reports Text:Collect Sync Reports
Checkbox@UNITDEBUG_CHECKBOX: Checkbox@GAMETIME_CHECKBOX:
Id:UNITDEBUG_CHECKBOX Id:GAMETIME_CHECKBOX
X:0 X:0
Y:60 Y:60
Width:300 Width:300
Height:20 Height:20
Text:Show Occupied Cells Text:Show Game Time Counter
Checkbox@PATHDEBUG_CHECKBOX: Checkbox:DEV_MODE_ENABLED
Id:PATHDEBUG_CHECKBOX Id:DEV_MODE_ENABLED
X:0 X:0
Y:90 Y:90
Width:300 Width:300
Height:20 Height:20
Text:Show Unit Paths Text:Enable Developer Mode
Checkbox@INDEXDEBUG_CHECKBOX:
Id:INDEXDEBUG_CHECKBOX
X:0
Y:120
Width:300
Height:20
Text:Show Spatial Index Debug
Checkbox@GAMETIME_CHECKBOX:
Id:GAMETIME_CHECKBOX
X:0
Y:150
Width:300
Height:20
Text:Show Game Time Counter