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

Cleanup

Browse Source
This commit is contained in:
justin
2022-06-09 11:29:42 +01:00
parent 1789a3785d
commit e4e7122070
43 changed files with 44 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Room/Airlock.hs
+1 -2
View File
@@ -9,12 +9,11 @@ import Dodge.Default.Wall
import Dodge.Data
import Dodge.LevelGen.Data
import Dodge.LevelGen.Switch
import Dodge.RandomHelp
import RandomHelp
import Geometry
import Picture
import qualified Data.IntMap.Strict as IM
import System.Random
import Control.Monad.State
{- | A passage with a switch that opens forward access while closing backwards access. -}
airlock :: RandomGen g => State g Room
src/Dodge/Room/Boss.hs
+1 -2
View File
@@ -12,14 +12,13 @@ import Dodge.Room.Corridor
import Dodge.Room.Path
--import Dodge.LevelGen.Data
import Dodge.Creature
import Dodge.RandomHelp
import RandomHelp
import Dodge.Tree
import Dodge.LevelGen.StaticWalls
import Geometry
import LensHelp
import Control.Monad.State
import System.Random
roomGlassOctogon
:: Float -- ^ Size
-> Room
src/Dodge/Room/Containing.hs
+1 -2
View File
@@ -3,7 +3,7 @@ module Dodge.Room.Containing where
import Dodge.Data
import Dodge.Tree
import Dodge.LevelGen.Data
import Dodge.RandomHelp
import RandomHelp
import Dodge.Room.Procedural
import Dodge.Room.Tanks
import Dodge.Room.Link
@@ -12,7 +12,6 @@ import LensHelp
import Geometry
--import Dodge.Item.Equipment
import System.Random
import Control.Monad.State
import Data.List
src/Dodge/Room/GlassLesson.hs
+1 -2
View File
@@ -4,7 +4,7 @@ import Dodge.RoomLink
import Dodge.Creature
import Dodge.LevelGen.Data
import Dodge.Data
import Dodge.RandomHelp
import RandomHelp
import Dodge.Default.Wall
import Dodge.Tree
import Dodge.Placement.Instance
@@ -19,7 +19,6 @@ import LensHelp
import qualified Data.Set as S
import Control.Monad.State
--import Control.Monad.Loops
import System.Random
glassLesson :: RandomGen g => State g (SubCompTree Room)
glassLesson = do
i <- takeOne [1,2,3]
src/Dodge/Room/LasTurret.hs
+1 -2
View File
@@ -25,13 +25,12 @@ import Geometry
import Color
import Shape
import LensHelp
import Dodge.RandomHelp
import RandomHelp
--import Dodge.SoundLogic
import qualified Data.Set as S
import Data.Maybe
import Control.Monad.State
import System.Random
cenLasTur :: Room
cenLasTur = roomNgon 8 200 & rmPmnts .~
src/Dodge/Room/Link.hs
+1 -3
View File
@@ -21,17 +21,15 @@ import Dodge.ShiftPoint
import Dodge.Placement.Shift
--import Dodge.LevelGen.Data
import Dodge.Data
import Dodge.RandomHelp
import RandomHelp
import Geometry
import Data.Tile
import Dodge.RoomLink
import System.Random
import Control.Monad.State
import Control.Lens
import Data.List
import qualified Data.Set as S
--import System.Random
chooseOneInLink :: RandomGen g => Room -> State g Room
chooseOneInLink r = restrictToFstInLink <$> shuffleLinks r
src/Dodge/Room/LongDoor.hs
+1 -2
View File
@@ -16,7 +16,7 @@ import Dodge.Room.Procedural
--import Dodge.Layout.Tree.Either
--import Dodge.LevelGen.Data
import Dodge.LevelGen.Switch
import Dodge.RandomHelp
import RandomHelp
import Dodge.Creature.Inanimate
import Dodge.Creature
import Dodge.LightSource
@@ -26,7 +26,6 @@ import LensHelp
--import Shape
import qualified Data.Set as S
import System.Random
import Control.Monad.State
import Data.Maybe
--import Data.Tree
src/Dodge/Room/LongRoom.hs
+1 -2
View File
@@ -14,7 +14,7 @@ import Dodge.Room.Procedural
--import Dodge.Layout.Tree.Either
--import Dodge.LevelGen.Data
--import Dodge.LevelGen.Switch
import Dodge.RandomHelp
import RandomHelp
import Dodge.Creature.Inanimate
import Dodge.Creature
--import Dodge.LightSource
@@ -24,7 +24,6 @@ import LensHelp
import Data.Tile
import qualified Data.Set as S
import System.Random
import Control.Monad.State
--import qualified Data.IntMap as IM
src/Dodge/Room/Modify/Girder.hs
+1 -3
View File
@@ -7,7 +7,6 @@ module Dodge.Room.Modify.Girder
--import Dodge.Data
import Dodge.LevelGen.Data
import Dodge.Data
import Dodge.RandomHelp
--import Dodge.Room.Procedural
import Dodge.Room.Foreground
--import Dodge.Room.RoadBlock
@@ -20,12 +19,11 @@ import Color
import Shape
import LensHelp
import Geometry
import RandomHelp
import Data.Maybe
import Data.List (nub)
--import Data.Tree
import Control.Monad.State
import System.Random
import qualified Data.Set as S
addGirderNS :: RandomGen g => (Point2 -> Point2 -> Shape) -> Color -> Room -> State g Room
src/Dodge/Room/NoNeedWeapon.hs
+1 -2
View File
@@ -8,14 +8,13 @@ import Dodge.Creature
import Dodge.LevelGen.Data
import Dodge.Room.Procedural
--import Dodge.Room.Link
import Dodge.RandomHelp
import RandomHelp
--import Dodge.LevelGen.Data
import Geometry.Data
import Control.Lens
--import Control.Monad
import Control.Monad.State
import System.Random
{- |
A room designed to be /passable/ with no weapons.
Highlights an issue: when trying to place next door rooms, if the level generation fails it will try a different link.
src/Dodge/Room/Procedural.hs
+1 -2
View File
@@ -23,7 +23,7 @@ import Dodge.Default.Room
--import Dodge.Item.Consumable
--import Dodge.Item.Equipment
--import Dodge.Item.Weapon
import Dodge.RandomHelp
import RandomHelp
import Dodge.LevelGen.Data
import Dodge.LevelGen.Switch
import Dodge.Creature
@@ -37,7 +37,6 @@ import qualified Data.IntMap.Strict as IM
--import Control.Lens
import Control.Monad
import Control.Monad.State
import System.Random
-- This will need a cleanup, but it might change a bit first
{- A simple rectangular room with a light in the center.
Creates links and pathfinding graph. -}
src/Dodge/Room/RezBox.hs
+1 -2
View File
@@ -9,7 +9,7 @@ import Dodge.Data
--import Dodge.Default
--import Dodge.RoomLink
import Dodge.Tree
import Dodge.RandomHelp
import RandomHelp
import Dodge.Room.Door
import Dodge.Room.Corridor
--import Dodge.Room.Room
@@ -32,7 +32,6 @@ import LensHelp
import qualified Data.Set as S
--import Data.Maybe
import Control.Monad.State
import System.Random
rezBox :: LightSource -> Room
rezBox ls = roomRect 40 60 1 1
src/Dodge/Room/RoadBlock.hs
+1 -2
View File
@@ -10,13 +10,12 @@ import Dodge.Placement.Instance
import Dodge.Room.Corridor
--import Dodge.LevelGen.Data
--import Dodge.Default.Wall
import Dodge.RandomHelp
import RandomHelp
import Dodge.Creature
import Dodge.Tree
import Control.Monad.State
import Control.Lens
import System.Random
armouredCorridor :: RandomGen g => State g Room
armouredCorridor = fmap (replacePutID 0 [PutCrit $ addArmour autoCrit]) litCorridor90
src/Dodge/Room/Room.hs
+1 -2
View File
@@ -10,7 +10,7 @@ import Dodge.Creature
import Dodge.Room.Pillar
import Dodge.Room.Modify.Girder
import Dodge.LevelGen.Data
import Dodge.RandomHelp
import RandomHelp
import Dodge.Default.Wall
import Dodge.Tree
import Dodge.Placement.Instance
@@ -29,7 +29,6 @@ import LensHelp
import qualified Data.Set as S
import Control.Monad.State
--import Control.Monad.Loops
import System.Random
import Data.Bifunctor
roomC :: RandomGen g => Float -> Float -> State g Room
src/Dodge/Room/RunPast.hs
+1 -2
View File
@@ -5,7 +5,7 @@ import Dodge.RoomLink
import Dodge.Data
--import Dodge.Default
--import Dodge.Layout.Tree.Either
import Dodge.RandomHelp
import RandomHelp
import Dodge.Room.Door
--import Dodge.Room.Room
import Dodge.Room.Link
@@ -27,7 +27,6 @@ import LensHelp
import qualified Data.Set as S
import Control.Monad.State
import System.Random
--import qualified Data.IntMap.Strict as IM
horEdgeTest :: (Float -> Bool) -> ((Point2,Float) -> Bool)
src/Dodge/Room/SensorDoor.hs
+1 -2
View File
@@ -27,13 +27,12 @@ import Color
import Shape
--import Lorem
import LensHelp
import Dodge.RandomHelp
import RandomHelp
import qualified Data.Set as S
import Data.Maybe
--import Data.Tree
import Control.Monad.State
import System.Random
-- TODO fix case where the sensor created by sensInsideDoor blocks another door
-- for roomRectAutoLinks-- make the locked door a center door?
src/Dodge/Room/Start.hs
+1 -2
View File
@@ -11,7 +11,7 @@ import Dodge.Room.LongDoor
--import Dodge.Default
--import Dodge.RoomLink
import Dodge.Tree
import Dodge.RandomHelp
import RandomHelp
import Dodge.Room.Door
import Dodge.Room.RezBox
import Dodge.Room.Corridor
@@ -28,7 +28,6 @@ import LensHelp
--import Data.Maybe
--import Data.Tree
import Control.Monad.State
import System.Random
--import qualified Data.IntMap.Strict as IM
powerFakeout :: RandomGen g => State g (SubCompTree Room)
src/Dodge/Room/Tanks.hs
+1 -2
View File
@@ -1,7 +1,7 @@
module Dodge.Room.Tanks where
import Dodge.Data
import Dodge.LevelGen.Data
import Dodge.RandomHelp
import RandomHelp
import Dodge.Room.Procedural
import Dodge.Room.Foreground
import Dodge.Room.Modify.Girder
@@ -18,7 +18,6 @@ import LensHelp
--import Data.Maybe
--import Data.Tree
import Control.Monad.State
import System.Random
--import qualified Data.Set as S
randomTank :: RandomGen g => State g Placement
src/Dodge/Room/Warning.hs
+1 -2
View File
@@ -26,7 +26,7 @@ import Geometry
--import Shape
--import Lorem
import LensHelp
import Dodge.RandomHelp
import RandomHelp
--import qualified Data.Set as S
import Data.Maybe
@@ -34,7 +34,6 @@ import qualified Data.Map.Strict as M
--import Data.Char
--import Data.Tree
import Control.Monad.State
import System.Random
--import qualified Data.Text as T