Stop door z fighting when opened

2021-11-27 00:28:59 +00:00
parent e231b851d9
commit 774808663a
4 changed files with 58 additions and 18 deletions
@@ -213,10 +213,7 @@ data Creature = Creature
    , _crMvDir          :: Float
    , _crID             :: Int
    , _crPict           :: Creature -> World -> SPic
-    , _crUpdate     
-        :: Creature 
-        -> World 
-        -> (Endo World, Maybe Creature)
+    , _crUpdate         :: Creature -> World -> (Endo World, Maybe Creature)
    , _crRad            :: Float
    , _crMass           :: Float
    , _crHP             :: Int
@@ -292,6 +289,50 @@ data FloorItem = FlIt { _flIt :: Item , _flItPos :: Point2 , _flItRot :: Float,
 data ItemPos 
    = InInv   { _itCrId :: Int , _itInvId :: Int }
    | OnFloor { _itFlID :: Int }
+data Item' = Item'
+    { _iName        :: String
+    , _iIdentity    :: ItemIdentity
+    , _iType        :: ItemType
+    , _iID          :: Int
+    , _itPos        :: ItemPos
+    }
+data ItemType = TargetItem
+    { _tiMaxAmmo        :: Int
+    , _tiLoadedAmmo     :: Int
+    , _tiAmmo           :: Ammo
+    , _tiReloadTime     :: Int
+    , _tiReloadState    :: Int
+    , _tiReloadType     :: ReloadType
+    , _tiMaxWarmUp      :: Int
+    , _tiCurWarmUp      :: Int
+    , _tiMaxCoolDown    :: Int
+    , _tiCurCoolDown    :: Int
+    , _tiUseRate        :: Int
+    , _tiUseTime        :: Int
+    , _tiUse            :: Item -> Creature -> World -> World
+    , _tiUseModifiers   :: [(Item -> Creature -> World -> World) -> Item -> Creature -> World -> World]
+    , _tiSpread         :: Float
+    , _tiRange          :: Float
+    , _tiHammer         :: HammerPosition
+    , _tiDraw           :: Item -> SPic
+    , _tiAimingSpeed    :: Float
+    , _tiAimingRange    :: Float
+    , _tiZoom           :: ItZoom
+    , _tiAimZoom        :: ItZoom
+    , _tiEquipDraw      :: Creature -> Int -> SPic
+    , _tiScroll         :: Float -> Creature -> Item -> Item
+    , _tiAttachment     :: ItAttachment
+    , _tiEffect         :: ItEffect
+    , _tiInvDisplay     :: Item -> String
+    , _tiInvColor       :: Color
+    , _tiTargeting      :: Maybe (World -> Maybe Point2, Int -> Item -> Creature -> World -> Picture)
+    , _tiWorldTrigger   :: Maybe (Int -> World -> Bool)
+    , _tiAimStance      :: AimStance
+    , _tiNumBarrels     :: Int
+    , _tiDimension      :: ItemDimension
+    , _tiCurseStatus    :: CurseStatus
+    }
+
 data Item 
    = Weapon
        { _itName        :: String