From 6633f0221b519289a9bfbeb485a1e3b387d9ceb7 Mon Sep 17 00:00:00 2001
From: Tissevert <tissevert+devel@marvid.fr>
Date: Mon, 17 Dec 2018 12:40:46 +0100
Subject: [PATCH] =?UTF-8?q?Rename=20type=20=C2=ABPokemon=C2=BB=20for=20to?=
 =?UTF-8?q?=20follow=20the=20same=20convention=20as=20other=20types?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Area/Tile.hs | 4 ++--
 src/Character.hs | 4 ++--
 src/Item.hs      | 4 ++--
 src/Pokemon.hs   | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Area/Tile.hs b/src/Area/Tile.hs
index 459e02e..f076f92 100644
--- a/src/Area/Tile.hs
+++ b/src/Area/Tile.hs
@@ -11,7 +11,7 @@ import Area.NaturalElements (NaturalElements)
 import Area.Climate (Climate)
 import qualified Character (Key)
 import qualified Item (Key)
-import qualified Pokemon (T)
+import Pokemon (Pokemon)
 
 data Terrain = Normal | Water deriving (Generic)
 
@@ -24,7 +24,7 @@ data Content =
     Empty
   | Item Item.Key
   | Character Character.Key
-  | Pokemon Pokemon.T
+  | Pokemon Pokemon
   | NaturalElements NaturalElements
   deriving (Generic)
 
diff --git a/src/Character.hs b/src/Character.hs
index a811a11..67183c7 100644
--- a/src/Character.hs
+++ b/src/Character.hs
@@ -10,14 +10,14 @@ import Data.Aeson (ToJSON(..), FromJSON(..), genericToEncoding, genericParseJSON
 import Data.Vector (Vector)
 import GHC.Generics (Generic)
 import Gender (Gender(..))
-import qualified Pokemon (T)
+import Pokemon (Pokemon)
 import Tool.Array (Array)
 
 data Character = Character {
       name :: String
     , skin :: FilePath
     , gender :: Gender
-    , pokemons :: Array Pokemon.T
+    , pokemons :: Array Pokemon
   } deriving (Generic)
 
 instance ToJSON Character where
diff --git a/src/Item.hs b/src/Item.hs
index 9e4b67b..1593dba 100644
--- a/src/Item.hs
+++ b/src/Item.hs
@@ -10,9 +10,9 @@ module Item (
 import Data.Aeson (ToJSON(..), FromJSON(..), genericToEncoding, genericParseJSON, defaultOptions)
 import Data.Vector (Vector)
 import GHC.Generics (Generic)
-import qualified Pokemon (T)
+import Pokemon (Pokemon)
 
-data Type = Hold | Transform (Pokemon.T -> Pokemon.T) | Special
+data Type = Hold | Transform (Pokemon -> Pokemon) | Special
 
 data Item = Item {
       name :: String
diff --git a/src/Pokemon.hs b/src/Pokemon.hs
index 6c24193..5722b58 100644
--- a/src/Pokemon.hs
+++ b/src/Pokemon.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE DeriveGeneric #-}
 module Pokemon (
-    T(..)
+    Pokemon(..)
   ) where
 
 import Data.Aeson (ToJSON(..), FromJSON(..), genericToEncoding, genericParseJSON, defaultOptions)
@@ -12,7 +12,7 @@ import Pokemon.Status (Status)
 import qualified Pokemon.Move as Move (Key)
 import Tool.Array (Array)
 
-data T = T {
+data Pokemon = Pokemon {
       nick :: Maybe String
     , species :: Species.Key
     , gender :: Gender
@@ -21,7 +21,7 @@ data T = T {
     , moves :: Array Move.Key
   } deriving (Generic)
 
-instance ToJSON T where
+instance ToJSON Pokemon where
   toEncoding = genericToEncoding defaultOptions
-instance FromJSON T where
+instance FromJSON Pokemon where
   parseJSON = genericParseJSON defaultOptions