Change LowPowerSlowdown to LowPowerModifier #14664

MustaphaTR · 2018-01-04T17:02:16Z

Also removed LowPowerSlowdown:s that were already equal to default value.

Didn't write a upgrade rule, not sure if wanted, as we are gonna rewrite them anyway.

GraionDilach · 2018-01-04T17:22:19Z

This, along with ProductionQueue->BuildDurationModifier should probably be ripped out to a separate conditional QueueSpeedModifier traits by this point.

alercah · 2018-01-13T17:00:52Z

OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs

@@ -508,7 +508,7 @@ public void Tick(PlayerResources pr)
 			if (pm.PowerState != PowerState.Normal)
 			{
 				if (--Slowdown <= 0)
-					Slowdown = Queue.Info.LowPowerSlowdown;
+					Slowdown = Queue.Info.LowPowerModifier;


This means that the slowdown is now multiplied by 100. Every tick, the Slowdown will go down by 1, so it will now take 300 ticks to do one build tick on low power. Allowing modifiers that aren't effectively multiple of 100 will require careful work to allow for fractional build ticks. I think it may be possible to do by replacing --Slowdown with Slowdown -= 100, but I'm not 100% sure.

You asked on IRC about the interaction with #14702; I have nothing in principle against allowing a modifier to speed up the build queue (values less than 100). That would require the logic here to allow the build to tick multiple times per game tick.

MustaphaTR · 2018-01-14T07:10:58Z

Updated, if my calculations are correct, this should do the job. I did a debug message locally with 175 modifier on Armor queue, values looks correct.

reaperrr · 2018-02-23T13:14:10Z

Didn't write a upgrade rule, not sure if wanted, as we are gonna rewrite them anyway.

There's currently no ETA for this, and the upgrade rule for this PR should be simple (rename and multiply value by 100).

Also needs a rebase.

MustaphaTR · 2018-02-24T19:24:42Z

Rebased and added a upgrade rule.

abcdefg30

Looks good to me otherwise. Needs a rebase though.

abcdefg30 · 2018-03-19T15:53:41Z

OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs

@@ -508,8 +508,8 @@ public void Tick(PlayerResources pr)

 			if (pm.PowerState != PowerState.Normal)
 			{
-				if (--Slowdown <= 0)
-					Slowdown = Queue.Info.LowPowerSlowdown;
+				if ((Slowdown -= 100) <= 0)


This looks weird, why didn't you use just if (Slowdown - 100 <= 0)?

Sorry, i haven't answered, because i wasn't sure. But looks like -= is correct. Slowdown needs to tick down, otherwise unit won't be built.

It would be cleaner to split this onto two lines:

Slowdown -= 100; if (SlowDown < 0) ...

MustaphaTR · 2018-03-31T07:51:17Z

Rebased. Moved the update rule to the new system, but did not test it.

MustaphaTR · 2018-04-17T11:50:58Z

NTM: Looks like this needs rebase again.

pchote · 2018-05-20T09:28:45Z

Ping @MustaphaTR.

pchote

A few thoughts:

pchote · 2018-05-21T19:16:37Z

OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs

@@ -80,8 +80,8 @@ public class ProductionQueueInfo : ITraitInfo

 		public void RulesetLoaded(Ruleset rules, ActorInfo ai)
 		{
-			if (LowPowerSlowdown <= 0)
-				throw new YamlException("Production queue must have LowPowerSlowdown of at least 1.");
+			if (LowPowerModifier < 100)


The previous check was needed because 0 or negative values would break the calculation. IMO there is no reason not to disallow modifiers between 1 and 100 (implying a speed up on low power) here.

pchote · 2018-05-21T19:18:01Z

OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs

@@ -508,8 +508,8 @@ public void Tick(PlayerResources pr)

 			if (pm.PowerState != PowerState.Normal)
 			{
-				if (--Slowdown <= 0)
-					Slowdown = Queue.Info.LowPowerSlowdown;
+				if ((Slowdown -= 100) <= 0)


It would be cleaner to split this onto two lines:

Slowdown -= 100; if (SlowDown < 0) ...

pchote · 2018-05-21T19:19:44Z

OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs

-		[Desc("The build time is multiplied with this value on low power.")]
-		public readonly int LowPowerSlowdown = 3;
+		[Desc("The build time is multiplied with this percentage on low power.")]
+		public readonly int LowPowerModifier = 300;


It may make sense to take this chance to reset the default to 100? a 3x slowdown is quite arbitrary, and specific to the default C&C mods.

MustaphaTR · 2018-09-29T13:57:04Z

Updated.

MustaphaTR · 2018-10-05T11:32:43Z

#15018 is merged. There was no merge conflict, but i still rebased to the lastest bleed. I haven't checked if #15018 added anything i should have edited for this to properly work tho.

Updated.

pchote · 2018-10-06T16:16:03Z

The build palette thinks it takes over an hour to build an APC in low power:

pchote · 2018-10-06T16:32:17Z

I suspect the issue is that ProductionItem.RemainingTimeActual is missing a division by 100.

MustaphaTR · 2018-10-06T16:55:24Z

Yeah, that was the issue. Updated.

abcdefg30

Looks good to me now. Needs a rebase however.

pchote

LGTM and looks fine ingame.

Just one tidy in the update rule, which I will push myself shortly to save you from yet another update cycle.

pchote · 2018-10-08T20:06:46Z

OpenRA.Mods.Common/UpdateRules/Rules/20180923/LowPowerSlowdownToModifier.cs

+				foreach (var q in actorNode.ChildrenMatching(trait))
+					queues.Add(q);
+
+			foreach (var queue in queues)


This can simplify to

foreach (var queue in queueTraits.SelectMany(q => actorNode.ChildrenMatching(q)))

and then the code above removed.

pchote · 2018-10-08T20:39:46Z

https://github.com/OpenRA/OpenRA/wiki/Changelog-(bleed)/_compare/409855cf8d8b85df28b66c3006cd8a6c2130e3ce

MustaphaTR force-pushed the low-power-modifier branch from 29ec0f3 to 8873dbc Compare January 4, 2018 17:07

MustaphaTR added the PR: Rebase me! label Jan 13, 2018

MustaphaTR force-pushed the low-power-modifier branch from 8873dbc to ef4033a Compare January 13, 2018 16:07

MustaphaTR removed the PR: Rebase me! label Jan 13, 2018

alercah reviewed Jan 13, 2018

View reviewed changes

MustaphaTR force-pushed the low-power-modifier branch from ef4033a to 8666bcf Compare January 14, 2018 07:08

MustaphaTR force-pushed the low-power-modifier branch from 8666bcf to 28f6d3c Compare January 14, 2018 07:33

reaperrr added the PR: Rebase me! label Feb 23, 2018

MustaphaTR force-pushed the low-power-modifier branch from 28f6d3c to fd62250 Compare February 24, 2018 19:22

MustaphaTR removed the PR: Rebase me! label Feb 24, 2018

abcdefg30 previously approved these changes Mar 19, 2018

View reviewed changes

abcdefg30 added PR: Rebase me! PR: Fixup requested labels Mar 19, 2018

MustaphaTR dismissed abcdefg30’s stale review via 1e35557 March 31, 2018 07:23

MustaphaTR force-pushed the low-power-modifier branch 2 times, most recently from 1e35557 to 31cf5c0 Compare March 31, 2018 07:50

MustaphaTR removed PR: Fixup requested PR: Rebase me! labels Mar 31, 2018

MustaphaTR added the PR: Rebase me! label Apr 17, 2018

MustaphaTR force-pushed the low-power-modifier branch from 31cf5c0 to 1044564 Compare May 21, 2018 19:13

pchote reviewed May 21, 2018

View reviewed changes

MustaphaTR added PR: Changes requested and removed PR: Rebase me! labels May 21, 2018

pchote added the PR: Has dependencies label Sep 29, 2018

MustaphaTR force-pushed the low-power-modifier branch 2 times, most recently from b25c03c to 7697753 Compare September 29, 2018 13:39

MustaphaTR force-pushed the low-power-modifier branch from 7697753 to ea81202 Compare October 5, 2018 11:23

abcdefg30 removed the PR: Has dependencies label Oct 5, 2018

pchote added the PR: Fixup requested label Oct 6, 2018

MustaphaTR force-pushed the low-power-modifier branch from ea81202 to 089868a Compare October 6, 2018 16:32

MustaphaTR removed the PR: Fixup requested label Oct 6, 2018

abcdefg30 previously approved these changes Oct 7, 2018

View reviewed changes

abcdefg30 added PR: Needs +2 PR: Rebase me! labels Oct 7, 2018

Change LowPowerSlowdown to LowPowerModifier

1f02b9b

MustaphaTR dismissed abcdefg30’s stale review via fbf91ea October 7, 2018 18:46

MustaphaTR force-pushed the low-power-modifier branch from 089868a to fbf91ea Compare October 7, 2018 18:46

pchote removed the PR: Rebase me! label Oct 8, 2018

pchote reviewed Oct 8, 2018

View reviewed changes

MustaphaTR added 3 commits October 8, 2018 21:27

Change default value of LowPowerModifier to 100

1c72dbc

Add Update rule for LPSlowdown to LPModifier

24195a3

Update mods for LowPowerSlowdown to LowPowerModifier

9084209

pchote force-pushed the low-power-modifier branch from fbf91ea to 9084209 Compare October 8, 2018 20:29

pchote approved these changes Oct 8, 2018

View reviewed changes

pchote merged commit 47c4be9 into OpenRA:bleed Oct 8, 2018

MustaphaTR deleted the low-power-modifier branch October 9, 2018 04:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change LowPowerSlowdown to LowPowerModifier #14664

Change LowPowerSlowdown to LowPowerModifier #14664

MustaphaTR commented Jan 4, 2018

GraionDilach commented Jan 4, 2018

alercah Jan 13, 2018

MustaphaTR commented Jan 14, 2018

reaperrr commented Feb 23, 2018

MustaphaTR commented Feb 24, 2018

abcdefg30 left a comment

abcdefg30 Mar 19, 2018

MustaphaTR Mar 31, 2018

pchote May 21, 2018

MustaphaTR commented Mar 31, 2018

MustaphaTR commented Apr 17, 2018

pchote commented May 20, 2018

pchote left a comment

pchote May 21, 2018

pchote May 21, 2018

pchote May 21, 2018

MustaphaTR commented Sep 29, 2018

MustaphaTR commented Oct 5, 2018 •

edited

Loading

pchote commented Oct 6, 2018

pchote commented Oct 6, 2018

MustaphaTR commented Oct 6, 2018

abcdefg30 left a comment

pchote left a comment

pchote Oct 8, 2018

pchote commented Oct 8, 2018

Change LowPowerSlowdown to LowPowerModifier #14664

Change LowPowerSlowdown to LowPowerModifier #14664

Conversation

MustaphaTR commented Jan 4, 2018

GraionDilach commented Jan 4, 2018

Choose a reason for hiding this comment

MustaphaTR commented Jan 14, 2018

reaperrr commented Feb 23, 2018

MustaphaTR commented Feb 24, 2018

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

Choose a reason for hiding this comment

MustaphaTR commented Mar 31, 2018

MustaphaTR commented Apr 17, 2018

pchote commented May 20, 2018

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

MustaphaTR commented Sep 29, 2018

MustaphaTR commented Oct 5, 2018 • edited Loading

pchote commented Oct 6, 2018

pchote commented Oct 6, 2018

MustaphaTR commented Oct 6, 2018

abcdefg30 left a comment

Choose a reason for hiding this comment

pchote left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pchote commented Oct 8, 2018

MustaphaTR commented Oct 5, 2018 •

edited

Loading