merge with emily's changes to margic carpet and desert

ecramer89 · Mar 2, 2014 · 6258908 · 6258908
2 parents 83b8686 + dcd0921
commit 6258908
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 157 deletions.
diff --git a/Assets/Scripts/DesertExplorer.cs b/Assets/Scripts/DesertExplorer.cs
@@ -59,7 +59,9 @@ void returnToSource ()
 		{
 				stopFlashing ();
 				removeSelfFromDesertState ();
-				gameObject.GetComponent<Meeple> ().player.GetComponent<Player> ().endTurn ();
+
+				reactToMovementEnding ();
+
 				gameObject.GetComponent<Meeple> ().endExploration ();
 
 		}
@@ -86,7 +88,7 @@ void OnMouseUpAsButton ()
 
 				if (MagicCarpet.waitingForPlayersMagicCarpetSelection) {
 
-			MagicCarpet.explorerToMove = gameObject;
+						MagicCarpet.explorerToMove = gameObject;
 
 
 				} else if (DesertMovementController.inMovementPhase && isMyPlayersTurn () && currentTile && firstExplorerMovedThisTurn ()) {
@@ -142,11 +144,8 @@ bool moving ()
 
 		bool flyingMagicCarpet ()
 		{
-		return MagicCarpet.explorerToMove == gameObject;
+				return MagicCarpet.explorerToMove == gameObject;
 		}
-		//called when we run out of water,
-		//and by the desert generator.
-
 
 		public void reactToMovementEnding ()
 		{
@@ -241,7 +240,6 @@ void handleSuccessfulMove (GameObject newLocation)
 								return; 
 						addGoodToPlayerInventory (newLocation);
 						if (GameController.testMeeplesSentBackToBazaarAfterFindingGood && !isMercenary ()) {
-								//closeMovement ();
 								leaveCurrentTile ();
 								returnToSource ();
 						} else
@@ -271,8 +269,7 @@ void graphicallyIndicateMoveState ()
 				else 
 						GetComponent<SpriteRenderer> ().color = defaultColor;
 				flash *= -1;
-
-
+
 
 		}
 

diff --git a/Assets/Scripts/DesertMovementController.cs b/Assets/Scripts/DesertMovementController.cs
@@ -23,7 +23,7 @@ public class DesertMovementController : Event
 		float sendToSourceDelayStart;
 		bool waitingOnExplorerReturn = false;
 
-	/*
+		/*
 		//magic carpet controller variables
 		public static GameObject playerWithMagicCarpet;
 		//requires:
@@ -141,6 +141,7 @@ public void updatePlayer ()
 		void endDesertMovementPhase ()
 		{
 				sendExplorersOnBazaarBackToSource ();
+				resetAllPlayerMovementVariables ();
 
 				eventStartTime = Time.time;
 				waitingOnExplorerReturn = true;
@@ -158,7 +159,8 @@ void announceEndOfMovePhaseAfterDelay ()
 		}
 
 		void announceEndOfMovePhase ()
-		{        	
+		{
+
 				showingEndOfMovePhaseScreen = true;
 				initializeEvent ();
 				waitingOnExplorerReturn = false;
@@ -168,7 +170,6 @@ void announceEndOfMovePhase ()
 
 		public override void activateEvent (GameObject aNullValueUseTheCollection)
 		{       
-
 				showingEndOfMovePhaseScreen = false;
 				showingPlayerMustTradeGoodsForExplorerScreen = true;
 				initializeEvent ();
@@ -180,15 +181,6 @@ public override void activateEvent (GameObject aNullValueUseTheCollection)
 
 		}
 
-		void initializeEvent ()
-		{
-				anEventIsHappeningInGeneral = true;
-				effectOccurring = true;
-				inControlOfTextBox = true;
-				tookEffect = false;
-				eventStartTime = Time.time;
-		}
-
 		void Update ()
 		{       
 				if (waitingOnExplorerReturn) {
@@ -202,24 +194,21 @@ void Update ()
 						} 
 
 				} else if (inControlOfTextBox) {
-						disableEventTextBox ();
-						inControlOfTextBox = false;
-						anEventIsHappeningInGeneral = true;
+						closeEvent ();
 
 
-								closeMovementPhase ();
+						closeMovementPhase ();
 				}
 
 
 
 		}
-
 
 		protected override void takeEffect ()
 		{
 
 				if (showingEndOfMovePhaseScreen) {
-						resetAllPlayerMovementVariables ();
+						//resetAllPlayerMovementVariables ();
 						checkForPlayersWhoNeedToReturnMeepleToSourceForGood ();
 
 
@@ -301,7 +290,7 @@ bool somePlayersNeedToTradeGoodsForExplorer ()
 
 		void closeMovementPhase ()
 		{
-				Debug.Log ("called end of move phase");
+
 				resetDesertState ();
 				playersWhoMustTradeGoodsForExplorer.Clear ();
 
@@ -350,9 +339,9 @@ void OnGUI ()
 
 
 
-						}
-
 				}
+
+		}
 
 
 

diff --git a/Assets/Scripts/Event.cs b/Assets/Scripts/Event.cs
@@ -16,7 +16,7 @@ public abstract class Event : MonoBehaviour
 		protected float delayStartTime;
 		protected float eventTextBoxDisplayDelay = 2.0f;
 		protected bool inControlOfTextBox;
-		public bool endPlayersTurn;
+
 
 		public abstract void activateEvent (GameObject desertExplorer);
 
@@ -110,15 +110,23 @@ protected void displayResultOfTwoCaseEvent (bool result, string waitingForResult
 		}
 
 		protected abstract void takeEffect ();
-	/*
-		protected void tellPlayerToFinishEndTurn ()
+
+		protected void initializeEvent ()
 		{
-				if (explorer && explorer.GetComponent<Meeple> ().player && endPlayersTurn) {
-						endPlayersTurn = false;
-						explorer.GetComponent<Meeple> ().player.GetComponent<Player> ().finishEndTurn ();
-				}
+				anEventIsHappeningInGeneral = true;
+				effectOccurring = true;
+				inControlOfTextBox = true;
+				tookEffect = false;
+				eventStartTime = Time.time;
+		}
+
+		protected void closeEvent ()
+		{
+				disableEventTextBox ();
+				inControlOfTextBox = false;
+				anEventIsHappeningInGeneral = false;
+
 		}
-		*/
 
 
 }
diff --git a/Assets/Scripts/Invader.cs b/Assets/Scripts/Invader.cs
@@ -22,30 +22,23 @@ public void prepareForInvasion ()
 
 		public override void activateEvent (GameObject desertExplorer)
 		{
-				anEventIsHappeningInGeneral = true;
-				effectOccurring = true;
-				inControlOfTextBox = true;
-				tookEffect = false;
-				eventStartTime = Time.time;
+				initializeEvent ();
 				explorer = desertExplorer;
 
 		}
 
 		protected override void takeEffect ()
 		{
-				swapLocationsWithVictim ();
+				moveIntoVictimsTile ();
 				removePlayersInvaderAbility ();
 
 
 
 		}
 
-		void swapLocationsWithVictim ()
+		void moveIntoVictimsTile ()
 		{
 				GameObject tileOfVictim = explorer.GetComponent<DesertExplorer> ().currentTile;
-
-
-
 				gameObject.GetComponent<DesertExplorer> ().updateLocation (tileOfVictim);
 
 		}
@@ -62,14 +55,16 @@ void Update ()
 						displayResultOfTwoCaseEvent (true, invaderMessagePartOne, invaderMessagePartTwo, "");
 
 				} else if (inControlOfTextBox) {
-						disableEventTextBox ();
-						inControlOfTextBox = false;
-						anEventIsHappeningInGeneral = false;
-						explorer.GetComponent<DesertExplorer> ().updateLocation (tileFromWhichInvaderAttacks);
-						//tellPlayerToFinishEndTurn ();
+						closeEvent ();
+						moveVictimToInvadersOldTile ();
+
 				}
+
 
+		}
 
-
+		void moveVictimToInvadersOldTile ()
+		{
+				explorer.GetComponent<DesertExplorer> ().updateLocation (tileFromWhichInvaderAttacks);
 		}
 }
diff --git a/Assets/Scripts/MagicCarpet.cs b/Assets/Scripts/MagicCarpet.cs
@@ -33,12 +33,9 @@ void Update ()
 						displayResultOfTwoCaseEvent (true, magicCarpetMessage, partTwoMagicCarpet, "");
 
 				} else if (inControlOfTextBox) {
-						disableEventTextBox ();
-						inControlOfTextBox = false;
-						anEventIsHappeningInGeneral = false;
-
-						//tellPlayerToFinishEndTurn ();
+						closeEvent ();
 				}
+
 				handleMagicCarpetPlayerSelection ();
 
 
@@ -57,33 +54,49 @@ void handleMagicCarpetPlayerSelection ()
 
 		public void setTilePlayerHasChosen (GameObject chosenTile)
 		{
-				if (!chosenTile.GetComponent<DesertTile> ().isBazaar () && chosenTile.GetComponent<DesertTile> ().roomForMoreOccupants ())
+				if (explorerToMove && validTile (chosenTile))
 						tileToMoveTo = chosenTile;
 
 		}
 
 		public void setExplorerPlayerHasChosen (GameObject explorer)
 		{
-				if (explorer.tag.Equals ("explorer") && explorer.GetComponent<Meeple> ().player == playerWithMagicCarpet)
+				if (validExplorer (explorer))
 						explorerToMove = explorer;
-		
+
 		}
 
 		bool playerHasMadeValidSelectionOfTileAndExplorer ()
 		{
 
-				if (explorerToMove && tileToMoveTo) {
-						if (tileToMoveTo.GetComponent<DesertTile> ().getNumOccupants () > 0) 
-								return tileToMoveTo.GetComponent<DesertTile> ().handleOccupiedTile (explorerToMove, tileToMoveTo);
-
-						return true;
-				}
-				return false;
+				return (explorerToMove && tileToMoveTo);
+
+		}
+
+		bool validExplorer (GameObject explorer)
+		{
+				return explorer.tag.Equals ("explorer") && explorer.GetComponent<Meeple> ().player == playerWithMagicCarpet && !explorer.GetComponent<DesertExplorer> ().hasMovedThisRound;
+
+		}
+
+		bool validTile (GameObject tile)
+		{
+				return !tile.GetComponent<DesertTile> ().isBazaar () && tile.GetComponent<DesertTile> ().roomForMoreOccupants () && explorerCanMoveToTile (tile);
+		}
+
+		bool explorerCanMoveToTile (GameObject tile)
+		{
+				if (tile.GetComponent<DesertTile> ().getNumOccupants () > 0) 
+						return tile.GetComponent<DesertTile> ().handleOccupiedTile (explorerToMove, tile);
+
+				return true;
+
 		}
 
 		void moveChosenExplorerToChosenTile ()
 		{
 				explorerToMove.GetComponent<DesertExplorer> ().updateLocation (tileToMoveTo);
+				explorerToMove.GetComponent<DesertExplorer> ().reactToMovementEnding ();
 		}
 
 		void closeMagicCarpetEvent ()
@@ -127,14 +140,6 @@ public override void activateEvent (GameObject dummy)
 				showingMagicCarpetScreen = true;
 
 		}
-
-		void initializeEvent ()
-		{
-				anEventIsHappeningInGeneral = true;
-				effectOccurring = true;
-				inControlOfTextBox = true;
-				tookEffect = false;
-				eventStartTime = Time.time;
-		}
+
 
 }
diff --git a/Assets/Scripts/Mercenary.cs b/Assets/Scripts/Mercenary.cs
@@ -51,18 +51,16 @@ public override void activateEvent (GameObject desertExplorer)
 		void Update ()
 		{       
 				price = requiredNumberOfGood + " " + desiredGoodType.ToString ();
-		canHireMessage = "You may hire the mercenary for " + price + System.Environment.NewLine + ". Do you wish to?";
+				canHireMessage = "You may hire the mercenary for " + price + System.Environment.NewLine + ". Do you wish to?";
 				insufficientFundsMessage = "you cannot pay my price of " + price;
 				cannotHireMessage = "Either " + insufficientFundsMessage + System.Environment.NewLine + " or " + noRoomMessage;
 
 				if (effectOccurring) {
 						displayResultOfTwoCaseEvent (mercenaryCanBeHired, foundMercenaryMessage, canHireMessage, cannotHireMessage);
 				} else if (!showingButtons ()) { 
 						if (inControlOfTextBox) {
-								disableEventTextBox ();
-								inControlOfTextBox = false;
-								anEventIsHappeningInGeneral = false;
-								//tellPlayerToFinishEndTurn ();
+								closeEvent ();
+
 						}
 
 				}
@@ -211,16 +209,11 @@ public void pickDesiredGoodTypeGivenCurrentLocation (GameObject currentLocation)
 		//assume that whenever this event has been called the new desired good type has been updated
 		public void reActivateEvent (GameObject desertExplorer)
 		{
-				anEventIsHappeningInGeneral = true;
-				inControlOfTextBox = true;
-
-
+				initializeEvent ();
 				mercenaryCanBeHired = roomAtTileWhereLocated () && checkIfPlayerHasSufficientFunds (desertExplorer.GetComponent<Meeple> ().player);
 				if (mercenaryCanBeHired)
 						getGoodItemsPlayerCanPay (desertExplorer.GetComponent<Meeple> ().player);		
-				effectOccurring = true;
-				tookEffect = false;
-				eventStartTime = Time.time;
+
 				explorer = desertExplorer;
 
 		}