diff --git a/examples/community/ASharedJourney/Makefile b/examples/community/ASharedJourney/Makefile deleted file mode 100644 index 53f7fd1..0000000 --- a/examples/community/ASharedJourney/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -run: - ./build_assets.sh - go run main.go - -build_mac: - ./build_mac.sh - -build_assets: - ./build_assets.sh diff --git a/examples/community/ASharedJourney/README.md b/examples/community/ASharedJourney/README.md index 315685c..b5dce04 100644 --- a/examples/community/ASharedJourney/README.md +++ b/examples/community/ASharedJourney/README.md @@ -1,7 +1,7 @@ # ASharedJourney This is a fork of a project originally developed during the SFR game jam along side Pierre, Gabriel, Aurore & Fabio. - +Original repo can be found [here](https://github.com/gandrin/ASharedJourney). This project uses the go [pixel](https://github.com/faiface/pixel) package for sound management and sprites, go check them out. @@ -19,27 +19,13 @@ This project uses the go [pixel](https://github.com/faiface/pixel) package for s ## Building and running -### Installation - -- First, install the game and its dependencies - -```bash -go get -u github.com/gandrin/ASharedJourney -``` - -- You will also need the `go-bindata` program to build the assets into the binary file +- You will need the `go-bindata` program to build the assets into the binary file ```bash go get -u github.com/jteeuwen/go-bindata/... ``` -> Make sure your `$GOPATH` is set :wink: - -### Run - -``` -make run -``` +> Make sure your `$GOPATH` is set to the root of pixel :wink: ### Releasing diff --git a/examples/community/ASharedJourney/animation/background.go b/examples/community/ASharedJourney/animation/background.go index 6b7b98c..ed00233 100644 --- a/examples/community/ASharedJourney/animation/background.go +++ b/examples/community/ASharedJourney/animation/background.go @@ -4,7 +4,7 @@ import ( "log" - "github.com/gandrin/ASharedJourney/shared" + "github.com/faiface/pixel/examples/community/ASharedJourney/shared" ) //placeholder diff --git a/examples/community/ASharedJourney/animation/game_animator.go b/examples/community/ASharedJourney/animation/game_animator.go index 819791f..a865598 100644 --- a/examples/community/ASharedJourney/animation/game_animator.go +++ b/examples/community/ASharedJourney/animation/game_animator.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/gandrin/ASharedJourney/mechanics" - "github.com/gandrin/ASharedJourney/shared" + "github.com/faiface/pixel/examples/community/ASharedJourneymechanics" + "github.com/faiface/pixel/examples/community/ASharedJourney/shared" ) type Animator struct { diff --git a/examples/community/ASharedJourney/main.go b/examples/community/ASharedJourney/main.go index 38731d2..7b8bdc7 100644 --- a/examples/community/ASharedJourney/main.go +++ b/examples/community/ASharedJourney/main.go @@ -3,17 +3,16 @@ package main import ( "time" - "github.com/gandrin/ASharedJourney/supervisor" - "github.com/faiface/pixel" "github.com/faiface/pixel/pixelgl" - "github.com/gandrin/ASharedJourney/tiles" + "github.com/faiface/pixel/examples/community/ASharedJourney/tiles" "golang.org/x/image/colornames" - "github.com/gandrin/ASharedJourney/mechanics" - "github.com/gandrin/ASharedJourney/menu" - "github.com/gandrin/ASharedJourney/music" - "github.com/gandrin/ASharedJourney/shared" + "github.com/faiface/pixel/examples/community/ASharedJourney/mechanics" + "github.com/faiface/pixel/examples/community/ASharedJourney/music" + "github.com/faiface/pixel/examples/community/ASharedJourney/shared" + "github.com/faiface/pixel/examples/community/ASharedJourney/menu" + "github.com/faiface/pixel/examples/community/ASharedJourney/supervisor" ) const frameRate = 60 diff --git a/examples/community/ASharedJourney/mechanics/game_mechanics.go b/examples/community/ASharedJourney/mechanics/game_mechanics.go index ca5e446..19b2140 100644 --- a/examples/community/ASharedJourney/mechanics/game_mechanics.go +++ b/examples/community/ASharedJourney/mechanics/game_mechanics.go @@ -6,12 +6,12 @@ import ( "log" "time" - "github.com/gandrin/ASharedJourney/shared" - "github.com/gandrin/ASharedJourney/supervisor" - "github.com/gandrin/ASharedJourney/tiles" - "github.com/gandrin/ASharedJourney/menu" + "github.com/faiface/pixel/examples/community/ASharedJourney/shared" + "github.com/faiface/pixel/examples/community/ASharedJourney/supervisor" + "github.com/faiface/pixel/examples/community/ASharedJourney/tiles" + "github.com/faiface/pixel/examples/community/ASharedJourney/menu" "github.com/faiface/pixel" - "github.com/gandrin/ASharedJourney/music" + "github.com/faiface/pixel/examples/community/ASharedJourney/music" "image/color" ) diff --git a/examples/community/ASharedJourney/mechanics/motion.go b/examples/community/ASharedJourney/mechanics/motion.go index 31e554f..1d0c4d0 100644 --- a/examples/community/ASharedJourney/mechanics/motion.go +++ b/examples/community/ASharedJourney/mechanics/motion.go @@ -4,10 +4,10 @@ import ( "reflect" "github.com/faiface/pixel" - "github.com/gandrin/ASharedJourney/menu" - "github.com/gandrin/ASharedJourney/music" - "github.com/gandrin/ASharedJourney/supervisor" - "github.com/gandrin/ASharedJourney/tiles" + "github.com/faiface/pixel/examples/community/ASharedJourney/menu" + "github.com/faiface/pixel/examples/community/ASharedJourney/music" + "github.com/faiface/pixel/examples/community/ASharedJourney/supervisor" + "github.com/faiface/pixel/examples/community/ASharedJourney/tiles" ) //move function receives as input the data from a player direction channel diff --git a/examples/community/ASharedJourney/menu/menu.go b/examples/community/ASharedJourney/menu/menu.go index 2560e6c..9312d1d 100644 --- a/examples/community/ASharedJourney/menu/menu.go +++ b/examples/community/ASharedJourney/menu/menu.go @@ -7,13 +7,13 @@ import ( "log" "time" - "github.com/gandrin/ASharedJourney/assets_manager" + "github.com/faiface/pixel/examples/community/ASharedJourney/assets_manager" "github.com/faiface/pixel" "github.com/faiface/pixel/pixelgl" "github.com/faiface/pixel/text" - "github.com/gandrin/ASharedJourney/music" - "github.com/gandrin/ASharedJourney/shared" + "github.com/faiface/pixel/examples/community/ASharedJourney/music" + "github.com/faiface/pixel/examples/community/ASharedJourney/shared" "golang.org/x/image/colornames" "golang.org/x/image/font/basicfont" ) diff --git a/examples/community/ASharedJourney/music/game_music.go b/examples/community/ASharedJourney/music/game_music.go index feeeffe..35ad5c6 100644 --- a/examples/community/ASharedJourney/music/game_music.go +++ b/examples/community/ASharedJourney/music/game_music.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - "github.com/gandrin/ASharedJourney/assets_manager" + "github.com/faiface/pixel/examples/community/ASharedJourney/assets_manager" "github.com/faiface/beep" "github.com/faiface/beep/mp3" diff --git a/examples/community/ASharedJourney/supervisor/direction.go b/examples/community/ASharedJourney/supervisor/direction.go index 035683e..bbdfd23 100644 --- a/examples/community/ASharedJourney/supervisor/direction.go +++ b/examples/community/ASharedJourney/supervisor/direction.go @@ -2,7 +2,7 @@ package supervisor import ( "github.com/faiface/pixel" - "github.com/gandrin/ASharedJourney/tiles" + "github.com/faiface/pixel/examples/community/ASharedJourney/tiles" ) //call motion diff --git a/examples/community/ASharedJourney/supervisor/event_catcher.go b/examples/community/ASharedJourney/supervisor/event_catcher.go index c163932..4580606 100644 --- a/examples/community/ASharedJourney/supervisor/event_catcher.go +++ b/examples/community/ASharedJourney/supervisor/event_catcher.go @@ -4,7 +4,7 @@ import ( "log" "github.com/faiface/pixel/pixelgl" - "github.com/gandrin/ASharedJourney/shared" + "github.com/faiface/pixel/examples/community/ASharedJourney/shared" ) type Event string diff --git a/examples/community/ASharedJourney/supervisor/game_suppervisor.go b/examples/community/ASharedJourney/supervisor/game_suppervisor.go index 5f88d52..523ac38 100644 --- a/examples/community/ASharedJourney/supervisor/game_suppervisor.go +++ b/examples/community/ASharedJourney/supervisor/game_suppervisor.go @@ -4,7 +4,7 @@ package supervisor import ( "time" - "github.com/gandrin/ASharedJourney/shared" + "github.com/faiface/pixel/examples/community/ASharedJourney/shared" ) type PlayerDirections struct { diff --git a/examples/community/ASharedJourney/supervisor/input_key.go b/examples/community/ASharedJourney/supervisor/input_key.go index 46bc5fa..c01e45a 100644 --- a/examples/community/ASharedJourney/supervisor/input_key.go +++ b/examples/community/ASharedJourney/supervisor/input_key.go @@ -2,7 +2,7 @@ package supervisor import ( "github.com/faiface/pixel/pixelgl" - "github.com/gandrin/ASharedJourney/shared" + "github.com/faiface/pixel/examples/community/ASharedJourney/shared" ) //transition Direction in x , y coordinates diff --git a/examples/community/ASharedJourney/tiles/tile_manager.go b/examples/community/ASharedJourney/tiles/tile_manager.go index 7851a6b..77e633c 100644 --- a/examples/community/ASharedJourney/tiles/tile_manager.go +++ b/examples/community/ASharedJourney/tiles/tile_manager.go @@ -7,11 +7,9 @@ import ( "image" "os" - "github.com/gandrin/ASharedJourney/assets_manager" + "github.com/faiface/pixel/examples/community/ASharedJourney/assets_manager" tiled "github.com/lafriks/go-tiled" - "github.com/gandrin/ASharedJourney/shared" - _ "image/png" "log" @@ -20,8 +18,9 @@ import ( "github.com/faiface/pixel" "github.com/faiface/pixel/pixelgl" - "github.com/gandrin/ASharedJourney/menu" - "github.com/gandrin/ASharedJourney/music" + "github.com/faiface/pixel/examples/community/ASharedJourney/menu" + "github.com/faiface/pixel/examples/community/ASharedJourney/music" + "github.com/faiface/pixel/examples/community/ASharedJourney/shared" ) // Level names