Make gap generators work when shroud is disabled. #7665

deniz1a · 2015-03-14T17:48:47Z

Fixes #6123. This will look at game settings, if fog of war is disabled, gap gens will work like they do now. If fog of war is enabled, gap gens will generate fog and there won't be any frozen actors visible while they are operational. Also this commit disables auto targeting for units/structures under gap, even if you have satellite. So satellite icons will also not appear where gap gen is active.

I tested this and seems to work.

RoosterDragon · 2015-03-14T18:00:20Z

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -74,7 +74,7 @@ public string GetCursor(World world, CPos xy, MouseInput mi)
 			else
 			{
 				var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi)
-					.Where(a => a.Info.Traits.Contains<ITargetableInfo>() && !a.Footprint.All(world.ShroudObscures))
+					.Where(a => a.Info.Traits.Contains<ITargetableInfo>() && !a.Footprint.All(world.ShroudObscures) && !world.RenderPlayer.Shroud.IsUnderGapGen(a.Footprint))


This code is duplicated in the Order method, will that need updating too?

I don't know, it seems to work with just this code. This is to prevent having an attack cursor for hidden buildings under fog (they dont have frozen images now if gap gen is active).

deniz1a · 2015-03-14T18:40:58Z

OK I think I fixed all code styling issues. I also squashed all commits.

deniz1a · 2015-03-14T18:50:53Z

Also for gap gen to cover a building, all its footprint cells must be within range. So if part of the building is outside gap gen range it will appear as normal. Does footprint include bibs, the space below structures?

pchote · 2015-03-14T23:57:49Z

Shroud is an engine-level feature, so please don't introduce RA-specific logic and naming there. You can do that instead in the mod-level traits.

deniz1a · 2015-03-15T02:10:27Z

Do you mean UpdateShroudGeneration to UpdateGapGeneration etc changes? But it doesn't generate shroud anymore if fog is enabled. Isn't gap a general name for it?

phrohdoh · 2015-03-15T03:40:49Z

No, shroud is the name for shroud and fog is the name for fog.

deniz1a · 2015-03-15T09:01:05Z

OK so how should it be called? It's not a shroud generator or fog generator but a combination of those. ShroudFogGeneration?

deniz1a · 2015-03-15T09:35:02Z

Actually if fog is enabled, gap generator doesn't generate fog. The fog is generated automatically by the engine. What gap gen does then is remove frozen actors from fog. So it either generates shroud or removes frozen actors from fog. WHat should it be called? Gap generator seems to be the most appropriate name, it generates a gap in enemy radar/map. Are there any other name suggestions? ShroudFogGeneration doesn't look suitable since gap gen doesn't generate fog.

deniz1a · 2015-03-15T09:42:58Z

Also the other point pchote made, I haven't introduced any ra specific code here? The shroud generation code was already there, I just changed its behaviour. And don't all mods have shroud and fog option? So it's not mod specific.

pchote · 2015-03-15T09:53:08Z

The concept of having the "shroud generation" do one thing if shroud is enabled but another if it isn't is a RA specific idea. Other mods may want to have pure shroud generators or pure cloak generators, but you are instead enforcing them to do what the gap generator does.

The shroud code needs to keep these ideas separate (with separate methods and state for shroud and cloak generation), and then the gameplay code (i.e. CreatesShroud) should expose trait properties so that the generation type can be configured in the yaml.

deniz1a · 2015-03-15T10:08:07Z

OK it was agreed in IRC to call this functionality "Stealth Field Generation". I will make the necessary changes and send another commit.

deniz1a · 2015-03-16T03:53:52Z

I decided to postpone this until #7577 and #7560 are merged and #7669 is fixed.

deniz1a · 2015-04-05T10:35:06Z

OK, the other PRs that were related to this one are merged so I started working on this again. Has dependencies label can be removed.

Now I have another naming question: So the general trait will be called CreatesStealth, it is a general stealth field. And then there will be two types of stealth. One is the current gap generator, it will generate shroud, so it's called Type: Shroud. But what should the new type be called? The new gap generator behaviour will act as frozen actor remover from fog, prevent units from being auto targeted and also remove satellite icons. Sensor disruptor was suggested in IRC. What do you think?

phrohdoh · 2015-04-05T14:07:18Z

👎 for CreatesStealth, shroud is not stealth/cloak.

penev92 · 2015-04-05T14:11:04Z

This is basically what I've gathered from all the discussions about how it should work when done:

Working with Shroud disabled - it removes actors frozen under fog
Working with Fog disabled - it generates shroud
Working with both Shroud and Fog disabled - ~~it just makes things "invisible" unless you are near them~~ - Or just disallow this option for normal games.
Working with both Shroud and Fog enabled - removes actors frozen under fog

deniz1a · 2015-04-05T14:18:07Z

Yes. Or simpler: if fog is enabled, gap gen acts as disruption generator. If fog is disabled but shroud is enabled, it generates shroud. ~~If both are disabled, it makes units invisible?~~ The option to disable both fog and shroud should be removed?

deniz1a · 2015-04-05T14:19:07Z

@phrohdoh: So what should it be called instead of CreatesStealth.cs?

phrohdoh · 2015-04-07T06:04:26Z

OpenRA.Game/OpenRA.Game.csproj

@@ -349,4 +349,4 @@
  </Target>
  -->
  <ItemGroup />
-</Project>
+</Project>


This needs to be reverted.

What needs to be reverted? Those changes in the project file were done by Visual Studio automatically when I renamed CreatesShroud.cs to CreatesConcealment.cs.

You should stage just the <Compile Include="Traits\CreatesDisruptionField.cs" /> line. We're trying to avoid staging other lines the different IDEs keep automatically changing so they don't go back and forth all the time.

deniz1a · 2015-04-27T15:04:03Z

I made the changes you requested. While I was doing that I also realized that there should also be a separate RenderDisruptionCircle trait to draw the range circle. And shouldn't this and RenderShroudCircle be in Mods.Common? Or even in the engine itself. Because they are part of CreatesShroud and CreatesDisruptionField traits.

deniz1a · 2015-04-29T19:21:27Z

And the developing continues...
[19:54:56] <+pchote> find the thing that calls the render, and then create an actor preview
[19:55:03] <+pchote> and then render that and stash the sprites
[19:55:46] <+pchote> actually, there's a problem there
[19:55:59] <+pchote> the base ActorPreview class currently lives in Mods.Common
[19:56:07] <+pchote> it will need to move into game for you to be able to do this

deniz1a · 2015-05-02T15:01:44Z

I have changed this to use ActorPreview for rendering the frozen actor. I also added some checks so that it is only rendered when the building state has changed.

abcdefg30 · 2015-05-02T15:20:25Z

OpenRA.Game/OpenRA.Game.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>


This needs to be undone.

…Gens work when shroud is disabled. Performance optimization Uses IsDisabled() method for simplification. Optimizes fog/shroud checks. Adds a new trait called RenderDisruptionCircle. Converts some IEnumerables to array. Simplifies if statements. Uses ActorPreview for rendering. Shortens some lines. Reverts faulty project file changes.

phrohdoh · 2015-05-02T20:48:30Z

OpenRA.Game/Traits/Player/FrozenActorLayer.cs

@@ -25,6 +26,7 @@ public class FrozenActorLayerInfo : ITraitInfo
 	public class FrozenActor
 	{
 		public readonly MPos[] Footprint;
+		public readonly CPos[] OccCells;


What is Occ, Occupied?

Yes, that's for Occupied Cells. But there already is a method called OccupiedCells() so I wanted to give this a different name to avoid confusion.

This sounds like duplication then.

But that method cannot be used if the actor is null. A frozen actor can exist even after its actor is destroyed. The actor's occupied cells have to be stored in the frozen actor so that they can be used even if the actor is null.

That is what the Footprint above is for. Use that instead.

penev92 · 2015-05-18T10:38:19Z

I am closing this in an attempt to clean up the PR queue a bit. Feel free to reopen it once the conceptual problems are cleared up.

deniz1a · 2015-05-22T12:36:10Z

This apparently depends on satellite code being fixed to handle visibility and stuff. Related: #8203

RoosterDragon reviewed Mar 14, 2015
View reviewed changes

deniz1a force-pushed the gapgen branch 2 times, most recently from bf5b14a to 86c690b Compare March 14, 2015 18:38

pchote added the PR: Changes requested label Mar 15, 2015

Mailaender added the PR: Has dependencies label Mar 20, 2015

penev92 removed the PR: Has dependencies label Apr 5, 2015

deniz1a force-pushed the gapgen branch from 86c690b to 0eb7488 Compare April 7, 2015 05:53

phrohdoh reviewed Apr 7, 2015
View reviewed changes

deniz1a mentioned this pull request Apr 28, 2015

Fixes unselectable and untargetable buildings issue. #7931

Closed

deniz1a force-pushed the gapgen branch from a479aa8 to 1ec2d89 Compare April 28, 2015 18:36

deniz1a force-pushed the gapgen branch 2 times, most recently from ef8a57d to 96d7b08 Compare May 2, 2015 14:44

abcdefg30 reviewed May 2, 2015
View reviewed changes

deniz1a force-pushed the gapgen branch from 96d7b08 to ed1bc2f Compare May 2, 2015 15:44

phrohdoh reviewed May 2, 2015
View reviewed changes

abcdefg30 added the PR: Changes requested label May 3, 2015

penev92 mentioned this pull request May 8, 2015

mobile gap-truck tweak #8112

Closed

deniz1a mentioned this pull request May 9, 2015

Rename the different traits that use original names? #6336

Open

14 tasks

Mailaender added the PR: Rebase me! label May 17, 2015

penev92 closed this May 18, 2015

abcdefg30 added this to the Future milestone May 18, 2015

deniz1a mentioned this pull request Jun 24, 2015

Starting spec #8551

Closed

deniz1a deleted the gapgen branch July 17, 2015 17:10

pchote removed this from the Future milestone Jan 30, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make gap generators work when shroud is disabled. #7665

Make gap generators work when shroud is disabled. #7665

deniz1a commented Mar 14, 2015

RoosterDragon Mar 14, 2015

deniz1a Mar 14, 2015

deniz1a commented Mar 14, 2015

deniz1a commented Mar 14, 2015

pchote commented Mar 14, 2015

deniz1a commented Mar 15, 2015

phrohdoh commented Mar 15, 2015

deniz1a commented Mar 15, 2015

deniz1a commented Mar 15, 2015

deniz1a commented Mar 15, 2015

pchote commented Mar 15, 2015

deniz1a commented Mar 15, 2015

deniz1a commented Mar 16, 2015

deniz1a commented Apr 5, 2015

phrohdoh commented Apr 5, 2015

penev92 commented Apr 5, 2015

deniz1a commented Apr 5, 2015

deniz1a commented Apr 5, 2015

phrohdoh Apr 7, 2015

deniz1a Apr 7, 2015

RoosterDragon Apr 26, 2015

deniz1a commented Apr 27, 2015

deniz1a commented Apr 29, 2015

deniz1a commented May 2, 2015

abcdefg30 May 2, 2015

phrohdoh May 2, 2015

deniz1a May 2, 2015

phrohdoh May 2, 2015

deniz1a May 2, 2015

pchote May 2, 2015

penev92 commented May 18, 2015

deniz1a commented May 22, 2015

		@@ -1,4 +1,4 @@
		<?xml version="1.0" encoding="utf-8"?>
		<?xml version="1.0" encoding="utf-8"?>

Make gap generators work when shroud is disabled. #7665

Make gap generators work when shroud is disabled. #7665

Conversation

deniz1a commented Mar 14, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

deniz1a commented Mar 14, 2015

deniz1a commented Mar 14, 2015

pchote commented Mar 14, 2015

deniz1a commented Mar 15, 2015

phrohdoh commented Mar 15, 2015

deniz1a commented Mar 15, 2015

deniz1a commented Mar 15, 2015

deniz1a commented Mar 15, 2015

pchote commented Mar 15, 2015

deniz1a commented Mar 15, 2015

deniz1a commented Mar 16, 2015

deniz1a commented Apr 5, 2015

phrohdoh commented Apr 5, 2015

penev92 commented Apr 5, 2015

deniz1a commented Apr 5, 2015

deniz1a commented Apr 5, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

deniz1a commented Apr 27, 2015

deniz1a commented Apr 29, 2015

deniz1a commented May 2, 2015

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

penev92 commented May 18, 2015

deniz1a commented May 22, 2015