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

Cleanup

Browse Source
This commit is contained in:
justin
2024-12-22 23:57:54 +00:00
parent e56a467111
commit bb5ed215e4
8 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Data/Item/Use.hs
+1 -1
View File
@@ -128,7 +128,7 @@ data AimParams = AimParams
deriving (Eq, Ord, Show, Read) --Generic, Flat) deriving (Eq, Ord, Show, Read) --Generic, Flat)
data FlareType data FlareType
= DefaultFlareType = NoFlare
| PistolFlare | PistolFlare
| MiniGunFlare | MiniGunFlare
| HeavySmokeFlare | HeavySmokeFlare
src/Dodge/Default/Item/Use/AimParams.hs
+1 -1
View File
@@ -21,7 +21,7 @@ defaultAimParams =
, _mzRot = 0 , _mzRot = 0
, _mzInaccuracy = 0.05 , _mzInaccuracy = 0.05
, _mzAmmoSlot = 0 , _mzAmmoSlot = 0
, _mzFlareType = DefaultFlareType , _mzFlareType = NoFlare
, _mzEffect = MuzzleShootBullet , _mzEffect = MuzzleShootBullet
, _mzAmmoPerShot = UseExactly 1 , _mzAmmoPerShot = UseExactly 1
, _mzFrame = 0 , _mzFrame = 0
src/Dodge/HeldUse.hs
+1 -3
View File
@@ -207,10 +207,9 @@ loadMuzzle t@(LDT _ l _) mz = fromMaybe (t, Nothing) $ do
makeMuzzleFlare :: Muzzle -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World makeMuzzleFlare :: Muzzle -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
makeMuzzleFlare mz itmtree cr = case mz ^. mzFlareType of makeMuzzleFlare mz itmtree cr = case mz ^. mzFlareType of
DefaultFlareType -> id NoFlare -> id
PistolFlare -> basicMuzFlare pos dir PistolFlare -> basicMuzFlare pos dir
MiniGunFlare -> MiniGunFlare ->
--makeTlsTimeRadColPos 2 100 (V3 1 1 0.5) (pos `v2z` 20)
(cWorld . lWorld . lights .:~ LSParam (pos `v2z` 20) 100 (V3 1 1 0.5)) (cWorld . lWorld . lights .:~ LSParam (pos `v2z` 20) 100 (V3 1 1 0.5))
. muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
HeavySmokeFlare -> basicMuzFlare pos dir HeavySmokeFlare -> basicMuzFlare pos dir
@@ -268,7 +267,6 @@ getLaserColor = const yellow
basicMuzFlare :: Point2 -> Float -> World -> World basicMuzFlare :: Point2 -> Float -> World -> World
basicMuzFlare pos dir = basicMuzFlare pos dir =
-- makeTlsTimeRadColPos 2 100 (V3 1 1 0.5) (pos `v2z` 20)
(cWorld . lWorld . lights .:~ LSParam (pos `v2z` 20) 100 (V3 1 1 0.5)) (cWorld . lWorld . lights .:~ LSParam (pos `v2z` 20) 100 (V3 1 1 0.5))
. muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
. muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
src/Dodge/Item/Held/BatteryGuns.hs
+1 -1
View File
@@ -83,6 +83,6 @@ tractorGun =
& itUse . heldAim . aimWeight .~ 6 & itUse . heldAim . aimWeight .~ 6
& itUse . heldAim . aimRange .~ 1 & itUse . heldAim . aimRange .~ 1
& itUse . heldAim . aimStance .~ TwoHandUnder & itUse . heldAim . aimStance .~ TwoHandUnder
& itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ DefaultFlareType & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ NoFlare
& itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleTractor & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleTractor
& itType .~ HELD TRACTORGUN & itType .~ HELD TRACTORGUN
src/Dodge/Item/Held/Cone.hs
+1 -1
View File
@@ -14,7 +14,7 @@ bangCone =
& itUse . heldDelay . rateMax .~ 20 & itUse . heldDelay . rateMax .~ 20
& itUse . heldAim . aimMuzzles & itUse . heldAim . aimMuzzles
.~ replicate 15 .~ replicate 15
(Muzzle (V2 15 0) 0 0.5 0 DefaultFlareType MuzzleShootBullet (UseExactly 1) 0) (Muzzle (V2 15 0) 0 0.5 0 NoFlare MuzzleShootBullet (UseExactly 1) 0)
& itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ PistolFlare & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ PistolFlare
& itUse . heldParams . muzVel .~ UniRandFloat 0.5 0.8 & itUse . heldParams . muzVel .~ UniRandFloat 0.5 0.8
& itUse . heldParams . rifling .~ UniRandFloat 0.3 0.8 & itUse . heldParams . rifling .~ UniRandFloat 0.3 0.8
src/Dodge/Item/Held/Launcher.hs
+1 -1
View File
@@ -33,7 +33,7 @@ launcherX i =
& itUse . heldAim . aimMuzzles .~ getZipList & itUse . heldAim . aimMuzzles .~ getZipList
(ZipList [Muzzle (V2 20 0) a 0 | a <- angles] (ZipList [Muzzle (V2 20 0) a 0 | a <- angles]
<*> ZipList [0..] <*> ZipList [0..]
<*> pure DefaultFlareType <*> pure NoFlare
<*> pure MuzzleLauncher <*> pure MuzzleLauncher
<*> pure (UseExactly 1) <*> pure (UseExactly 1)
<*> pure 0 <*> pure 0
src/Dodge/Item/Held/SprayGuns.hs
+1 -1
View File
@@ -77,7 +77,7 @@ flameThrower =
& itUse . heldAim . aimWeight .~ 5 & itUse . heldAim . aimWeight .~ 5
& itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 5, _izMin = 1.5} & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 5, _izMin = 1.5}
& itUse . heldAim . aimStance .~ TwoHandUnder & itUse . heldAim . aimStance .~ TwoHandUnder
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 18 0) 0 0 0 DefaultFlareType & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 18 0) 0 0 0 NoFlare
MuzzleNozzle MuzzleNozzle
{ _nzPressure = ConstFloat 4 { _nzPressure = ConstFloat 4
, _nzMaxWalkAngle = 0.2 , _nzMaxWalkAngle = 0.2
src/Dodge/Item/Held/Stick.hs
+2 -1
View File
@@ -26,12 +26,13 @@ bangStick i =
a a
0.01 0.01
0 0
DefaultFlareType NoFlare
MuzzleShootBullet MuzzleShootBullet
(UseExactly 1) (UseExactly 1)
0 0
| a <- spreadAroundCenter i baseStickSpread | a <- spreadAroundCenter i baseStickSpread
] ]
& itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ PistolFlare
baseStickSpread :: Float baseStickSpread :: Float
baseStickSpread = 0.2 baseStickSpread = 0.2