Move towards allowing equipable targeting items

2023-01-06 11:01:32 +00:00
parent bf479ca080
commit 612ee85579
23 changed files with 152 additions and 145 deletions
@@ -54,8 +54,12 @@ defaultCreature =
        , _crName = "DEFAULTCRNAME"
        , _crStatistics = CreatureStatistics 10 10 10
        , _crCamouflage = FullyVisible
+        , _crTargeting = defaultCreatureTargeting
        }

+defaultCreatureTargeting :: CreatureTargeting
+defaultCreatureTargeting = CreatureTargeting Nothing Nothing Nothing False
+
 defaultCreatureSkin :: CreatureType
 defaultCreatureSkin = Humanoid (greyN 0.9) (light4 green) (greyN 0.3) InanimateAI

@@ -23,7 +23,7 @@ defaultLeftUse =
 defaultEquipUse :: ItemUse
 defaultEquipUse = EquipUse
    { _equipEffect = defaultEquip
-    , _equipTargeting = NoTargeting
+    , _useTargeting = Nothing
    }

 defaultHeldUse :: ItemUse
@@ -36,5 +36,5 @@ defaultHeldUse =
        , _heldAim = defaultAimParams
        , _heldScroll = HeldScrollDoNothing
        , _heldConsumption = defaultLoadable
-        , _heldTargeting = NoTargeting
+        , _useTargeting = Nothing
        }