1
This commit is contained in:
@@ -9,27 +9,24 @@ namespace WulaFallenEmpire
|
||||
public class CompAbilityEffect_SpawnFlyOver : CompAbilityEffect
|
||||
{
|
||||
public new CompProperties_AbilitySpawnFlyOver Props => (CompProperties_AbilitySpawnFlyOver)props;
|
||||
// 新增:检查航道等级限制
|
||||
|
||||
public override bool CanApplyOn(LocalTargetInfo target, LocalTargetInfo dest)
|
||||
{
|
||||
if (!base.CanApplyOn(target, dest))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
// 在 CompAbilityEffect_SpawnFlyOver.cs 中修改航道检查方法:
|
||||
// 修改 DestroyLowerLevelFlyOvers 方法(现在由全局管理器处理):
|
||||
|
||||
public override void Apply(LocalTargetInfo target, LocalTargetInfo dest)
|
||||
{
|
||||
base.Apply(target, dest);
|
||||
if (parent.pawn == null || parent.pawn.Map == null)
|
||||
return;
|
||||
|
||||
try
|
||||
{
|
||||
Log.Message($"FlyOver skill activated by {parent.pawn.Label} at position {parent.pawn.Position}");
|
||||
Log.Message($"Target cell: {target.Cell}, Dest: {dest.Cell}");
|
||||
// 计算起始和结束位置
|
||||
IntVec3 startPos, endPos;
|
||||
// 根据进场类型选择不同的计算方法
|
||||
if (Props.approachType == ApproachType.Perpendicular)
|
||||
{
|
||||
CalculatePerpendicularPath(target, out startPos, out endPos);
|
||||
@@ -39,16 +36,17 @@ namespace WulaFallenEmpire
|
||||
startPos = CalculateStartPosition(target);
|
||||
endPos = CalculateEndPosition(target, startPos);
|
||||
}
|
||||
|
||||
// 确保位置安全
|
||||
startPos = GetSafeMapPosition(startPos, parent.pawn.Map);
|
||||
endPos = GetSafeMapPosition(endPos, parent.pawn.Map);
|
||||
|
||||
// 验证并优化飞行路径
|
||||
if (!ValidateAndOptimizePath(ref startPos, ref endPos, target.Cell))
|
||||
{
|
||||
Log.Warning("FlyOver path validation failed, using fallback path");
|
||||
CalculateFallbackPath(target, out startPos, out endPos);
|
||||
}
|
||||
Log.Message($"Final positions - Start: {startPos}, End: {endPos}");
|
||||
|
||||
// 根据类型创建不同的飞越物体
|
||||
switch (Props.flyOverType)
|
||||
{
|
||||
@@ -69,7 +67,7 @@ namespace WulaFallenEmpire
|
||||
Log.Error($"Error spawning fly over: {ex}");
|
||||
}
|
||||
}
|
||||
// 更新:技能提示信息,包含航道等级信息
|
||||
|
||||
public override string ExtraLabelMouseAttachment(LocalTargetInfo target)
|
||||
{
|
||||
string baseInfo = "";
|
||||
@@ -83,7 +81,7 @@ namespace WulaFallenEmpire
|
||||
}
|
||||
return baseInfo;
|
||||
}
|
||||
// 更新:验证方法,包含航道等级检查
|
||||
|
||||
public override bool Valid(LocalTargetInfo target, bool throwMessages = false)
|
||||
{
|
||||
if (!base.Valid(target, throwMessages))
|
||||
@@ -94,7 +92,7 @@ namespace WulaFallenEmpire
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
// 更新:创建标准飞越方法,添加航道等级组件
|
||||
|
||||
private void CreateStandardFlyOver(IntVec3 startPos, IntVec3 endPos)
|
||||
{
|
||||
ThingDef flyOverDef = Props.flyOverDef ?? DefDatabase<ThingDef>.GetNamedSilentFail("ARA_HiveShip");
|
||||
@@ -103,6 +101,7 @@ namespace WulaFallenEmpire
|
||||
Log.Warning("No fly over def specified for standard fly over");
|
||||
return;
|
||||
}
|
||||
|
||||
FlyOver flyOver = FlyOver.MakeFlyOver(
|
||||
flyOverDef,
|
||||
startPos,
|
||||
@@ -113,13 +112,8 @@ namespace WulaFallenEmpire
|
||||
);
|
||||
flyOver.spawnContentsOnImpact = Props.dropContentsOnImpact;
|
||||
flyOver.playFlyOverSound = Props.playFlyOverSound;
|
||||
if (Props.customSound != null)
|
||||
{
|
||||
// 自定义音效逻辑
|
||||
}
|
||||
Log.Message($"Standard FlyOver created: {flyOver} from {startPos} to {endPos}");
|
||||
}
|
||||
// 更新:创建地面扫射飞越,添加航道等级组件
|
||||
|
||||
private void CreateGroundStrafingFlyOver(IntVec3 startPos, IntVec3 endPos, IntVec3 targetCell)
|
||||
{
|
||||
ThingDef flyOverDef = Props.flyOverDef ?? DefDatabase<ThingDef>.GetNamedSilentFail("ARA_HiveCorvette");
|
||||
@@ -128,6 +122,7 @@ namespace WulaFallenEmpire
|
||||
Log.Warning("No fly over def specified for ground strafing fly over");
|
||||
return;
|
||||
}
|
||||
|
||||
FlyOver flyOver = FlyOver.MakeFlyOver(
|
||||
flyOverDef,
|
||||
startPos,
|
||||
@@ -137,19 +132,17 @@ namespace WulaFallenEmpire
|
||||
Props.altitude,
|
||||
casterPawn: parent.pawn
|
||||
);
|
||||
// 设置基本属性
|
||||
|
||||
flyOver.spawnContentsOnImpact = Props.dropContentsOnImpact;
|
||||
flyOver.playFlyOverSound = Props.playFlyOverSound;
|
||||
// 获取扫射组件并设置预处理后的目标单元格
|
||||
|
||||
CompGroundStrafing strafingComp = flyOver.GetComp<CompGroundStrafing>();
|
||||
if (strafingComp != null)
|
||||
{
|
||||
// 修复:计算扫射区域的所有单元格,以目标单元格为中心
|
||||
Vector3 flightDirection = (endPos.ToVector3() - startPos.ToVector3()).normalized;
|
||||
List<IntVec3> potentialTargetCells = CalculateStrafingImpactCells(targetCell, flightDirection);
|
||||
if (potentialTargetCells.Count > 0)
|
||||
{
|
||||
// 预处理:根据概率筛选实际会被射击的单元格
|
||||
List<IntVec3> confirmedTargetCells = PreprocessStrafingTargets(
|
||||
potentialTargetCells,
|
||||
Props.strafeFireChance
|
||||
@@ -158,22 +151,10 @@ namespace WulaFallenEmpire
|
||||
{
|
||||
strafingComp.SetConfirmedTargets(confirmedTargetCells);
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.Warning("No confirmed target cells after preprocessing!");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.Error("No potential target cells calculated for ground strafing!");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.Error("FlyOver def does not have CompGroundStrafing component!");
|
||||
}
|
||||
}
|
||||
// 更新:创建扇形监视飞越,添加航道等级组件
|
||||
|
||||
private void CreateSectorSurveillanceFlyOver(IntVec3 startPos, IntVec3 endPos)
|
||||
{
|
||||
ThingDef flyOverDef = Props.flyOverDef ?? DefDatabase<ThingDef>.GetNamedSilentFail("ARA_HiveCorvette");
|
||||
@@ -182,6 +163,7 @@ namespace WulaFallenEmpire
|
||||
Log.Warning("No fly over def specified for sector surveillance fly over");
|
||||
return;
|
||||
}
|
||||
|
||||
FlyOver flyOver = FlyOver.MakeFlyOver(
|
||||
flyOverDef,
|
||||
startPos,
|
||||
@@ -191,76 +173,64 @@ namespace WulaFallenEmpire
|
||||
Props.altitude,
|
||||
casterPawn: parent.pawn
|
||||
);
|
||||
// 设置基本属性
|
||||
|
||||
flyOver.spawnContentsOnImpact = Props.dropContentsOnImpact;
|
||||
flyOver.playFlyOverSound = Props.playFlyOverSound;
|
||||
Log.Message($"SectorSurveillance FlyOver created: {flyOver} from {startPos} to {endPos}");
|
||||
}
|
||||
// 新增:验证和优化飞行路径
|
||||
|
||||
private bool ValidateAndOptimizePath(ref IntVec3 startPos, ref IntVec3 endPos, IntVec3 targetCell)
|
||||
{
|
||||
Map map = parent.pawn.Map;
|
||||
|
||||
// 检查路径是否有效
|
||||
if (!startPos.InBounds(map) || !endPos.InBounds(map))
|
||||
return false;
|
||||
|
||||
// 检查起点和终点是否相同
|
||||
if (startPos == endPos)
|
||||
return false;
|
||||
|
||||
// 检查路径长度是否合理
|
||||
float distance = Vector3.Distance(startPos.ToVector3(), endPos.ToVector3());
|
||||
if (distance < 10f) // 最小飞行距离
|
||||
if (distance < 10f)
|
||||
return false;
|
||||
|
||||
// 检查路径是否经过目标区域附近
|
||||
if (!IsPathNearTarget(startPos, endPos, targetCell))
|
||||
{
|
||||
// 优化路径使其经过目标区域
|
||||
OptimizePathForTarget(ref startPos, ref endPos, targetCell);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
// 新增:检查路径是否经过目标区域
|
||||
|
||||
private bool IsPathNearTarget(IntVec3 startPos, IntVec3 endPos, IntVec3 targetCell)
|
||||
{
|
||||
Vector3 start = startPos.ToVector3();
|
||||
Vector3 end = endPos.ToVector3();
|
||||
Vector3 target = targetCell.ToVector3();
|
||||
|
||||
// 计算点到直线的距离
|
||||
Vector3 lineDirection = (end - start).normalized;
|
||||
Vector3 pointToLine = target - start;
|
||||
Vector3 projection = Vector3.Project(pointToLine, lineDirection);
|
||||
Vector3 perpendicular = pointToLine - projection;
|
||||
|
||||
float distanceToLine = perpendicular.magnitude;
|
||||
|
||||
// 检查投影是否在线段内
|
||||
float projectionLength = projection.magnitude;
|
||||
float lineLength = (end - start).magnitude;
|
||||
bool isWithinSegment = projectionLength >= 0 && projectionLength <= lineLength;
|
||||
|
||||
// 如果距离小于15格且在路径线段内,则认为路径经过目标
|
||||
return distanceToLine <= 15f && isWithinSegment;
|
||||
}
|
||||
// 新增:优化路径使其经过目标区域
|
||||
|
||||
private void OptimizePathForTarget(ref IntVec3 startPos, ref IntVec3 endPos, IntVec3 targetCell)
|
||||
{
|
||||
Map map = parent.pawn.Map;
|
||||
Vector3 target = targetCell.ToVector3();
|
||||
|
||||
// 计算从目标点到地图边缘的方向
|
||||
Vector3[] directions = {
|
||||
new Vector3(1, 0, 0), // 右
|
||||
new Vector3(-1, 0, 0), // 左
|
||||
new Vector3(0, 0, 1), // 上
|
||||
new Vector3(0, 0, -1) // 下
|
||||
new Vector3(1, 0, 0),
|
||||
new Vector3(-1, 0, 0),
|
||||
new Vector3(0, 0, 1),
|
||||
new Vector3(0, 0, -1)
|
||||
};
|
||||
|
||||
// 找到两个相对的方向,确保路径穿过目标
|
||||
Vector3 bestStartDir = Vector3.zero;
|
||||
Vector3 bestEndDir = Vector3.zero;
|
||||
float bestScore = float.MinValue;
|
||||
@@ -272,19 +242,16 @@ namespace WulaFallenEmpire
|
||||
Vector3 dir1 = directions[i];
|
||||
Vector3 dir2 = directions[j];
|
||||
|
||||
// 检查两个方向是否相对(夹角接近180度)
|
||||
float dot = Vector3.Dot(dir1, dir2);
|
||||
if (dot < -0.5f) // 相对方向
|
||||
if (dot < -0.5f)
|
||||
{
|
||||
IntVec3 testStart = FindMapEdgeInDirection(map, targetCell, dir1);
|
||||
IntVec3 testEnd = FindMapEdgeInDirection(map, targetCell, dir2);
|
||||
|
||||
if (testStart.InBounds(map) && testEnd.InBounds(map))
|
||||
{
|
||||
// 计算路径质量:路径长度和是否经过目标
|
||||
float pathLength = Vector3.Distance(testStart.ToVector3(), testEnd.ToVector3());
|
||||
bool passesNearTarget = IsPathNearTarget(testStart, testEnd, targetCell);
|
||||
|
||||
float score = pathLength + (passesNearTarget ? 50f : 0f);
|
||||
|
||||
if (score > bestScore)
|
||||
@@ -298,95 +265,73 @@ namespace WulaFallenEmpire
|
||||
}
|
||||
}
|
||||
|
||||
// 应用最佳路径
|
||||
if (bestStartDir != Vector3.zero && bestEndDir != Vector3.zero)
|
||||
{
|
||||
startPos = FindMapEdgeInDirection(map, targetCell, bestStartDir);
|
||||
endPos = FindMapEdgeInDirection(map, targetCell, bestEndDir);
|
||||
Log.Message($"Optimized path: {startPos} -> {targetCell} -> {endPos}");
|
||||
}
|
||||
}
|
||||
// 新增:备用路径计算方法
|
||||
|
||||
private void CalculateFallbackPath(LocalTargetInfo target, out IntVec3 startPos, out IntVec3 endPos)
|
||||
{
|
||||
Map map = parent.pawn.Map;
|
||||
IntVec3 targetPos = target.Cell;
|
||||
|
||||
// 使用简单的对角路径
|
||||
if (Rand.Value < 0.5f)
|
||||
{
|
||||
// 从左下到右上
|
||||
startPos = new IntVec3(0, 0, 0);
|
||||
endPos = new IntVec3(map.Size.x - 1, 0, map.Size.z - 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
// 从右下到左上
|
||||
startPos = new IntVec3(map.Size.x - 1, 0, 0);
|
||||
endPos = new IntVec3(0, 0, map.Size.z - 1);
|
||||
}
|
||||
|
||||
// 确保位置在地图范围内
|
||||
startPos = GetSafeMapPosition(startPos, map);
|
||||
endPos = GetSafeMapPosition(endPos, map);
|
||||
|
||||
Log.Message($"Fallback path: {startPos} -> {endPos}");
|
||||
}
|
||||
// 改进的垂直线进场路径计算方法
|
||||
|
||||
private void CalculatePerpendicularPath(LocalTargetInfo target, out IntVec3 startPos, out IntVec3 endPos)
|
||||
{
|
||||
Map map = parent.pawn.Map;
|
||||
IntVec3 casterPos = parent.pawn.Position;
|
||||
IntVec3 targetPos = target.Cell;
|
||||
Log.Message($"Calculating perpendicular path: Caster={casterPos}, Target={targetPos}");
|
||||
// 计算施法者到目标的方向向量
|
||||
Vector3 directionToTarget = (targetPos.ToVector3() - casterPos.ToVector3()).normalized;
|
||||
|
||||
// 如果方向为零向量,使用随机方向
|
||||
Vector3 directionToTarget = (targetPos.ToVector3() - casterPos.ToVector3()).normalized;
|
||||
if (directionToTarget == Vector3.zero)
|
||||
{
|
||||
directionToTarget = new Vector3(Rand.Range(-1f, 1f), 0, Rand.Range(-1f, 1f)).normalized;
|
||||
Log.Message($"Using random direction: {directionToTarget}");
|
||||
}
|
||||
// 计算垂直于施法者-目标连线的方向(旋转90度)
|
||||
|
||||
Vector3 perpendicularDirection = new Vector3(-directionToTarget.z, 0, directionToTarget.x).normalized;
|
||||
|
||||
Log.Message($"Perpendicular direction: {perpendicularDirection}");
|
||||
// 改进:从目标点出发,向垂直方向的两侧延伸找到地图边缘
|
||||
// 确保两个边缘点在目标点的相对两侧
|
||||
IntVec3 edge1 = FindMapEdgeInDirection(map, targetPos, perpendicularDirection);
|
||||
IntVec3 edge2 = FindMapEdgeInDirection(map, targetPos, -perpendicularDirection);
|
||||
// 验证路径质量
|
||||
|
||||
Vector3 edge1Vec = edge1.ToVector3();
|
||||
Vector3 edge2Vec = edge2.ToVector3();
|
||||
Vector3 targetVec = targetPos.ToVector3();
|
||||
|
||||
// 检查两个边缘点是否在目标点的相对两侧
|
||||
Vector3 toEdge1 = (edge1Vec - targetVec).normalized;
|
||||
Vector3 toEdge2 = (edge2Vec - targetVec).normalized;
|
||||
float dot = Vector3.Dot(toEdge1, toEdge2);
|
||||
|
||||
// 如果两个方向相似(夹角小于90度),说明路径有问题
|
||||
if (dot > -0.3f)
|
||||
{
|
||||
Log.Warning($"Perpendicular path may not cross target properly (dot: {dot}), adjusting...");
|
||||
|
||||
// 强制使用相对方向
|
||||
if (perpendicularDirection.x != 0)
|
||||
{
|
||||
// 如果原方向主要是水平,改用垂直方向
|
||||
perpendicularDirection = new Vector3(0, 0, 1f);
|
||||
}
|
||||
else
|
||||
{
|
||||
// 如果原方向主要是垂直,改用水平方向
|
||||
perpendicularDirection = new Vector3(1f, 0, 0);
|
||||
}
|
||||
|
||||
edge1 = FindMapEdgeInDirection(map, targetPos, perpendicularDirection);
|
||||
edge2 = FindMapEdgeInDirection(map, targetPos, -perpendicularDirection);
|
||||
}
|
||||
// 随机选择起点和终点(确保目标点在路径上)
|
||||
|
||||
if (Rand.Value < 0.5f)
|
||||
{
|
||||
startPos = edge1;
|
||||
@@ -397,26 +342,21 @@ namespace WulaFallenEmpire
|
||||
startPos = edge2;
|
||||
endPos = edge1;
|
||||
}
|
||||
Log.Message($"Perpendicular path: {startPos} -> {targetPos} -> {endPos}, path length: {Vector3.Distance(startPos.ToVector3(), endPos.ToVector3())}");
|
||||
}
|
||||
// 改进的地图边缘查找方法
|
||||
|
||||
private IntVec3 FindMapEdgeInDirection(Map map, IntVec3 fromPos, Vector3 direction)
|
||||
{
|
||||
// 确保方向向量有效
|
||||
if (direction == Vector3.zero)
|
||||
{
|
||||
direction = new Vector3(Rand.Range(-1f, 1f), 0, Rand.Range(-1f, 1f)).normalized;
|
||||
}
|
||||
|
||||
// 使用精确的射线投射方法找到地图边缘
|
||||
Vector3 fromVec = fromPos.ToVector3();
|
||||
Vector3 dirNormalized = direction.normalized;
|
||||
|
||||
// 计算与地图边界的交点
|
||||
float minT = float.MaxValue;
|
||||
IntVec3? bestEdgePos = null;
|
||||
|
||||
// 检查四个边界
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
float t = 0f;
|
||||
@@ -424,7 +364,7 @@ namespace WulaFallenEmpire
|
||||
|
||||
switch (i)
|
||||
{
|
||||
case 0: // 左边界 (x = 0)
|
||||
case 0:
|
||||
if (Mathf.Abs(dirNormalized.x) > 0.001f)
|
||||
{
|
||||
t = (0 - fromVec.x) / dirNormalized.x;
|
||||
@@ -439,7 +379,7 @@ namespace WulaFallenEmpire
|
||||
}
|
||||
break;
|
||||
|
||||
case 1: // 右边界 (x = map.Size.x - 1)
|
||||
case 1:
|
||||
if (Mathf.Abs(dirNormalized.x) > 0.001f)
|
||||
{
|
||||
t = (map.Size.x - 1 - fromVec.x) / dirNormalized.x;
|
||||
@@ -454,7 +394,7 @@ namespace WulaFallenEmpire
|
||||
}
|
||||
break;
|
||||
|
||||
case 2: // 下边界 (z = 0)
|
||||
case 2:
|
||||
if (Mathf.Abs(dirNormalized.z) > 0.001f)
|
||||
{
|
||||
t = (0 - fromVec.z) / dirNormalized.z;
|
||||
@@ -469,7 +409,7 @@ namespace WulaFallenEmpire
|
||||
}
|
||||
break;
|
||||
|
||||
case 3: // 上边界 (z = map.Size.z - 1)
|
||||
case 3:
|
||||
if (Mathf.Abs(dirNormalized.z) > 0.001f)
|
||||
{
|
||||
t = (map.Size.z - 1 - fromVec.z) / dirNormalized.z;
|
||||
@@ -485,7 +425,6 @@ namespace WulaFallenEmpire
|
||||
break;
|
||||
}
|
||||
|
||||
// 找到最近的有效边界点
|
||||
if (edgePos.IsValid && edgePos.InBounds(map) && t > 0 && t < minT)
|
||||
{
|
||||
minT = t;
|
||||
@@ -495,52 +434,44 @@ namespace WulaFallenEmpire
|
||||
|
||||
if (bestEdgePos.HasValue)
|
||||
{
|
||||
Log.Message($"Found map edge at {bestEdgePos.Value} in direction {direction}");
|
||||
return bestEdgePos.Value;
|
||||
}
|
||||
|
||||
// 如果没找到合适的边界点,使用随机边缘位置
|
||||
Log.Warning($"Could not find map edge in direction {direction}, using random edge");
|
||||
return GetRandomMapEdgePosition(map);
|
||||
}
|
||||
// 改进的随机地图边缘位置获取
|
||||
|
||||
private IntVec3 GetRandomMapEdgePosition(Map map)
|
||||
{
|
||||
// 避免选择角落位置,因为角落容易导致路径问题
|
||||
int edge = Rand.Range(0, 4);
|
||||
int x, z;
|
||||
|
||||
switch (edge)
|
||||
{
|
||||
case 0: // 上边 (避免左右角落)
|
||||
case 0:
|
||||
x = Rand.Range(5, map.Size.x - 5);
|
||||
z = 0;
|
||||
break;
|
||||
case 1: // 右边 (避免上下角落)
|
||||
case 1:
|
||||
x = map.Size.x - 1;
|
||||
z = Rand.Range(5, map.Size.z - 5);
|
||||
break;
|
||||
case 2: // 下边 (避免左右角落)
|
||||
case 2:
|
||||
x = Rand.Range(5, map.Size.x - 5);
|
||||
z = map.Size.z - 1;
|
||||
break;
|
||||
case 3: // 左边 (避免上下角落)
|
||||
case 3:
|
||||
default:
|
||||
x = 0;
|
||||
z = Rand.Range(5, map.Size.z - 5);
|
||||
break;
|
||||
}
|
||||
|
||||
// 确保位置有效
|
||||
x = Mathf.Clamp(x, 0, map.Size.x - 1);
|
||||
z = Mathf.Clamp(z, 0, map.Size.z - 1);
|
||||
|
||||
IntVec3 edgePos = new IntVec3(x, 0, z);
|
||||
Log.Message($"Random map edge position (avoiding corners): {edgePos}");
|
||||
return edgePos;
|
||||
return new IntVec3(x, 0, z);
|
||||
}
|
||||
|
||||
// 修复的预览绘制方法
|
||||
public override void DrawEffectPreview(LocalTargetInfo target)
|
||||
{
|
||||
base.DrawEffectPreview(target);
|
||||
@@ -551,7 +482,6 @@ namespace WulaFallenEmpire
|
||||
|
||||
try
|
||||
{
|
||||
// 计算飞行路径
|
||||
IntVec3 startPos, endPos;
|
||||
if (Props.approachType == ApproachType.Perpendicular)
|
||||
{
|
||||
@@ -563,17 +493,14 @@ namespace WulaFallenEmpire
|
||||
endPos = CalculateEndPosition(target, startPos);
|
||||
}
|
||||
|
||||
// 确保位置在地图范围内
|
||||
startPos = GetSafeMapPosition(startPos, map);
|
||||
endPos = GetSafeMapPosition(endPos, map);
|
||||
|
||||
// 检查预览稳定性
|
||||
if (!IsPreviewStable(startPos, endPos, map))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// 根据不同类型显示不同的预览
|
||||
if (Props.enableGroundStrafing && Props.showStrafePreview)
|
||||
{
|
||||
DrawStrafingAreaPreview(startPos, endPos, target.Cell);
|
||||
@@ -585,57 +512,45 @@ namespace WulaFallenEmpire
|
||||
}
|
||||
catch (System.Exception)
|
||||
{
|
||||
// 忽略预览绘制中的错误,避免影响游戏体验
|
||||
// 忽略预览绘制中的错误
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 安全的位置计算方法
|
||||
private IntVec3 GetSafeMapPosition(IntVec3 pos, Map map)
|
||||
{
|
||||
if (map == null) return pos;
|
||||
|
||||
// 确保位置在地图范围内
|
||||
pos.x = Mathf.Clamp(pos.x, 0, map.Size.x - 1);
|
||||
pos.z = Mathf.Clamp(pos.z, 0, map.Size.z - 1);
|
||||
|
||||
return pos;
|
||||
}
|
||||
|
||||
// 预览绘制稳定性检查
|
||||
private bool IsPreviewStable(IntVec3 startPos, IntVec3 endPos, Map map)
|
||||
{
|
||||
if (map == null) return false;
|
||||
|
||||
// 检查位置是否有效
|
||||
if (!startPos.IsValid || !endPos.IsValid) return false;
|
||||
|
||||
// 检查位置是否在地图范围内
|
||||
if (!startPos.InBounds(map) || !endPos.InBounds(map)) return false;
|
||||
|
||||
// 检查距离是否合理(避免过短的路径)
|
||||
float distance = Vector3.Distance(startPos.ToVector3(), endPos.ToVector3());
|
||||
if (distance < 5f) return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// 修复:绘制地面扫射预览,现在接受目标单元格参数
|
||||
private void DrawStrafingAreaPreview(IntVec3 startPos, IntVec3 endPos, IntVec3 targetCell)
|
||||
{
|
||||
Map map = parent.pawn.Map;
|
||||
|
||||
// 计算飞行方向
|
||||
Vector3 flightDirection = (endPos.ToVector3() - startPos.ToVector3()).normalized;
|
||||
if (flightDirection == Vector3.zero)
|
||||
{
|
||||
flightDirection = Vector3.forward;
|
||||
}
|
||||
|
||||
// 只计算扫射影响区域的单元格
|
||||
List<IntVec3> strafeImpactCells = CalculateStrafingImpactCells(targetCell, flightDirection);
|
||||
|
||||
// 绘制扫射影响区域的预览单元格
|
||||
foreach (IntVec3 cell in strafeImpactCells)
|
||||
{
|
||||
if (cell.InBounds(map))
|
||||
@@ -644,44 +559,33 @@ namespace WulaFallenEmpire
|
||||
}
|
||||
}
|
||||
|
||||
// 绘制飞行路径线
|
||||
GenDraw.DrawLineBetween(startPos.ToVector3Shifted(), endPos.ToVector3Shifted(), SimpleColor.Red, 0.2f);
|
||||
|
||||
// 绘制扫射范围边界
|
||||
DrawStrafingBoundaries(targetCell, flightDirection);
|
||||
}
|
||||
|
||||
// 修复:计算扫射影响区域的单元格,现在以目标单元格为中心
|
||||
private List<IntVec3> CalculateStrafingImpactCells(IntVec3 targetCell, Vector3 flightDirection)
|
||||
{
|
||||
List<IntVec3> cells = new List<IntVec3>();
|
||||
Map map = parent.pawn.Map;
|
||||
|
||||
// 计算垂直于飞行方向的方向
|
||||
Vector3 perpendicular = new Vector3(-flightDirection.z, 0f, flightDirection.x).normalized;
|
||||
|
||||
// 修复:以目标单元格为中心计算扫射区域
|
||||
Vector3 targetCenter = targetCell.ToVector3();
|
||||
|
||||
// 计算扫射区域的起始和结束位置(基于扫射长度,以目标为中心)
|
||||
float strafeHalfLength = Props.strafeLength * 0.5f;
|
||||
Vector3 strafeStart = targetCenter - flightDirection * strafeHalfLength;
|
||||
Vector3 strafeEnd = targetCenter + flightDirection * strafeHalfLength;
|
||||
|
||||
// 使用整数步进避免浮点精度问题
|
||||
int steps = Mathf.Max(1, Mathf.CeilToInt(Props.strafeLength));
|
||||
for (int i = 0; i <= steps; i++)
|
||||
{
|
||||
float progress = (float)i / steps;
|
||||
Vector3 centerPoint = Vector3.Lerp(strafeStart, strafeEnd, progress);
|
||||
|
||||
// 在垂直方向扩展扫射宽度
|
||||
for (int w = -Props.strafeWidth; w <= Props.strafeWidth; w++)
|
||||
{
|
||||
Vector3 offset = perpendicular * w;
|
||||
Vector3 cellPos = centerPoint + offset;
|
||||
|
||||
// 使用更精确的单元格转换
|
||||
IntVec3 cell = new IntVec3(
|
||||
Mathf.RoundToInt(cellPos.x),
|
||||
Mathf.RoundToInt(cellPos.y),
|
||||
@@ -695,37 +599,29 @@ namespace WulaFallenEmpire
|
||||
}
|
||||
}
|
||||
|
||||
Log.Message($"Strafing Area: Calculated {cells.Count} impact cells centered at {targetCell}");
|
||||
return cells;
|
||||
}
|
||||
|
||||
// 修复:绘制扫射范围边界,现在以目标单元格为中心
|
||||
private void DrawStrafingBoundaries(IntVec3 targetCell, Vector3 flightDirection)
|
||||
{
|
||||
Map map = parent.pawn.Map;
|
||||
Vector3 perpendicular = new Vector3(-flightDirection.z, 0f, flightDirection.x).normalized;
|
||||
|
||||
// 修复:以目标单元格为中心
|
||||
Vector3 targetCenter = targetCell.ToVector3();
|
||||
|
||||
// 计算扫射区域的起始和结束位置
|
||||
float strafeHalfLength = Props.strafeLength * 0.5f;
|
||||
Vector3 strafeStart = targetCenter - flightDirection * strafeHalfLength;
|
||||
Vector3 strafeEnd = targetCenter + flightDirection * strafeHalfLength;
|
||||
|
||||
// 计算扫射区域的四个角
|
||||
Vector3 startLeft = strafeStart + perpendicular * Props.strafeWidth;
|
||||
Vector3 startRight = strafeStart - perpendicular * Props.strafeWidth;
|
||||
Vector3 endLeft = strafeEnd + perpendicular * Props.strafeWidth;
|
||||
Vector3 endRight = strafeEnd - perpendicular * Props.strafeWidth;
|
||||
|
||||
// 转换为 IntVec3 并确保在地图范围内
|
||||
IntVec3 startLeftCell = GetSafeMapPosition(new IntVec3((int)startLeft.x, (int)startLeft.y, (int)startLeft.z), map);
|
||||
IntVec3 startRightCell = GetSafeMapPosition(new IntVec3((int)startRight.x, (int)startRight.y, (int)startRight.z), map);
|
||||
IntVec3 endLeftCell = GetSafeMapPosition(new IntVec3((int)endLeft.x, (int)endLeft.y, (int)endLeft.z), map);
|
||||
IntVec3 endRightCell = GetSafeMapPosition(new IntVec3((int)endRight.x, (int)endRight.y, (int)endRight.z), map);
|
||||
|
||||
// 绘制边界线 - 只绘制在地图范围内的线段
|
||||
if (startLeftCell.InBounds(map) && endLeftCell.InBounds(map))
|
||||
GenDraw.DrawLineBetween(startLeftCell.ToVector3Shifted(), endLeftCell.ToVector3Shifted(), SimpleColor.Red, 0.2f);
|
||||
|
||||
@@ -739,25 +635,19 @@ namespace WulaFallenEmpire
|
||||
GenDraw.DrawLineBetween(endLeftCell.ToVector3Shifted(), endRightCell.ToVector3Shifted(), SimpleColor.Red, 0.2f);
|
||||
}
|
||||
|
||||
// 绘制扇形区域预览
|
||||
private void DrawSectorAreaPreview(IntVec3 startPos, IntVec3 endPos)
|
||||
{
|
||||
Map map = parent.pawn.Map;
|
||||
|
||||
// 计算飞行方向
|
||||
Vector3 flightDirection = (endPos.ToVector3() - startPos.ToVector3()).normalized;
|
||||
if (flightDirection == Vector3.zero)
|
||||
{
|
||||
flightDirection = Vector3.forward;
|
||||
}
|
||||
|
||||
// 计算垂直于飞行方向的方向
|
||||
Vector3 perpendicular = new Vector3(-flightDirection.z, 0f, flightDirection.x).normalized;
|
||||
|
||||
// 使用strafeWidth来近似扇形扫过的区域宽度
|
||||
List<IntVec3> previewCells = CalculateRectangularPreviewArea(startPos, endPos, flightDirection, perpendicular);
|
||||
|
||||
// 绘制预览区域
|
||||
foreach (IntVec3 cell in previewCells)
|
||||
{
|
||||
if (cell.InBounds(map))
|
||||
@@ -766,36 +656,28 @@ namespace WulaFallenEmpire
|
||||
}
|
||||
}
|
||||
|
||||
// 绘制飞行路径线
|
||||
GenDraw.DrawLineBetween(startPos.ToVector3Shifted(), endPos.ToVector3Shifted(), SimpleColor.Blue, 0.2f);
|
||||
|
||||
// 绘制预览区域边界
|
||||
DrawRectangularPreviewBoundaries(startPos, endPos, flightDirection, perpendicular);
|
||||
}
|
||||
|
||||
// 计算矩形预览区域(近似扇形扫过的区域)
|
||||
private List<IntVec3> CalculateRectangularPreviewArea(IntVec3 startPos, IntVec3 endPos, Vector3 flightDirection, Vector3 perpendicular)
|
||||
{
|
||||
List<IntVec3> cells = new List<IntVec3>();
|
||||
Map map = parent.pawn.Map;
|
||||
|
||||
// 计算飞行路径的总长度
|
||||
float totalPathLength = Vector3.Distance(startPos.ToVector3(), endPos.ToVector3());
|
||||
|
||||
// 沿着飞行路径计算预览单元格
|
||||
int steps = Mathf.Max(1, Mathf.CeilToInt(totalPathLength));
|
||||
|
||||
for (int i = 0; i <= steps; i++)
|
||||
{
|
||||
float progress = (float)i / steps;
|
||||
Vector3 centerPoint = Vector3.Lerp(startPos.ToVector3(), endPos.ToVector3(), progress);
|
||||
|
||||
// 在垂直方向扩展预览宽度(使用strafeWidth)
|
||||
for (int w = -Props.strafeWidth; w <= Props.strafeWidth; w++)
|
||||
{
|
||||
Vector3 offset = perpendicular * w;
|
||||
Vector3 cellPos = centerPoint + offset;
|
||||
|
||||
// 使用精确的单元格转换
|
||||
IntVec3 cell = new IntVec3(
|
||||
Mathf.RoundToInt(cellPos.x),
|
||||
Mathf.RoundToInt(cellPos.y),
|
||||
@@ -812,24 +694,20 @@ namespace WulaFallenEmpire
|
||||
return cells;
|
||||
}
|
||||
|
||||
// 绘制矩形预览边界
|
||||
private void DrawRectangularPreviewBoundaries(IntVec3 startPos, IntVec3 endPos, Vector3 flightDirection, Vector3 perpendicular)
|
||||
{
|
||||
Map map = parent.pawn.Map;
|
||||
|
||||
// 计算预览区域的四个角
|
||||
Vector3 startLeft = startPos.ToVector3() + perpendicular * Props.strafeWidth;
|
||||
Vector3 startRight = startPos.ToVector3() - perpendicular * Props.strafeWidth;
|
||||
Vector3 endLeft = endPos.ToVector3() + perpendicular * Props.strafeWidth;
|
||||
Vector3 endRight = endPos.ToVector3() - perpendicular * Props.strafeWidth;
|
||||
|
||||
// 转换为 IntVec3 并确保在地图范围内
|
||||
IntVec3 startLeftCell = GetSafeMapPosition(new IntVec3((int)startLeft.x, (int)startLeft.y, (int)startLeft.z), map);
|
||||
IntVec3 startRightCell = GetSafeMapPosition(new IntVec3((int)startRight.x, (int)startRight.y, (int)startRight.z), map);
|
||||
IntVec3 endLeftCell = GetSafeMapPosition(new IntVec3((int)endLeft.x, (int)endLeft.y, (int)endLeft.z), map);
|
||||
IntVec3 endRightCell = GetSafeMapPosition(new IntVec3((int)endRight.x, (int)endRight.y, (int)endRight.z), map);
|
||||
|
||||
// 绘制边界线 - 只绘制在地图范围内的线段
|
||||
if (startLeftCell.InBounds(map) && endLeftCell.InBounds(map))
|
||||
GenDraw.DrawLineBetween(startLeftCell.ToVector3Shifted(), endLeftCell.ToVector3Shifted(), SimpleColor.Blue, 0.2f);
|
||||
|
||||
@@ -843,11 +721,11 @@ namespace WulaFallenEmpire
|
||||
GenDraw.DrawLineBetween(endLeftCell.ToVector3Shifted(), endRightCell.ToVector3Shifted(), SimpleColor.Blue, 0.2f);
|
||||
}
|
||||
|
||||
// 预处理扫射目标单元格
|
||||
private List<IntVec3> PreprocessStrafingTargets(List<IntVec3> potentialTargets, float fireChance)
|
||||
{
|
||||
List<IntVec3> confirmedTargets = new List<IntVec3>();
|
||||
List<IntVec3> missedCells = new List<IntVec3>();
|
||||
|
||||
foreach (IntVec3 cell in potentialTargets)
|
||||
{
|
||||
if (Rand.Value <= fireChance)
|
||||
@@ -860,16 +738,13 @@ namespace WulaFallenEmpire
|
||||
}
|
||||
}
|
||||
|
||||
// 应用最小和最大射弹数限制
|
||||
if (Props.maxStrafeProjectiles > -1 && confirmedTargets.Count > Props.maxStrafeProjectiles)
|
||||
{
|
||||
// 如果超出最大值,随机丢弃一些目标
|
||||
confirmedTargets = confirmedTargets.InRandomOrder().Take(Props.maxStrafeProjectiles).ToList();
|
||||
}
|
||||
|
||||
if (Props.minStrafeProjectiles > -1 && confirmedTargets.Count < Props.minStrafeProjectiles)
|
||||
{
|
||||
// 如果不足最小值,从之前未选中的格子里补充
|
||||
int needed = Props.minStrafeProjectiles - confirmedTargets.Count;
|
||||
if (needed > 0 && missedCells.Count > 0)
|
||||
{
|
||||
@@ -877,11 +752,9 @@ namespace WulaFallenEmpire
|
||||
}
|
||||
}
|
||||
|
||||
Log.Message($"Strafing Preprocess: {confirmedTargets.Count}/{potentialTargets.Count} cells confirmed after min/max adjustment.");
|
||||
return confirmedTargets;
|
||||
}
|
||||
|
||||
// 原有的位置计算方法
|
||||
private IntVec3 CalculateStartPosition(LocalTargetInfo target)
|
||||
{
|
||||
Map map = parent.pawn.Map;
|
||||
@@ -890,16 +763,12 @@ namespace WulaFallenEmpire
|
||||
{
|
||||
case StartPosition.Caster:
|
||||
return parent.pawn.Position;
|
||||
|
||||
case StartPosition.MapEdge:
|
||||
return GetMapEdgePosition(map, GetDirectionFromCasterToTarget(target));
|
||||
|
||||
case StartPosition.CustomOffset:
|
||||
return GetSafeMapPosition(parent.pawn.Position + Props.customStartOffset, map);
|
||||
|
||||
case StartPosition.RandomMapEdge:
|
||||
return GetRandomMapEdgePosition(map);
|
||||
|
||||
default:
|
||||
return parent.pawn.Position;
|
||||
}
|
||||
@@ -915,24 +784,18 @@ namespace WulaFallenEmpire
|
||||
case EndPosition.TargetCell:
|
||||
endPos = target.Cell;
|
||||
break;
|
||||
|
||||
case EndPosition.OppositeMapEdge:
|
||||
endPos = GetOppositeMapEdgeThroughCenter(map, startPos);
|
||||
break;
|
||||
|
||||
case EndPosition.CustomOffset:
|
||||
endPos = GetSafeMapPosition(target.Cell + Props.customEndOffset, map);
|
||||
break;
|
||||
|
||||
case EndPosition.FixedDistance:
|
||||
endPos = GetFixedDistancePosition(startPos, target.Cell);
|
||||
break;
|
||||
|
||||
case EndPosition.RandomMapEdge:
|
||||
endPos = GetRandomMapEdgePosition(map);
|
||||
Log.Message($"Random map edge selected as end position: {endPos}");
|
||||
break;
|
||||
|
||||
default:
|
||||
endPos = target.Cell;
|
||||
break;
|
||||
@@ -941,23 +804,18 @@ namespace WulaFallenEmpire
|
||||
return GetSafeMapPosition(endPos, map);
|
||||
}
|
||||
|
||||
// 原有的辅助方法
|
||||
private IntVec3 GetOppositeMapEdgeThroughCenter(Map map, IntVec3 startPos)
|
||||
{
|
||||
IntVec3 center = map.Center;
|
||||
Vector3 toCenter = (center.ToVector3() - startPos.ToVector3()).normalized;
|
||||
|
||||
|
||||
if (toCenter == Vector3.zero)
|
||||
{
|
||||
toCenter = new Vector3(Rand.Range(-1f, 1f), 0, Rand.Range(-1f, 1f)).normalized;
|
||||
Log.Message($"Using random direction to center: {toCenter}");
|
||||
}
|
||||
|
||||
Vector3 fromCenter = toCenter;
|
||||
IntVec3 oppositeEdge = GetMapEdgePositionFromCenter(map, fromCenter);
|
||||
|
||||
Log.Message($"Found opposite edge through center: {oppositeEdge}");
|
||||
return oppositeEdge;
|
||||
return GetMapEdgePositionFromCenter(map, fromCenter);
|
||||
}
|
||||
|
||||
private IntVec3 GetMapEdgePositionFromCenter(Map map, Vector3 direction)
|
||||
@@ -974,13 +832,10 @@ namespace WulaFallenEmpire
|
||||
|
||||
if (!testPos.InBounds(map))
|
||||
{
|
||||
IntVec3 edgePos = FindClosestValidPosition(testPos, map);
|
||||
Log.Message($"Found map edge from center: {edgePos} (direction: {direction}, distance: {i})");
|
||||
return edgePos;
|
||||
return FindClosestValidPosition(testPos, map);
|
||||
}
|
||||
}
|
||||
|
||||
Log.Warning("Could not find map edge from center, using random edge");
|
||||
return GetRandomMapEdgePosition(map);
|
||||
}
|
||||
|
||||
@@ -989,7 +844,6 @@ namespace WulaFallenEmpire
|
||||
if (direction == Vector3.zero)
|
||||
{
|
||||
direction = new Vector3(Rand.Range(-1f, 1f), 0, Rand.Range(-1f, 1f)).normalized;
|
||||
Log.Message($"Using random direction: {direction}");
|
||||
}
|
||||
|
||||
IntVec3 center = map.Center;
|
||||
@@ -1004,13 +858,10 @@ namespace WulaFallenEmpire
|
||||
|
||||
if (!testPos.InBounds(map))
|
||||
{
|
||||
IntVec3 edgePos = FindClosestValidPosition(testPos, map);
|
||||
Log.Message($"Found map edge position: {edgePos} (direction: {direction}, distance: {i})");
|
||||
return edgePos;
|
||||
return FindClosestValidPosition(testPos, map);
|
||||
}
|
||||
}
|
||||
|
||||
Log.Warning("Could not find map edge in direction, using random edge");
|
||||
return GetRandomMapEdgePosition(map);
|
||||
}
|
||||
|
||||
@@ -1030,16 +881,14 @@ namespace WulaFallenEmpire
|
||||
|
||||
return map.Center;
|
||||
}
|
||||
|
||||
private IntVec3 GetFixedDistancePosition(IntVec3 startPos, IntVec3 targetPos)
|
||||
{
|
||||
Vector3 direction = (targetPos.ToVector3() - startPos.ToVector3()).normalized;
|
||||
IntVec3 endPos = startPos + new IntVec3(
|
||||
return startPos + new IntVec3(
|
||||
(int)(direction.x * Props.flyOverDistance),
|
||||
0,
|
||||
(int)(direction.z * Props.flyOverDistance));
|
||||
|
||||
Log.Message($"Fixed distance position: {endPos} (from {startPos}, distance: {Props.flyOverDistance})");
|
||||
return endPos;
|
||||
}
|
||||
|
||||
private Vector3 GetDirectionFromCasterToTarget(LocalTargetInfo target)
|
||||
@@ -1049,7 +898,6 @@ namespace WulaFallenEmpire
|
||||
if (direction == Vector3.zero)
|
||||
{
|
||||
direction = new Vector3(Rand.Range(-1f, 1f), 0, Rand.Range(-1f, 1f)).normalized;
|
||||
Log.Message($"Using random direction: {direction}");
|
||||
}
|
||||
|
||||
return direction;
|
||||
|
||||
Reference in New Issue
Block a user