rohan/XCom2-RWRealisticAimingAnglesHL - Change ZC7RMRAEGOJTHV4EZMR5MWIIRNT3BN4DXLXERJSAFRTNP5JUVAEQC

simpler no-line-of-sight which also accounts for existing cover, higher resolution far cover

Created by rohan on September 14, 2022

ZC7RMRAEGOJTHV4EZMR5MWIIRNT3BN4DXLXERJSAFRTNP5JUVAEQC

Dependencies

In channels

main

Change contents

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 525 [6.20224]
B:BD[4.56] → [5.0:56]
```
        local TTile PeekHead, LosTile, TargetPeekTile;
```
[4.56]
[4.122]
```
        local TTile ShooterPeekTile, LosTile, TargetPeekTile;
```
Insertion in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 530 [6.20224]
[6.46386]
[6.46386]
```
	local bool NoLineOfSight;
	local vector ShooterPeekVec, LosVec;
	local int floor;
```
Insertion in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 703 [6.20224]
[6.55927]
[7.2633]
```
								// FIXME this can be covered by far cover instead
```

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 773 [6.20224]

B:BD[4.634] → [2.0:152]

∅:D[2.152] → [4.859:949]

∅:D[5.164] → [4.859:949]

B:BD[4.859] → [4.859:949]

						PeekHead = VisInfo.SourceTile;
						`log("PeekTile:"@PeekHead.X@","@PeekHead.Y@","@PeekHead.Z, true, 'XCom_HitRolls');
						PeekHead.Z += 1;
						`log("PeekHead:"@PeekHead.X@","@PeekHead.Y@","@PeekHead.Z, true, 'XCom_HitRolls');

[4.634]

[4.949]

						ShooterPeekTile = VisInfo.SourceTile;
						ShooterPeekTile.Z += 1;
						`log("ShooterPeekTile:"@ShooterPeekTile.X@","@ShooterPeekTile.Y@","@ShooterPeekTile.Z, true, 'XCom_HitRolls');
						`log("Shooter floor:"@`XWORLD.GetFloorTileZ(ShooterTile));

Insertion in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 781 [6.20224]
[4.1205]
[4.1205]
```
						`log("Target floor:"@`XWORLD.GetFloorTileZ(TargetTile));
						`log("Target peek floor:"@`XWORLD.GetFloorTileZ(TargetPeekTile));
```
Deletion in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 784 [6.20224]
∅:D[4.1282] → [6.64789:64791]
∅:D[7.5172] → [6.64789:64791]
B:BD[6.64789] → [6.64789:64791]
Deletion in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 785 [6.20224]
B:BD[6.66768] → [4.1283:1431]
```
						// FarCover to a tile which may already be granting cover
						LosTile = TargetTile;
						LosTile.Z = `XWORLD.GetFloorTileZ(TargetTile);
```

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 800 [6.20224]

B:BD[3.493] → [3.493:550]

						for (i=ExistingCoverHeight; i<=TargetHeight; i++)

[3.493]

[7.7955]


						// FarCover to a tile which may already be granting cover
						FarCover = 0;
						NoLineOfSight = true;
						ShooterPeekVec = `XWORLD.GetPositionFromTileCoordinates(ShooterPeekTile);
						LosTile = TargetTile;
						LosTile.Z = `XWORLD.GetFloorTileZ(TargetTile);
						LosVec = `XWORLD.GetPositionFromTileCoordinates(LosTile);
						Floor = LosVec.Z;
						for (i = 16; i<TargetState.UnitHeight * 64; i += 16)

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 812 [6.20224]

B:BD[4.1803] → [4.1803:1873]

							if (`XWORLD.VoxelRaytrace_Tiles(PeekHead, LosTile, RayTrace))

[7.7964]

[8.827]

							LosVec.Z = Floor + i;
							if (`XWORLD.VoxelRaytrace_Locations(ShooterPeekVec, LosVec, RayTrace))

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 815 [6.20224]

B:BD[8.837] → [3.551:801]

								`log("LOS blocked by far cover:"@i@","@VisInfo.TargetCover, true, 'XCom_HitRolls');
								`log("Blocking tile:"@RayTrace.BlockedTile.X@","@RayTrace.BlockedTile.Y@","@RayTrace.BlockedTile.Z, true, 'XCom_HitRolls');
								FarCover += 1;

[8.837]

[8.1090]

								// Don't apply far cover to existing cover or above the target's head
								if (i > ExistingCoverHeight*64 && i <= TargetHeight*64)
								{
									`log("LOS blocked by far cover vector:"@i@","@VisInfo.TargetCover, true, 'XCom_HitRolls');
									FarCover += 1;
								}
								else if (i <= ExistingCoverHeight*64)
								{
									`log("Hit existing cover:"@RayTrace.BlockedTile.X@","@RayTrace.BlockedTile.Y@","@RayTrace.BlockedTile.Z, true, 'XCom_HitRolls');
								}
							}
							else if (i <= TargetHeight*64)
							{
								NoLineOfSight = false;

Deletion in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 831 [6.20224]
B:BD[6.74012] → [9.1190:1192]
B:BD[9.1192] → [4.2123:2144]
```
							LosTile.Z++;
```

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 836 [6.20224]

B:BD[4.2307] → [3.802:888]

						for (i=0; i<=TargetState.UnitHeight; i++)  // Target not crouched when peeking

[4.2307]

[9.1240]

						LosVec = `XWORLD.GetPositionFromTileCoordinates(LosTile);
						Floor = LosVec.Z;
						for (i=16; i<TargetState.UnitHeight * 64; i += 16)

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 840 [6.20224]

B:BD[4.2542] → [4.2542:2612]

							if (`XWORLD.VoxelRaytrace_Tiles(PeekHead, LosTile, RayTrace))

[9.1249]

[9.1277]

							LosVec.Z = Floor + i;
							if (`XWORLD.VoxelRaytrace_Locations(ShooterPeekVec, LosVec, RayTrace))

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 843 [6.20224]
B:BD[9.1287] → [4.2613:2682]
```
								`log("LOS blocked by far cover:"@i, true, 'XCom_HitRolls');
```
[9.1287]
[3.889]
```
								`log("LOS blocked by far cover vector:"@i, true, 'XCom_HitRolls');
```
Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 847 [6.20224]
B:BD[9.1298] → [4.2707:2730]
```
							LosTile.Z++;
```
[9.1298]
[4.2730]
```
							else // Target is always standing when peeking
							{
								NoLineOfSight = false;
							}
```

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 859 [6.20224]

B:BD[4.2935] → [5.369:476]

						if (default.GiveHitChanceZeroWhenTargetableEnemiesAreInsteadNotTrulyInLineOfSight && FarCover == 6)

[4.2935]

[4.3043]

						if (default.GiveHitChanceZeroWhenTargetableEnemiesAreInsteadNotTrulyInLineOfSight && NoLineOfSight)

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 867 [6.20224]

B:BD[4.3593] → [5.477:569]

							FarCoverBonus = FarCover * HIGH_COVER_BONUS / 6; // 6 is the maximum considered ray

[4.3593]

[4.3687]

							FarCoverBonus = FarCover * HIGH_COVER_BONUS / 14; // 14 is the maximum considered ray

simpler no-line-of-sight which also accounts for existing cover, higher resolution far cover

Dependencies

In channels

Change contents

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 525 [6.20224]

Insertion in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 530 [6.20224]

Insertion in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 703 [6.20224]

Replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 773 [6.20224]

Insertion in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 781 [6.20224]

Deletion in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 784 [6.20224]

Deletion in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 785 [6.20224]