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

Tweak flares

Browse Source
This commit is contained in:
justin
2024-12-23 10:28:46 +00:00
parent bb5ed215e4
commit 34c7186aa1
8 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
saveSlot/LevelStart0
+1 -1
View File
File diff suppressed because one or more lines are too long
src/Dodge/Creature.hs
+1
View File
@@ -250,6 +250,7 @@ inventoryX c = case c of
[targetingScope tt | tt <- [minBound .. maxBound]] [targetingScope tt | tt <- [minBound .. maxBound]]
<> <>
[ battery [ battery
, zoomScope
, augmentedHUD , augmentedHUD
, autoRifle , autoRifle
, megaTinMag 10200 , megaTinMag 10200
src/Dodge/Data/Item/Use.hs
+2 -1
View File
@@ -129,7 +129,8 @@ data AimParams = AimParams
data FlareType data FlareType
= NoFlare = NoFlare
| PistolFlare | BasicFlare
| NoLightFlare
| MiniGunFlare | MiniGunFlare
| HeavySmokeFlare | HeavySmokeFlare
| LasGunFlare | LasGunFlare
src/Dodge/Default/Item.hs
+1 -1
View File
@@ -43,7 +43,7 @@ defaultBulletWeapon =
defaultHeldItem defaultHeldItem
& itAmmoSlots .~ singleAmmo BulletAmmo & itAmmoSlots .~ singleAmmo BulletAmmo
& itUse . heldAim . aimMuzzles .~ & itUse . heldAim . aimMuzzles .~
[Muzzle (V2 15 0) 0 0.01 0 PistolFlare MuzzleShootBullet (UseExactly 1) 0] [Muzzle (V2 15 0) 0 0.01 0 BasicFlare MuzzleShootBullet (UseExactly 1) 0]
defaultItEffect :: ItEffect defaultItEffect :: ItEffect
defaultItEffect = defaultItEffect =
src/Dodge/HeldUse.hs
+2 -1
View File
@@ -208,7 +208,8 @@ 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
NoFlare -> id NoFlare -> id
PistolFlare -> basicMuzFlare pos dir BasicFlare -> basicMuzFlare pos dir
NoLightFlare -> muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
MiniGunFlare -> MiniGunFlare ->
(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
src/Dodge/Item/Held/Cane.hs
+1 -1
View File
@@ -38,7 +38,7 @@ volleyGun i =
& itUse . heldAim . aimMuzzles .~ getZipList & itUse . heldAim . aimMuzzles .~ getZipList
(ZipList [Muzzle (V2 15 x) 0 0.01 | x <- spreadAroundCenter i 6] (ZipList [Muzzle (V2 15 x) 0 0.01 | x <- spreadAroundCenter i 6]
<*> ZipList [0..i-1] <*> ZipList [0..i-1]
<*> pure PistolFlare <*> pure MiniGunFlare
<*> pure MuzzleShootBullet <*> pure MuzzleShootBullet
<*> pure (UseExactly 1) <*> pure (UseExactly 1)
<*> ZipList [0..i-1] <*> ZipList [0..i-1]
src/Dodge/Item/Held/Cone.hs
+1 -1
View File
@@ -15,7 +15,7 @@ bangCone =
& itUse . heldAim . aimMuzzles & itUse . heldAim . aimMuzzles
.~ replicate 15 .~ replicate 15
(Muzzle (V2 15 0) 0 0.5 0 NoFlare 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 .~ BasicFlare
& 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
& itUse . heldParams . recoil .~ 150 & itUse . heldParams . recoil .~ 150
src/Dodge/Item/Held/Stick.hs
+4 -2
View File
@@ -32,7 +32,9 @@ bangStick i =
0 0
| a <- spreadAroundCenter i baseStickSpread | a <- spreadAroundCenter i baseStickSpread
] ]
& itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ PistolFlare & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ NoLightFlare
& itUse . heldAim . aimMuzzles . ix (i `div` 2) . mzFlareType .~ MiniGunFlare
& itUse . heldAim . aimMuzzles . ix (i-1) . mzFlareType .~ NoLightFlare
baseStickSpread :: Float baseStickSpread :: Float
baseStickSpread = 0.2 baseStickSpread = 0.2
@@ -43,7 +45,7 @@ pistol =
& itUse . heldDelay . rateMax .~ 6 & itUse . heldDelay . rateMax .~ 6
& itUse . heldAim . aimMuzzles . ix 0 . mzPos %~ const (V2 10 0) & itUse . heldAim . aimMuzzles . ix 0 . mzPos %~ const (V2 10 0)
& itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy %~ const 0.05 & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy %~ const 0.05
& itUse . heldAim . aimMuzzles . ix 0 . mzFlareType %~ const PistolFlare & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType %~ const BasicFlare
& itUse . heldParams & itUse . heldParams
%~ ( (muzVel .~ ConstFloat 0.8) %~ ( (muzVel .~ ConstFloat 0.8)
. (rifling .~ ConstFloat 0.8) . (rifling .~ ConstFloat 0.8)