justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Move AmmoType, going towards no need for Aeson

Browse Source
This commit is contained in:
justin
2025-06-05 13:16:57 +01:00
parent cff32e50f3
commit 7f1b790688
17 changed files with 241 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Item/Held/BatteryGuns.hs
+3 -3
View File
@@ -27,7 +27,7 @@ teslaGun =
-- & itUse . heldMuzzles . ix 0 . mzFlareType .~ TeslaGunFlare
-- & itUse . heldMuzzles . ix 0 . mzEffect .~ MuzzleTesla
& itType .~ HELD TESLAGUN
& itAmmoSlots .~ singleAmmo ElectricalAmmo
-- & itAmmoSlots .~ singleAmmo ElectricalAmmo
teslaParams :: ItemParams
teslaParams =
@@ -42,7 +42,7 @@ laser :: Item
laser =
defaultHeldItem
-- & itUse . heldParams .~ BeamShooterParams-- Nothing
& itAmmoSlots .~ singleAmmo ElectricalAmmo
-- & itAmmoSlots .~ singleAmmo ElectricalAmmo
-- & itUse . heldDelay .~ NoDelay
-- & itUse . heldMuzzles . ix 0 . mzPos .~ V2 6 0
-- & itUse . heldMuzzles . ix 0 . mzInaccuracy .~ 0
@@ -61,7 +61,7 @@ tractorGun :: Item
tractorGun =
defaultHeldItem
-- & itUse . heldParams .~ BeamShooterParams
& itAmmoSlots .~ singleAmmo ElectricalAmmo
-- & itAmmoSlots .~ singleAmmo ElectricalAmmo
-- & itUse . heldMuzzles . ix 0 . mzPos .~ V2 30 0
-- & itUse . heldMuzzles . ix 0 . mzInaccuracy .~ 0
-- & itUse . heldMuzzles . ix 0 . mzFlareType .~ NoFlare
src/Dodge/Item/Held/Cane.hs
+4 -4
View File
@@ -9,7 +9,7 @@ module Dodge.Item.Held.Cane (
import Dodge.Data.Item
import Dodge.Default
import qualified Data.IntMap.Strict as IM
--import qualified Data.IntMap.Strict as IM
import LensHelp
defaultBangCane :: Item
@@ -32,7 +32,7 @@ volleyGun i =
-- <*> ZipList [0..i-1]
-- )
& itType .~ HELD (VOLLEYGUN i)
& itAmmoSlots .~ IM.fromList (zip [0..i-1] $ repeat BulletAmmo)
-- & itAmmoSlots .~ IM.fromList (zip [0..i-1] $ repeat BulletAmmo)
-- & itUse . heldUseEffect .~ RandomiseMuzzleFrames i
rifle :: Item
@@ -42,7 +42,7 @@ rifle = defaultBangCane & itType .~ HELD RIFLE
alteRifle :: Item
alteRifle = rifle
& itType .~ HELD ALTERIFLE
& itAmmoSlots .~ IM.fromList (zip [0..1] $ repeat BulletAmmo)
-- & itAmmoSlots .~ IM.fromList (zip [0..1] $ repeat BulletAmmo)
& itParams .~ AlteRifleSwitch 0
autoRifle :: Item
@@ -63,7 +63,7 @@ miniGunX i =
-- & itUse . heldDelay .~ WarmUpNoDelay{
-- --_warmTime = 0,
-- _warmMax = 100, _warmSound = crankSlowS}
& itAmmoSlots .~ singleAmmo BeltBulletAmmo
-- & itAmmoSlots .~ singleAmmo BeltBulletAmmo
-- & itUse . heldMuzzles
-- .~ replicate i
-- (Muzzle (V2 30 0) 0 0.05 0 MiniGunFlare MuzzleShootBullet (UseExactly 1) 0)
src/Dodge/Item/Held/Launcher.hs
+4 -4
View File
@@ -9,7 +9,7 @@ import Control.Lens
import Dodge.Data.Item
import Dodge.Default.Item
--import Geometry.Data
import qualified IntMapHelp as IM
--import qualified IntMapHelp as IM
rLauncher :: Item
rLauncher =
@@ -18,7 +18,7 @@ rLauncher =
-- & itUse . heldMuzzles . ix 0 . mzInaccuracy .~ 0
-- & itUse . heldMuzzles . ix 0 . mzEffect .~ MuzzleRLauncher
-- & itUse . heldMuzzles . ix 0 . mzPos .~ V2 20 0
& itAmmoSlots .~ singleAmmo LauncherAmmo
-- & itAmmoSlots .~ singleAmmo LauncherAmmo
& itType .~ HELD RLAUNCHER
gLauncher :: Item
@@ -40,6 +40,6 @@ rLauncherX i =
-- <*> pure (UseExactly 1)
-- <*> pure 0
-- )
& itAmmoSlots .~ IM.fromList [(j, LauncherAmmo) | j <- [0 .. i -1]]
where
-- & itAmmoSlots .~ IM.fromList [(j, LauncherAmmo) | j <- [0 .. i -1]]
-- where
-- angles = take i [0, 2 * pi / fromIntegral i ..]
src/Dodge/Item/Held/SprayGuns.hs
+3 -3
View File
@@ -18,7 +18,7 @@ poisonSprayer :: Item
poisonSprayer =
flameThrower
& itType .~ HELD POISONSPRAYER
& itAmmoSlots .~ singleAmmo GasAmmo
-- & itAmmoSlots .~ singleAmmo GasAmmo
flameSpitter :: Item
flameSpitter =
@@ -77,8 +77,8 @@ flameThrower =
-- (UseExactly 1)
-- 0
-- ]
& itAmmoSlots .~ singleAmmo GasAmmo
& itType .~ HELD FLAMETHROWER
-- & itAmmoSlots .~ singleAmmo GasAmmo
-- & itType .~ HELD FLAMETHROWER
-- & itUse . heldParams .~ GasSprayParams
-- { _weaponInvLock = 0
---- , _weaponRepeat = mempty
src/Dodge/Item/Held/Utility.hs
+3 -3
View File
@@ -29,7 +29,7 @@ torch =
defaultHeldItem
& itType .~ HELD TORCH
-- & itUse . heldMuzzles . ix 0 . mzPos . _x .~ 10
& itAmmoSlots .~ singleAmmo ElectricalAmmo
-- & itAmmoSlots .~ singleAmmo ElectricalAmmo
-- | Sends out pulses that display walls.
detector :: Detector -> Item
@@ -37,7 +37,7 @@ detector dt =
defaultHeldItem
& itUseCondition .~ UseableAnytime
-- & itUse . heldDelay . rateMax .~ 20
& itAmmoSlots .~ singleAmmo ElectricalAmmo
-- & itAmmoSlots .~ singleAmmo ElectricalAmmo
& itType .~ DETECTOR dt
-- & itUse . heldMuzzles . ix 0 . mzEffect .~ MuzzleDetector
-- & itUse . heldMuzzles . ix 0 . mzAmmoPerShot .~ UseExactly 100
@@ -47,7 +47,7 @@ blinker =
defaultHeldItem
& itUseCondition .~ UseableAnytime
-- & itUse . heldDelay . rateMax .~ 20
& itAmmoSlots .~ singleAmmo ElectricalAmmo
-- & itAmmoSlots .~ singleAmmo ElectricalAmmo
-- & itUse . heldMuzzles . ix 0 . mzEffect .~ MuzzleBlink
-- & itUse . heldMuzzles . ix 0 . mzAmmoPerShot .~ UseExactly 10000000
& itType .~ HELD BLINKER
src/Dodge/Item/Held/Weapons.hs
+1 -1
View File
@@ -10,7 +10,7 @@ shatterGun =
defaultHeldItem
& itType .~ HELD SHATTERGUN
-- & itUse . heldDelay . rateMax .~ 10
& itAmmoSlots .~ singleAmmo ElectricalAmmo
-- & itAmmoSlots .~ singleAmmo ElectricalAmmo
-- & itUse . heldMuzzles . ix 0 . mzPos .~ V2 30 0
-- & itUse . heldMuzzles . ix 0 . mzInaccuracy .~ 0
-- & itUse . heldMuzzles . ix 0 . mzEffect .~ MuzzleShatter