Changed things to do with Shroud to WRange. Updated Utility. #4694
Conversation
|
Trike has 2c0, when compared to the 2c512 of the soldier, stuff looks a lot nicer now. |
| @@ -24,6 +24,7 @@ public struct WPos | |||
| public WPos(WRange x, WRange y, WRange z) { X = x.Range; Y = y.Range; Z = z.Range; } | |||
|
|
|||
| public static readonly WPos Zero = new WPos(0, 0, 0); | |||
| public static WPos FromCPos(CPos cell) { return new WPos(cell.X, cell.Y, 0); } | |||
There was a problem hiding this comment.
This breaks the definition of our coordinate system. There is a scaling factor and offset between cell and world units, so you can't just convert between the two like this. Use CPos.CenterPosition instead.
|
I swear I fixed that first one earlier today, maybe I just forgot to push. |
|
static IEnumerable<CPos> FindVisibleTiles(World world, CPos position, WRange radius)
{
var r = (radius.Range + 1023) / 1024;
var min = position - new CVec(r, r);
var max = position + new CVec(r, r);
if (min.X < world.Map.Bounds.Left - 1)
min = new CPos(world.Map.Bounds.Left - 1, min.Y);
if (min.Y < world.Map.Bounds.Top - 1)
min = new CPos(min.X, world.Map.Bounds.Top - 1);
if (max.X > world.Map.Bounds.Right)
max = new CPos(world.Map.Bounds.Right + 1, max.Y);
if (max.Y > world.Map.Bounds.Bottom)
max = new CPos(max.X, world.Map.Bounds.Bottom + 1);
var circleArea = r * r;
for (var j = min.Y; j <= max.Y; j++)
for (var i = min.X; i <= max.X; i++)
if (circleArea >= (new CPos(i, j) - position).LengthSquared)
yield return new CPos(i, j);
}Trike is 2c1, infantry is 3c512. I also changed infantry to 2c512 and the shroud rendered in what looked like a 3x3 square. |
|
Your strange reveal circles are because your final filtering check is done in cell units. The |
| { | ||
| foreach (var q in FindVisibleTiles(world, center, range)) | ||
| explored[q.X, q.Y] = true; | ||
|
|
||
| var box = new Rectangle(center.X - range, center.Y - range, 2*range + 1, 2*range + 1); | ||
| var box = new Rectangle(center.X - (range.Range / 1024), center.Y - (range.Range / 1024), 2 * (range.Range / 1024) + 1, 2 * (range.Range / 1024) + 1); |
There was a problem hiding this comment.
You should define a variable for range.Range / 1024 (you may also want to round up using (range.Range + 1023) / 1024) to avoid unnecessary duplication.
|
Good job generalizing this ugly low-level code :) Tentative 👍 once you
|
|
As we discussed in IRC last week, you will still need to remove the unrelated changes that --upgrade-mod introduced. You will also need to rebase on to the latest bleed. This is a fundamental change, so I would like to see a :+2: from another reviewer before we merge this. |
|
Alright, I think this is finally done... |
|
👎 crashes the RA shellmap: |
|
Fixed. |
|
👍 can't find any regressions. Checked both shroud reveal and gap generator. |
Changed things to do with Shroud to WRange. Updated Utility. Closes #4679
|
Yay! Finally! Anyway, I will not be able to complete the d2k updates, I think I might as well just scrap the PR, as I am no longer interested in re-balancing the mod, as no one plays it. |
That would be a shame. The impression I have is that one of the main reasons people don't play D2K is that our mod plays nothing like the original, but is instead a "ra with sand" style spam-fest. I was hoping that your balance changes would address that by resetting the balance and therefore gameplay closer to the original game. |
|
Others seem to want to take on that task http://www.sleipnirstuff.com/forum/viewtopic.php?f=83&t=16465 |
Closes #4679