From: <bee...@us...> - 2008-09-23 19:14:08
|
Revision: 5975 http://megamek.svn.sourceforge.net/megamek/?rev=5975&view=rev Author: beerockxs Date: 2008-09-23 19:12:46 +0000 (Tue, 23 Sep 2008) Log Message: ----------- + Bug: getting up from hull down not working correctly + Bug: experimental/unofficial ammo not being allowed when appropriate game option is set Modified Paths: -------------- trunk/megamek/docs/history.txt trunk/megamek/src/megamek/client/ui/AWT/CustomMechDialog.java trunk/megamek/src/megamek/client/ui/AWT/MovementDisplay.java trunk/megamek/src/megamek/client/ui/swing/CustomMechDialog.java trunk/megamek/src/megamek/server/Server.java Modified: trunk/megamek/docs/history.txt =================================================================== --- trunk/megamek/docs/history.txt 2008-09-22 04:01:24 UTC (rev 5974) +++ trunk/megamek/docs/history.txt 2008-09-23 19:12:46 UTC (rev 5975) @@ -23,6 +23,9 @@ + Implemented Communications Gear, including ECCM, Ghost Target and Initiative bonus functions + Bug: Fixed physical weapon attacks to hit mods + + Bug: getting up from hull down not working correctly + + Bug: experimental/unofficial ammo not being allowed when appropriate game + option is set v0.33.32 (2009-09-15, 21:21 GMT+1) + Remove unused image files Modified: trunk/megamek/src/megamek/client/ui/AWT/CustomMechDialog.java =================================================================== --- trunk/megamek/src/megamek/client/ui/AWT/CustomMechDialog.java 2008-09-22 04:01:24 UTC (rev 5974) +++ trunk/megamek/src/megamek/client/ui/AWT/CustomMechDialog.java 2008-09-23 19:12:46 UTC (rev 5975) @@ -794,12 +794,16 @@ if (!clientgui.getClient().game.getOptions().booleanOption( "is_eq_limits")) { if (entity.getTechLevel() == TechConstants.T_CLAN_TW - && atCheck.getTechLevel() == TechConstants.T_CLAN_ADVANCED) { + && (atCheck.getTechLevel() == TechConstants.T_CLAN_ADVANCED + || atCheck.getTechLevel() == TechConstants.T_CLAN_EXPERIMENTAL + || atCheck.getTechLevel() == TechConstants.T_CLAN_UNOFFICIAL)) { bTechMatch = true; } if (((entity.getTechLevel() == TechConstants.T_INTRO_BOXSET) || (entity .getTechLevel() == TechConstants.T_IS_TW_NON_BOX)) - && (atCheck.getTechLevel() == TechConstants.T_IS_ADVANCED)) { + && (atCheck.getTechLevel() == TechConstants.T_IS_ADVANCED + || atCheck.getTechLevel() == TechConstants.T_IS_EXPERIMENTAL + || atCheck.getTechLevel() == TechConstants.T_IS_UNOFFICIAL)) { bTechMatch = true; } } Modified: trunk/megamek/src/megamek/client/ui/AWT/MovementDisplay.java =================================================================== --- trunk/megamek/src/megamek/client/ui/AWT/MovementDisplay.java 2008-09-22 04:01:24 UTC (rev 5974) +++ trunk/megamek/src/megamek/client/ui/AWT/MovementDisplay.java 2008-09-23 19:12:46 UTC (rev 5975) @@ -2871,10 +2871,8 @@ buttonLayout %= NUM_BUTTON_LAYOUTS; setupButtonPanel(); } else if (ev.getActionCommand().equals(MOVE_UNJAM)) { - if (gear == MovementDisplay.GEAR_JUMP || gear == MovementDisplay.GEAR_CHARGE || gear == MovementDisplay.GEAR_DFA || cmd.getMpUsed() > ce.getWalkMP() || gear == MovementDisplay.GEAR_SWIM || gear == MovementDisplay.GEAR_RAM) { // in - // the - // wrong - // gear + if (gear == MovementDisplay.GEAR_JUMP || gear == MovementDisplay.GEAR_CHARGE || gear == MovementDisplay.GEAR_DFA || cmd.getMpUsed() > ce.getWalkMP() || gear == MovementDisplay.GEAR_SWIM || gear == MovementDisplay.GEAR_RAM) { + // in the wrong gear // clearAllMoves(); // gear = Compute.GEAR_LAND; setUnjamEnabled(false); Modified: trunk/megamek/src/megamek/client/ui/swing/CustomMechDialog.java =================================================================== --- trunk/megamek/src/megamek/client/ui/swing/CustomMechDialog.java 2008-09-22 04:01:24 UTC (rev 5974) +++ trunk/megamek/src/megamek/client/ui/swing/CustomMechDialog.java 2008-09-23 19:12:46 UTC (rev 5975) @@ -802,12 +802,16 @@ if (!clientgui.getClient().game.getOptions().booleanOption( "is_eq_limits")) { if (entity.getTechLevel() == TechConstants.T_CLAN_TW - && atCheck.getTechLevel() == TechConstants.T_CLAN_ADVANCED) { + && (atCheck.getTechLevel() == TechConstants.T_CLAN_ADVANCED + || atCheck.getTechLevel() == TechConstants.T_CLAN_EXPERIMENTAL + || atCheck.getTechLevel() == TechConstants.T_CLAN_UNOFFICIAL)) { bTechMatch = true; } if (((entity.getTechLevel() == TechConstants.T_INTRO_BOXSET) || (entity .getTechLevel() == TechConstants.T_IS_TW_NON_BOX)) - && (atCheck.getTechLevel() == TechConstants.T_IS_ADVANCED)) { + && (atCheck.getTechLevel() == TechConstants.T_IS_ADVANCED + || atCheck.getTechLevel() == TechConstants.T_IS_EXPERIMENTAL + || atCheck.getTechLevel() == TechConstants.T_IS_UNOFFICIAL)) { bTechMatch = true; } } Modified: trunk/megamek/src/megamek/server/Server.java =================================================================== --- trunk/megamek/src/megamek/server/Server.java 2008-09-22 04:01:24 UTC (rev 5974) +++ trunk/megamek/src/megamek/server/Server.java 2008-09-23 19:12:46 UTC (rev 5975) @@ -4567,6 +4567,7 @@ entity.heatBuildup += 1; entity.setProne(false); + entity.setHullDown(false); wasProne = false; game.resetPSRs(entity); entityFellWhileAttemptingToStand = !doSkillCheckInPlace(entity, rollTarget); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |