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

Commit before removing stackable items

Browse Source
This commit is contained in:
justin
2024-09-08 15:17:59 +01:00
parent 1006bb5529
commit 86795f1a10
20 changed files with 73 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ghcidOutput
+25 -1
View File
@@ -1 +1,25 @@
All good (613 modules, at 10:30:52)
/home/justin/Haskell/loop/src/Dodge/Item/Grammar.hs:3:1: warning: [-Wunused-imports]
The import of ‘Dodge.Data.Item’ is redundant
|
3 | import Dodge.Data.Item
| ^^^^^^^^^^^^^^^^^^^^^^
/home/justin/Haskell/loop/src/Dodge/Item/Draw/SPic.hs:20:1: warning: [-Wunused-top-binds]
Defined but not used: ‘itemHeldAmmoPic’
|
20 | itemHeldAmmoPic itm amit = itemSPic itm <> addAmmoClip itm amit
| ^^^^^^^^^^^^^^^
/home/justin/Haskell/loop/src/Dodge/Item/Draw/SPic.hs:23:1: warning: [-Wunused-top-binds]
Defined but not used: ‘addAmmoClip’
|
23 | addAmmoClip itm amit = fromMaybe mempty $ do
| ^^^^^^^^^^^
/home/justin/Haskell/loop/src/Dodge/Item/Draw/SPic.hs:23:17: warning: [-Wunused-matches]
Defined but not used: ‘amit’
|
23 | addAmmoClip itm amit = fromMaybe mempty $ do
| ^^^^
/home/justin/Haskell/loop/src/Dodge/Item/Draw/SPic.hs:24:5: warning: [-Wunused-matches]
Defined but not used: ‘hit’
|
24 | hit <- itm ^? itType . iyBase . ibtHeld
| ^^^
saveSlot/LevelStart0
+1 -1
View File
File diff suppressed because one or more lines are too long
src/Dodge/Creature.hs
+3
View File
@@ -264,8 +264,11 @@ stackedInventory :: [Item]
stackedInventory =
[ burstRifle
, tinMag
, drumMag
, launcher
, shellMag
, shellMag
, shellMag
, pipe
, scrollWatch
, rewindWatch
src/Dodge/Data/Item/Use.hs
+1 -1
View File
@@ -32,7 +32,7 @@ data ItemUse
, _heldMods :: HeldMod
, _heldHammer :: HammerPosition
, _heldAim :: AimParams
, _heldConsumption :: [AmmoType]
, _heldAmmoTypes :: [AmmoType]
, _heldParams :: HeldParams
-- , _useTargeting :: Maybe TargetType
}
src/Dodge/Data/SoundOrigin.hs
-1
View File
@@ -20,7 +20,6 @@ data SoundOrigin
| MachineAltSound Int
| TerminalSound
| WallSound Int
| CrReloadSound Int
| Flamer
| ShellSound Int
| FlameSound
src/Dodge/Default/Item.hs
+1 -1
View File
@@ -44,7 +44,7 @@ defaultCraftItem = defaultHeldItem & itUse .~ CraftUse 1
defaultBulletWeapon :: Item
defaultBulletWeapon =
defaultWeapon
& itUse . heldConsumption .~ [BulletAmmo]
& itUse . heldAmmoTypes .~ [BulletAmmo]
& itUse . heldUse .~ HeldUseAmmoParams -- useAmmoParams
& itType . iyModules . at ModBulletCollision ?~ EMPTYMODULE
-- & itType . iyModules . at ModBulletPayload ?~ EMPTYMODULE
src/Dodge/Default/Item/Use.hs
+1 -1
View File
@@ -34,7 +34,7 @@ defaultHeldUse =
, _heldMods = HeldModNothing
, _heldHammer = HammerUp
, _heldAim = defaultAimParams
, _heldConsumption = []
, _heldAmmoTypes = []
, _heldParams = BulletShooterParams
{ _muzVel = 0.8
, _rifling = 0.8
src/Dodge/HeldUse.hs
+1 -1
View File
@@ -435,7 +435,7 @@ overNozzle eff ams it cr w nz =
getAmmoMagazine :: Item -> Creature -> Maybe ItemUse
getAmmoMagazine itm cr = do
invid <- itm ^? itLocation . ipInvID
amtype <- itm ^? itUse . heldConsumption . ix 0
amtype <- itm ^? itUse . heldAmmoTypes . ix 0
mag <- cr ^? crInv . ix (invid + 1) . itUse
magtype <- mag ^? amagType
guard $ amtype == magtype
src/Dodge/Item/Draw/SPic.hs
+9
View File
@@ -14,6 +14,15 @@ import LensHelp
import Picture
import Shape
import ShapePicture
import Data.Maybe
itemHeldAmmoPic :: Item -> Item -> SPic
itemHeldAmmoPic itm amit = itemSPic itm <> addAmmoClip itm amit
addAmmoClip :: Item -> Item -> SPic
addAmmoClip itm amit = fromMaybe mempty $ do
hit <- itm ^? itType . iyBase . ibtHeld
return mempty
itemSPic :: Item -> SPic
itemSPic it =
src/Dodge/Item/Held/BatteryGuns.hs
+1 -1
View File
@@ -36,7 +36,7 @@ teslaGun =
lasGun :: Item
lasGun =
defaultAutoBatteryGun
& itUse . heldConsumption .~ [ElectricalAmmo]
& itUse . heldAmmoTypes .~ [ElectricalAmmo]
& itParams
.~ Refracting
{ _phaseV = 1
src/Dodge/Item/Held/Cane.hs
+1 -1
View File
@@ -101,7 +101,7 @@ miniGunUse i =
& heldAim . aimRange .~ 1
& heldAim . aimStance .~ TwoHandUnder
& heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
& heldConsumption .~ [BulletAmmo]
& heldAmmoTypes .~ [BulletAmmo]
miniGunX :: Int -> Item
miniGunX i =
src/Dodge/Item/Held/Launcher.hs
+1 -1
View File
@@ -32,7 +32,7 @@ launcher =
-- & itUse . heldAim . aimHandlePos .~ V2 3 0
-- & itUse . heldAim . aimMuzPos .~ 20
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 20 0) 0 0]
& itUse . heldConsumption .~ [ProjectileAmmo]
& itUse . heldAmmoTypes .~ [ProjectileAmmo]
& itType . iyBase .~ HELD LAUNCHER
& itType . iyModules . at ModLauncherHoming ?~ EMPTYMODULE
src/Dodge/Item/Held/SprayGuns.hs
+2 -2
View File
@@ -17,7 +17,7 @@ poisonSprayer :: Item
poisonSprayer =
flameThrower
& itType . iyBase .~ HELD POISONSPRAYER
& itUse . heldConsumption .~ [GasAmmo]
& itUse . heldAmmoTypes .~ [GasAmmo]
& itUse . heldParams .~ GasSprayParams CreatePoisonGas --aGasCloud
& itUse . heldMods .~ PoisonSprayerMod
@@ -89,6 +89,6 @@ flameThrower =
& itUse . heldAim . aimStance .~ TwoHandUnder
-- & itUse . heldAim . aimHandlePos .~ 0
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 18 0) 0 0]
& itUse . heldConsumption .~ [GasAmmo]
& itUse . heldAmmoTypes .~ [GasAmmo]
& itType . iyBase .~ HELD FLAMETHROWER
& itUse . heldParams .~ GasSprayParams CreateFlame --aGasCloud
src/Dodge/Item/Held/Stick.hs
+1 -1
View File
@@ -38,7 +38,7 @@ baseStickSpread = 0.2
pistol :: Item
pistol =
bangStick 1
& itUse . heldConsumption .~ [BulletAmmo]
& itUse . heldAmmoTypes .~ [BulletAmmo]
& itUse . heldDelay . rateMax .~ 6
& itUse . heldMods .~ PistolMod
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 10 0) 0 0.05]
src/Dodge/Item/Held/Utility.hs
+1 -1
View File
@@ -43,7 +43,7 @@ forceFieldGun =
-- than the list below
--[ hammerCheckI , ammoCheckI , useAmmoAmount 1]
& itType . iyBase .~ HELD FORCEFIELDGUN
& itUse . heldConsumption .~ [ElectricalAmmo]
& itUse . heldAmmoTypes .~ [ElectricalAmmo]
{- |
Sends out pulses that display walls.
src/Dodge/Item/Weapon/Drone.hs
+1 -1
View File
@@ -16,7 +16,7 @@ droneLauncher =
& itUse . heldAim . aimWeight .~ 8
& itUse . heldAim . aimRange .~ 0.5
& itUse . heldAim . aimStance .~ TwoHandOver
& itUse . heldConsumption .~ [DroneAmmo]
& itUse . heldAmmoTypes .~ [DroneAmmo]
& itType . iyBase .~ HELD DRONELAUNCHER
lasDronesPic :: Item -> SPic
src/Dodge/Item/Weapon/TriggerType.hs
+3 -3
View File
@@ -145,13 +145,13 @@ ammoCheckI eff ams itm cr w = fromMaybe (failsound w) $ do
x <- ams ^? ix 0 . itUse . amagLoadStatus . iaLoaded
guard $ x > 0
matype <- ams ^? ix 0 . itUse . amagType
iatype <- itm ^? itUse . heldConsumption . ix 0
iatype <- itm ^? itUse . heldAmmoTypes . ix 0
guard $ matype == iatype
return $ eff ams itm cr $ w -- & cWorld . lWorld . creatures . ix (_crID cr) %~ crCancelReloading
where
failsound = case w ^? input . mouseButtons . ix SDL.ButtonLeft of
Just 0 -> soundStart (CrReloadSound (_crID cr)) (_crPos cr) click1S Nothing
_ -> soundContinue (CrReloadSound (_crID cr)) (_crPos cr) click1S Nothing
Just 0 -> soundStart (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing
_ -> soundContinue (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing
itUseCharge :: Int -> Item -> Item
itUseCharge x = itUse . leftConsumption . arLoaded %~ (max 0 . subtract x)
src/Dodge/Projectile/Create.hs
+2 -2
View File
@@ -29,8 +29,8 @@ createProjectile ammoitem muz itm cr = fromMaybe failsound $ do
-- the sound should be moved to the projectile firing
startthesound = soundMultiFrom [CrWeaponSound (_crID cr) j | j <- [0..3]] (_crPos cr) tap4S Nothing
failsound w' = case w' ^? input . mouseButtons . ix SDL.ButtonLeft of
Just 0 -> soundStart (CrReloadSound (_crID cr)) (_crPos cr) click1S Nothing w'
_ -> soundContinue (CrReloadSound (_crID cr)) (_crPos cr) click1S Nothing w'
Just 0 -> soundStart (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w'
_ -> soundContinue (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w'
fireShell :: Item -> Muzzle -> Item -> Creature -> World -> World
fireShell ammoitem muz it cr =
src/Dodge/Update/Scroll.hs
+3 -3
View File
@@ -10,7 +10,7 @@ import Dodge.HeldScroll
import Dodge.InputFocus
import Dodge.Inventory
import Dodge.SelectionSections
import Dodge.SoundLogic
--import Dodge.SoundLogic
import Dodge.Terminal
import Dodge.Tweak
import qualified IntMapHelp as IM
@@ -32,10 +32,10 @@ updateWheelEvent yi w = case w ^. hud . hudElement of
(Just (invid,hs), _) -> doHeldScroll invid hs y w
| lbDown -> w & wCam . camZoom +~ y
| invKeyDown -> changeSwapSel yi w
| otherwise -> stopSoundFrom (CrReloadSound 0) $ scrollAugInvSel yi w
| otherwise -> scrollAugInvSel yi w
DisplayInventory{_subInventory = ExamineInventory mi}
| invKeyDown && rbDown -> w & moveTweakSel yi
| invKeyDown -> stopSoundFrom (CrReloadSound 0) $ scrollAugInvSel yi w
| invKeyDown -> scrollAugInvSel yi w
| rbDown -> w & changeTweakParam mi yi
| otherwise -> w & moveTweakSel yi
DisplayInventory{_subInventory = CombineInventory{}} -> w & moveCombineSel yi
tags
+15 -16
View File
@@ -206,7 +206,7 @@ BangStickMod src/Dodge/Data/Item/HeldUse.hs 94;" C
Bark src/Dodge/Data/ActionPlan.hs 40;" C
Barrel src/Dodge/Creature/State/Data.hs 23;" C
Barrel src/Dodge/Data/Creature/State.hs 30;" C
BarrelHiss src/Dodge/Data/SoundOrigin.hs 31;" C
BarrelHiss src/Dodge/Data/SoundOrigin.hs 30;" C
BarrelType src/Dodge/Data/Creature/Misc.hs 76;" t
Barreloid src/Dodge/Data/Creature/Misc.hs 71;" C
Barreloid src/Dodge/Barreloid.hs 1;" m
@@ -252,7 +252,7 @@ Block src/Dodge/Default/Block.hs 1;" m
Block src/Dodge/LevelGen/Block.hs 2;" m
Block src/Dodge/Placement/Instance/Block.hs 1;" m
Block src/Dodge/Placement/PlaceSpot/Block.hs 2;" m
BlockDegradeSound src/Dodge/Data/SoundOrigin.hs 29;" C
BlockDegradeSound src/Dodge/Data/SoundOrigin.hs 28;" C
BlockDraw src/Dodge/Data/Block.hs 38;" t
BlockDrawBlSh src/Dodge/Data/Block.hs 40;" C
BlockDrawColHeightPoss src/Dodge/Data/Block.hs 42;" C
@@ -496,7 +496,7 @@ CrGroupParams src/Dodge/Data/CrGroupParams.hs 14;" t
CrGroupParams src/Dodge/Data/CrGroupParams.hs 6;" m
CrGroupUpdate src/Dodge/Data/CrGroupParams.hs 22;" t
CrGroupUpdate src/Dodge/CrGroupUpdate.hs 1;" m
CrHitSound src/Dodge/Data/SoundOrigin.hs 30;" C
CrHitSound src/Dodge/Data/SoundOrigin.hs 29;" C
CrID src/Dodge/Data/CrWlID.hs 12;" C
CrImp src/Dodge/Data/CreatureEffect.hs 23;" t
CrIsAiming src/Dodge/Data/CreatureEffect.hs 41;" C
@@ -506,7 +506,6 @@ CrMouth src/Dodge/Data/SoundOrigin.hs 17;" C
CrMvType src/Dodge/Data/Creature/Misc.hs 37;" t
CrMvType src/Dodge/Data/Creature/Misc.hs 40;" C
CrNumAlive' src/Dodge/World/Trigger/Data.hs 14;" C
CrReloadSound src/Dodge/Data/SoundOrigin.hs 23;" C
CrSound src/Dodge/Data/SoundOrigin.hs 16;" C
CrSpState src/Dodge/Creature/State/Data.hs 22;" t
CrSpState src/Dodge/Data/Creature/State.hs 29;" t
@@ -863,7 +862,7 @@ Event src/Dodge/Event.hs 14;" m
ExamineInventory src/Dodge/Data/HUD.hs 25;" C
ExpireAndDamage src/Dodge/Particle/HitEffect/ExpireAndDamage.hs 1;" m
Explore src/Dodge/Data/Scenario.hs 4;" C
Explosion src/Dodge/Data/SoundOrigin.hs 36;" C
Explosion src/Dodge/Data/SoundOrigin.hs 35;" C
Explosion src/Dodge/WorldEvent/Explosion.hs 4;" m
ExplosionPayload src/Dodge/Data/Payload.hs 11;" C
ExplosiveBarrel src/Dodge/Data/Creature/Misc.hs 76;" C
@@ -930,11 +929,11 @@ Flame src/Dodge/Data/Flame.hs 6;" m
Flame src/Dodge/Flame.hs 1;" m
Flame src/Dodge/Particle/Flame.hs 1;" m
FlameBeamCombine src/Dodge/Data/Beam.hs 39;" C
FlameSound src/Dodge/Data/SoundOrigin.hs 26;" C
FlameSound src/Dodge/Data/SoundOrigin.hs 25;" C
FlameSpitterMod src/Dodge/Data/Item/HeldUse.hs 71;" C
FlameSpitterRepeatMod src/Dodge/Data/Item/HeldUse.hs 72;" C
FlameThrowerMod src/Dodge/Data/Item/HeldUse.hs 73;" C
Flamer src/Dodge/Data/SoundOrigin.hs 24;" C
Flamer src/Dodge/Data/SoundOrigin.hs 23;" C
Flank src/Dodge/Data/ActionPlan.hs 177;" C
Flare src/Dodge/Data/Flare.hs 14;" t
Flare src/Dodge/Data/Flare.hs 6;" m
@@ -975,7 +974,7 @@ FoldlHelp src/FoldlHelp.hs 1;" m
FollowImpulses src/Dodge/Data/ActionPlan.hs 182;" C
FootForward src/Dodge/Creature/Stance/Data.hs 33;" t
FootForward src/Dodge/Data/Creature/Stance.hs 31;" t
FootstepSound src/Dodge/Data/SoundOrigin.hs 28;" C
FootstepSound src/Dodge/Data/SoundOrigin.hs 27;" C
ForceField src/Dodge/ForceField.hs 1;" m
ForceField src/Dodge/Wall/ForceField.hs 1;" m
ForceFieldAmmo src/Dodge/Data/Ammo.hs 47;" C
@@ -1036,7 +1035,7 @@ Gib src/Dodge/Prop/Gib.hs 1;" m
Girder src/Dodge/Room/Girder.hs 1;" m
Girder src/Dodge/Room/Modify/Girder.hs 1;" m
Glass src/Dodge/Data/Material.hs 11;" C
GlassBreakSound src/Dodge/Data/SoundOrigin.hs 32;" C
GlassBreakSound src/Dodge/Data/SoundOrigin.hs 31;" C
GlassLesson src/Dodge/Room/GlassLesson.hs 2;" m
GloomLayer src/Dodge/Picture/Layer/Data.hs 18;" C
Goal src/Dodge/Data/ActionPlan.hs 196;" t
@@ -1369,7 +1368,7 @@ Lampoid src/Dodge/Lampoid.hs 1;" m
Large src/Shape/Data.hs 29;" C
LasBeamCombine src/Dodge/Data/Beam.hs 40;" C
LasMod src/Dodge/Data/Item/HeldUse.hs 79;" C
LasSound src/Dodge/Data/SoundOrigin.hs 27;" C
LasSound src/Dodge/Data/SoundOrigin.hs 26;" C
LasTurret src/Dodge/Room/LasTurret.hs 1;" m
LasWideMod src/Dodge/Data/Item/HeldUse.hs 77;" C
Laser src/Dodge/Data/Laser.hs 28;" t
@@ -1407,7 +1406,7 @@ Lethargic src/Dodge/Data/Creature/Perception.hs 55;" C
LevelGen src/Dodge/LevelGen.hs 1;" m
LevelStartSlot src/Dodge/Data/SaveSlot.hs 11;" C
LevelStructure src/Dodge/LevelGen/LevelStructure.hs 1;" m
LeverSound src/Dodge/Data/SoundOrigin.hs 35;" C
LeverSound src/Dodge/Data/SoundOrigin.hs 34;" C
LifeSupportSystemsRoomSS src/Dodge/Data/Scenario.hs 113;" C
LifeboatBaySS src/Dodge/Data/Scenario.hs 107;" C
LightSource src/Dodge/Data/LightSource.hs 34;" t
@@ -1543,7 +1542,7 @@ MapHelp src/MapHelp.hs 1;" m
Material src/Dodge/Data/Material.hs 11;" t
Material src/Dodge/Data/Material.hs 6;" m
Material src/Dodge/Material.hs 1;" m
MaterialSound src/Dodge/Data/SoundOrigin.hs 33;" C
MaterialSound src/Dodge/Data/SoundOrigin.hs 32;" C
MatrixHelper src/MatrixHelper.hs 1;" m
Maybe' src/MaybeHelp.hs 13;" t
MaybeHelp src/MaybeHelp.hs 7;" m
@@ -2325,7 +2324,7 @@ Shell src/Dodge/Data/Projectile.hs 15;" C
Shell src/Dodge/Default/Shell.hs 1;" m
Shell src/Dodge/Item/Weapon/Shell.hs 1;" m
ShellLauncher src/Dodge/Data/Item/Params.hs 24;" C
ShellSound src/Dodge/Data/SoundOrigin.hs 25;" C
ShellSound src/Dodge/Data/SoundOrigin.hs 24;" C
ShieldGroup src/Dodge/Creature/State/Data.hs 49;" C
ShieldGroup src/Dodge/Data/Creature/State.hs 52;" C
Shift src/Dodge/Layout/Tree/Shift.hs 4;" m
@@ -2531,7 +2530,7 @@ TUBE src/Dodge/Combine/Data.hs 28;" C
TUBE src/Dodge/Data/Item/Combine.hs 31;" C
Tank src/Dodge/Placement/Instance/Tank.hs 1;" m
Tanks src/Dodge/Room/Tanks.hs 1;" m
Tap src/Dodge/Data/SoundOrigin.hs 37;" C
Tap src/Dodge/Data/SoundOrigin.hs 36;" C
TargetAttachParams src/Dodge/Data/Item/Use.hs 79;" C
TargetCursor src/Dodge/Data/Item/Targeting.hs 16;" C
TargetCursorUpdate src/Dodge/Data/Targeting.hs 26;" C
@@ -2553,7 +2552,7 @@ Targeting src/Dodge/Item/Targeting.hs 1;" m
Targeting src/Dodge/Item/Weapon/Targeting.hs 1;" m
Targeting src/Dodge/Targeting.hs 1;" m
TargetingLaser src/Dodge/Data/Laser.hs 16;" C
TeleSound src/Dodge/Data/SoundOrigin.hs 34;" C
TeleSound src/Dodge/Data/SoundOrigin.hs 33;" C
Teleport src/Dodge/Room/Teleport.hs 2;" m
TelsaArc src/Dodge/Data/TelsaArc.hs 3;" m
TempLightSource src/Dodge/Data/LightSource.hs 42;" t
@@ -3413,7 +3412,7 @@ _gusts src/Dodge/Data/LWorld.hs 102;" f
_gwWorld src/Dodge/Data/GenWorld.hs 25;" f
_hammerPosition src/Dodge/Data/Hammer.hs 14;" f
_heldAim src/Dodge/Data/Item/Use.hs 34;" f
_heldConsumption src/Dodge/Data/Item/Use.hs 35;" f
_heldAmmoTypes src/Dodge/Data/Item/Use.hs 35;" f
_heldDelay src/Dodge/Data/Item/Use.hs 31;" f
_heldHammer src/Dodge/Data/Item/Use.hs 33;" f
_heldMods src/Dodge/Data/Item/Use.hs 32;" f