Tweak display, scrolling of item values

This commit is contained in:
2025-01-07 21:10:29 +00:00
parent b3cf10bd26
commit 5fa5bdf21e
18 changed files with 367 additions and 384 deletions
+1 -2
View File
@@ -19,14 +19,13 @@ import Data.Aeson.TH
import Dodge.GameRoom
import Geometry.ConvexPoly
import Dodge.Data.Camera
import qualified Data.IntSet as IS
import Data.Graph.Inductive
data CWorld = CWorld
{ _lWorld :: LWorld
, _cwGen :: CWGen
, _cClock :: Int
, _seenWalls :: IS.IntSet
-- , _seenWalls :: IS.IntSet
, _cwTiles :: [Tile]
, _pathGraph :: Gr Point2 PathEdge
, _numberFloorVerxs :: Int
+1 -2
View File
@@ -72,8 +72,7 @@ data TriggerType = AutoTrigger | HammerTrigger
deriving (Eq, Show, Read)
data AttachParams
= APProjectiles
{_apProjectiles :: [Int]}
= APProjectiles {_apProjectiles :: [Int]}
| APInt {_apInt :: Int}
| APNothing
deriving (Eq, Show, Read)
+1 -1
View File
@@ -113,7 +113,7 @@ data LWorld = LWorld
, _flares :: Picture -- picture drawn for one frame
, _teslaArcs :: [TeslaArc]
, _shockwaves :: [Shockwave]
, _lasers :: [LaserStart]
, _lasers :: [Laser]
-- , _lasersToDraw :: [Laser]
, _linearShockwaves :: IM.IntMap LinearShockwave
, _tractorBeams :: [TractorBeam]
+3 -12
View File
@@ -18,7 +18,7 @@ data LaserType
| TargetingLaser {_laserEmmiter :: NewInt ItmInt}
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data LaserStart = LaserStart
data Laser = Laser
{ _lpPhaseV :: Float
, _lpPos :: Point2
, _lpDir :: Float
@@ -27,16 +27,7 @@ data LaserStart = LaserStart
}
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--data Laser = Laser
-- { _lzColor :: Color
-- , _lzPoints :: [Point2]
-- , _lzType :: LaserType
-- }
-- deriving (Eq, Ord, Show, Read) --Generic, Flat)
--makeLenses ''Laser
makeLenses ''LaserStart
makeLenses ''Laser
makeLenses ''LaserType
deriveJSON defaultOptions ''LaserType
deriveJSON defaultOptions ''LaserStart
--deriveJSON defaultOptions ''Laser
deriveJSON defaultOptions ''Laser