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

Make aiming speed be gouverned by strength

Browse Source
This commit is contained in:
justin
2022-05-22 14:33:34 +01:00
parent 6891bd7541
commit fd40da2d4a
15 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Item/Weapon/AmmoParams.hs
+1 -1
View File
@@ -28,7 +28,7 @@ ruseAmmoParamsRate rate ht usemods = RightUse
}
defaultAimParams :: AimParams
defaultAimParams = AimParams
{ _aimSpeed = 1
{ _aimWeight = 0
, _aimRange = 0
, _aimZoom = ItZoom 20 0.2 1
, _aimStance = OneHand
src/Dodge/Item/Weapon/BatteryGuns.hs
+7 -7
View File
@@ -84,7 +84,7 @@ teslaGun = defaultBatteryGun
, withSoundForI elecCrackleS 1
, useAmmoAmount 1
]
& useAim . aimSpeed .~ 0.4
& useAim . aimWeight .~ 6
& useAim . aimStance .~ TwoHandFlat
, _itDimension = ItemDimension
{ _dimRad = 9
@@ -146,7 +146,7 @@ lasGunWide n = lasGun
, useAmmoAmount 1
, duplicateOffsets xs
]
& useAim . aimSpeed .~ 0.4
& useAim . aimWeight .~ 6
& useAim . aimRange .~ 1
& useAim . aimStance .~ TwoHandTwist
)
@@ -168,7 +168,7 @@ lasGunWidePulse = lasGun
, useAmmoAmount 1
, withItemUpdate itup $ \it -> duplicateOffsets (xs it)
]
& useAim . aimSpeed .~ 0.4
& useAim . aimWeight .~ 6
& useAim . aimRange .~ 1
& useAim . aimStance .~ TwoHandTwist
)
@@ -195,7 +195,7 @@ lasGunSway = lasGun
, useAmmoAmount 1
, withItemUpdate itup $ \it -> duplicateOffsets (x it)
]
& useAim . aimSpeed .~ 0.4
& useAim . aimWeight .~ 6
& useAim . aimRange .~ 1
& useAim . aimStance .~ TwoHandTwist
)
@@ -242,7 +242,7 @@ lasGunDual = lasGun
, withSoundForI tone440sawtoothquietS 2
, useAmmoAmount 1
]
& useAim . aimSpeed .~ 0.4
& useAim . aimWeight .~ 6
& useAim . aimRange .~ 1
& useAim . aimStance .~ TwoHandTwist
)
@@ -282,7 +282,7 @@ lasGun = defaultAutoBatteryGun
, withItem $ \it -> withMuzPos $ flareCircleAt (_lasColor $ _itParams it) 0.8
, useAmmoAmount 1
]
& useAim . aimSpeed .~ 0.4
& useAim . aimWeight .~ 6
& useAim . aimRange .~ 1
& useAim . aimStance .~ TwoHandTwist
, _itParams = Refracting
@@ -345,7 +345,7 @@ tractorGun = lasGun
, _itUse = ruseInstant aTractorBeam NoHammer
[ ammoCheckI
]
& useAim . aimSpeed .~ 0.4
& useAim . aimWeight .~ 6
& useAim . aimRange .~ 1
& useAim . aimStance .~ TwoHandTwist
, _itDimension = ItemDimension
src/Dodge/Item/Weapon/BulletGun/Cane.hs
+3 -3
View File
@@ -110,7 +110,7 @@ bangCaneX i = bangCane
. (\k -> fromIntegral k * 5 - ((fromIntegral i - 1) * 2.5))) [0..i-1]
) <> caneClipX i it
}
} & itUse . useAim . aimSpeed .~ 0.4
} & itUse . useAim . aimWeight .~ 6
& itUse . useAim . aimRange .~ 1
& itUse . useAim . aimStance .~ TwoHandFlat
& itUse . useAim . aimZoom .~ defaultItZoom {_itZoomFac = 1.5}
@@ -149,7 +149,7 @@ rifle = bangCane
& itName .~ "RIFLE"
& itType .~ RIFLE
& itConsumption . ammoBaseMax .~ 1
& itUse . useAim . aimSpeed .~ 0.4
& itUse . useAim . aimWeight .~ 6
& itUse . useAim . aimRange .~ 1
& itUse . useAim . aimZoom .~ defaultItZoom {_itZoomFac = 1.5}
repeater :: Item
@@ -271,7 +271,7 @@ miniGunX i = defaultAutoGun
}
, _itUse = miniGunUse i
& useDelay .~ WarmUpNoDelay {_warmTime = 0,_warmMax = 200}
& useAim . aimSpeed .~ 0.4
& useAim . aimWeight .~ 6
& useAim . aimRange .~ 1
& useAim . aimStance .~ TwoHandTwist
& useAim . aimZoom .~ defaultItZoom {_itZoomFac = 1.5}
src/Dodge/Item/Weapon/BulletGun/Rod.hs
+1 -1
View File
@@ -77,7 +77,7 @@ bangRod = defaultGun
, _reloadType = ActiveClear
}
}
& itUse . useAim . aimSpeed .~ 0.2
& itUse . useAim . aimWeight .~ 8
& itUse . useAim . aimRange .~ 1
& itUse . useAim . aimStance .~ OneHand
& itUse . useAim . aimZoom .~ defaultItZoom {_itZoomFac = 1.5}
src/Dodge/Item/Weapon/BulletGuns.hs
+4 -4
View File
@@ -72,7 +72,7 @@ autoGun = defaultAutoGun
, withMuzFlareI
, withSmoke 1 black 20 200 5
]
& useAim . aimSpeed .~ 0.4
& useAim . aimWeight .~ 6
& useAim . aimRange .~ 1
& useAim . aimStance .~ TwoHandTwist
& useAim . aimZoom .~ defaultItZoom {_itZoomFac = 1.5}
@@ -177,7 +177,7 @@ blunderbuss = bangCone
& itConsumption . ammoBaseMax .~ 25
& itConsumption . reloadTime .~ 30
& itUse . useAim . aimStance .~ TwoHandTwist
& itUse . useAim . aimSpeed .~ 0.4
& itUse . useAim . aimWeight .~ 6
bigBlunderbuss :: Item
bigBlunderbuss = blunderbuss
{_itName = "BIGBLUNDERBUSS"
@@ -229,7 +229,7 @@ hvAutoGun = defaultAutoGun
, withThinSmokeI
, withMuzFlareI
]
& useAim . aimSpeed .~ 0.2
& useAim . aimWeight .~ 8
& useAim . aimRange .~ 1
& useAim . aimStance .~ TwoHandTwist
& useAim . aimZoom .~ defaultItZoom {_itZoomFac = 1.5}
@@ -291,7 +291,7 @@ longGun = defaultGun
, withTorqueAfter
, withMuzFlareI
]
& useAim . aimSpeed .~ 0.2
& useAim . aimWeight .~ 8
& useAim . aimRange .~ 1
& useAim . aimStance .~ TwoHandTwist
& useAim . aimZoom .~ defaultItZoom {_itZoomMax = 0.5, _itZoomMin = 0.5}
src/Dodge/Item/Weapon/Drone.hs
+1 -1
View File
@@ -34,7 +34,7 @@ lasDrones = defaultGun
, withSoundStart tap4S
, useAmmoAmount 1
]
& useAim . aimSpeed .~ 0.2
& useAim . aimWeight .~ 8
& useAim . aimRange .~ 0.5
& useAim . aimStance .~ TwoHandTwist
, _itEffect = NoItEffect
src/Dodge/Item/Weapon/Launcher.hs
+1 -1
View File
@@ -58,7 +58,7 @@ launcher = defaultGun
, withSoundStart tap4S
, useAmmoAmount 1
]
& useAim . aimSpeed .~ 0.2
& useAim . aimWeight .~ 8
& useAim . aimRange .~ 0.5
& useAim . aimStance .~ TwoHandTwist
, _itParams = ShellLauncher
src/Dodge/Item/Weapon/SonicGuns.hs
+1 -1
View File
@@ -42,7 +42,7 @@ sonicGun = defaultAutoGun
, useTimeCheck
, useAmmoAmount 1
]
& useAim . aimSpeed .~ 0.4
& useAim . aimWeight .~ 6
& useAim . aimRange .~ 1
& useAim . aimStance .~ TwoHandTwist
, _itParams = NoParams
src/Dodge/Item/Weapon/SprayGuns.hs
+1 -1
View File
@@ -140,7 +140,7 @@ flameThrower = defaultAutoGun
--, withTempLight 1 100 (V3 1 0 0)
, withSidePushAfterI 20
]
& useAim . aimSpeed .~ 0.5
& useAim . aimWeight .~ 5
& useAim . aimZoom .~ defaultItZoom {_itZoomMax = 5, _itZoomMin = 1.5}
& useAim . aimStance .~ TwoHandTwist
-- , _itFloorPict = flamerPic