Skip to content

Commit

Permalink
Finish v5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
hsandt committed Dec 17, 2020
2 parents 00ea8a6 + 2a1f058 commit 3ce8a25
Show file tree
Hide file tree
Showing 12 changed files with 63 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ script:

before_deploy:
# zip multiple cartridges (including data) into one distributable archive
- cp data/data_stage*.p8 "build/v${BUILD_VERSION}_release"
- cp data/data_*.p8 "build/v${BUILD_VERSION}_release"
- pushd "build/v${BUILD_VERSION}_release"
- zip -r "picosonic_v${BUILD_VERSION}_release_cartridges.zip" .
- popd
Expand Down
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [5.1] - 2020-12-17
### Changed
- Audio: fixed Travis release for GitHub forgetting to upload BGM cartridge (a glitchy version of Green Hill Zone was played instead of Angel Island)

## [5.0] - 2020-12-10
### Added
- Title: added title background showing "Pico Island" with water shimmer animation, pico-sonic logo, Sonic 3 (not 3 & Knuckles) intro jingle, and title menu showing after a short time
Expand Down Expand Up @@ -197,8 +201,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Game: in-game: debug character flies X/Y on directional input, go back to title menu on reach goal
- Test: all busted unit tests in separator folder tests

[Unreleased]: https://github.com/hsandt/sonic-pico8/compare/v5.0...HEAD
[5.0]: https://github.com/hsandt/sonic-pico8/compare/v4.2...v4.3
[Unreleased]: https://github.com/hsandt/sonic-pico8/compare/v5.1...HEAD
[5.1]: https://github.com/hsandt/sonic-pico8/compare/v5.0...v5.1
[5.0]: https://github.com/hsandt/sonic-pico8/compare/v4.2...v5.0
[4.2]: https://github.com/hsandt/sonic-pico8/compare/v4.1...v4.2
[4.1]: https://github.com/hsandt/sonic-pico8/compare/v4.0...v4.1
[4.0]: https://github.com/hsandt/sonic-pico8/compare/v3.1...v4.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Works with PICO-8 0.2.0i and 0.2.1b.

## Features

Version: 5.0
Version: 5.1

### Physics

Expand Down
2 changes: 1 addition & 1 deletion build_itest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ build_output_path="$(dirname "$0")/build"
author="leyn"
title="pico sonic itests (all)"
cartridge_stem="picosonic_itest_all"
version="5.0"
version="5.1"
config='itest'
# symbols='assert,log,visual_logger,tuner,profiler,mouse,itest'
# cheat needed to set debug motion mode
Expand Down
2 changes: 1 addition & 1 deletion build_pico8_utests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ build_output_path="$(dirname "$0")/build"
author="leyn"
title="pico sonic - pico8 utests (all)"
cartridge_stem="picosonic_pico8_utests_all"
version="5.0"
version="5.1"
config='debug'
symbols='assert,tostring,dump,log,p8utest'

Expand Down
2 changes: 1 addition & 1 deletion build_single_cartridge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ data_path="$(dirname "$0")/data"
author="leyn"
title="pico sonic"
cartridge_stem="picosonic"
version="5.0"
version="5.1"

help() {
echo "Build a PICO-8 cartridge with the passed config."
Expand Down
33 changes: 24 additions & 9 deletions export_cartridge_release.p8
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,41 @@ __lua__
-- Note that it will not warn if cartridge is not found.
-- Paths are relative to PICO-8 carts directory.

cd("picosonic/v5.0_release")
cd("picosonic/v5.1_release")

local entry_cartridge = "picosonic_titlemenu.p8"

local additional_cartridges_list = {
"picosonic_ingame.p8",
"picosonic_stage_clear.p8",
"data_bgm1.p8",
"data_stage1_00.p8", "data_stage1_10.p8", "data_stage1_20.p8",
"data_stage1_01.p8", "data_stage1_11.p8", "data_stage1_21.p8"
"data_stage1_01.p8", "data_stage1_11.p8", "data_stage1_21.p8",
"data_stage1_runtime.p8"
}

-- first, load the additional cartridges just to save them as png cartridges
-- before we load the entry cartridge
-- the metadata label is used automatically
-- prepare folder for png cartridges
mkdir("picosonic_v5.1_release.png")

-- load each additional cartridge to save it as png cartridge
-- in folder created above
-- the metadata label is used automatically for each
for cartridge_name in all(additional_cartridges_list) do
load(cartridge_name)

cd("picosonic_v5.1_release.png")
save(cartridge_name..".png")
cd("..")
end

-- second, load the entry cartridge (titlemenu)
-- load the entry cartridge (titlemenu) last, since we're going to use it for export
-- just after
load(entry_cartridge)

-- save png cartridge
-- save as png cartridge
cd("picosonic_v5.1_release.png")
save(entry_cartridge..".png")
cd("..")

-- concatenate cartridge names with space separator with a very simplified version
-- of string.lua > joinstr_table that doesn't mind about adding an initial space
Expand All @@ -47,5 +58,9 @@ end
-- with top-left at sprite 160 (run1) => -i 160
-- on pink (color 14) background => -c 14
-- and most importantly we pass ingame, stage_clear and data files as additional cartridges
export("picosonic_v5.0_release.bin "..additional_cartridges_string.." -i 160 -s 2 -c 14")
export("picosonic_v5.0_release.html "..additional_cartridges_string.." -i 160 -s 2 -c 14")
export("picosonic_v5.1_release.bin "..additional_cartridges_string.." -i 160 -s 2 -c 14")

mkdir("picosonic_v5.1_release.web")
cd("picosonic_v5.1_release.web")
export("picosonic_v5.1_release.html "..additional_cartridges_string.." -i 160 -s 2 -c 14")
cd("..")
2 changes: 1 addition & 1 deletion install_single_cartridge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fi

# Configuration: cartridge
cartridge_stem="picosonic"
version="5.0"
version="5.1"
cartridge_suffix="$1"; shift
config="$1"; shift

Expand Down
2 changes: 1 addition & 1 deletion run_cartridge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# Configuration: cartridge
cartridge_stem="picosonic"
version="5.0"
version="5.1"

# shift allows to pass extra arguments as $@
cartridge_suffix="$1"; shift
Expand Down
2 changes: 1 addition & 1 deletion run_itest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Configuration: cartridge
cartridge_stem="picosonic_itest_all"
version="5.0"
version="5.1"

cartridge_suffix="$1"; shift

Expand Down
2 changes: 1 addition & 1 deletion run_pico8_utests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Configuration: cartridge
cartridge_stem="picosonic_pico8_utests_all"
version="5.0"
version="5.1"

run_cmd="pico8 -run build/${cartridge_stem}_v${version}_debug.p8 -screenshot_scale 4 -gif_scale 4 $@"

Expand Down
23 changes: 23 additions & 0 deletions sonic-2d-tech-demo.sublime-project
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,29 @@
}
]
},
{
"name": "Game: build full game",
"working_dir": "${project_path}",
"shell": true,
"cmd": ["./build_and_install_all_cartridges.sh debug"],
"file_regex": "(.*\\.sh)(?:\\: line )([\\d]+)(?:\\:)([\\d]+)? (.*)",
"syntax": "Packages/Python/Python.sublime-syntax",
"variants":
[
{
"name": "debug",
"cmd": ["./build_and_install_all_cartridges.sh debug"]
},
{
"name": "cheat",
"cmd": ["./build_and_install_all_cartridges.sh cheat"]
},
{
"name": "release",
"cmd": ["./build_and_install_all_cartridges.sh release"]
}
]
},
{
"name": "Game: build itests titlemenu",
"working_dir": "${project_path}",
Expand Down

0 comments on commit 3ce8a25

Please sign in to comment.