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

Move around ammo source checks

Browse Source
This commit is contained in:
justin
2024-06-22 16:23:34 +01:00
parent 25cecb8ea6
commit c723d1b1e1
25 changed files with 218 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Item/Ammo.hs
+9 -11
View File
@@ -14,7 +14,7 @@ tinMag =
& itUse
.~ AmmoMagUse
{ _amagParams = BulletParams defaultBullet
, _amagType = SmallBulletAmmo
, _amagType = BulletAmmo
, _amagLoadStatus =
ReloadStatus
{ _iaMax = 15
@@ -57,8 +57,8 @@ shellMag =
}
, _amagLoadStatus =
ReloadStatus
{ _iaMax = 15
, _iaLoaded = 15
{ _iaMax = 1
, _iaLoaded = 1
, _iaPrimed = True
, _iaCycle = [loadEject 10, loadInsert 10, loadPrime 10]
, _iaProgress = Nothing
@@ -66,19 +66,17 @@ shellMag =
, _amagType = ProjectileAmmo
}
smallBattery :: Item
smallBattery =
defaultHeldItem & itType . iyBase .~ AMMOMAG TINMAG
& itType . iyModules . at ModBulletPayload ?~ EMPTYMODULE
& itType . iyModules . at ModBulletTrajectory ?~ EMPTYMODULE
battery :: Item
battery =
defaultHeldItem & itType . iyBase .~ AMMOMAG BATTERY
& itUse
.~ AmmoMagUse
{ _amagParams = BulletParams defaultBullet
, _amagType = SmallBulletAmmo
, _amagType = ElectricalAmmo
, _amagLoadStatus =
ReloadStatus
{ _iaMax = 15
, _iaLoaded = 15
{ _iaMax = 100
, _iaLoaded = 100
, _iaPrimed = True
, _iaCycle = [loadEject 10, loadInsert 10, loadPrime 10]
, _iaProgress = Nothing
src/Dodge/Item/Equipment.hs
+4 -2
View File
@@ -77,7 +77,8 @@ bulletBeltPack =
& itUse . equipEffect . eeSite .~ GoesOnBack
& itType . iyBase .~ EQUIP BULLETBELTPACK
& itUse . equipEffect . eeAttachPos .~ V3 (-9) 0 10
& itUse . equipEffect . eeUse .~ EAmmoSource 2000 2000 BulletSource Nothing
& itUse . equipEffect . eeUse .~ EAmmoSource 2000 2000 --BulletSource
Nothing
bulletBeltBracer :: Item
bulletBeltBracer =
@@ -85,7 +86,8 @@ bulletBeltBracer =
& itUse . equipEffect . eeSite .~ GoesOnWrist
& itType . iyBase .~ EQUIP BULLETBELTBRACER
& itUse . equipEffect . eeAttachPos .~ V3 (-9) 0 10
& itUse . equipEffect . eeUse .~ EAmmoSource 100 100 BulletSource Nothing
& itUse . equipEffect . eeUse .~ EAmmoSource 100 100 --BulletSource
Nothing
jetPack :: Item
jetPack =
src/Dodge/Item/Held/BatteryGuns.hs
+1 -6
View File
@@ -36,9 +36,7 @@ teslaGun =
lasGun :: Item
lasGun =
defaultAutoBatteryGun
& itUse . heldConsumption
.~ ( defaultLoadable
)
& itUse . heldConsumption .~ [ElectricalAmmo]
& itParams
.~ Refracting
{ _phaseV = 1
@@ -75,9 +73,6 @@ lasGunTweak =
tractorGun :: Item
tractorGun =
lasGun
& itUse . heldConsumption
.~ ( defaultLoadable
)
& itParams .~ Attracting{_attractionPower = 1}
& itTweaks
.~ Tweakable
src/Dodge/Item/Held/Launcher.hs
+1 -2
View File
@@ -32,8 +32,7 @@ launcher =
-- & itUse . heldAim . aimHandlePos .~ V2 3 0
-- & itUse . heldAim . aimMuzPos .~ 20
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 20 0) 0 0]
& itUse . heldConsumption . laAmmoType
.~ ProjectileAmmo
& itUse . heldConsumption .~ [BulletAmmo]
& itType . iyBase .~ HELD LAUNCHER
& itType . iyModules . at ModLauncherHoming ?~ EMPTYMODULE
src/Dodge/Item/Held/SprayGuns.hs
+4 -11
View File
@@ -17,10 +17,8 @@ poisonSprayer :: Item
poisonSprayer =
flameThrower
& itType . iyBase .~ HELD POISONSPRAYER
& itUse . heldConsumption . laAmmoType
.~ GasAmmo
{ _amCreateGas = CreatePoisonGas --aGasCloud
}
& itUse . heldConsumption .~ [GasAmmo]
& itUse . heldParams .~ GasSprayParams CreatePoisonGas --aGasCloud
& itUse . heldMods .~ PoisonSprayerMod
flameSpitter :: Item
@@ -91,11 +89,6 @@ flameThrower =
& itUse . heldAim . aimStance .~ TwoHandUnder
-- & itUse . heldAim . aimHandlePos .~ 0
& itUse . heldAim . aimMuzzles .~ [Muzzle (V2 18 0) 0 0]
& itUse . heldConsumption
.~ ( defaultLoadable
& laAmmoType
.~ GasAmmo
{ _amCreateGas = CreateFlame --aFlame
}
)
& itUse . heldConsumption .~ [GasAmmo]
& itType . iyBase .~ HELD FLAMETHROWER
& itUse . heldParams .~ GasSprayParams CreateFlame --aGasCloud
src/Dodge/Item/Held/Stick.hs
+1 -3
View File
@@ -38,9 +38,7 @@ baseStickSpread = 0.2
pistol :: Item
pistol =
bangStick 1
& itUse . heldConsumption
.~ ( defaultBulletLoadable
)
& itUse . heldConsumption .~ [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 .~ (defaultLoadable & laAmmoType .~ ForceFieldAmmo DefaultForceField)
& itUse . heldConsumption .~ [ElectricalAmmo]
{- |
Sends out pulses that display walls.
src/Dodge/Item/Info.hs
+1 -1
View File
@@ -191,7 +191,7 @@ craftInfo fit = case fit of
MICROPHONE -> "A device that measures air vibration."
CREATURESENSOR -> "A device for detecting living beings."
WIRE -> "A small thin object that conducts electricity."
BATTERY -> "A store of electical potential energy."
-- BATTERY -> "A store of electical potential energy."
FUELCELL -> "A devices that converts chemical energy into electricity."
PORTABLEFUSION -> "A miniature nuclear reactor."
GASINJECTOR -> "A device that can inject small quantities of gas into objects."
src/Dodge/Item/Weapon/Bullet.hs
-6
View File
@@ -1,5 +1,4 @@
module Dodge.Item.Weapon.Bullet (
basicBulletAmmo,
hvBulletAmmo,
defaultBullet,
) where
@@ -8,11 +7,6 @@ import Control.Lens
import Dodge.Data.Item.Use.Consumption.Ammo
import Geometry.Data
basicBulletAmmo :: AmmoType
basicBulletAmmo = SmallBulletAmmo
-- , _amBullet = defaultBullet
defaultBullet :: Bullet
defaultBullet =
Bullet
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 . laAmmoType .~ DroneAmmo
& itUse . heldConsumption .~ [DroneAmmo]
& itType . iyBase .~ HELD DRONELAUNCHER
lasDronesPic :: Item -> SPic