Adam Olsen <rhamph+warzone@...> uploaded file warzone-artillery-predict.diff (1.1 KiB)

Zarel changed status from new to accepted

Zarel set owner to Zarel

Zarel commented

Yay, math!

Adam Olsen <rhamph+warzone@...> uploaded file warzone-predict.diff (1.5 KiB)

Handle EMP as well

Adam Olsen <rhamph+warzone@...> commented

New version, handles delays due to EMP. Seems to work for artillery, but I didn't find a convenient example of normal direct weapons having problems to test with.

Zarel changed status from accepted to closed

Zarel set resolution to fixed

Zarel commented

Committed in [7155].
Backported to 2.2 in [7156].

Adam Olsen <rhamph+warzone@...> commented

Indirect fire has four range categories (for trajectory purposes, not hit chance purposes):

Long: fixed angle, variable (high) velocity
Medium: low variable angle, fixed velocity
Short: super high variable angle, fixed velocity
Point blank: direct fire

My previous patch confused the point blank/short threshold for the medium/long threshold. My new patch fixes this, although the threshold itself is a little fuzzy.

The original code had correct prediction for point blank and medium. My previous patch added correct prediction for long. However, there is still no correct prediction for short. Short also has significant problems with height differences, so it is often unable to hit targets that are much lower than it. I've added an extra range check (psStats->minRange < TILE_UNITS*3) to reduce how often it gets used, but I've been unable to eliminate it (without making point blank excessively large.)

IMO, there's a lot of ugliness here, but I want to get the medium/long threshold fixed before getting too deep in fixing other things. I did add a small check for projectiles passing below the map, but that's usually because they skipped past their real target.

Adam Olsen <rhamph+warzone@...> uploaded file warzone-predict-3.diff (3.0 KiB)

Zarel changed status from closed to reopened

Zarel changed resolution from fixed to ``

Rhamphoryncus uploaded file warzone-predict-3b.diff (57.5 KiB)

Missed a bit. Bluh.

Per commented

That last patch is full of noise.

Rhamphoryncus commented

Sorry, ignore it, 3 is right.

Buginator changed priority from major to blocker

Buginator commented

Just a FYI, this is a git patch, so I couldn't apply it at this time.

Changing priority to blocker, since, we need a fix.

Rhamphoryncus uploaded file warzone-predict-4.diff (2.3 KiB)

Rhamphoryncus commented

Version 4, latest in the escapade:

• Updated to trunk, including Zarel's slightly excessive casting fix
• Ditches the TILE_UNITS*3 threshold, which should be a separate patch IMO.

Per uploaded file buggy.diff (2.3 KiB)

Normal diff instead of git diff

Buginator commented

(In [7383]) Artillery prediction fix.
patch by Rhamphoryncus (Adam Olsen)

fixes #374
Thanks to per for the conversion

Buginator changed status from reopened to closed

Buginator changed resolution from `` to fixed

Buginator commented

(In [7384]) Artillery prediction fix.
patch by Rhamphoryncus (Adam Olsen)

fixes #374
Thanks to per for the conversion

Buginator removed milestone (was 2.2)

Buginator commented

Milestone 2.2 deleted