Added buildradius checkbox to lobby options #14209

ghost · 2017-10-18T08:28:28Z

Implements #14203

ghost · 2017-10-18T09:53:55Z

sorry about dune2k commits, I do not know alot about it

abcdefg30 · 2017-10-18T15:18:12Z

OpenRA.Mods.Common/Traits/Buildings/Building.cs

@@ -164,7 +164,7 @@ public Actor FindBaseProvider(World world, Player p, CPos topLeft)

 				// Range is counted from the center of the actor, not from each cell.
 				var target = Target.FromPos(bp.Actor.CenterPosition);
-				if (target.IsInRange(center, bp.Trait.Info.Range))
+				if (target.IsInRange(center, bp.Trait.Info.Range) || !world.WorldActor.Trait<MapBuildRadius>().BuildRadiusEnabled)


We already query the MapBuildRadius trait above and should 'cache' it therefore, imho.
I.e. something like:

public Actor FindBaseProvider(World world, Player p, CPos topLeft) { var center = world.Map.CenterOfCell(topLeft) + CenterOffset(world); var mapBuildRadius = world.WorldActor.Trait<MapBuildRadius>(); var allyBuildEnabled = mapBuildRadius.AllyBuildRadiusEnabled; foreach (var bp in world.ActorsWithTrait<BaseProvider>()) { [...] if (mapBuildRadius.BuildRadiusEnabled || target.IsInRange(center, bp.Trait.Info.Range)) return bp.Actor; } return null; }

abcdefg30 · 2017-10-18T15:18:16Z

OpenRA.Mods.Common/Traits/World/MapBuildRadius.cs

@@ -45,6 +54,8 @@ void INotifyCreated.Created(Actor self)
 		{
 			AllyBuildRadiusEnabled = self.World.LobbyInfo.GlobalSettings
 				.OptionOrDefault("allybuild", info.AllyBuildRadiusEnabled);
+			BuildRadiusEnabled = self.World.LobbyInfo.GlobalSettings
+        .OptionOrDefault("buildradius", info.BuildRadiusEnabled);


Those spaces should be replaced by tabs.

abcdefg30 · 2017-10-18T15:19:48Z

OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs

@@ -80,7 +80,7 @@ bool ValidRenderPlayer()
 		public IEnumerable<IRenderable> RangeCircleRenderables(WorldRenderer wr)
 		{
 			// Visible to player and allies
-			if (!ValidRenderPlayer())
+			if (!ValidRenderPlayer() || !wr.World.WorldActor.Trait<MapBuildRadius>().BuildRadiusEnabled)


I think we should cache BuildRadiusEnabled here as well as AllyBuildEnabled is already. (Also see the comment below.)

abcdefg30 · 2017-10-18T15:24:45Z

sorry about dune2k commits, I do not know alot about it

Don't worry. ^^ Just squash the commits together later on.
(Btw, if you got questions, feel free to reach out to me or someone else on our IRC channel #openra.)

GraionDilach · 2017-10-18T15:31:10Z

This is fundamentally wrong and suffers from tunnel vision - the ticket would be the perfect case to be resolved akin with a mutator, since you're now propagating a trait used in a single mod to be disabled in every shipped and thirdparty one (you can't really disable lobby checkboxes).

ghost · 2017-10-18T15:56:07Z

is tarvis-ci failing at getting mono usual?

pchote · 2017-10-18T16:45:10Z

is tarvis-ci failing at getting mono usual?

No, this appears to be an upstream issue. I assume that they should fix it within a day or two.
In any case, the tests would fail because you're still using space indentation in a few places. Can you please fix that?

pchote · 2017-10-18T16:48:43Z

mods/common/chrome/lobby-options.yaml

@@ -48,6 +48,11 @@ Background@LOBBY_OPTIONS_BIN:
 					Width: 150
 					Height: 20
 					Text: Debug Menu
+				Checkbox@BUILDRADIUS_CHECKBOX:


Tiberian Sun doesn't include the base radius, so can you please duplicate the lobby-options.yaml into mods/ts/chrome and adjust its mod.yaml to use it, the same way d2k does?

pchote · 2017-10-18T16:50:29Z

mods/cnc/chrome/lobby-options.yaml

+					Width: 150
+					Height: 20
+					Font: Regular
+					Text: Build Radius


"Build Radius" isn't a very obvious name. Can we change this to something like "Limit ConYard Area"?

pchote · 2017-10-18T16:50:58Z

OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs

@@ -46,6 +47,7 @@ public BaseProvider(Actor self, BaseProviderInfo info)
 			devMode = self.Owner.PlayerActor.Trait<DeveloperMode>();
 			progress = total = info.InitialDelay;
 			allyBuildEnabled = self.World.WorldActor.Trait<MapBuildRadius>().AllyBuildRadiusEnabled;
+            buildRadiusEnabled = self.World.WorldActor.Trait<MapBuildRadius>().BuildRadiusEnabled;


Space indentation.

pchote · 2017-10-18T16:51:04Z

OpenRA.Mods.Common/Traits/Buildings/Building.cs

@@ -154,7 +154,9 @@ public WVec CenterOffset(World w)
 		public Actor FindBaseProvider(World world, Player p, CPos topLeft)
 		{
 			var center = world.Map.CenterOfCell(topLeft) + CenterOffset(world);
-			var allyBuildEnabled = world.WorldActor.Trait<MapBuildRadius>().AllyBuildRadiusEnabled;
+            var mapBuildRadius = world.WorldActor.Trait<MapBuildRadius>();


Space indentation.

pchote · 2017-10-18T16:51:26Z

OpenRA.Mods.Common/Traits/World/MapBuildRadius.cs

@@ -45,6 +54,8 @@ void INotifyCreated.Created(Actor self)
 		{
 			AllyBuildRadiusEnabled = self.World.LobbyInfo.GlobalSettings
 				.OptionOrDefault("allybuild", info.AllyBuildRadiusEnabled);
+			BuildRadiusEnabled = self.World.LobbyInfo.GlobalSettings
+                .OptionOrDefault("buildradius", info.BuildRadiusEnabled);


Space indentation.

pchote · 2017-10-18T16:53:46Z

Looks good to me, otherwise.

ghost · 2017-10-18T17:56:14Z

fixing in few moments, there are no spacing problems on my local files

pchote · 2017-10-18T18:03:47Z

Sorry for the about face, but can you please duplicate the options yaml for ra instead of ts and keep the common copy unmodified? As @GraionDilach mentioned this probably doesnt want to be forced on downstream mods

ghost · 2017-10-18T18:43:09Z

@pchote done and working

pchote

Looks better, thanks. There are a couple more minor changes you can do to improve performance:

pchote · 2017-10-18T19:56:28Z

OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs

@@ -46,6 +47,7 @@ public BaseProvider(Actor self, BaseProviderInfo info)
 			devMode = self.Owner.PlayerActor.Trait<DeveloperMode>();
 			progress = total = info.InitialDelay;
 			allyBuildEnabled = self.World.WorldActor.Trait<MapBuildRadius>().AllyBuildRadiusEnabled;
+			buildRadiusEnabled = self.World.WorldActor.Trait<MapBuildRadius>().BuildRadiusEnabled;


Nit: can you please define a var mapBuildRadius = self.World.WorldActor.Trait<MapBuildRadius>(); instead of doing two trait lookups?

pchote · 2017-10-18T19:57:53Z

OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs

@@ -80,7 +82,7 @@ bool ValidRenderPlayer()
 		public IEnumerable<IRenderable> RangeCircleRenderables(WorldRenderer wr)
 		{
 			// Visible to player and allies
-			if (!ValidRenderPlayer())
+			if (!ValidRenderPlayer() || !buildRadiusEnabled)


It would be better to put this in ValidRenderPlayer so that it also applies to the selection bar.

pchote · 2017-10-18T20:06:47Z

OpenRA.Mods.Common/Traits/Buildings/Building.cs

@@ -164,7 +166,7 @@ public Actor FindBaseProvider(World world, Player p, CPos topLeft)

 				// Range is counted from the center of the actor, not from each cell.
 				var target = Target.FromPos(bp.Actor.CenterPosition);
-				if (target.IsInRange(center, bp.Trait.Info.Range))
+				if (target.IsInRange(center, bp.Trait.Info.Range) || !buildRadiusEnabled)


Please change this to return null before the loop if !buildRadiusEnabled, and then:

Query MapBuildRadius in the Building constructor and store the result in a readonly bool buildRadiusEnabled.

Check that value in IsCloseEnoughToBase to avoid calling this method entirely.

abcdefg30 · 2017-10-19T10:57:18Z

OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs

@@ -74,7 +78,7 @@ public bool Ready()

 		bool ValidRenderPlayer()
 		{
-			return self.Owner == self.World.RenderPlayer || (allyBuildEnabled && self.Owner.IsAlliedWith(self.World.RenderPlayer));
+			return buildRadiusEnabled ? self.Owner == self.World.RenderPlayer || (allyBuildEnabled && self.Owner.IsAlliedWith(self.World.RenderPlayer)) : false;


I think this can be simplified to return buildRadiusEnabled && (self.Owner == self.World.RenderPlayer || (allyBuildEnabled && self.Owner.IsAlliedWith(self.World.RenderPlayer)));.

abcdefg30 · 2017-10-19T10:58:02Z

OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs

@@ -38,14 +39,17 @@ public class BaseProvider : ITick, INotifyCreated, IRenderAboveShroudWhenSelecte
 		int total;
 		int progress;
 		bool allyBuildEnabled;
+		bool buildRadiusEnabled;


Is there a reason why this is not readonly?

Its not because allyBuildEnabled is not

Hm, I think you should make both readonly then. ^^
(They only get a value assigned in the constructor.)

ghost · 2017-10-19T12:00:47Z

Is this better?

abcdefg30

Is this better?

Yes, just some more minor things and I hope we're done with changing the code back and forth. (Sorry for the hassle, btw...)

abcdefg30 · 2017-10-19T12:04:57Z

OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs


 		public BaseProvider(Actor self, BaseProviderInfo info)
 		{
 			Info = info;
 			this.self = self;
 			devMode = self.Owner.PlayerActor.Trait<DeveloperMode>();
 			progress = total = info.InitialDelay;
-			allyBuildEnabled = self.World.WorldActor.Trait<MapBuildRadius>().AllyBuildRadiusEnabled;
+			mapBuildRadius = self.World.WorldActor.Trait<MapBuildRadius>();


Actually, we only use this in the constructor. So I'd suggest you make this a local var and drop the readonly MapBuildRadius mapBuildRadius;.

abcdefg30 · 2017-10-19T12:05:18Z

OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs

-			return self.Owner == self.World.RenderPlayer || (allyBuildEnabled && self.Owner.IsAlliedWith(self.World.RenderPlayer));
-		}
+			return buildRadiusEnabled && (self.Owner == self.World.RenderPlayer || (allyBuildEnabled && self.Owner.IsAlliedWith(self.World.RenderPlayer)));
+        }


Somehow spaces sneaked in here again. Please change them to tabs.

ghost · 2017-10-19T12:14:34Z

@abcdefg30 done, I hope there is nothing else (expecially spaces)

Code changed

pchote

LGTM aside from one last minor nit:

pchote · 2017-10-20T19:14:40Z

OpenRA.Mods.Common/Traits/Buildings/Building.cs

@@ -154,7 +154,8 @@ public WVec CenterOffset(World w)
 		public Actor FindBaseProvider(World world, Player p, CPos topLeft)
 		{
 			var center = world.Map.CenterOfCell(topLeft) + CenterOffset(world);
-			var allyBuildEnabled = world.WorldActor.Trait<MapBuildRadius>().AllyBuildRadiusEnabled;
+			var mapBuildRadius = world.WorldActor.Trait<MapBuildRadius>();
+			var allyBuildEnabled = mapBuildRadius.AllyBuildRadiusEnabled;


Please add an

if (!mapBuildRadius) return null;

as there are no base providers if the build radius is disabled.

ghost · 2017-10-20T20:29:47Z

@pchote is this good?

pchote · 2017-10-21T09:37:20Z

OpenRA.Mods.Common/Traits/Buildings/Building.cs

+			var mapBuildRadius = world.WorldActor.Trait<MapBuildRadius>();
+			var allyBuildEnabled = mapBuildRadius.AllyBuildRadiusEnabled;
+
+            if (!mapBuildRadius.BuildRadiusEnabled)


These lines are now indented using spaces. Please replace them with tabs.

https://github.com/OpenRA/OpenRA/wiki/Coding-Standard includes a guide on how to configure Visual Studio to use tabs.

but I use linux

ghost · 2017-10-21T16:53:07Z

well great

NethIafin

Not a fan of this new row while there is just one item, but this works as advertised. LGTM

pchote · 2017-10-21T21:55:05Z

Not a fan of this new row while there is just one item

There are two other long thought about checkboxes that could be implemented by somebody to fill in the gaps (but certainly not in this PR!):

Kill bounties
Undeployable MCV (from the original games)

NethIafin · 2017-10-21T22:16:14Z

Yeah, got it. Maybe @kosti1 can create separate pr for those, so in playtest we would have full row. Either way this is good as it is

ghost · 2017-10-22T15:15:37Z

will look in to it
I have already implemented bounty checkbox in my modded engine (but it might be very unoptimized)

MustaphaTR

Looks good to me 👍

abcdefg30 · 2017-11-01T17:20:46Z

Changelog

GraionDilach · 2017-11-01T17:31:27Z

Congratulations to everyone for creating the worst precedent in regarding to customized lobby checkboxes! @pchote, since you were interested on the other day why I believe taht modder feedback is ignored in eaxact cases - here is one.

The CnCNetv5 client used by many TS/RA2 mods apply a rules edit behind the checkbox between the main rules and the map edits. That system should have been used here, not expanding the system with made-up arbitrary stuff.

pchote · 2017-11-01T22:15:35Z

@GraionDilach: I don't really understand your hostility towards this. This PR doesn't set a precident; it follows our conventions that were established in #11364 and prerequisite PRs. Asking a new contributor to implement a new low-level engine feature that completely changes our lobby options conventions doesn't make sense.

GraionDilach · 2017-11-02T03:50:48Z

What does this PR does in effect on RA rules? Let me sum it up with two lines.

FACT:
	-BaseProvider:

Where this PR does set a precedent is that lousy hardcoded lobby checkboxes which should have been implemented via custom rules are acceptable as C# code fragments and encouraged to do so. This precedent is already utilized at #14245.

There wasn't a need to completely change the lobby options besides providing a secondary method. #9422 was filed exactly for lobby options causing this level of YAML edits. Ignoring it is convenient, blowing it to out-of-proportion levels is even more convenient - especially when one decides to ignore how CnCNet TS/YR is able to utilize said system for years now.

penev92 · 2017-11-02T10:42:14Z

OK, as for the help/feedback/attitude:

since you were interested on the other day why I believe taht modder feedback is ignored in eaxact cases - here is one.

I checked - all you said prior to merge is "this is bad". That's all the feedback.
Now, assuming you had linked to the ticket that you opened (which you didn't, so ... shame on everyone else for not making the connection?), that ticket still goes exactly ankle-deep in the issue - it more or less just says "hey guys, CnCNet use X, UT2004 uses Y; they look like this: <screenshots>". You scratch the surface of an actual explanation of implementation details but go no further.
In fact, the first time I can find you mentioning that you have an idea about how to implement it other than visually was yesterday on Discord after this PR was merged. Now that was some decent feedback, but perhaps just a tiny a bit late, no?

Now, as for the suggested implementation:

From what I've read that method sounds utterly unsupportable for more than 1 or 2 very simple mutators.
I don't know how CnCNet does it, maybe the inis there are better suited for the task, maybe it's a complete mess... but for the simplest of mutators you can easily need to have a copy of your mod's entire rules folder, just because it affects every actor you have.
So if you have 20 (again, simple mutators), you either have this folder setup in your mod:

rules_default
rules_mutator_1
rules_mutator_2
rules_mutator_3
...
rules_mutator_20

or you have these yamls in your rules folder along with all the others:

mutator1.yaml
mutator2.yaml
mutator3.yaml
...
mutator20.yaml

with each of those potentially having a 2-line entry (at best) for every actor in the mod.
I think you can see how that is going to become utterly unsupportable, unmaintainable, unmanageable...
Yes, it would be (somewhat) flexible (as long as you only want to tweak trait values, which is somewhat limited for a mutator), but the YAML overhead would be enough to completely negate any usefulness IMO.

In conclusion,

I'm not saying the used approach is very good or scalable, but IMO neither is the one you're suggesting.
and
Please don't go all "I tried to help but they ignored my feedback so * them" again, since like I said, your feedback actually came after this was merged.

So how about we all do something constructive for a change and try to come up with an actually good approach together?

MustaphaTR · 2017-11-02T10:50:31Z

I think you can see how that is going to become utterly unsupportable, unmaintainable, unmanageable...

Sorry, but i can't. I agree with @GraionDilach that Mutators as CnCNet has would be way better alternative to this. I see no problem with having 20 mutator files, probably under rules/mutators folder not directly rules.

CnCNet aside even original RA2 had a similar logic, called Game Types. Only difference ypu can only appy one of those.

Plus we already have stuff like disable-player-experience or campaign-tooltip files.

GraionDilach · 2017-11-02T14:06:52Z

I left a comment somewhere at @kosti1's repo on a commit weeks ago explaining this exact same thing I'm atm pissed on but apparently it was lost in a rebase.

ghost mentioned this pull request Oct 18, 2017

[Suggestion] Option to disable build radius #14203

Closed

abcdefg30 reviewed Oct 18, 2017

View reviewed changes

abcdefg30 added the PR: Fixup requested label Oct 18, 2017

pchote previously requested changes Oct 18, 2017

View reviewed changes

pchote reviewed Oct 18, 2017

View reviewed changes

abcdefg30 reviewed Oct 19, 2017

View reviewed changes

abcdefg30 removed the PR: Fixup requested label Oct 19, 2017

pchote reviewed Oct 20, 2017

View reviewed changes

pchote reviewed Oct 21, 2017

View reviewed changes

Added buildradius checkbox to lobby options

1876cae

pchote approved these changes Oct 21, 2017

View reviewed changes

pchote added the PR: Needs +2 label Oct 21, 2017

NethIafin approved these changes Oct 21, 2017

View reviewed changes

ghost mentioned this pull request Oct 22, 2017

Implement bounty checkbox #14245

Closed

MustaphaTR approved these changes Oct 28, 2017

View reviewed changes

abcdefg30 approved these changes Nov 1, 2017

View reviewed changes

abcdefg30 merged commit 6a750d7 into OpenRA:bleed Nov 1, 2017

penev92 mentioned this pull request Nov 2, 2017

Add "mutators" (minichanges) to the game. #9422

Closed

TheChosenEvilOne mentioned this pull request Dec 23, 2017

FACT undeploy checkbox #14567

Merged

pchote mentioned this pull request Jan 2, 2018

Replace mod upgrade rules with a fit for purpose alternative. #14600

Closed

Added buildradius checkbox to lobby options #14209

Added buildradius checkbox to lobby options #14209

Conversation

ghost commented Oct 18, 2017 • edited by ghost

ghost commented Oct 18, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abcdefg30 commented Oct 18, 2017

GraionDilach commented Oct 18, 2017

ghost commented Oct 18, 2017

pchote commented Oct 18, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pchote commented Oct 18, 2017

ghost commented Oct 18, 2017

pchote commented Oct 18, 2017 • edited

ghost commented Oct 18, 2017

pchote left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Oct 19, 2017

abcdefg30 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Oct 19, 2017

pchote left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Oct 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Oct 21, 2017

NethIafin left a comment

Choose a reason for hiding this comment

pchote commented Oct 21, 2017 • edited

NethIafin commented Oct 21, 2017

ghost commented Oct 22, 2017 • edited by ghost

MustaphaTR left a comment

Choose a reason for hiding this comment

abcdefg30 commented Nov 1, 2017

GraionDilach commented Nov 1, 2017

pchote commented Nov 1, 2017 • edited

GraionDilach commented Nov 2, 2017

penev92 commented Nov 2, 2017

OK, as for the help/feedback/attitude:

Now, as for the suggested implementation:

In conclusion,

MustaphaTR commented Nov 2, 2017 • edited

GraionDilach commented Nov 2, 2017

ghost commented Oct 18, 2017 •

edited by ghost

pchote commented Oct 18, 2017 •

edited

pchote commented Oct 21, 2017 •

edited

ghost commented Oct 22, 2017 •

edited by ghost

pchote commented Nov 1, 2017 •

edited

MustaphaTR commented Nov 2, 2017 •

edited