wgaffa/ffxwt - Change U4BSTER6LP7X5XSXMCBKVCHR4GUKAAW5ZZUS2RKXN4UB3I2E4CIAC

Use Data.PrintableText as well as some cleanup

Created by wgaffa on January 7, 2023

U4BSTER6LP7X5XSXMCBKVCHR4GUKAAW5ZZUS2RKXN4UB3I2E4CIAC

Dependencies

In channels

main

Change contents

Replacement in src/Overdrive.hs at line 9 [3.37]

B:BD[3.167] → [3.167:294]

import           Data.Char       (isSpace)
import           Data.List       (find)
import           Data.Maybe      (fromJust)

[3.167]

[3.294]

import           Data.Char          (isSpace)
import           Data.List          (find)
import           Data.Maybe         (fromJust)
import           Data.PrintableText

Replacement in src/Overdrive.hs at line 14 [3.37]

B:BD[3.295] → [3.295:371]

import qualified Data.Map        as M
import qualified Data.Text       as T

[3.295]

[3.371]

import qualified Data.Map           as M
import qualified Data.Text          as T

Replacement in src/Overdrive.hs at line 55 [3.37]
B:BD[3.1514] → [3.1514:1553]
```
        mkName = fromJust . mkItemName
```
[3.1514]
[3.1553]
```
        mkName = fromJust . fromText
```

Replacement in src/Overdrive.hs at line 58 [3.37]

B:BD[3.1659] → [3.1659:1730]

        searchFilter haystack = (== haystack) . unItemName . view name

[3.1659]

[3.1730]

        searchFilter haystack = (== haystack) . unPrintableText . view name

Replacement in src/Overdrive.hs at line 63 [3.37]

B:BD[3.1867] → [3.1867:1964]

    , Effect (ItemDetails (mkName "Ultra Potion") "Fully restore all allies HP") Multi [Healing]

[3.1867]

[3.1964]

    , Effect (ItemDetails (mkName "Ultra Potion") "Fully restore all allies HP") Multi [health RestoreFull]

Replacement in src/Overdrive.hs at line 65 [3.37]

B:BD[3.2092] → [3.2092:2179]

        Multi [Damage Normal, Condition Blindness, Condition Silence, Condition Sleep]

[3.2092]

[3.2179]

        Multi [Damage Normal, Cure Blindness, Cure Silence, Cure Sleep]

Replacement in src/Overdrive.hs at line 70 [3.37]

B:BD[3.2369] → [3.2369:2408]

        mkName = fromJust . mkItemName

[3.2369]

        mkName = fromJust . fromText

Insertion in src/Item.hs at line 1 [3.2441]
[3.2441]
[3.2477]
```
{-# LANGUAGE FlexibleInstances #-}
```
Insertion in src/Item.hs at line 4 [3.2441]
[3.2547]
[3.2547]
```
{-# LANGUAGE TypeApplications  #-}
```
Replacement in src/Item.hs at line 7 [3.2441]
B:BD[3.2560] → [3.2560:2580]
```
    ( Category (..)
```
[3.2560]
[3.2580]
```
    ( -- * Classes
      Category (..)
```
Replacement in src/Item.hs at line 17 [3.2441]
B:BD[3.2752] → [3.2752:2772]
```
    , ItemName (..)
```
[3.2752]
[2.0]
```
    , RestoreAmount (..)
```
Insertion in src/Item.hs at line 19 [3.2441]
[2.18]
[3.2790]
```
      -- * Collections
```
Replacement in src/Item.hs at line 21 [3.2441]
B:BD[3.2802] → [3.2802:2819]
```
    , mkItemName
```
[3.2802]
[3.2819]
```
      -- * Utility
    , health
    , mana
```

Replacement in src/Item.hs at line 26 [3.2441]

B:BD[3.2832] → [3.2832:2957]

import           Data.Char       (isSpace)
import           Data.Maybe      (fromJust)
import qualified Data.Text       as T

[3.2832]

[3.2957]

import           Data.Char          (isSpace)
import           Data.Maybe         (fromJust)
import           Data.PrintableText
import qualified Data.Text          as T

Deletion in src/Item.hs at line 34 [3.2441]

B:BD[3.3022] → [3.3022:3105]

newtype ItemName = ItemName { unItemName :: T.Text }
    deriving (Eq, Ord, Show)

Replacement in src/Item.hs at line 49 [3.2441]
B:BD[2.35] → [2.35:73]
```
    = Healing
    | Damage DamageType
```
[2.35]
[2.73]
```
    = Damage DamageType
```

Replacement in src/Item.hs at line 52 [3.2441]

B:BD[2.115] → [2.115:139]

    | Restore Condition

[2.115]

[3.3535]

    | Cure Condition
    | Restore Restore
    deriving (Show, Eq, Ord)
data Restore
    = HPRestore RestoreAmount
    | MPRestore RestoreAmount

Replacement in src/Item.hs at line 61 [3.2441]

B:BD[3.3565] → [3.3565:3635]

data Condition = Blindness | Silence | Sleep deriving (Show, Eq, Ord)

[3.3565]

[3.3635]

data RestoreAmount = RestoreAmount Int | RestoreFull deriving (Show, Eq, Ord)

Insertion in src/Item.hs at line 63 [3.2441]

[3.3636]

data Condition
    = Blindness
    | Petrification
    | Poison
    | Silence
    | Sleep
    deriving (Show, Eq, Ord)

Replacement in src/Item.hs at line 81 [3.2441]
B:BD[3.3902] → [3.3902:3933]
```
    { _name        :: ItemName
```
[3.3902]
[3.3933]
```
    { _name        :: PrintableText
```

Replacement in src/Item.hs at line 105 [3.2441]

B:BD[3.4467] → [3.4467:4596]

mkItemName :: T.Text -> Maybe ItemName
mkItemName name
    | T.all isSpace name = Nothing
    | otherwise = Just $ ItemName name

[3.4467]

[3.4596]

class Restoreable a where
    toRestore :: a -> RestoreAmount
instance Restoreable Int where
    toRestore = RestoreAmount
instance Restoreable RestoreAmount where
    toRestore = id
health :: Restoreable a => a -> EffectType
health = Restore . HPRestore . toRestore

Insertion in src/Item.hs at line 117 [3.2441]

[3.4597]

mana :: Restoreable a => a -> EffectType
mana = Restore . MPRestore . toRestore

Replacement in src/Item.hs at line 122 [3.2441]

B:BD[3.4621] → [3.4621:5451]

    [ Item (ItemDetails (mkName "Bomb Core") "A bomb core") Single [Damage Normal] Use Rare
    , Item (ItemDetails (mkName "Potion") "Heals 200 HP") Single [Healing] Potion Common
    , Item (ItemDetails (mkName "Hi-Potion") "Heals 1,000 HP") Single [Healing] Potion Common
    , Item (ItemDetails (mkName "X-Potion") "Fully heals") Single [Healing] Potion Uncommon
    , Item (ItemDetails (mkName "Ether") "Restores 100 MP") Single [] Potion Common
    , Item (ItemDetails (mkName "Eye Drops") "Removes Blindness") Single [] Potion Common
    , Item (ItemDetails (mkName "Grenade") "Damages all enemies") Multi [Damage Normal] Use Uncommon
    , Item (ItemDetails (mkName "Power Sphere") "Unlocks a Power node") Single [] Grid Common
    , Item (ItemDetails (mkName "Speed Sphere") "Unlocks a Speed node") Single [] Grid Common

[3.4621]

[3.5451]

    [ item "Bomb Core" "A bomb core" Single [Damage Normal] Use Rare
    , item "Potion" "Restores 200 HP" Single [health @Int 200] Potion Common
    , item "Hi-Potion" "Restores 1,000 HP" Single [health @Int 1000] Potion Common
    , item "X-Potion" "Fully restores HP" Single [health RestoreFull] Potion Uncommon
    , item "Ether" "Restores 100 MP" Single [mana @Int 100] Potion Common
    , item "Eye Drops" "Removes Blindness" Single [Cure Blindness] Potion Common
    , item "Soft" "Removes Petrification" Single [Cure Petrification] Potion Common
    , item "Antidote" "Removes Poison" Single [Cure Poison] Potion Common
    , item "Echo Screen" "Removes Silence" Single [Cure Silence] Potion Common
    , item "Grenade" "Damages all enemies" Multi [Damage Normal] Use Uncommon
    , item "Mega Potion" "Restore 2000 HP for all allies" Multi [health @Int 2000] Potion Uncommon
    , item "Power Sphere" "Unlocks a Power node" Single [] Grid Common
    , item "Speed Sphere" "Unlocks a Speed node" Single [] Grid Common

Replacement in src/Item.hs at line 137 [3.2441]

B:BD[3.5467] → [3.5467:5506]

        mkName = fromJust . mkItemName

[3.5467]

[3.5506]

        mkName = fromJust . fromText
        details x = ItemDetails (mkName x)
        item x y = Item (details x y)

Use Data.PrintableText as well as some cleanup

Dependencies

In channels

Change contents

Replacement in src/Overdrive.hs at line 9 [3.37]

Replacement in src/Overdrive.hs at line 14 [3.37]

Replacement in src/Overdrive.hs at line 55 [3.37]

Replacement in src/Overdrive.hs at line 58 [3.37]

Replacement in src/Overdrive.hs at line 63 [3.37]

Replacement in src/Overdrive.hs at line 65 [3.37]

Replacement in src/Overdrive.hs at line 70 [3.37]

Insertion in src/Item.hs at line 1 [3.2441]

Insertion in src/Item.hs at line 4 [3.2441]

Replacement in src/Item.hs at line 7 [3.2441]

Replacement in src/Item.hs at line 17 [3.2441]

Insertion in src/Item.hs at line 19 [3.2441]

Replacement in src/Item.hs at line 21 [3.2441]