Cleanup tesla arcs

2022-03-24 08:05:58 +00:00
parent 64be9ee7a8
commit 11d954674c
8 changed files with 111 additions and 196 deletions
@@ -46,6 +46,7 @@ import Shape

 import GHC.Generics
 import Control.Lens
+import Control.Monad.State
 import System.Random
 import Data.Graph.Inductive
 import qualified Data.Set as S
@@ -640,7 +641,16 @@ data ItemParams
        , _currentWalkAngle :: Float
        , _walkSpeed :: Float
        }
-    | Arcing { _currentArc :: Maybe [(Point2,Float,Maybe (Either Creature Wall))] }
+    | Arcing 
+        { _currentArc :: Maybe [(Point2,Float,Maybe (Either Creature Wall))] 
+        , _arcSize :: Float
+        , _arcNumber :: Int
+        , _newArcStep :: ItemParams -> World 
+            -> (Point2,Float,Maybe (Either Creature Wall))
+            -> State StdGen (Maybe (Point2,Float,Maybe (Either Creature Wall)))
+        , _previousArcEffect :: PreviousArcEffect
+        }
+data PreviousArcEffect = NoPreviousArcEffect | PerturbTillBreakPreviousArc
 data Modification
    = ModIDTimerPoint3Bool
        { _mdID     :: Int
@@ -808,6 +818,7 @@ data Wall = Wall
    , _wlRotateTo   :: Bool
    , _wlStructure  :: WallStructure
    , _wlHeight     :: Float
+    , _wlDamageEff  :: Damage -> Wall -> World -> World
    }
 data Opacity
    = SeeThrough