@@ -2578,7 +2578,7 @@ items:
     clipSize: -1
     strengthApplied: true
     damageType: 7
-    accuracyMelee: 80
+    accuracyMelee: 100
     tuMelee: 15
     battleType: 3
     fixedWeapon: true
@@ -2594,7 +2594,7 @@ items:
     clipSize: -1
     strengthApplied: true
     damageType: 7
-    accuracyMelee: 80
+    accuracyMelee: 100
     tuMelee: 15
     battleType: 3
     fixedWeapon: true
@@ -2632,7 +2632,7 @@ items:
     hitSound: 48
     strengthApplied: true
     damageType: 7
-    accuracyMelee: 92
+    accuracyMelee: 100
     tuMelee: 15
     clipSize: -1
     battleType: 3
@@ -2671,7 +2671,7 @@ items:
     hitSound: 48
     strengthApplied: true
     damageType: 7
-    accuracyMelee: 80
+    accuracyMelee: 100
     tuMelee: 15
     battleType: 3
     fixedWeapon: true
 
@@ -884,6 +884,12 @@ bool BattlescapeGenerator::placeItemByLayout(BattleItem *item)
 					item->setSlot(_game->getRuleset()->getInventory((*j)->getSlot()));
 					item->setSlotX((*j)->getSlotX());
 					item->setSlotY((*j)->getSlotY());
+					if (Options::includePrimeStateInSavedLayout &&
+						(item->getRules()->getBattleType() == BT_GRENADE ||
+						item->getRules()->getBattleType() == BT_PROXIMITYGRENADE))
+					{
+						item->setFuseTimer((*j)->getFuseTimer());
+					}
 					_save->getItems()->push_back(item);
 					return true;
 				}
 
@@ -36,6 +36,7 @@
 #include "../Savegame/Ufo.h"
 #include <sstream>
 #include "../Engine/Options.h"
+#include "../Engine/Screen.h"
 
 namespace OpenXcom
 {
@@ -168,6 +169,9 @@ BriefingState::~BriefingState()
 void BriefingState::btnOkClick(Action *)
 {
 	_game->popState();
+	Options::baseXResolution = Options::baseXBattlescape;
+	Options::baseYResolution = Options::baseYBattlescape;
+	_game->getScreen()->resetDisplay();
 	BattlescapeState *bs = new BattlescapeState(_game);
 	int liveAliens = 0, liveSoldiers = 0;
 	bs->getBattleGame()->tallyUnits(liveAliens, liveSoldiers, false);
@@ -180,6 +184,9 @@ void BriefingState::btnOkClick(Action *)
 	}
 	else
 	{
+		Options::baseXResolution = Options::baseXGeoscape;
+		Options::baseYResolution = Options::baseYGeoscape;
+		_game->getScreen()->resetDisplay();
 		delete bs;
 		_game->pushState(new AliensCrashState(_game));
 	}
 
@@ -61,6 +61,7 @@
 #include "../Interface/Cursor.h"
 #include "../Engine/Options.h"
 #include "../Basescape/ManageAlienContainmentState.h"
+#include "../Engine/Screen.h"
 
 namespace OpenXcom
 {
@@ -71,6 +72,10 @@ namespace OpenXcom
  */
 DebriefingState::DebriefingState(Game *game) : State(game), _region(0), _country(0), _noContainment(false), _manageContainment(false), _destroyBase(false)
 {
+	Options::baseXResolution = Options::baseXGeoscape;
+	Options::baseYResolution = Options::baseYGeoscape;
+	_game->getScreen()->resetDisplay();
+
 	// Restore the cursor in case something weird happened
 	_game->getCursor()->setVisible(true);
 	_containmentLimit = Options::alienContainmentLimitEnforced ? 1 : 0;
 
@@ -682,7 +682,7 @@ void Inventory::mouseClick(Action *action, State *state)
 	{
 		if (_selItem == 0)
 		{
-			if (!_base)
+			if (!_base || Options::includePrimeStateInSavedLayout)
 			{
 				if (!_tu)
 				{
 
@@ -382,7 +382,8 @@ void InventoryState::saveEquipmentLayout()
 				(*j)->getSlot()->getId(),
 				(*j)->getSlotX(),
 				(*j)->getSlotY(),
-				ammo
+				ammo,
+				(*j)->getFuseTimer()
 			));
 		}
 	}
 
@@ -106,7 +106,8 @@ int Projectile::calculateTrajectory(double accuracy, Position originVoxel)
 		_action.actor->getFaction() == FACTION_PLAYER &&
 		_action.autoShotCounter == 1 &&
 		(SDL_GetModState() & KMOD_CTRL) == 0 &&
-		_save->getBattleGame()->getPanicHandled())
+		_save->getBattleGame()->getPanicHandled() &&
+		_action.type != BA_LAUNCH)
 	{
 		Position hitPos = Position(_trajectory.at(0).x/16, _trajectory.at(0).y/16, _trajectory.at(0).z/24);
 		if (test == V_UNIT && _save->getTile(hitPos) && _save->getTile(hitPos)->getUnit() == 0) //no unit? must be lower
 
@@ -332,6 +332,7 @@ bool ProjectileFlyBState::createNewProjectile()
 			delete projectile;
 			_parent->getMap()->setProjectile(0);
 			_action.result = "STR_NO_LINE_OF_FIRE";
+			_unit->abortTurn();
 			_parent->popState();
 			return false;
 		}
@@ -372,6 +373,7 @@ bool ProjectileFlyBState::createNewProjectile()
 			delete projectile;
 			_parent->getMap()->setProjectile(0);
 			_action.result = "STR_NO_LINE_OF_FIRE";
+			_unit->abortTurn();
 			_parent->popState();
 			return false;
 		}
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`	`#include "../Savegame/Ufo.h"`
`37`	`37`	`#include <sstream>`
`38`	`38`	`#include "../Engine/Options.h"`
	`39`	`+#include "../Engine/Screen.h"`
`39`	`40`
`40`	`41`	`namespace OpenXcom`
`41`	`42`	`{`
`@@ -168,6 +169,9 @@ BriefingState::~BriefingState()`
`168`	`169`	`void BriefingState::btnOkClick(Action *)`
`169`	`170`	`{`
`170`	`171`	`_game->popState();`
	`172`	`+ Options::baseXResolution = Options::baseXBattlescape;`
	`173`	`+ Options::baseYResolution = Options::baseYBattlescape;`
	`174`	`+ _game->getScreen()->resetDisplay();`
`171`	`175`	`BattlescapeState *bs = new BattlescapeState(_game);`
`172`	`176`	`int liveAliens = 0, liveSoldiers = 0;`
`173`	`177`	`bs->getBattleGame()->tallyUnits(liveAliens, liveSoldiers, false);`
`@@ -180,6 +184,9 @@ void BriefingState::btnOkClick(Action *)`
`180`	`184`	`}`
`181`	`185`	`else`
`182`	`186`	`{`
	`187`	`+ Options::baseXResolution = Options::baseXGeoscape;`
	`188`	`+ Options::baseYResolution = Options::baseYGeoscape;`
	`189`	`+ _game->getScreen()->resetDisplay();`
`183`	`190`	`delete bs;`
`184`	`191`	`_game->pushState(new AliensCrashState(_game));`
`185`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -682,7 +682,7 @@ void Inventory::mouseClick(Action action, State state)`
`682`	`682`	`{`
`683`	`683`	`if (_selItem == 0)`
`684`	`684`	`{`
`685`		`- if (!_base)`
	`685`	`+ if (!_base \|\| Options::includePrimeStateInSavedLayout)`
`686`	`686`	`{`
`687`	`687`	`if (!_tu)`
`688`	`688`	`{`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,8 @@ void InventoryState::saveEquipmentLayout()`
`382`	`382`	`(*j)->getSlot()->getId(),`
`383`	`383`	`(*j)->getSlotX(),`
`384`	`384`	`(*j)->getSlotY(),`
`385`		`- ammo`
	`385`	`+ ammo,`
	`386`	`+ (*j)->getFuseTimer()`
`386`	`387`	`));`
`387`	`388`	`}`
`388`	`389`	`}`