Update to fix some things

This commit is contained in:
William Moore 2022-07-30 04:12:19 -05:00
parent 59f46392e8
commit bd3ffd4afc
7 changed files with 579 additions and 266 deletions

1
.gitignore vendored
View File

@ -5,7 +5,6 @@
.DS_Store .DS_Store
build/ build/
dist/ dist/
.vscode/
Release/ Release/
Index/ Index/
*.plist *.plist

1
.vscode/configurationCache.log vendored Normal file
View File

@ -0,0 +1 @@
{"buildTargets":["ButteredToast","ButteredToast.inform/Source/story.i6","all","clean"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}

7
.vscode/dryrun.log vendored Normal file
View File

@ -0,0 +1,7 @@
make --dry-run --always-make --keep-going --print-directory
make: Entering directory `/Users/caranmegil/if/butteredtoast'
~/if/inform7/inform/inform7/Tangled/inform7 -project "./ButteredToast.inform"
~/if/inform7/inform/inform6/Tangled/inform6 -E2w~S~DG ./ButteredToast.inform/Build/auto.inf ./ButteredToast.inform/Build/output.ulx
~/if/inform7/inform/inblorb/Tangled/inblorb ./ButteredToast.inform/Release.blurb ./ButteredToast.gblorb
make: Leaving directory `/Users/caranmegil/if/butteredtoast'

7
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,7 @@
{
"makefile.extensionOutputFolder": "./.vscode",
"[inform7]": {
"editor.insertSpaces": false,
"editor.tabSize": 2
}
}

296
.vscode/targets.log vendored Normal file
View File

@ -0,0 +1,296 @@
make all --print-data-base --no-builtin-variables --no-builtin-rules --question
# GNU Make 3.81
# Copyright (C) 2006 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions.
# There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
# This program built for i386-apple-darwin11.3.0
# Make data base, printed on Fri Jul 22 11:19:51 2022
# Variables
# automatic
<D = $(patsubst %/,%,$(dir $<))
# automatic
?F = $(notdir $?)
# makefile (from `Makefile', line 8)
TARGET := ButteredToast
# makefile (from `Makefile', line 3)
INFORM6 := ~/if/inform7/inform/inform6/Tangled/inform6
# automatic
?D = $(patsubst %/,%,$(dir $?))
# makefile (from `Makefile', line 12)
I6S := ./ButteredToast.inform/Source/story.i6
# automatic
@D = $(patsubst %/,%,$(dir $@))
# automatic
@F = $(notdir $@)
# makefile
CURDIR := /Users/caranmegil/if/butteredtoast
# makefile
SHELL = /bin/sh
# environment
VSCODE_NLS_CONFIG = {"locale":"en-us","availableLanguages":{},"_languagePackSupport":true}
# environment
_ = /usr/bin/make
# makefile (from `Makefile', line 1)
MAKEFILE_LIST := Makefile
# makefile (from `Makefile', line 5)
BUILDDIR := build
# environment
__CFBundleIdentifier = com.microsoft.VSCode
# environment
VSCODE_CWD = /
# environment
PATH = /opt/miniforge3/condabin:/Library/Frameworks/Python.framework/Versions/3.9/bin:/Library/Frameworks/Python.framework/Versions/3.9/bin:/Library/Frameworks/Python.framework/Versions/3.9/bin:/Users/caranmegil/.cargo/bin:/Users/caranmegil/.yarn/bin:/Users/caranmegil/.config/yarn/global/node_modules/.bin:/Users/caranmegil/Library/Android/sdk/platform-tools/:/Library/Frameworks/Python.framework/Versions/3.6/bin:/Library/Frameworks/Python.framework/Versions/3.6/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin:/usr/local/MacGPG2/bin:/Library/Apple/usr/bin:/usr/local/flutter/bin:/Users/caranmegil/Library/Android/sdk/emulator:/Users/caranmegil/Library/Android/sdk/tools:/Users/caranmegil/Library/Android/sdk/tools/bin:/Users/caranmegil/Library/Android/sdk/platform-tools
# makefile (from `Makefile', line 1)
INFORM := ~/if/inform7/inform
# environment
ELECTRON_RUN_AS_NODE = 1
# environment
ANDROID_HOME = /Users/caranmegil/Library/Android/sdk
# default
.FEATURES := target-specific order-only second-expansion else-if archives jobserver check-symlink
# environment
SSH_AUTH_SOCK = /private/tmp/com.apple.launchd.JhSvGGtZkn/Listeners
# makefile (from `Makefile', line 7)
SRCDIR := .
# automatic
%F = $(notdir $%)
# environment
CONDA_EXE = /opt/miniforge3/bin/conda
# environment
PWD = /Users/caranmegil/if/butteredtoast
# environment
ORIGINAL_XDG_CURRENT_DESKTOP = undefined
# environment
VSCODE_AMD_ENTRYPOINT = vs/workbench/api/node/extensionHostProcess
# environment
HOME = /Users/caranmegil
# default
MAKEFILEPATH := /Applications/Xcode.app/Contents/Developer/Makefiles
# environment
VSCODE_CODE_CACHE_PATH = /Users/caranmegil/Library/Application Support/Code/CachedData/b06ae3b2d2dbfe28bca3134cc6be65935cdfea6a
# environment
LOGNAME = caranmegil
# environment
APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = 1
# environment
VSCODE_HANDLES_UNCAUGHT_ERRORS = true
# automatic
^D = $(patsubst %/,%,$(dir $^))
# makefile (from `Makefile', line 6)
DISTDIR := dist
# environment
XPC_FLAGS = 0x0
# default
MAKE = $(MAKE_COMMAND)
# default
MAKECMDGOALS := all
# makefile (from `Makefile', line 11)
SRCS := ./ButteredToast.inform/Source/story.ni
# environment
SHLVL = 2
# default
MAKE_VERSION := 3.81
# environment
USER = caranmegil
# makefile
.DEFAULT_GOAL := all
# automatic
%D = $(patsubst %/,%,$(dir $%))
# environment
CONDA_SHLVL = 0
# default
MAKE_COMMAND := /Applications/Xcode.app/Contents/Developer/usr/bin/make
# default
.VARIABLES :=
# environment
TMPDIR = /var/folders/w6/sfbt669d6914x8w489scn21c0000gn/T/
# automatic
*F = $(notdir $*)
# environment
VSCODE_IPC_HOOK = /Users/caranmegil/Library/Application Support/Code/1.69.1-main.sock
# environment
MallocNanoZone = 0
# makefile
MAKEFLAGS = Rrqp
# environment
MFLAGS = -Rrqp
# automatic
*D = $(patsubst %/,%,$(dir $*))
# environment
XPC_SERVICE_NAME = application.com.microsoft.VSCode.27134730.27134736
# automatic
+D = $(patsubst %/,%,$(dir $+))
# automatic
+F = $(notdir $+)
# environment
__CF_USER_TEXT_ENCODING = 0x1F5:0x0:0x0
# environment
COMMAND_MODE = unix2003
# default
MAKEFILES :=
# automatic
<F = $(notdir $<)
# makefile (from `Makefile', line 9)
PROJDIR := ./ButteredToast.inform
# environment
LC_ALL = C
# makefile (from `Makefile', line 2)
INFORM7 := ~/if/inform7/inform/inform7/Tangled/inform7
# environment
CONDA_PYTHON_EXE = /opt/miniforge3/bin/python
# automatic
^F = $(notdir $^)
# default
SUFFIXES :=
# environment
_CE_M =
# default
.INCLUDE_DIRS = /usr/local/include
# environment
MAKELEVEL := 0
# environment
LANG = C
# environment
VSCODE_PID = 28194
# environment
_CE_CONDA =
# makefile (from `Makefile', line 4)
INBLORB := ~/if/inform7/inform/inblorb/Tangled/inblorb
# variable set hash-table stats:
# Load=75/1024=7%, Rehash=0, Collisions=1/114=1%
# Pattern-specific Variable Values
# No pattern-specific variable values.
# Directories
# . (device 16777233, inode 23302098): 12 files, no impossibilities.
# ./ButteredToast.inform/Source (device 16777233, inode 26978637): 3 files, no impossibilities.
# ButteredToast.inform/Source (device 16777233, inode 26978637): 3 files, no impossibilities.
# 18 files, no impossibilities in 3 directories.
# Implicit Rules
%.i6: %.ni
# commands to execute (from `Makefile', line 21):
$(INFORM7) -project "$(PROJDIR)" $(ARGS)
# 1 implicit rules, 0 (0.0%) terminal.
# Files
all: ButteredToast
# Command-line target.
# Implicit rule search has not been done.
# File does not exist.
# File has been updated.
# Needs to be updated (-q is set).
# variable set hash-table stats:
# Load=0/32=0%, Rehash=0, Collisions=0/5=0%
# commands to execute (from `Makefile', line 15):
$(INBLORB) $(PROJDIR)/Release.blurb $(SRCDIR)/$(TARGET).gblorb
# Not a target:
.SUFFIXES:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# Not a target:
Makefile:
# Implicit rule search has been done.
# Last modified 2022-07-21 05:28:01
# File has been updated.
# Successfully updated.
# variable set hash-table stats:
# Load=0/32=0%, Rehash=0, Collisions=0/0=0%
ButteredToast: ButteredToast.inform/Source/story.i6
# Implicit rule search has not been done.
# File does not exist.
# File has been updated.
# Needs to be updated (-q is set).
# variable set hash-table stats:
# Load=0/32=0%, Rehash=0, Collisions=0/5=0%
# commands to execute (from `Makefile', line 18):
$(INFORM6) -E2w~S~DG $(PROJDIR)/Build/auto.inf $(PROJDIR)/Build/output.ulx
# Not a target:
ButteredToast.inform/Source/story.ni:
# Implicit rule search has been done.
# Last modified 2022-07-21 05:24:29
# File has been updated.
# Successfully updated.
# variable set hash-table stats:
# Load=0/32=0%, Rehash=0, Collisions=0/0=0%
# Not a target:
.DEFAULT:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
clean:
# Implicit rule search has not been done.
# Modification time never checked.
# File has not been updated.
# commands to execute (from `Makefile', line 24):
- rm -rf $(PROJDIR)/Build
- rm *.gblorb
ButteredToast.inform/Source/story.i6: ButteredToast.inform/Source/story.ni
# Implicit rule search has been done.
# Implicit/static pattern stem: `ButteredToast.inform/Source/story'
# File does not exist.
# File has been updated.
# Needs to be updated (-q is set).
# automatic
# @ := ButteredToast.inform/Source/story.i6
# automatic
# % :=
# automatic
# * := ButteredToast.inform/Source/story
# automatic
# + := ButteredToast.inform/Source/story.ni
# automatic
# | :=
# automatic
# < := ButteredToast.inform/Source/story.ni
# automatic
# ^ := ButteredToast.inform/Source/story.ni
# automatic
# ? := ButteredToast.inform/Source/story.ni
# variable set hash-table stats:
# Load=8/32=25%, Rehash=0, Collisions=1/13=8%
# commands to execute (from `Makefile', line 21):
$(INFORM7) -project "$(PROJDIR)" $(ARGS)
# files hash-table stats:
# Load=8/1024=1%, Rehash=0, Collisions=0/26=0%
# VPATH Search Paths
# No `vpath' search paths.
# No general (`VPATH' variable) search path.
# # of strings in strcache: 1
# # of strcache buffers: 1
# strcache size: total = 4096 / max = 4096 / min = 4096 / avg = 4096
# strcache free: total = 4087 / max = 4087 / min = 4087 / avg = 4087
# Finished Make data base on Fri Jul 22 11:19:51 2022

View File

@ -129,7 +129,7 @@ Stanley Fairborn is a person in Fairborn Residence. The significance of Stanley
Lewis Fairborn is a person in Fairborn Residence. The significance of Lewis Fairborn is significant. The seeability of Lewis Fairborn is unseen. The conversability of Lewis Fairborn is unspoken. The description of Lewis Fairborn is "A filthy, dirty man who wears coveralls that don't quite cover all." Lewis Fairborn is a person in Fairborn Residence. The significance of Lewis Fairborn is significant. The seeability of Lewis Fairborn is unseen. The conversability of Lewis Fairborn is unspoken. The description of Lewis Fairborn is "A filthy, dirty man who wears coveralls that don't quite cover all."
Morgan Alford is a person. The significance of Morgan Alford is significant. The seeability of Morgan Alford is unseen. The description of Morgan Alford is "A smartly dressed man who moves and speaks with passion and conversabilityiction." Morgan Alford is a person. The significance of Morgan Alford is significant. The seeability of Morgan Alford is unseen. The description of Morgan Alford is "A smartly dressed man who moves and speaks with passion and conviction."
Wayfare Tavern Barkeep is a person. They are in Wayfare Tavern. The significance of the Wayfare Tavern Barkeep is significant. The description of Wayfare Tavern Barkeep is "The barkeep is your generic barkeep. He has a closely shaved head. A dark, waxed moustache and dark goatee. He seems to always be cleaning a beer mug with a rag despite the fact he serves people from other mugs found in the bar." Wayfare Tavern Barkeep is a person. They are in Wayfare Tavern. The significance of the Wayfare Tavern Barkeep is significant. The description of Wayfare Tavern Barkeep is "The barkeep is your generic barkeep. He has a closely shaved head. A dark, waxed moustache and dark goatee. He seems to always be cleaning a beer mug with a rag despite the fact he serves people from other mugs found in the bar."
@ -419,16 +419,19 @@ Instead of drinking Can of Pepso during Act II Scene 5:
silently try taking Card for a Lifetime Supply of Original Pepso; silently try taking Card for a Lifetime Supply of Original Pepso;
increase the current score of the player by 10. increase the current score of the player by 10.
After speech when the noun is Emcee and the Emcee does not have Bottle of Alcohol or Emcee does not have Agreement for Smashing Pumpkins Performance: After speech when the noun is Emcee and the player has Lawyer Contract:
say "Emcee says 'I'll do your event. However, you need to bring me some alcohol and some entertainment.'". if the noun does not have Bottle of Alcohol or the noun does not have Agreement for Smashing Pumpkins Performance,
say "Emcee says 'I'll do your event. However, you need to bring me some alcohol and some entertainment.'";
otherwise:
say "Emcee says 'I still need both alcohol and some entertainment.'".
After speech when the noun is Billy Corgan and Act II Scene 5 is happening: After speech when the noun is Billy Corgan and Act II Scene 5 is happening and the player has Lawyer Contract:
say "Billy Corgan says 'Sure, I'll play your fundraiser.'"; say "Billy Corgan says 'Sure, I'll play your fundraiser.'";
say "You're given [Agreement for Smashing Pumpkins Performance]!"; say "You're given [Agreement for Smashing Pumpkins Performance]!";
move Agreement for Smashing Pumpkins Performance to location of player; move Agreement for Smashing Pumpkins Performance to location of player;
silently try taking Agreement for Smashing Pumpkins Performance. silently try taking Agreement for Smashing Pumpkins Performance.
After speech when the noun is Wayfare Tavern Barkeep and Act II Scene 5 is happening: After speech when the noun is Wayfare Tavern Barkeep and Act II Scene 5 is happening and the player has Lawyer Contract:
say "The Wayfare Tavern Barkeep says 'Sure, I'll give you some booze if it means getting rid of those pesky Fairborns.'"; say "The Wayfare Tavern Barkeep says 'Sure, I'll give you some booze if it means getting rid of those pesky Fairborns.'";
say "You're given [Bottle of Alcohol]!"; say "You're given [Bottle of Alcohol]!";
move Bottle of Alcohol to location of player; move Bottle of Alcohol to location of player;