Cleanup

src/Dodge/Data/WorldEffect.hs

@@ -1,24 +1,31 @@
+{-# LANGUAGE DeriveGeneric #-}
 --{-# LANGUAGE DeriveGeneric #-}
 --{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
-{-# LANGUAGE DeriveGeneric #-}
-module Dodge.Data.WorldEffect where
-import Dodge.Data.Item
-import Data.Aeson
-import GHC.Generics
-import Dodge.Data.CreatureEffect
-import Sound.Data
-import Geometry.Data
-import Dodge.Data.SoundOrigin
-data ItCrWdWd = ItCrWdId
-    | ItCrWdItemEffect
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON ItCrWdWd  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON ItCrWdWd 
 
-data WdWd = NoWorldEffect
-    | SetTrigger Bool Int 
+module Dodge.Data.WorldEffect where
+
+import Data.Aeson
+import Dodge.Data.CreatureEffect
+import Dodge.Data.Item
+import Dodge.Data.SoundOrigin
+import GHC.Generics
+import Geometry.Data
+import Sound.Data
+
+data ItCrWdWd
+    = ItCrWdId
+    | ItCrWdItemEffect
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON ItCrWdWd where
+    toEncoding = genericToEncoding defaultOptions
+
+instance FromJSON ItCrWdWd
+
+data WdWd
+    = NoWorldEffect
+    | SetTrigger Bool Int
     | WorldEffects [WdWd]
     | SetLSCol Point3 Int
     | AccessTerminal (Maybe Int)
@@ -29,55 +36,81 @@ data WdWd = NoWorldEffect
     | WdWdNegateTrig Int
     | WdWdFromItixCrixWdWd Int Int ItCrWdWd
     | WdWdFromItCrixWdWd Item Int ItCrWdWd
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON WdWd  where
+    deriving (Eq, Show, Read, Generic)
+
+instance ToJSON WdWd where
     toEncoding = genericToEncoding defaultOptions
-instance FromJSON WdWd 
-data WdP2 = WdP2Const Point2
+
+instance FromJSON WdWd
+
+data WdP2
+    = WdP2Const Point2
     | WdYouPos
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON WdP2  where
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON WdP2 where
     toEncoding = genericToEncoding defaultOptions
-instance FromJSON WdP2 
-data MdWdWd = MdWdId
+
+instance FromJSON WdP2
+
+data MdWdWd
+    = MdWdId
     | MdTrigIf MdWdWd MdWdWd
     | MdSetLSCol Point3
     | MdFlickerUpdate
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON MdWdWd  where
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON MdWdWd where
     toEncoding = genericToEncoding defaultOptions
-instance FromJSON MdWdWd 
-data WdBl = WdTrig Int
+
+instance FromJSON MdWdWd
+
+data WdBl
+    = WdTrig Int
     | WdBlDoorMoving Int
     | WdBlConst Bool
     | WdBlNegate WdBl
     | WdBlCrFilterNearPoint Float Point2 CrBl
     | WdBlBtOn Int
     | WdBlBtNotOff Int
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON WdBl  where
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON WdBl where
     toEncoding = genericToEncoding defaultOptions
-instance FromJSON WdBl 
-data WdP2f = WdP2f0
+
+instance FromJSON WdBl
+
+data WdP2f
+    = WdP2f0
     | WdP2fDoorPosition Int
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON WdP2f  where
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON WdP2f where
     toEncoding = genericToEncoding defaultOptions
-instance FromJSON WdP2f 
-data DrWdWd = DrWdId
+
+instance FromJSON WdP2f
+
+data DrWdWd
+    = DrWdId
     | DrWdMakeDoorDebris
-    | DrWdMechanismStepwise Int [Int] [(Point2,Point2)]
+    | DrWdMechanismStepwise Int [Int] [(Point2, Point2)]
     | DoorMechanism
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON DrWdWd  where
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON DrWdWd where
     toEncoding = genericToEncoding defaultOptions
-instance FromJSON DrWdWd 
-data TmWdWd = TmWdId
+
+instance FromJSON DrWdWd
+
+data TmWdWd
+    = TmWdId
     | TmWdWdDisconnectTerminal
     | TmWdWdfromWdWd WdWd
     | TmWdWdTermSound SoundID
     | TmWdWdDoDeathTriggers
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON TmWdWd  where
+    deriving (Eq, Show, Read, Generic)
+
+instance ToJSON TmWdWd where
     toEncoding = genericToEncoding defaultOptions
-instance FromJSON TmWdWd 
+
+instance FromJSON TmWdWd