Work on cleaning up item effects/attachments etc

2022-07-27 16:39:58 +01:00
parent 8d17ce66e9
commit b52adddd5d
39 changed files with 696 additions and 844 deletions
@@ -1,5 +1,6 @@
 module Dodge.Default.Item (
    defaultItem,
+    defaultItEffect,
 ) where

 import Dodge.Data.Item
@@ -12,12 +13,12 @@ defaultItem =
        { _itCurseStatus = Uncursed
        , _itType = defaultItemType
        , --    , _itEquipPict = \_ _ -> (,) emptySH blank
-          _itEffect = NoItEffect
+          _itEffect = defaultItEffect
        , _itID = Nothing
        , _itIsHeld = False
        , _itInvColor = yellow
        , _itInvSize = 1
-        , _itPos = VoidItm
+        , _itLocation = VoidItm
        , _itDimension = ItemDimension 2 0 (V3 10 (-5) 3)
        , _itUse = CraftUse (ItAmount 1)
        , _itParams = NoParams
@@ -25,7 +26,16 @@ defaultItem =
        , _itScope = NoScope
        , _itTargeting = NoTargeting
        , _itValue = ItemValue 0 MundaneItem
-        , _itAttachment = NoItAttachment
+        }
+
+defaultItEffect :: ItEffect
+defaultItEffect =
+    ItEffect
+        { _ieInv = NoInvEffect
+        , _ieOnInsert = NoInvEffect
+        , _ieOnDrop = NoInvEffect
+        , _ieOnHeld = NoInvEffect
+        , _ieOnStash = NoInvEffect
        }

 defaultItemType :: ItemType
@@ -47,7 +47,7 @@ defaultCWorld = CWorld
    , _clZoning         = mempty
    , _gusts            = IM.empty
    , _gsZoning         = mempty --Zoning IM.empty clZoneSize (zonePos _guPos)
-    , _itemPositions    = IM.empty
+    , _itemLocations    = IM.empty
    , _props            = IM.empty
    , _projectiles      = IM.empty
    , _instantBullets   = []