From 8489f37f83cf301d1f39fab1697a76dca6ff7d9b Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 22 Nov 2021 10:44:56 +0000 Subject: [PATCH] Tweak drones --- src/Dodge/Item/Weapon/Drone.hs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Dodge/Item/Weapon/Drone.hs b/src/Dodge/Item/Weapon/Drone.hs index 681098755..31602e7f4 100644 --- a/src/Dodge/Item/Weapon/Drone.hs +++ b/src/Dodge/Item/Weapon/Drone.hs @@ -1,7 +1,6 @@ module Dodge.Item.Weapon.Drone where import Dodge.Data import Dodge.Default.Weapon -import Dodge.Default.Shell import Dodge.SoundLogic.LoadSound import Dodge.Item.Weapon.TriggerType import Geometry @@ -21,10 +20,10 @@ import Control.Lens lasDrones :: Item lasDrones = defaultGun - { _itName = "ROCKO" - , _itIdentity = Launcher - , _wpMaxAmmo = 30 - , _wpLoadedAmmo = 30 + { _itName = "DRONES" + , _itIdentity = Generic + , _wpMaxAmmo = 2 + , _wpLoadedAmmo = 2 , _wpReloadTime = 80 , _wpReloadState = 0 , _itUseRate = 20 @@ -68,14 +67,11 @@ aDroneWithItemParams it cr w = over props (IM.insert i theShell) w pos = _crPos cr +.+ ((_crRad cr +1) *.* unitVectorAtAngle dir) dir = _crDir cr --ammoMvs pj w' = foldr (\pjP -> _pjMoveParam pjP (_pjIntParam pjP) it cr pj) w' (_amPjParams am) - theShell = defaultShell + theShell = Drone { _pjPos = pos , _pjStartPos = pos , _pjVel = rotateV dir (V2 1 0) - , _pjAcc = rotateV dir (V2 3 0) , _prDraw = _amPjDraw am , _pjID = i , _pjUpdate = \_ -> id - , _pjPayload = _amPayload am - , _pjTimer = 50 }