Skip to content

Commit

Permalink
code updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@SJuliez
SJuliez committed Nov 3, 2024
1 parent f0774d0 commit b6387df
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 119 deletions.
154 changes: 48 additions & 106 deletions megamek/src/megamek/common/Entity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@
import megamek.logging.MMLogger;
import megamek.utilities.xml.MMXMLUtility;

import static megamek.common.EquipmentTypeLookup.TSM;

/**
* Entity is a master class for basically anything on the board except terrain.
*/
Expand Down Expand Up @@ -7124,40 +7122,34 @@ public PilotingRollData getBasePilotingRoll(EntityMovementType moveType) {
PilotingRollData roll;

// Crew dead?
if (getCrew().isDead() || getCrew().isDoomed()
|| (getCrew().getHits() >= 6)) {
if (getCrew().isDead() || getCrew().isDoomed() || (getCrew().getHits() >= 6)) {
// Following line switched from impossible to automatic failure
// -- bug fix for dead units taking PSRs
return new PilotingRollData(entityId, TargetRoll.AUTOMATIC_FAIL,
"Pilot dead");
return new PilotingRollData(entityId, TargetRoll.AUTOMATIC_FAIL, "Pilot dead");
}
// pilot awake?
else if (!getCrew().isActive()) {
return new PilotingRollData(entityId, TargetRoll.IMPOSSIBLE,
"Pilot unconscious");
return new PilotingRollData(entityId, TargetRoll.IMPOSSIBLE, "Pilot unconscious");
}
// gyro operational? does not apply if using tracked/quadvee vehicle/lam fighter
// movement
if (isGyroDestroyed() && canFall()
&& moveType != EntityMovementType.MOVE_VTOL_WALK
&& moveType != EntityMovementType.MOVE_VTOL_RUN) {
return new PilotingRollData(entityId, TargetRoll.AUTOMATIC_FAIL,
getCrew().getPiloting() + 6, "Gyro destroyed");
return new PilotingRollData(entityId, TargetRoll.AUTOMATIC_FAIL, getCrew().getPiloting() + 6, "Gyro destroyed");
}

// both legs present?
if ((this instanceof BipedMek)
&& (((BipedMek) this).countBadLegs() == 2)
&& (moveType != EntityMovementType.MOVE_VTOL_WALK)
&& (moveType != EntityMovementType.MOVE_VTOL_RUN)) {
return new PilotingRollData(entityId,
TargetRoll.AUTOMATIC_FAIL,
getCrew().getPiloting() + 10, "Both legs destroyed");
return new PilotingRollData(entityId, TargetRoll.AUTOMATIC_FAIL,
getCrew().getPiloting() + 10, "Both legs destroyed");
} else if (this instanceof QuadMek) {
if (((QuadMek) this).countBadLegs() >= 3) {
return new PilotingRollData(entityId,
TargetRoll.AUTOMATIC_FAIL, getCrew().getPiloting()
+ (((Mek) this).countBadLegs() * 5),
TargetRoll.AUTOMATIC_FAIL, getCrew().getPiloting() + (((Mek) this).countBadLegs() * 5),
((Mek) this).countBadLegs() + " legs destroyed");
}
}
Expand All @@ -7166,17 +7158,13 @@ TargetRoll.AUTOMATIC_FAIL, getCrew().getPiloting()
return new PilotingRollData(entityId, TargetRoll.AUTOMATIC_FAIL,
getCrew().getPiloting() + 3, "Reactor shut down");
} else if (isShutDown()) {
return new PilotingRollData(entityId, TargetRoll.AUTOMATIC_FAIL,
TargetRoll.IMPOSSIBLE, "Reactor shut down");
return new PilotingRollData(entityId, TargetRoll.AUTOMATIC_FAIL, TargetRoll.IMPOSSIBLE, "Reactor shut down");
}

// okay, let's figure out the stuff then
roll = new PilotingRollData(entityId, getCrew().getPiloting(moveType),
"Base piloting skill");
roll = new PilotingRollData(entityId, getCrew().getPiloting(moveType), "Base piloting skill");

// Let's see if we have a modifier to our piloting skill roll. We'll
// pass in the roll
// object and adjust as necessary
// Let's see if we have a modifier to our piloting skill roll. We'll pass in the roll object and adjust as necessary
roll = addEntityBonuses(roll);

// add planetary condition modifiers
Expand All @@ -7199,8 +7187,7 @@ TargetRoll.AUTOMATIC_FAIL, getCrew().getPiloting()
}
}

if (game.getOptions().booleanOption(OptionsConstants.ADVANCED_TACOPS_FATIGUE)
&& crew.isPilotingFatigued()) {
if (game.getOptions().booleanOption(OptionsConstants.ADVANCED_TACOPS_FATIGUE) && crew.isPilotingFatigued()) {
roll.addModifier(1, "fatigue");
}

Expand Down Expand Up @@ -7702,105 +7689,61 @@ public PilotingRollData checkMovedTooFast(MoveStep step,
}

/**
* Checks if the entity might skid on pavement. If so, returns the target
* roll for the piloting skill check.
* Checks if the entity might skid. If so, returns the target roll for the piloting skill check.
*/
public PilotingRollData checkSkid(EntityMovementType moveType, Hex prevHex,
EntityMovementType overallMoveType, MoveStep prevStep, MoveStep currStep,
int prevFacing, int curFacing, Coords lastPos, Coords curPos,
boolean isInfantry, int distance) {
PlanetaryConditions conditions = game.getPlanetaryConditions();

PilotingRollData roll = getBasePilotingRoll(overallMoveType);
// If we aren't traveling along a road, apply terrain modifiers
// Unless said pavement has black ice
if (!((prevStep == null || prevStep.isPavementStep()) && currStep.isPavementStep())) {
addPilotingModifierForTerrain(roll, lastPos);
}

if (isAirborne() || isAirborneVTOLorWIGE()) {
roll.addModifier(TargetRoll.CHECK_FALSE,
"Check false: flying entities don't skid");
return roll;
}

if (isInfantry) {
roll.addModifier(TargetRoll.CHECK_FALSE,
"Check false: infantry don't skid");
return roll;
return new PilotingRollData(id, TargetRoll.CHECK_FALSE, "flying units don't skid");
}

if (moveType == EntityMovementType.MOVE_JUMP) {
roll.addModifier(TargetRoll.CHECK_FALSE,
"Check false: jumping entities don't skid");
return roll;
return new PilotingRollData(id, TargetRoll.CHECK_FALSE, "jumping units don't skid");
}

if ((null != prevStep) && prevStep.isHasJustStood()) {
roll.addModifier(TargetRoll.CHECK_FALSE,
"Check false: getting up entities don't skid");
return roll;
return new PilotingRollData(id, TargetRoll.CHECK_FALSE, "units don't skid from getting up");
}

/*
* Hex curHex = null; if (null != curPos) { curHex =
* game.getBoard().getHex(curPos); }
*/
PilotingRollData roll = getBasePilotingRoll(overallMoveType);

// If we aren't traveling along a road, apply terrain modifiers
boolean previousStepCountsAsPavement = (prevStep == null) || prevStep.isPavementStep();
if (!previousStepCountsAsPavement || !currStep.isPavementStep()) {
addPilotingModifierForTerrain(roll, lastPos);
}

boolean prevStepPavement;
if (prevStep != null) {
prevStepPavement = prevStep.isPavementStep();
} else {
prevStepPavement = prevHex.hasPavement();
}

// TODO: add check for elevation of pavement, road,
// or bridge matches entity elevation.
boolean hoverOrWigeStrongGale = movementMode.isHoverOrWiGE()
&& conditions.getWind().isStrongerThan(Wind.STRONG_GALE);
boolean iceCheck = !movementMode.isHoverOrWiGE() || hoverOrWigeStrongGale;
boolean runOrSprint = (overallMoveType == EntityMovementType.MOVE_RUN)
|| (overallMoveType == EntityMovementType.MOVE_SPRINT);
if ((prevHex != null)
&& prevHex.containsTerrain(Terrains.ICE)
&& (currStep.getElevation() == 0)
&& iceCheck
&& (prevFacing != curFacing)
&& !lastPos.equals(curPos)) {
boolean prevStepPavement = (prevStep != null) ? prevStep.isPavementStep() : prevHex.hasPavement();

Check warning

Code scanning / CodeQL

Dereferenced variable may be null Warning

Variable
prevHex
Loading
may be null at this access as suggested by
this
Loading
null guard.
Variable
prevHex
Loading
may be null at this access as suggested by
this
Loading
null guard.
PlanetaryConditions conditions = game.getPlanetaryConditions();
boolean affectedByIce = !movementMode.isHoverOrWiGE() || conditions.getWind().isStrongerThan(Wind.STRONG_GALE);
boolean runOrSprint = (overallMoveType == EntityMovementType.MOVE_RUN) || (overallMoveType == EntityMovementType.MOVE_SPRINT);
boolean unitTouchesIce = (prevHex != null) && prevHex.containsTerrain(Terrains.ICE) && (currStep.getElevation() == 0);
boolean unitTouchesBlackIce = (prevHex != null) && prevHex.containsTerrain(Terrains.BLACK_ICE)
&& ((currStep.getElevation() == 0)
|| (prevHex.containsTerrain(Terrains.BRIDGE_ELEV) && currStep.getElevation() == prevHex.terrainLevel(Terrains.BRIDGE_ELEV)));
boolean isMoveAndTurn = (prevFacing != curFacing) && !Objects.equals(curPos, lastPos);

if (unitTouchesIce && affectedByIce && isMoveAndTurn) {
// Turning on ice
roll.append(new PilotingRollData(getId(), getMovementBeforeSkidPSRModifier(distance), "turning on ice"));
adjustDifficultTerrainPSRModifier(roll);
return roll;
} else if ((prevHex != null)
&& prevHex.containsTerrain(Terrains.BLACK_ICE)
&& (currStep.getElevation() == 0)
&& iceCheck
&& (prevFacing != curFacing)
&& !lastPos.equals(curPos)) {
addPilotingModifierForTerrain(roll, lastPos);

} else if (unitTouchesBlackIce && affectedByIce && isMoveAndTurn) {
// Turning on black ice
roll.append(new PilotingRollData(getId(), getMovementBeforeSkidPSRModifier(distance), "turning on black ice"));
adjustDifficultTerrainPSRModifier(roll);
return roll;
} else if (prevStepPavement
&& runOrSprint
&& !movementMode.isHoverOrWiGE()
&& (prevFacing != curFacing)
&& !lastPos.equals(curPos)) {
if (this instanceof Mek) {
roll.append(new PilotingRollData(getId(),
getMovementBeforeSkidPSRModifier(distance),
"running & turning on pavement"));
} else {
roll.append(new PilotingRollData(getId(),
getMovementBeforeSkidPSRModifier(distance),
"reckless driving on pavement"));
}
adjustDifficultTerrainPSRModifier(roll);
return roll;

} else if (prevStepPavement && runOrSprint && !movementMode.isHoverOrWiGE() && isMoveAndTurn) {
// Running & turning on pavement
String description = isMek() ? "running & turning on pavement" : "reckless driving on pavement";
roll.append(new PilotingRollData(getId(), getMovementBeforeSkidPSRModifier(distance), description));

} else {
roll.addModifier(TargetRoll.CHECK_FALSE,
"Check false: Entity is not apparently skidding");
return roll;
return new PilotingRollData(id, TargetRoll.CHECK_FALSE, "unit doesn't skid");
}
adjustDifficultTerrainPSRModifier(roll);
return roll;
}

/**
Expand Down Expand Up @@ -11172,16 +11115,15 @@ public void addPilotingModifierForTerrain(PilotingRollData roll, Coords c) {
* @param c the coordinates where the PSR happens
* @param enteringRubble True if entering rubble, else false
*/
public void addPilotingModifierForTerrain(PilotingRollData roll, Coords c,
boolean enteringRubble) {
public void addPilotingModifierForTerrain(PilotingRollData roll, Coords c, boolean enteringRubble) {
if ((c == null) || (roll == null)) {
return;
}
if (isOffBoard() || !(isDeployed())) {
return;
}
Hex hex = game.getBoard().getHex(c);
hex.terrainPilotingModifier(getMovementMode(), roll, enteringRubble);
hex.applyTerrainPilotingModifiers(getMovementMode(), roll, enteringRubble);

if (hex.containsTerrain(Terrains.JUNGLE) && hasAbility(OptionsConstants.PILOT_TM_FOREST_RANGER)) {
roll.addModifier(-1, "Forest Ranger");
Expand Down
9 changes: 3 additions & 6 deletions megamek/src/megamek/common/Hex.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,11 +525,8 @@ public Hex duplicate() {
/**
* Adds terrain modifiers to PSRs made in this hex
*/
public void terrainPilotingModifier(EntityMovementMode moveMode, PilotingRollData roll,
boolean enteringRubble) {
for (Integer i : terrains.keySet()) {
terrains.get(i).pilotingModifier(moveMode, roll, enteringRubble);
}
public void applyTerrainPilotingModifiers(EntityMovementMode moveMode, PilotingRollData roll, boolean enteringRubble) {
terrains.values().forEach(t -> t.applyPilotingModifier(moveMode, roll, enteringRubble));
}

/**
Expand Down Expand Up @@ -856,4 +853,4 @@ public String getClipboardString() {
}
return new Hex(hexLevel, terrainString, theme, new Coords(0, 0));
}
}
}
7 changes: 7 additions & 0 deletions megamek/src/megamek/common/Infantry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1933,4 +1933,11 @@ public int getGenericBattleValue() {
public boolean hasPatchworkArmor() {
return false;
}

@Override
public PilotingRollData checkSkid(EntityMovementType moveType, Hex prevHex, EntityMovementType overallMoveType, MoveStep prevStep,
MoveStep currStep, int prevFacing, int curFacing, Coords lastPos, Coords curPos,
boolean isInfantry, int distance) {
return new PilotingRollData(id, TargetRoll.CHECK_FALSE, "Infantry can't skid");
}
}
8 changes: 2 additions & 6 deletions megamek/src/megamek/common/MoveStep.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3150,14 +3150,10 @@ && getEntity().getPosition().equals(prev)
if (destHex.containsTerrain(Terrains.BLACK_ICE)) {
mp++;
}
if (destHex.containsTerrain(Terrains.BLACK_ICE)
&& !isCareful()
&& (nDestEl == destHex.getLevel())) {
if (destHex.containsTerrain(Terrains.BLACK_ICE) && !isCareful() && (nDestEl == destHex.getLevel())) {
mp--;
}
if (isPavementStep
&& !destHex.containsTerrain(Terrains.BLACK_ICE)
&& isCareful()) {
if (isPavementStep && !destHex.containsTerrain(Terrains.BLACK_ICE) && isCareful()) {
mp++;
}

Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/Terrain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public String toString() {
* @param roll the piloting roll
* @param enteringRubble if the entered terrain contains rubble
*/
public void pilotingModifier(EntityMovementMode moveMode, PilotingRollData roll, boolean enteringRubble) {
public void applyPilotingModifier(EntityMovementMode moveMode, PilotingRollData roll, boolean enteringRubble) {
switch (type) {
case JUNGLE:
if (level == 3) {
Expand Down

0 comments on commit b6387df

Please sign in to comment.