Merge remote-tracking branch 'origin/master'

bbarker · Sep 2, 2014 · ffe6972 · ffe6972
2 parents e933fa0 + 187f906
commit ffe6972
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/MoresmauJP/Rpg/Arena.hs b/src/MoresmauJP/Rpg/Arena.hs
@@ -334,7 +334,7 @@ choiceArena :: WScreenT Arena
 choiceArena = do
 	ar<-gets gsData
 	let status=getHealthSummary (arenaCharacter ar)
-	let statusOpp=printf "You're fighting a %s." (ppNPC (arenaOpponent ar))
+	let statusOpp=printf "You're fighting %s." (ppNPC (arenaOpponent ar))
 	let actions=getPossibleArenaActions (arenaCharacter ar) (arenaOpponent ar)
 	return (getShowCombo (["Your health:"]++status++[statusOpp]++["Choose next action"]) actions choiceArenaF)
 
@@ -457,4 +457,4 @@ getItemsFromNPC rr f= do
 		i3=addGold i2 (-gold)
 		i4=addGold (inventory $ arenaCharacter ar) gold
 	put (gs{gsData=ar{arenaCharacter=(arenaCharacter ar){inventory=i4}, arenaOpponent=c2{npcCharacter=c2b{inventory=i3}},arenaItems=its1++its}})
-	return (itemCount,gold)
+	return (itemCount,gold)
diff --git a/src/MoresmauJP/Rpg/TextOutput.hs b/src/MoresmauJP/Rpg/TextOutput.hs
@@ -108,7 +108,7 @@ ppTradeOperation' = render . ppTradeOperation
 
 ppAttitude :: NPCCharacter -> String
 ppAttitude (NPCCharacter{npcAttitude=a}) 
-	| a<5="very vostile"
+	| a<5="very hostile"
 	| a<9="hostile"
 	| a<13="neutral"
 	| a<17="friendly"
@@ -142,4 +142,4 @@ ppNPC :: NPCCharacter -> String
 ppNPC npc=let
 	c=npcCharacter npc
 	in printf "a %s, looking %s and apparently %s and %s" (name c) (ppAttitude npc) (ppPhysical c) (ppMental c)
-
+