Commit before changing creature inventory to a list

This commit is contained in:
2021-11-30 13:41:51 +00:00
parent 4d21c0f31a
commit 184c0c09c1
4 changed files with 5 additions and 0 deletions
+2
View File
@@ -225,6 +225,7 @@ data Creature = Creature
, _crMaxHP :: Int , _crMaxHP :: Int
, _crInv :: IM.IntMap Item , _crInv :: IM.IntMap Item
, _crInvSel :: Int , _crInvSel :: Int
, _crInvCapacity :: Int
, _crLeftInvSel :: Maybe Int , _crLeftInvSel :: Maybe Int
, _crState :: CreatureState , _crState :: CreatureState
, _crCorpse :: Picture , _crCorpse :: Picture
@@ -339,6 +340,7 @@ data Item
, _itAttachment :: ItAttachment , _itAttachment :: ItAttachment
, _itID :: Maybe Int , _itID :: Maybe Int
, _itEffect :: ItEffect , _itEffect :: ItEffect
, _itInvSize :: Int
, _itInvDisplay :: Item -> String , _itInvDisplay :: Item -> String
, _itInvColor :: Color , _itInvColor :: Color
, _itTargeting :: Maybe (World -> Maybe Point2, Int -> Item -> Creature -> World -> Picture) , _itTargeting :: Maybe (World -> Maybe Point2, Int -> Item -> Creature -> World -> Picture)
+1
View File
@@ -37,6 +37,7 @@ defaultCreature = Creature
, _crMaxHP = 150 , _crMaxHP = 150
, _crInv = IM.empty , _crInv = IM.empty
, _crInvSel = 0 , _crInvSel = 0
, _crInvCapacity = 25
, _crLeftInvSel = Nothing , _crLeftInvSel = Nothing
, _crState = defaultState , _crState = defaultState
, _crCorpse = setLayer 0 $ onLayer CorpseLayer $ color (greyN 0.5) $ circleSolid 10 , _crCorpse = setLayer 0 $ onLayer CorpseLayer $ color (greyN 0.5) $ circleSolid 10
+1
View File
@@ -100,6 +100,7 @@ defaultGun = Weapon
, _itEffect = NoItEffect , _itEffect = NoItEffect
, _itInvDisplay = basicWeaponDisplay , _itInvDisplay = basicWeaponDisplay
, _itInvColor = white , _itInvColor = white
, _itInvSize = 1
, _itTargeting = Nothing , _itTargeting = Nothing
, _itParams = NoParams , _itParams = NoParams
, _itDimension = defaultItemDimension , _itDimension = defaultItemDimension
+1
View File
@@ -256,6 +256,7 @@ miniGun = defaultAutoGun
, _itFloorPict = miniGunPictItem , _itFloorPict = miniGunPictItem
, _itEquipPict = pictureWeaponAim miniGunPictItem , _itEquipPict = pictureWeaponAim miniGunPictItem
, _itTweaks = defaultBulletSelTweak , _itTweaks = defaultBulletSelTweak
, _itInvSize = 2
} & itDimension . muzzleLength .~ 15 } & itDimension . muzzleLength .~ 15
where where
recoilAmount = 5 recoilAmount = 5