From 184c0c09c1c4e4bf035b7218e59069643f60fe4b Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 30 Nov 2021 13:41:51 +0000 Subject: [PATCH] Commit before changing creature inventory to a list --- src/Dodge/Data.hs | 2 ++ src/Dodge/Default.hs | 1 + src/Dodge/Default/Weapon.hs | 1 + src/Dodge/Item/Weapon/BulletGuns.hs | 1 + 4 files changed, 5 insertions(+) diff --git a/src/Dodge/Data.hs b/src/Dodge/Data.hs index a2f778890..9e84d9b4c 100644 --- a/src/Dodge/Data.hs +++ b/src/Dodge/Data.hs @@ -225,6 +225,7 @@ data Creature = Creature , _crMaxHP :: Int , _crInv :: IM.IntMap Item , _crInvSel :: Int + , _crInvCapacity :: Int , _crLeftInvSel :: Maybe Int , _crState :: CreatureState , _crCorpse :: Picture @@ -339,6 +340,7 @@ data Item , _itAttachment :: ItAttachment , _itID :: Maybe Int , _itEffect :: ItEffect + , _itInvSize :: Int , _itInvDisplay :: Item -> String , _itInvColor :: Color , _itTargeting :: Maybe (World -> Maybe Point2, Int -> Item -> Creature -> World -> Picture) diff --git a/src/Dodge/Default.hs b/src/Dodge/Default.hs index 2b33c3cde..8e8382466 100644 --- a/src/Dodge/Default.hs +++ b/src/Dodge/Default.hs @@ -37,6 +37,7 @@ defaultCreature = Creature , _crMaxHP = 150 , _crInv = IM.empty , _crInvSel = 0 + , _crInvCapacity = 25 , _crLeftInvSel = Nothing , _crState = defaultState , _crCorpse = setLayer 0 $ onLayer CorpseLayer $ color (greyN 0.5) $ circleSolid 10 diff --git a/src/Dodge/Default/Weapon.hs b/src/Dodge/Default/Weapon.hs index c7bc9cc6e..1b49f618c 100644 --- a/src/Dodge/Default/Weapon.hs +++ b/src/Dodge/Default/Weapon.hs @@ -100,6 +100,7 @@ defaultGun = Weapon , _itEffect = NoItEffect , _itInvDisplay = basicWeaponDisplay , _itInvColor = white + , _itInvSize = 1 , _itTargeting = Nothing , _itParams = NoParams , _itDimension = defaultItemDimension diff --git a/src/Dodge/Item/Weapon/BulletGuns.hs b/src/Dodge/Item/Weapon/BulletGuns.hs index 9d95d7e34..fcfa89b98 100644 --- a/src/Dodge/Item/Weapon/BulletGuns.hs +++ b/src/Dodge/Item/Weapon/BulletGuns.hs @@ -256,6 +256,7 @@ miniGun = defaultAutoGun , _itFloorPict = miniGunPictItem , _itEquipPict = pictureWeaponAim miniGunPictItem , _itTweaks = defaultBulletSelTweak + , _itInvSize = 2 } & itDimension . muzzleLength .~ 15 where recoilAmount = 5