From 2d5a01548e2aba142544893ffe62c71d9bd86e44 Mon Sep 17 00:00:00 2001
From: William Moore <caranmegil@noreply.codeberg.org>
Date: Thu, 21 Jul 2022 05:40:04 -0500
Subject: [PATCH] Update for massive overhaul

---
 .gitignore                                    |   7 +++++-
 ButteredToast.blurb                           |   7 ------
 .../Source/story.ni                           |   6 +++++-
 .../Cover.jpg                                 | Bin
 Makefile                                      |  20 +++++++++---------
 5 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 ButteredToast.blurb
 rename src/ButteredToast1.inform => ButteredToast.inform/Source/story.ni (98%)
 rename cover.jpeg => ButteredToast.materials/Cover.jpg (100%)

diff --git a/.gitignore b/.gitignore
index 4564663..8fbfe64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,9 @@
 build/
 dist/
 .vscode/
-Release/
\ No newline at end of file
+Release/
+Index/
+*.plist
+*.blurb
+*.iFiction
+gametext.txt
\ No newline at end of file
diff --git a/ButteredToast.blurb b/ButteredToast.blurb
deleted file mode 100644
index 003a224..0000000
--- a/ButteredToast.blurb
+++ /dev/null
@@ -1,7 +0,0 @@
-author "Masterful Interactions"
-copyright "(c) Masterful Interactions 2022"
-
-
-storyfile "ButteredToast1.ulx" include
-cover "./cover.jpeg"
-picture 1 "./cover.jpeg"
\ No newline at end of file
diff --git a/src/ButteredToast1.inform b/ButteredToast.inform/Source/story.ni
similarity index 98%
rename from src/ButteredToast1.inform
rename to ButteredToast.inform/Source/story.ni
index 61af2ec..d8d903d 100644
--- a/src/ButteredToast1.inform
+++ b/ButteredToast.inform/Source/story.ni
@@ -12,7 +12,11 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <https://www.gnu.org/licenses/>. ]
 
-"Buttered Toast: the Interactive Fiction Starring Billy Davis" by "Masterful Interactions"
+"Buttered Toast" by "Masterful Interactions".
+The story headline is "the Interactive Fiction Starring Billy Davis".
+The story description is "You are Billy Davis and you need to lead Chung Ho to San Francisco. However, can you keep him safe from the legendary Possum Crotch?".
+Release along with cover art.
+The release number is 2.
 
 Asking someone about something is speech. Telling someone about something is speech. Answering someone that something is speech. Asking someone for something is speech.
 
diff --git a/cover.jpeg b/ButteredToast.materials/Cover.jpg
similarity index 100%
rename from cover.jpeg
rename to ButteredToast.materials/Cover.jpg
diff --git a/Makefile b/Makefile
index d43d61f..311a95e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,22 +4,22 @@ INFORM6 := $(INFORM)/inform6/Tangled/inform6
 INBLORB := $(INFORM)/inblorb/Tangled/inblorb
 BUILDDIR := build
 DISTDIR := dist
-SRCDIR := src
-TARGET := ButteredToast1
+SRCDIR := .
+TARGET := ButteredToast
+PROJDIR := $(SRCDIR)/$(TARGET).inform
 
-SRCS := $(wildcard $(SRCDIR)/*.inform)
-I6S := $(patsubst %.inform,%.i6,$(SRCS))
+SRCS := $(wildcard $(PROJDIR)/Source/*.ni)
+I6S := $(patsubst %.ni,%.i6,$(SRCS))
 
 all: $(TARGET)
-	$(INBLORB) ButteredToast.blurb ButteredToast.gblorb
+	$(INBLORB) $(PROJDIR)/Release.blurb $(SRCDIR)/$(TARGET).gblorb
 
 $(TARGET): $(I6S)
-	$(INFORM6) -E2w~S~DG $<
+	$(INFORM6) -E2w~S~DG $(PROJDIR)/Build/auto.inf $(PROJDIR)/Build/output.ulx
 
-%.i6: %.inform
-	$(INFORM7) $(ARGS) $<
+%.i6: %.ni
+	$(INFORM7) -project "$(PROJDIR)" $(ARGS)
 
 clean:
-	- rm $(SRCDIR)/*.i6
+	- rm -rf $(PROJDIR)/Build
 	- rm *.gblorb
-	- rm *.ulx