Merge branch 'develop' of https://github.com/hpi-swa-teaching/TabletopUI

 into develop

packages/TabletopUI-CommandProcessing.package/TTCharacterCommand.class/instance/executeRemove.from..st

@@ -6,7 +6,7 @@ executeRemove: aContext from: aTTCharacter
 		^TTCommandMessage new
 			errorMessage: aContext wrongContextErrorString;
 			yourself].
-	messageString := aContext removePlayer: self name from aTTCharacter.
+	messageString := aContext removePlayer: self name from: aTTCharacter.
 	^TTCommandMessage new
 		outputString: messageString;
 		yourself

packages/TabletopUI-CommandProcessing.package/TTCharacterCommand.class/methodProperties.json

@@ -2,6 +2,6 @@
 	"class" : {
 		"newWith:" : "JA 6/9/2022 22:21" },
 	"instance" : {
-		"executeRemove:from:" : "ML 6/15/2022 16:15",
+		"executeRemove:from:" : "ML 6/16/2022 09:43",
 		"name" : "JA 6/9/2022 22:20",
 		"name:" : "JA 6/9/2022 22:20" } }

packages/TabletopUI-CommandProcessing.package/TTCommandParser.class/instance/parseAction.st

@@ -4,7 +4,7 @@ parseAction
 	| token |
 	token := lexer nextToken.
 
-	(token = 'initiative') ifTrue: [
+	((token = 'initiative') | (token = 'ini')) ifTrue: [
 		^ TTInitiativeCommand new. ].
 	(token = 'fight') ifTrue: [
 		^ TTFightCommand new. ].

packages/TabletopUI-CommandProcessing.package/TTCommandParser.class/methodProperties.json

@@ -14,7 +14,7 @@
 		"lexer" : "JA 6/9/2022 21:22",
 		"lexer:" : "JA 6/9/2022 21:22",
 		"parse:" : "ML 6/15/2022 16:40",
-		"parseAction" : "ML 6/15/2022 16:41",
+		"parseAction" : "ML 6/16/2022 10:04",
 		"parseCharacter" : "JA 6/9/2022 22:21",
 		"parseRollable" : "ML 6/15/2022 16:43",
 		"parseValue" : "ML 6/15/2022 16:43" } }

packages/TabletopUI-CommandProcessing.package/TTFightContext.class/instance/currentPlayer..st

@@ -1,3 +1,5 @@
 accessing
-currentPlayer: anObject
-	currentPlayer := anObject
+currentPlayer: aTTCharacter
+
+	currentPlayer := aTTCharacter.
+	self changed: #currentPlayerName

packages/TabletopUI-CommandProcessing.package/TTFightContext.class/instance/onlyCurrentPlayerErrorString.st

@@ -0,0 +1,4 @@
+messages
+onlyCurrentPlayerErrorString
+
+	^'Only the current Player can do that.'

packages/TabletopUI-CommandProcessing.package/TTFightContext.class/instance/proceedToNextPlayer..st

@@ -2,4 +2,5 @@ fight
 proceedToNextPlayer: aTTCharacter
 
 	(aTTCharacter = self currentPlayer) ifTrue: [
-		^ self proceedToNextPlayer].
+		^ self proceedToNextPlayer].
+	^self onlyCurrentPlayerErrorString

packages/TabletopUI-CommandProcessing.package/TTFightContext.class/instance/removePlayer.from..st

@@ -1,10 +1,13 @@
 fight
-removePlayer: aTTCharacter from: aPerformingTTCharacter
+removePlayer: aTTCharacterName from: aPerformingTTCharacter
 
+	| aTTCharacter |
 	aPerformingTTCharacter isGamemaster ifFalse: [
 		^self onlyGMIsAllowedMessageString].
-	(self currentPlayer = aTTCharacter) ifTrue: [
+	(self currentPlayer name = aTTCharacterName) ifTrue: [
 		self proceedToNextPlayer].
+	self fightingPlayers do: [ :aPlayer |
+		aPlayer name = aTTCharacterName ifTrue: [aTTCharacter := aPlayer]].
 	self fightingPlayers remove: aTTCharacter.
 	self changed: #fightingPlayersNames.
 	^self playerRemovedMessageString: aTTCharacter

packages/TabletopUI-CommandProcessing.package/TTFightContext.class/methodProperties.json

@@ -3,7 +3,7 @@
 		"newWithfightOrder:" : "ML 6/15/2022 15:55" },
 	"instance" : {
 		"currentPlayer" : "ML 6/15/2022 13:44",
-		"currentPlayer:" : "ML 6/15/2022 13:44",
+		"currentPlayer:" : "ML 6/16/2022 10:15",
 		"currentPlayerName" : "ML 6/15/2022 13:45",
 		"display" : "ML 6/15/2022 13:44",
 		"display:" : "ML 6/15/2022 13:44",
@@ -14,11 +14,12 @@
 		"fightingPlayersNames" : "ML 6/15/2022 13:45",
 		"gameState" : "ML 6/15/2022 14:39",
 		"nextPlayerMessageString" : "ML 6/15/2022 15:10",
+		"onlyCurrentPlayerErrorString" : "ML 6/16/2022 09:58",
 		"openTurnOrderDisplay" : "ML 6/15/2022 13:48",
 		"playerRemovedMessageString:" : "ML 6/15/2022 15:25",
 		"playersWhoRolled" : "ML 6/15/2022 15:52",
-		"proceedToNextPlayer" : "ML 6/15/2022 15:11",
-		"proceedToNextPlayer:" : "ML 6/15/2022 13:47",
-		"removePlayer:from:" : "ML 6/15/2022 15:24",
+		"proceedToNextPlayer" : "ML 6/16/2022 10:15",
+		"proceedToNextPlayer:" : "ML 6/16/2022 09:58",
+		"removePlayer:from:" : "ML 6/16/2022 10:11",
 		"validCommands" : "ML 6/15/2022 09:58",
 		"wrongContextErrorString" : "ML 6/15/2022 14:48" } }