Skip to content

Commit 338a5cc

Browse files
committed
Rename a bunch of stuff to say isometry instead of starlight.
1 parent b3edd1e commit 338a5cc

File tree

9 files changed

+20
-36
lines changed

9 files changed

+20
-36
lines changed

.ghci.repl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- GHCI settings for starlight, collected by running cabal repl -v and checking out the flags cabal passes to ghc.
1+
-- GHCI settings for isometry, collected by running cabal repl -v and checking out the flags cabal passes to ghc.
22
-- These live here instead of script/repl for ease of commenting.
33
-- These live here instead of .ghci so cabal repl remains unaffected.
44
-- These live here instead of script/ghci-flags so ghcide remains unaffected.

README.md

+3-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# `starlight`
1+
# `isometry`
22

3-
<img width="2048" alt="screenshot showing player’s ship in quite a close approach to Mercury" src="https://user-images.githubusercontent.com/59671/74091980-28e20780-4a8c-11ea-8ed8-15247cb06eaf.png">
3+
Messing around with programmatic tiling in an isometric setting.
44

55

66
## Development
@@ -18,21 +18,4 @@ cabal build # to set up dist-newstyle with the ghc package db
1818

1919
Run `script/repl` to load the project (both library & executable) into the REPL. In the REPL, `:main` will launch the game. Use `:main --profile` to enable profiling (timings for various parts of the game, shown on exit).
2020

21-
Alternatively, `cabal run starlight` will launch the game. Use `cabal run starlight -- --profile` to enable profiling.
22-
23-
24-
## Controls
25-
26-
Controls are currently hard-coded; I intend to eventually make them configurable.
27-
28-
- Up arrow: forward thrust
29-
- Left/right arrows: turn left/right
30-
- Down arrow: turn to face opposite direction from current heading (relative to target’s heading, if any, or absolute otherwise; helps you match speed and heading to target’s)
31-
- +/-: increase/decrease throttle (controls rate of thrust)
32-
- tab/shift tab: switch to the next/prev target
33-
- escape: clear the target
34-
- space: fire weapons in the direction you’re facing
35-
- t: turn to face the selected target (if any)
36-
- f: face in the direction the ship is moving
37-
- b: brake/match speed to target
38-
- j: jump to the target (if any)
21+
Alternatively, `cabal run isometry` will launch the game. Use `cabal run isometry -- --profile` to enable profiling.

starlight.cabal renamed to isometry.cabal

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cabal-version: 2.2
22

3-
name: starlight
3+
name: isometry
44
version: 0.0.0.0
55
-- synopsis:
66
-- description:
7-
homepage: https://github.com/robrix/starlight#readme
7+
homepage: https://github.com/robrix/isometry#readme
88
license: BSD-3-Clause
99
license-file: LICENSE
1010
author: Rob Rix
@@ -148,9 +148,9 @@ library
148148
Unit.Power
149149
Unit.Time
150150
other-modules:
151-
Paths_starlight
151+
Paths_isometry
152152
autogen-modules:
153-
Paths_starlight
153+
Paths_isometry
154154
build-depends:
155155
, adjunctions
156156
, base
@@ -181,15 +181,15 @@ library
181181
, unordered-containers
182182
, vector ^>= 0.12
183183

184-
executable starlight
184+
executable isometry
185185
import: common
186186
hs-source-dirs: app
187187
main-is: Main.hs
188188
ghc-options: -threaded -rtsopts -with-rtsopts=-N
189189
build-depends:
190190
, base
191-
, starlight
191+
, isometry
192192

193193
source-repository head
194194
type: git
195-
location: https://github.com/robrix/starlight
195+
location: https://github.com/robrix/isometry

script/ghci-flags

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ function flags {
3232

3333
# preprocessor options, for -XCPP
3434
echo "-optP-include"
35-
echo "-optP$build_dir/starlight-0.0.0.0/build/autogen/cabal_macros.h"
35+
echo "-optP$build_dir/isometry-0.0.0.0/build/autogen/cabal_macros.h"
3636

3737
# autogenerated sources, both .hs and .h (e.g. Foo_paths.hs)
38-
echo "-i$build_dir/starlight-0.0.0.0/build/autogen"
39-
echo "-I$build_dir/starlight-0.0.0.0/build/autogen"
38+
echo "-i$build_dir/isometry-0.0.0.0/build/autogen"
39+
echo "-I$build_dir/isometry-0.0.0.0/build/autogen"
4040

4141
# .hs source dirs
4242
echo "-iapp"

script/ghci-flags-dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ cd $(dirname "$0")/..
77

88
echo "cabal.project"
99

10-
echo "starlight.cabal"
10+
echo "isometry.cabal"

script/repl

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ cd "$(dirname "$0")/.."
99
# cabal v2-build all --only-dependencies
1010

1111
cores=$(sysctl -n machdep.cpu.core_count || echo 4)
12-
env starlight_datadir=. cabal v2-exec env -- -u GHC_ENVIRONMENT ghci +RTS -N$((cores + 1)) -RTS -ghci-script=.ghci.repl $(script/ghci-flags) -no-ignore-dot-ghci $@
12+
env isometry_datadir=. cabal v2-exec env -- -u GHC_ENVIRONMENT ghci +RTS -N$((cores + 1)) -RTS -ghci-script=.ghci.repl $(script/ghci-flags) -no-ignore-dot-ghci $@

src/Starlight/CLI.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import Data.Generics.Product.Fields
2222
import Data.Version (showVersion)
2323
import GHC.Generics (Generic)
2424
import Options.Applicative
25-
import qualified Paths_starlight as Library (version)
25+
import qualified Paths_isometry as Library (version)
2626

2727
data Options = Options
2828
{ profile :: Flag ShouldProfile
@@ -68,7 +68,7 @@ options = foldl' (&) defaultOptions <$> sequenceA
6868

6969

7070
versionString :: String
71-
versionString = "starlight version " <> showVersion Library.version
71+
versionString = "isometry version " <> showVersion Library.version
7272

7373
version :: Parser (a -> a)
7474
version = infoOption versionString (long "version" <> short 'V' <> help "Output version info.")

src/Starlight/Ship.hs

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ radar_ :: Lens' Ship Radar
3434
radar_ = field @"radar"
3535

3636

37+
-- | Components are parts of ships. A ship has multiple components, and can only perform actions if it has the required components to do so.
3738
data Component
3839
= Cargo
3940
| Engine

src/Starlight/Sol.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import qualified Data.IntMap as IntMap
1818
import qualified Data.Map as Map
1919
import Database.SQLite3 (SQLData(..))
2020
import Linear.Exts
21-
import Paths_starlight
21+
import Paths_isometry
2222
import Starlight.Body
2323
import Starlight.Faction
2424
import Starlight.Identifier

0 commit comments

Comments
 (0)