Fold aiming parameters into item use datatype

This commit is contained in:
2021-11-27 18:10:05 +00:00
parent 8639b2d428
commit 652af6b0a9
24 changed files with 135 additions and 155 deletions
-6
View File
@@ -138,13 +138,9 @@ defaultEquipment = Equipment
, _itEquipPict = \_ _ -> (,) emptySH blank
, _itEffect = NoItEffect
, _itID = Nothing
, _itAimingSpeed = 1
, _itAimingRange = 0
, _itZoom = defaultItZoom
, _itAimZoom = defaultItZoom
, _itInvColor = yellow
, _itInvDisplay = _itName
, _itAimStance = LeaveHolstered
, _itDimension = defaultItemDimension
}
defaultItZoom :: ItZoom
@@ -163,7 +159,6 @@ defaultConsumable = Consumable
, _itInvColor = blue
, _itInvDisplay = \it -> _itName it ++ " x" ++ show (_itAmount it)
, _itEffect = wpRecock
, _itAimStance = LeaveHolstered
, _itDimension = defaultItemDimension
}
defaultApplyDamage :: [DamageType] -> Creature -> (World -> World, Creature)
@@ -212,7 +207,6 @@ defaultIt = Consumable
, _itInvDisplay = _itName
, _itInvColor = blue
, _itEffect = NoItEffect
, _itAimStance = LeaveHolstered
}
defaultMachine :: Machine
defaultMachine = Machine