From d3a4c262e5c5ccae17812505065211428a892d66 Mon Sep 17 00:00:00 2001 From: William Moore Date: Tue, 19 Jul 2022 20:49:56 -0500 Subject: [PATCH] Update to use Glulx --- .gitignore | 3 ++- ButteredToast.blurb | 2 +- Makefile | 6 +++--- src/ButteredToast1.ni | 18 ++++++++---------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index c1e87a0..4564663 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.i6 -*.zblorb +*.*blorb *.z8 +*.ulx .DS_Store build/ dist/ diff --git a/ButteredToast.blurb b/ButteredToast.blurb index 2d6cab6..43de443 100644 --- a/ButteredToast.blurb +++ b/ButteredToast.blurb @@ -2,4 +2,4 @@ author "Masterful Interactions" copyright "(c) Masterful Interactions 2022" -storyfile "ButteredToast1.z8" include +storyfile "ButteredToast1.ulx" include diff --git a/Makefile b/Makefile index ec427a2..43be4f3 100644 --- a/Makefile +++ b/Makefile @@ -11,13 +11,13 @@ SRCS := $(wildcard $(SRCDIR)/*.ni) I6S := $(patsubst %.ni,%.i6,$(SRCS)) all: $(TARGET) - $(INBLORB) ButteredToast.blurb ButteredToast.zblorb + $(INBLORB) ButteredToast.blurb ButteredToast.gblorb $(TARGET): $(I6S) - $(INFORM6) -E2w~S~Dv8 $< + $(INFORM6) -E2w~S~DG $< %.i6: %.ni - $(INFORM7) -format=Inform6/16d $< + $(INFORM7) $(ARGS) $< clean: rm $(SRCDIR)/*.i6 diff --git a/src/ButteredToast1.ni b/src/ButteredToast1.ni index caaf6f3..61af2ec 100644 --- a/src/ButteredToast1.ni +++ b/src/ButteredToast1.ni @@ -238,14 +238,13 @@ Every turn when Scene 6 is happening and the charge of the amulet is 20: He then uses the bat to beat Chung Ho to death."; now Chung Ho is dead -Instead of rubbing the amulet of destiny: - if the charge of the amulet is not 20, - say "Several hired goons come running out with various blunt weapons, which they use to repeatedly pummel Chung Ho. Once dead, they drag Chung Ho out of Chinatown."; - say "A medium size, muscular man drops down from the top of a nearby building. He has long, flowing, black hair and is wearing olive pants, camoflauge short sleeved shirt, wearing a gas mask, and wielding a baseball bat!"; - say "He looks very confused. Looks around and rips off the mask. He then mutters something incoherent."; - say "After shrugging his shoulders, he then swings the bat slightly and says 'I'm killing him now!'"; - say "He then throws the bat onto the ground and storms off."; - now Chung Ho is dead +Instead of rubbing the amulet of destiny during Scene 6: + say "Several hired goons come running out with various blunt weapons, which they use to repeatedly pummel Chung Ho. Once dead, they drag Chung Ho out of Chinatown."; + say "A medium size, muscular man drops down from the top of a nearby building. He has long, flowing, black hair and is wearing olive pants, camoflauge short sleeved shirt, wearing a gas mask, and wielding a baseball bat!"; + say "He looks very confused. Looks around and rips off the mask. He then mutters something incoherent."; + say "After shrugging his shoulders, he then swings the bat slightly and says 'I'm killing him now!'"; + say "He then throws the bat onto the ground and storms off."; + now Chung Ho is dead. [ The End ] The End is a scene. The End begins when Scene 6 ends. @@ -261,6 +260,5 @@ When The End begins: After speech when the noun is Narrator and The End is happening: say "The Narrator looks up and appears surprised that you're there. Oh! Um! You're back!? How was it? Did you save Chung Ho? I see. Well, maybe better luck next time or you could see the upcoming sequel: Buttered Toast: the Legend of Possum Crotch."; end the story. -[ + test wt with "speak with narrator / go s / go w / get canoe / go e / go n / give canoe to ho / go n / go w / go w / go n / slap barkeep / give whiskey to amelia / go s / go e / go s / speak with barkeep / say hi to darcon / go s / say greetings to wallaby fits / go sw / say hi to ho / go n" -] \ No newline at end of file