[General Purpose] New Engrave trajectory

CREDITS.md

@@ -391,6 +391,7 @@ This page lists all the individual contributions to the project by their author.
   - No turret unit turn to the target
   - Damage multiplier for different houses
   - Extended gattling rate down logic
+  - New Engrave trajectory
 - **Ollerus**
   - Build limit group enhancement
   - Customizable rocker amplitude

Phobos.vcxproj

@@ -38,6 +38,7 @@
     <ClCompile Include="src\Ext\Bullet\Trajectories\BombardTrajectory.cpp" />
     <ClCompile Include="src\Ext\Bullet\Trajectories\PhobosTrajectory.cpp" />
     <ClCompile Include="src\Ext\Bullet\Trajectories\StraightTrajectory.cpp" />
+    <ClCompile Include="src\Ext\Bullet\Trajectories\EngraveTrajectory.cpp" />
     <ClCompile Include="src\Ext\Bullet\Trajectories\ParabolaTrajectory.cpp" />
     <ClCompile Include="src\Ext\CaptureManager\Hooks.cpp" />
     <ClCompile Include="src\Ext\CaptureManager\Body.cpp" />
@@ -200,6 +201,7 @@
     <ClInclude Include="src\Ext\Bullet\Trajectories\BombardTrajectory.h" />
     <ClInclude Include="src\Ext\Bullet\Trajectories\PhobosTrajectory.h" />
     <ClInclude Include="src\Ext\Bullet\Trajectories\StraightTrajectory.h" />
+    <ClInclude Include="src\Ext\Bullet\Trajectories\EngraveTrajectory.h" />
     <ClInclude Include="src\Ext\Bullet\Trajectories\ParabolaTrajectory.h" />
     <ClInclude Include="src\Ext\OverlayType\Body.h" />
     <ClInclude Include="src\Ext\ParticleType\Body.h" />

docs/New-or-Enhanced-Logics.md

@@ -727,6 +727,7 @@ Currently interceptor weapons with projectiles that do not have `Inviso=true` wi
   - The speed of the projectile is defined by `Trajectory.Speed`, which unlike `Speed` used by `ROT` > 0 projectiles is defined on projectile not weapon.
     - In `Trajectory=Straight`, it refers to the whole distance speed of the projectile and it has no restrictions.
     - In `Trajectory=Bombard`, it refers to the initial speed of the projectile and it has no restrictions.
+    - In `Trajectory=Engrave`, it refers to the horizontal engrave speed of the projectile and it cannot exceed 128. Recommend set as about 40.
     - In `Trajectory=Parabola`, it refers to the horizontal velocity of the projectile and is only used for modes 0, 3, or 5 and it has no restrictions.
 
 In `rulesmd.ini`:
@@ -917,6 +918,77 @@ Trajectory.Parabola.AxisOfRotation=0,0,1        ; integer - Forward,Lateral,Heig
 - Certainly, `Gravity` can also affect the trajectory.
 ```
 
+#### Engrave trajectory
+
+- Visually, like the thermal lance. Calling it 'trajectory' may not be appropriate. It does not read the settings on the weapon.
+  - `Trajectory.Engrave.SourceCoord` controls the starting point of engraving line segment. Taking the target as the coordinate center. Specifically, it will start from the firing position when set to 0,0 . The height of the point will always at ground level, unless `Trajectory.Engrave.ConfineOnGround` is set to false.
+  - `Trajectory.Engrave.TargetCoord` controls the end point of engraving line segment. Taking the target as the coordinate center. The height of the point will always at ground level, unless `Trajectory.Engrave.ConfineOnGround` is set to false.
+    - `Trajectory.Engrave.MirrorCoord` controls whether `Trajectory.Engrave.SourceCoord` and `Trajectory.Engrave.TargetCoord` need to mirror the lateral value to adapt to the current FLH.
+  - `Trajectory.Engrave.UseDisperseCoord` controls whether the emission position of the engrave laser need to replaced with the FLH of its superior's dispersed trajectory, which set `Trajectory.Disperse.RecordSourceCoord` to true.
+  - `Trajectory.Engrave.ApplyRangeModifiers` controls whether any applicable weapon range modifiers from the firer are applied to the engrave process.
+  - `Trajectory.Engrave.AllowFirerTurning` controls whether the projectile allow for significant changes in the orientation of the firer, otherwise it will disappear.
+  - `Trajectory.Engrave.Duration` controls the duration of the entire engrave process. Set to 0 will automatically use `Trajectory.Engrave.SourceCoord` and `Trajectory.Engrave.TargetCoord` to calculate the process duration.
+  - `Trajectory.Engrave.IsLaser` controls whether laser drawing is required.
+    - `Trajectory.Engrave.IsIntense` controls whether the engrave laser will be brighter and thicker. Need to set `Trajectory.Engrave.IsHouseColor` or `Trajectory.Engrave.IsSingleColor` to true.
+    - `Trajectory.Engrave.IsHouseColor` controls whether set the engrave laser to draw using player's team color. These lasers respect `Trajectory.Engrave.LaserThickness` and `Trajectory.Engrave.IsIntense`.
+    - `Trajectory.Engrave.IsSingleColor` controls whether set the engrave laser to draw using only `Trajectory.Engrave.LaserInnerColor`. These lasers respect `Trajectory.Engrave.LaserThickness` and `Trajectory.Engrave.IsIntense`.
+    - `Trajectory.Engrave.LaserInnerColor` controls the inner color of the engrave laser.
+    - `Trajectory.Engrave.LaserOuterColor` controls the outer color of the engrave laser.
+    - `Trajectory.Engrave.LaserOuterSpread` controls the spread color of the engrave laser.
+    - `Trajectory.Engrave.LaserThickness` controls the thickness of the engrave laser. Need to set `Trajectory.Engrave.IsHouseColor` or `Trajectory.Engrave.IsSingleColor` to true.
+    - `Trajectory.Engrave.LaserDuration` controls the duration of the engrave laser.
+    - `Trajectory.Engrave.LaserDelay` controls how often to draw the engrave laser.
+  - `Trajectory.Engrave.DamageDelay` controls how often to detonate warheads.
+  - `Trajectory.Engrave.ProximityImpact` controls the initial proximity fuse times. When there are enough remaining times and the projectile approaches another valid target, it will detonate a warhead defined by `Trajectory.Engrave.ProximityWarhead` on it. If the number of times is exhausted, the engraving process can still continue, but it will not detonate additional warhead as a result. This function can be cancelled by setting to 0. A negative integer means unlimited times. (You can use this to cause non repeated damage to all units encountered during the flight of the projectile.)
+    - `Trajectory.Engrave.ProximityWarhead` defines the warhead detonated by `Trajectory.Engrave.ProximityImpact`, and `Trajectory.Engrave.ProximityDamage` defines the damage caused by `Trajectory.Engrave.ProximityWarhead`.
+    - `Trajectory.Engrave.ProximityRadius` controls the range of proximity fuse. It can NOT be set as a negative integer.
+    - `Trajectory.Engrave.ProximityDirect` controls whether let the target receive damage instead of detonating the warhead.
+    - `Trajectory.Engrave.ProximityMedial` controls whether to detonate `Trajectory.Engrave.ProximityWarhead` at the bullet's location rather than the proximity target's location.
+    - `Trajectory.Engrave.ProximityAllies` controls whether allies will also trigger the proximity fuse.
+    - `Trajectory.Engrave.ProximityFlight` controls whether to count units in the air.
+    - `Trajectory.Engrave.ProximitySuicide` controls whether the projectile will self destruct after the number of proximity fuse times has been exhausted. If `Trajectory.Engrave.ProximityImpact` set to 0, this will not be enabled.
+  - `Trajectory.Engrave.ConfineOnGround` controls whether the height of the projectile will always at ground level.
+
+
+In `rulesmd.ini`:
+```ini
+[SOMEPROJECTILE]                               ; Projectile
+Trajectory=Engrave                             ; Trajectory type
+Trajectory.Engrave.SourceCoord=0,0             ; integer - Forward,Lateral
+Trajectory.Engrave.TargetCoord=0,0             ; integer - Forward,Lateral
+Trajectory.Engrave.MirrorCoord=true            ; boolean
+Trajectory.Engrave.UseDisperseCoord=false      ; boolean
+Trajectory.Engrave.ApplyRangeModifiers=false   ; boolean
+Trajectory.Engrave.AllowFirerTurning=true      ; boolean
+Trajectory.Engrave.Duration=0                  ; integer
+Trajectory.Engrave.IsLaser=true                ; boolean
+Trajectory.Engrave.IsIntense=false             ; boolean
+Trajectory.Engrave.IsHouseColor=false          ; boolean
+Trajectory.Engrave.IsSingleColor=false         ; boolean
+Trajectory.Engrave.LaserInnerColor=0,0,0       ; integer - Red,Green,Blue
+Trajectory.Engrave.LaserOuterColor=0,0,0       ; integer - Red,Green,Blue
+Trajectory.Engrave.LaserOuterSpread=0,0,0      ; integer - Red,Green,Blue
+Trajectory.Engrave.LaserThickness=3            ; integer
+Trajectory.Engrave.LaserDuration=1             ; integer
+Trajectory.Engrave.LaserDelay=1                ; integer
+Trajectory.Engrave.DamageDelay=2               ; integer
+Trajectory.Engrave.ProximityImpact=0           ; integer
+Trajectory.Engrave.ProximityWarhead=           ; WarheadType
+Trajectory.Engrave.ProximityDamage=0           ; integer
+Trajectory.Engrave.ProximityRadius=0.7         ; floating point value
+Trajectory.Engrave.ProximityDirect=false       ; boolean
+Trajectory.Engrave.ProximityMedial=false       ; boolean
+Trajectory.Engrave.ProximityAllies=false       ; boolean
+Trajectory.Engrave.ProximityFlight=false       ; boolean
+Trajectory.Engrave.ProximitySuicide=false      ; boolean
+Trajectory.Engrave.ConfineOnGround=true        ; boolean
+```
+
+```{note}
+- It's best not to let it be intercepted.
+- Make sure you set a low `Trajectory.Engrave.ProximityRadius` value unless necessary.
+```
+
 ### Shrapnel enhancements
 
 ![image](_static/images/shrapnel.gif)

docs/Whats-New.md

@@ -328,9 +328,11 @@ New:
 - Damage multiplier for different houses (by CrimRecya)
 - Customizable duration for electric bolts (by Starkku)
 - Extended gattling rate down logic (by CrimRecya)
+- New Engrave trajectory (by CrimRecya)
 
 Vanilla fixes:
 - Prevent the units with locomotors that cause problems from entering the tank bunker (by TaranDahl)
+- Fix an issue where a unit will leave an impassable invisible barrier in its original position when it is teleported by ChronoSphere onto an uncrushable unit and self destruct (by NetsuNegi)
 
 Fixes / interactions with other extensions:
 - Allowed `AuxBuilding` and Ares' `SW.Aux/NegBuildings` to count building upgrades (by Ollerus)

src/Ext/Bullet/Hooks.cpp

@@ -295,6 +295,7 @@ constexpr bool CheckTrajectoryCanNotAlwaysSnap(const TrajectoryFlag flag)
 	return flag != TrajectoryFlag::Invalid;
 /*	return flag == TrajectoryFlag::Straight
 		|| flag == TrajectoryFlag::Bombard
+		|| flag == TrajectoryFlag::Engrave;
 		|| flag == TrajectoryFlag::Parabola;*/
 }