From d1746983cf8f27a1e0f06e69e20e70e0ca29162c Mon Sep 17 00:00:00 2001 From: Damian Yerrick Date: Tue, 16 Oct 2018 23:58:36 -0400 Subject: [PATCH] fix make dist for v0.01 --- .gitignore | 2 ++ 05-burndown/note_from_nocash.md | 11 ++++++----- LICENSE | 22 ++++++++++++++++++++++ README.md | 14 ++++++++++---- makefile | 8 +++++--- obj/gb/index.txt | 2 +- 6 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 LICENSE diff --git a/.gitignore b/.gitignore index e7490e2..3d9857a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ __pycache__ /obj/gb/ /*.map /*.sym +/zip.in +/libbet-*.zip diff --git a/05-burndown/note_from_nocash.md b/05-burndown/note_from_nocash.md index 6cef132..f0f6109 100644 --- a/05-burndown/note_from_nocash.md +++ b/05-burndown/note_from_nocash.md @@ -21,9 +21,9 @@ Once I secured permission, I got to work. distinctive enough in both shade and texture for the low-contrast monochrome passive-matrix STN LCD of the original Game Boy. 2. The game's intro mentions "you are a boulder". Design and animate - a "boulder girl" inspired by the pear-shaped Terra-Firmians from - _DuckTales_ episode "Earth Quack". Write a Python tool to read - sprites off a sprite sheet. + Libbet, a boulder girl inspired by the pear-shaped Terra-Firmians + from _DuckTales_ episode "Earth Quack". Write a Python tool to + read cels off a sprite sheet and combine duplicate tiles. 3. Write a reference implementation of floor generation in Python. Add constraints to reject unplayable floors. To the original, which only ensured maximum score >= area, I added three: same @@ -43,5 +43,6 @@ Once I secured permission, I got to work. floor, move a plain boulder on the floor, track score, open a door at the far end once score reaches 90 percent of maximum, replace the plain boulder with the animated boulder girl, and sequence the - floor sizes. This leaves us two weeks later with a 6502-byte - Game Boy game. + floor sizes. Two weeks later, with a 6502-byte Game Boy game in + hand, come clean about the title. But leave Libbet's name in the + title because `magic floor game` isn't distinctive in web search. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2b49c6c --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +The zlib License +================ + +Copyright (c) 2018 Damian Yerrick + +This software is provided 'as-is', without any express or implied warranty. In +no event will the authors be held liable for any damages arising from the use of +this software. + +Permission is granted to anyone to use this software for any purpose, including +commercial applications, and to alter it and redistribute it freely, subject to +the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a product, + an acknowledgment in the product documentation would be appreciated but is + not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. diff --git a/README.md b/README.md index 98fdf20..ec9b95c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ Libbet and the Magic Floor -======================= +========================== This is a port of Martin Korth's game _[Magic Floor]_ to the Game Boy compact video game system, introducing Libbet the boulder girl. -"One day, Libbet was rearranging her basement when she discovered +One day, Libbet was rearranging her basement when she discovered a passage to an empty hall whose floor had a peculiar pattern. -She rolled in to investigate." +She rolled in to investigate. The floor tiles have four shades. Libbet can roll or jump between tiles of the same shade. She can also roll or jump onto the next @@ -22,7 +22,13 @@ The game is written in assembly language. Building it from source requires [RGBDS], GNU Make, Python 3, and [Pillow] (Python Imaging Library). -Free software license pending. +Legal +----- +Copyright 2002, 2012 Martin Korth +Copyright 2018 Damian Yerrick + +This program is free software. Permission is granted to use it +subject to the terms of the zlib License. See the file `LICENSE`. [Magic Floor]: https://problemkaputt.de/magicflr.htm diff --git a/makefile b/makefile index f81569c..0a64fc0 100644 --- a/makefile +++ b/makefile @@ -41,6 +41,7 @@ all: $(title).gb clean: -rm obj/gb/*.z80 obj/gb/*.o obj/gb/*.chrgb obj/gb/*.pb16 + -rm obj/gb/*.chr1 # Packaging @@ -50,14 +51,15 @@ zip: $(title)-$(version).zip # The zipfile depends on every file in zip.in, but as a shortcut, # mention only files on which the ROM doesn't itself depend. $(title)-$(version).zip: zip.in $(title).gb \ - README.md CHANGES.txt obj/gb/index.txt + README.md obj/gb/index.txt $(PY) tools/zipup.py $< $(title)-$(version) -o $@ -advzip -z3 $@ # Build zip.in from the list of files in the Git tree zip.in: makefile - git ls-files | grep -e "^[^.]" > $@ - echo $(title).gb.png >> $@ + git ls-files | grep -e "^[^.0]" > $@ + echo 05-burndown/note_from_nocash.md >> $@ + echo $(title).gb >> $@ echo zip.in >> $@ obj/gb/index.txt: makefile diff --git a/obj/gb/index.txt b/obj/gb/index.txt index d1cd90e..c5c8c2c 100644 --- a/obj/gb/index.txt +++ b/obj/gb/index.txt @@ -1 +1 @@ -Rooster goes where? +Files produced by build tools go here. (This file's existence forces the unzip tool to create this folder.)