From 098a6ac4f06538e412bfa46f79043e90e0d12e85 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 9 Jan 2022 13:45:19 -0600
Subject: [PATCH 01/44] =?UTF-8?q?=F0=9F=9A=A7=20It=20compiles!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 remontel.inf | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/remontel.inf b/remontel.inf
index e69de29..1e711a4 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -0,0 +1,15 @@
+Constant Story "The Siege of Remontel";
+Constant Headline "^A Star Trek fan production^";
+
+Release 1;
+
+Include "Parser";
+Include "VerbLib";
+
+! @todo
+
+[ Initialise ;
+
+];
+
+Include "Grammar";

From 45f221ae29f68e1c40a0f3ac3a0e0260eb3f4bc3 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 9 Jan 2022 18:25:05 -0600
Subject: [PATCH 02/44] =?UTF-8?q?=F0=9F=9A=A7=20We=20have=20rooms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rooms.inf    | 10 ++++++++++
 remontel.inf |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 Rooms.inf

diff --git a/Rooms.inf b/Rooms.inf
new file mode 100644
index 0000000..c40a019
--- /dev/null
+++ b/Rooms.inf
@@ -0,0 +1,10 @@
+Object lower_decks "Lower Decks Corridor"
+    with description "You stand in a lower decks corridor.
+                      This corridor contains several bunks lining the walls where the lower deckers sleep."
+    has light;
+
+Object bunk "Your bunk" lower_decks
+    with name "bunk" "bunks",
+      description "Your bunk is like every other bunk on the lower decks.^
+           It's barely big enough to fit you. But it's home."
+    has enterable container openable;
\ No newline at end of file
diff --git a/remontel.inf b/remontel.inf
index 1e711a4..0be1d65 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -6,10 +6,10 @@ Release 1;
 Include "Parser";
 Include "VerbLib";
 
-! @todo
+Include "Rooms.inf";
 
 [ Initialise ;
-
+    location = bunk;
 ];
 
 Include "Grammar";

From a54e850bdd7d4ea134117eb0b8b59c7c72e19be9 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 9 Jan 2022 19:32:15 -0600
Subject: [PATCH 03/44] =?UTF-8?q?=F0=9F=99=88=20Ignore=20more=20compilatio?=
 =?UTF-8?q?n=20artifacts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9506b23..d7ce8ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 remontel.z5
 remontel.ulx
+gametext.txt
+gameinfo.dbg

From 229633cd481c240352102192d671e4f7990fc719 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 9 Jan 2022 19:52:04 -0600
Subject: [PATCH 04/44] =?UTF-8?q?=F0=9F=91=B7=20Add=20Makefiles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile       | 12 ++++++++++++
 lib/.gitignore |  3 +++
 lib/Makefile   | 15 +++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 Makefile
 create mode 100644 lib/.gitignore
 create mode 100644 lib/Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a905a79
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+.PHONY: default
+
+default: remontel.ulx
+
+remontel.ulx: remontel.inf Rooms.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+	inform -G +include_path=,lib remontel.inf
+
+remontel.z5: remontel.inf Rooms.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+	inform +include_path=,lib remontel.inf
+
+lib/Parser.h lib/VerbLib.h lib/Grammar.h:
+	$(MAKE) -C lib Parser.h
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 0000000..a0991ff
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1,3 @@
+*
+!.gitignore
+!Makefile
diff --git a/lib/Makefile b/lib/Makefile
new file mode 100644
index 0000000..ca62c1b
--- /dev/null
+++ b/lib/Makefile
@@ -0,0 +1,15 @@
+.PHONY: default
+
+default: Parser.h
+
+parser.h grammar.h verblib.h:
+	wget https://ifarchive.org/if-archive/infocom/compilers/inform6/library/inform6lib-6.12.5.zip
+	unzip -u -j inform6lib-6.12.5.zip
+	rm -v inform6lib-6.12.5.zip
+
+Parser.h Grammar.h VerbLib.h: parser.h grammar.h verblib.h
+	ln -s parser.h Parser.h
+	ln -s grammar.h Grammar.h
+	ln -s verblib.h VerbLib.h
+	ln -s english.h English.h
+	ln -s version.h Version.h

From 64381da7865120b9f80b3d267fe22e46d0636705 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 9 Jan 2022 22:55:57 -0600
Subject: [PATCH 05/44] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20getting=20classy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Classes.inf  |  8 ++++++++
 Globals.inf  |  0
 Rooms.inf    | 10 ++++++----
 remontel.inf |  4 ++++
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 Classes.inf
 create mode 100644 Globals.inf

diff --git a/Classes.inf b/Classes.inf
new file mode 100644
index 0000000..5a856f0
--- /dev/null
+++ b/Classes.inf
@@ -0,0 +1,8 @@
+Class Room has light;
+
+Class Set
+    with before [;
+        Examine: return false;
+        default: print_ret "You can't do that with ", (the) self, ".";
+    ],
+    has scenery;
\ No newline at end of file
diff --git a/Globals.inf b/Globals.inf
new file mode 100644
index 0000000..e69de29
diff --git a/Rooms.inf b/Rooms.inf
index c40a019..08fb610 100644
--- a/Rooms.inf
+++ b/Rooms.inf
@@ -1,10 +1,12 @@
-Object lower_decks "Lower Decks Corridor"
+Room lower_decks "Lower Decks Corridor"
     with description "You stand in a lower decks corridor.
-                      This corridor contains several bunks lining the walls where the lower deckers sleep."
-    has light;
+                      This corridor contains several bunks
+                      lining the walls where the lower deckers
+                      sleep.";
 
+! @todo fix "in the Your bunk"
 Object bunk "Your bunk" lower_decks
     with name "bunk" "bunks",
       description "Your bunk is like every other bunk on the lower decks.^
            It's barely big enough to fit you. But it's home."
-    has enterable container openable;
\ No newline at end of file
+    has enterable container openable;
diff --git a/remontel.inf b/remontel.inf
index 0be1d65..21757da 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -6,10 +6,14 @@ Release 1;
 Include "Parser";
 Include "VerbLib";
 
+Include "Globals.inf";
+Include "Classes.inf";
 Include "Rooms.inf";
 
 [ Initialise ;
     location = bunk;
+    player.description = "You are wearing an operations uniform,
+            with a single pip.";
 ];
 
 Include "Grammar";

From 7ea3d64c82df706b5c0d25e64a41f6974e4abf07 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 9 Jan 2022 23:28:56 -0600
Subject: [PATCH 06/44] =?UTF-8?q?=F0=9F=9A=A7=20Adding=20items?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Classes.inf  | 17 ++++++++++++++++-
 Items.inf    |  4 ++++
 Rooms.inf    |  5 +++--
 remontel.inf |  1 +
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 Items.inf

diff --git a/Classes.inf b/Classes.inf
index 5a856f0..61fbeec 100644
--- a/Classes.inf
+++ b/Classes.inf
@@ -5,4 +5,19 @@ Class Set
         Examine: return false;
         default: print_ret "You can't do that with ", (the) self, ".";
     ],
-    has scenery;
\ No newline at end of file
+    has scenery;
+
+Class Decoration
+    with before [;
+        Take,Pull,Push,PushDir:
+            print_ret "You can't do that with ", (the) self, ".";
+    ],
+    has static;
+
+Class Furniture
+    class Decoration,
+    with before [;
+        Take,Pull,Push,PushDir:
+            print_ret (the) self, " is too heavy for that.";
+    ],
+    has supporter;
diff --git a/Items.inf b/Items.inf
new file mode 100644
index 0000000..eb0fe6e
--- /dev/null
+++ b/Items.inf
@@ -0,0 +1,4 @@
+Decoration poster "Starfleet recruitment poster" bunk
+    with name 'poster' 'recruitment',
+        description "A poster is attached to the roof of your bunk.^
+          This poster is what inspired you to join Starfleet.";
\ No newline at end of file
diff --git a/Rooms.inf b/Rooms.inf
index 08fb610..1d17ecd 100644
--- a/Rooms.inf
+++ b/Rooms.inf
@@ -1,3 +1,4 @@
+! @todo fix "You stand" when in bunk
 Room lower_decks "Lower Decks Corridor"
     with description "You stand in a lower decks corridor.
                       This corridor contains several bunks
@@ -5,8 +6,8 @@ Room lower_decks "Lower Decks Corridor"
                       sleep.";
 
 ! @todo fix "in the Your bunk"
-Object bunk "Your bunk" lower_decks
-    with name "bunk" "bunks",
+Room bunk "Your bunk" lower_decks
+    with name 'bunk' 'bunks',
       description "Your bunk is like every other bunk on the lower decks.^
            It's barely big enough to fit you. But it's home."
     has enterable container openable;
diff --git a/remontel.inf b/remontel.inf
index 21757da..e65d48a 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -9,6 +9,7 @@ Include "VerbLib";
 Include "Globals.inf";
 Include "Classes.inf";
 Include "Rooms.inf";
+Include "Items.inf";
 
 [ Initialise ;
     location = bunk;

From 877eff18acd794b478e10beb3c0ad03931f3227f Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Mon, 10 Jan 2022 09:47:30 -0600
Subject: [PATCH 07/44] =?UTF-8?q?=F0=9F=92=AC=20Change=20"film"=20to=20"ga?=
 =?UTF-8?q?me"=20in=20disclaimer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 879c41d..5a66132 100644
--- a/README.md
+++ b/README.md
@@ -14,4 +14,4 @@ The bridge crew and senior officers have all been abducted. It's now up to you t
 
 ## Disclaimer
 
-Star Trek and all related marks, logos and characters are solely owned by CBS Studios Inc. This fan production is not endorsed by, sponsored by, nor affiliated with CBS, Paramount Pictures, or any other Star Trek franchise, and is a non-commercial fan-made film intended for recreational use. No commercial exhibition or distribution is permitted. No alleged independent rights will be asserted against CBS or Paramount Pictures.
+Star Trek and all related marks, logos and characters are solely owned by CBS Studios Inc. This fan production is not endorsed by, sponsored by, nor affiliated with CBS, Paramount Pictures, or any other Star Trek franchise, and is a non-commercial fan-made game intended for recreational use. No commercial exhibition or distribution is permitted. No alleged independent rights will be asserted against CBS or Paramount Pictures.

From 21782b6660f46e24991ae09c183953b0f50be0e3 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Mon, 10 Jan 2022 09:48:37 -0600
Subject: [PATCH 08/44] =?UTF-8?q?=F0=9F=91=B7=20Have=20make=20build=20both?=
 =?UTF-8?q?=20ulx=20and=20z5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a905a79..81bdc51 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: default
 
-default: remontel.ulx
+default: remontel.ulx remontel.z5
 
 remontel.ulx: remontel.inf Rooms.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
 	inform -G +include_path=,lib remontel.inf

From 285653039d8bf36c3e355ca961a2e16553676212 Mon Sep 17 00:00:00 2001
From: Dan Jones <dan.jones@grin.co>
Date: Mon, 10 Jan 2022 10:03:56 -0600
Subject: [PATCH 09/44] =?UTF-8?q?=F0=9F=91=B7=20Update=20Makefile=20for=20?=
 =?UTF-8?q?all=20inf=20files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 81bdc51..c5f29f0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@
 
 default: remontel.ulx remontel.z5
 
-remontel.ulx: remontel.inf Rooms.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+remontel.ulx: *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
 	inform -G +include_path=,lib remontel.inf
 
-remontel.z5: remontel.inf Rooms.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+remontel.z5: *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
 	inform +include_path=,lib remontel.inf
 
 lib/Parser.h lib/VerbLib.h lib/Grammar.h:

From 86a2ec5ae591c4a22904c564a8dc9462b79c31a7 Mon Sep 17 00:00:00 2001
From: Dan Jones <dan.jones@grin.co>
Date: Mon, 10 Jan 2022 10:05:34 -0600
Subject: [PATCH 10/44] =?UTF-8?q?=F0=9F=92=AC=20Update=20take=20message=20?=
 =?UTF-8?q?for=20poster?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Items.inf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Items.inf b/Items.inf
index eb0fe6e..8ce179a 100644
--- a/Items.inf
+++ b/Items.inf
@@ -1,4 +1,7 @@
 Decoration poster "Starfleet recruitment poster" bunk
     with name 'poster' 'recruitment',
         description "A poster is attached to the roof of your bunk.^
-          This poster is what inspired you to join Starfleet.";
\ No newline at end of file
+          This poster is what inspired you to join Starfleet.",
+        with before [;
+             Take: print_ret (The) self, " is stuck on the ceiling.";
+        ];

From 4c64bc77737324825d856bd06404fce45a7bdcbb Mon Sep 17 00:00:00 2001
From: Dan Jones <dan.jones@grin.co>
Date: Mon, 10 Jan 2022 11:05:41 -0600
Subject: [PATCH 11/44] =?UTF-8?q?=F0=9F=9A=A7=20Start=20work=20on=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore             |  1 +
 Makefile               |  3 +++
 story_outline.fountain | 17 +++++++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 story_outline.fountain

diff --git a/.gitignore b/.gitignore
index d7ce8ed..ed1c2e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ remontel.z5
 remontel.ulx
 gametext.txt
 gameinfo.dbg
+story_outline.pdf
diff --git a/Makefile b/Makefile
index c5f29f0..0996171 100644
--- a/Makefile
+++ b/Makefile
@@ -10,3 +10,6 @@ remontel.z5: *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
 
 lib/Parser.h lib/VerbLib.h lib/Grammar.h:
 	$(MAKE) -C lib Parser.h
+
+story_outline.pdf: story_outline.fountain
+	screenplain $< $@
diff --git a/story_outline.fountain b/story_outline.fountain
new file mode 100644
index 0000000..d05f408
--- /dev/null
+++ b/story_outline.fountain
@@ -0,0 +1,17 @@
+Title: The Siege of Remontel
+Subtitle: A Star Trek fan production.
+Author: Dan Jones
+Notes:
+  Story for "The Siege of Remontel" text adventure game.
+
+===
+
+A BUNK.
+
+The bunk is small, just big enough to fit a single person with a little bit of wiggle room.
+
+The bunk is closed. Our protagonist is laying in her bed. A red alert klaxon is blaring, having woken her up.
+
+ENSIGN (V.O.)
+What in the world is that?
+

From 2327204ec186db5f0a1fbe8768047a075f2bceea Mon Sep 17 00:00:00 2001
From: Dan Jones <dan.jones@grin.co>
Date: Mon, 10 Jan 2022 11:05:59 -0600
Subject: [PATCH 12/44] =?UTF-8?q?=F0=9F=91=B7=E2=99=BB=EF=B8=8F=20Use=20va?=
 =?UTF-8?q?riable=20names=20in=20Makefile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 0996171..be51cac 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,11 @@
 
 default: remontel.ulx remontel.z5
 
-remontel.ulx: *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
-	inform -G +include_path=,lib remontel.inf
+remontel.ulx: remontel.inf *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+	inform -G +include_path=,lib $<
 
-remontel.z5: *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
-	inform +include_path=,lib remontel.inf
+remontel.z5: remontel.inf *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+	inform +include_path=,lib $<
 
 lib/Parser.h lib/VerbLib.h lib/Grammar.h:
 	$(MAKE) -C lib Parser.h

From afda829d46e8245901c43d06e0489182b0195fa8 Mon Sep 17 00:00:00 2001
From: Dan Jones <dan.jones@grin.co>
Date: Mon, 10 Jan 2022 11:06:59 -0600
Subject: [PATCH 13/44] =?UTF-8?q?=F0=9F=90=9B=20Missing=20comma=20in=20bun?=
 =?UTF-8?q?k?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rooms.inf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rooms.inf b/Rooms.inf
index 1d17ecd..e570ae0 100644
--- a/Rooms.inf
+++ b/Rooms.inf
@@ -9,5 +9,5 @@ Room lower_decks "Lower Decks Corridor"
 Room bunk "Your bunk" lower_decks
     with name 'bunk' 'bunks',
       description "Your bunk is like every other bunk on the lower decks.^
-           It's barely big enough to fit you. But it's home."
+           It's barely big enough to fit you. But it's home.",
     has enterable container openable;

From 1ac42a1147ac0bcc96adbd6a12111a8f4ea330f6 Mon Sep 17 00:00:00 2001
From: Dan Jones <dan.jones@grin.co>
Date: Mon, 10 Jan 2022 11:52:29 -0600
Subject: [PATCH 14/44] =?UTF-8?q?=F0=9F=92=AC=20Fill=20out=20a=20bit=20mor?=
 =?UTF-8?q?e=20of=20the=20first=20scene=20of=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 story_outline.fountain | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/story_outline.fountain b/story_outline.fountain
index d05f408..6ea6c33 100644
--- a/story_outline.fountain
+++ b/story_outline.fountain
@@ -8,10 +8,22 @@ Notes:
 
 A BUNK.
 
-The bunk is small, just big enough to fit a single person with a little bit of wiggle room.
-
-The bunk is closed. Our protagonist is laying in her bed. A red alert klaxon is blaring, having woken her up.
+The bunk is closed. It is dark. Our protagonist is laying in her bed. A red alert klaxon is blaring, having woken her up.
 
 ENSIGN (V.O.)
 What in the world is that?
 
+ENSIGN
+Computer, lights.
+
+The lights come up, and we see the bunk. It is small, just big enough to fit a single person with a little bit of wiggle room.
+It is sparsely decorated. There is a single poster affixed to the ceiling of the bunk. The poster is a Starfleet recruitement poster.
+Our protagonist keeps it in her bunk to remind herself of why she joined Starfleet.
+
+The protagonist is dressed in the familiar operations uniform, and a single Ensign's pip.
+
+ENSIGN
+Computer, open my bunk
+
+The bunk wall slides open, revealing a hallway which serves as the lower deck quarters. Bunks line the walls. A few other people are slowly waking up, and look confused.
+

From feafcb3da54c88979ab06175c81f2883976fa644 Mon Sep 17 00:00:00 2001
From: Dan Jones <dan.jones@grin.co>
Date: Mon, 10 Jan 2022 11:54:02 -0600
Subject: [PATCH 15/44] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20story=5Foutline?=
 =?UTF-8?q?=20to=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's just quicker to type
---
 .gitignore                                | 2 +-
 Makefile                                  | 2 +-
 story_outline.fountain => script.fountain | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename story_outline.fountain => script.fountain (100%)

diff --git a/.gitignore b/.gitignore
index ed1c2e1..fc7f689 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@ remontel.z5
 remontel.ulx
 gametext.txt
 gameinfo.dbg
-story_outline.pdf
+script.pdf
diff --git a/Makefile b/Makefile
index be51cac..95b7848 100644
--- a/Makefile
+++ b/Makefile
@@ -11,5 +11,5 @@ remontel.z5: remontel.inf *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
 lib/Parser.h lib/VerbLib.h lib/Grammar.h:
 	$(MAKE) -C lib Parser.h
 
-story_outline.pdf: story_outline.fountain
+script.pdf: script.fountain
 	screenplain $< $@
diff --git a/story_outline.fountain b/script.fountain
similarity index 100%
rename from story_outline.fountain
rename to script.fountain

From 1712c20833839003cbce7343f39cc6c708f08d22 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 11 Jan 2022 06:51:23 -0600
Subject: [PATCH 16/44] =?UTF-8?q?=F0=9F=92=AC=20More=20of=20first=20scene?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's slow going
---
 script.fountain | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/script.fountain b/script.fountain
index 6ea6c33..7e8d6ec 100644
--- a/script.fountain
+++ b/script.fountain
@@ -1,19 +1,21 @@
 Title: The Siege of Remontel
-Subtitle: A Star Trek fan production.
+Source: A Star Trek fan production.
 Author: Dan Jones
 Notes:
   Story for "The Siege of Remontel" text adventure game.
+Contact: <danjones@goodevilgenius.org>
+Draft date: 2022-01-10
 
 ===
 
-A BUNK.
+INT. BUNK
 
 The bunk is closed. It is dark. Our protagonist is laying in her bed. A red alert klaxon is blaring, having woken her up.
 
-ENSIGN (V.O.)
+PROTAGONIST (V.O.)
 What in the world is that?
 
-ENSIGN
+PROTAGONIST
 Computer, lights.
 
 The lights come up, and we see the bunk. It is small, just big enough to fit a single person with a little bit of wiggle room.
@@ -22,8 +24,12 @@ Our protagonist keeps it in her bunk to remind herself of why she joined Starfle
 
 The protagonist is dressed in the familiar operations uniform, and a single Ensign's pip.
 
-ENSIGN
+PROTAGONIST
 Computer, open my bunk
 
 The bunk wall slides open, revealing a hallway which serves as the lower deck quarters. Bunks line the walls. A few other people are slowly waking up, and look confused.
 
+The protagonist climbs out of her bunk. Hers is the second in a stack of three, so there is some space to step down.
+
+As her feet step down, the alarm stops.
+

From 670fb183e14b673cee7329fb99ee71fe16def710 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 11 Jan 2022 10:22:02 -0600
Subject: [PATCH 17/44] =?UTF-8?q?=E2=9C=A8=20Add=20the=20computer=20charac?=
 =?UTF-8?q?ter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Still a bit buggy, but responds to a few commands
---
 Characters.inf | 42 ++++++++++++++++++++++++++++++++++++++++++
 Classes.inf    | 26 +++++++++++++-------------
 Rooms.inf      |  2 +-
 remontel.inf   |  3 ++-
 4 files changed, 58 insertions(+), 15 deletions(-)
 create mode 100644 Characters.inf

diff --git a/Characters.inf b/Characters.inf
new file mode 100644
index 0000000..c59f2cf
--- /dev/null
+++ b/Characters.inf
@@ -0,0 +1,42 @@
+! @todo fix talking to computer when lights are off
+! @todo fix computer not being in bunk
+Object computer "Computer"
+    with name 'computer' 'ship',
+        description "The computer of the ship uses non-sentient artificial intelligence^
+            It can perform many tasks and answer questions.",
+        found_in [; rtrue; ],
+        orders [loc ;
+            loc = parent(player);
+            SetTo:
+                if (noun == lights && second == 'full') {
+                    give loc light;
+                    print_ret "Lights at full.";
+                }
+                if (noun == lights && (second == 'zero' || second == 'off')) {
+                    give loc ~light;
+                    print_ret "Lights are off.";
+                }
+                print_ret "I do not know how to set ", (the) noun, " to ", (address) second;
+            Open:
+                switch(noun) {
+                    bunk:
+                        give noun open;
+                        print_ret (The) noun, " is open.";
+                }
+            Close:
+                switch(noun) {
+                    bunk:
+                        give noun ~open;
+                        print_ret (The) noun, " is closed.";
+                }
+            Tell:
+                ! @todo fill this out for various things to talk about
+                print_ret "You want me to tell you about ", (string) second;
+            NotUnderstood: print_ret "I do not understand.";
+        ],
+    has animate scenery;
+
+Object lights "Lights"
+    with name 'lights',
+    found_in [; rtrue; ],
+    has static scenery;
\ No newline at end of file
diff --git a/Classes.inf b/Classes.inf
index 61fbeec..7475720 100644
--- a/Classes.inf
+++ b/Classes.inf
@@ -1,11 +1,11 @@
 Class Room has light;
 
-Class Set
-    with before [;
-        Examine: return false;
-        default: print_ret "You can't do that with ", (the) self, ".";
-    ],
-    has scenery;
+! Class Set
+!     with before [;
+!         Examine: return false;
+!         default: print_ret "You can't do that with ", (the) self, ".";
+!     ],
+!     has scenery;
 
 Class Decoration
     with before [;
@@ -14,10 +14,10 @@ Class Decoration
     ],
     has static;
 
-Class Furniture
-    class Decoration,
-    with before [;
-        Take,Pull,Push,PushDir:
-            print_ret (the) self, " is too heavy for that.";
-    ],
-    has supporter;
+! Class Furniture
+!     class Decoration,
+!     with before [;
+!         Take,Pull,Push,PushDir:
+!             print_ret (the) self, " is too heavy for that.";
+!     ],
+!     has supporter;
diff --git a/Rooms.inf b/Rooms.inf
index e570ae0..7fdb8bf 100644
--- a/Rooms.inf
+++ b/Rooms.inf
@@ -10,4 +10,4 @@ Room bunk "Your bunk" lower_decks
     with name 'bunk' 'bunks',
       description "Your bunk is like every other bunk on the lower decks.^
            It's barely big enough to fit you. But it's home.",
-    has enterable container openable;
+    has enterable container static ~open ~light;
diff --git a/remontel.inf b/remontel.inf
index e65d48a..1a3ae96 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -9,10 +9,11 @@ Include "VerbLib";
 Include "Globals.inf";
 Include "Classes.inf";
 Include "Rooms.inf";
+Include "Characters.inf";
 Include "Items.inf";
 
 [ Initialise ;
-    location = bunk;
+    location = lower_decks; ! @todo switch to bunk
     player.description = "You are wearing an operations uniform,
             with a single pip.";
 ];

From a8bf9baaf82709cf4f5a32f7a7a2ada3bbcfbedc Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 11 Jan 2022 10:47:23 -0600
Subject: [PATCH 18/44] =?UTF-8?q?=F0=9F=90=9B=20Ensure=20computer=20is=20i?=
 =?UTF-8?q?n=20every=20room=20or=20enterable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Characters.inf |  1 -
 remontel.inf   | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Characters.inf b/Characters.inf
index c59f2cf..8d193bd 100644
--- a/Characters.inf
+++ b/Characters.inf
@@ -1,5 +1,4 @@
 ! @todo fix talking to computer when lights are off
-! @todo fix computer not being in bunk
 Object computer "Computer"
     with name 'computer' 'ship',
         description "The computer of the ship uses non-sentient artificial intelligence^
diff --git a/remontel.inf b/remontel.inf
index 1a3ae96..f00ab55 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -4,7 +4,22 @@ Constant Headline "^A Star Trek fan production^";
 Release 1;
 
 Include "Parser";
+
+Replace PlayerTo;
 Include "VerbLib";
+[ PlayerTo newplace flag;
+    NoteDeparture();
+    move player to newplace;
+    move computer to newplace;
+    while (parent(newplace)) newplace = parent(newplace);
+    location = real_location = newplace;
+    MoveFloatingObjects(); AdjustLight(1);
+    switch (flag) {
+      0:    <Look>;
+      1:    NoteArrival(); ScoreArrival();
+      2:    LookSub(1);
+    }
+];
 
 Include "Globals.inf";
 Include "Classes.inf";
@@ -13,9 +28,10 @@ Include "Characters.inf";
 Include "Items.inf";
 
 [ Initialise ;
-    location = lower_decks; ! @todo switch to bunk
+    location = bunk; ! @todo switch to bunk
     player.description = "You are wearing an operations uniform,
             with a single pip.";
+    move computer to bunk;
 ];
 
 Include "Grammar";

From fd508d9ab0430d227d4e4a5f8383dadd6f6ecdad Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 11 Jan 2022 11:13:34 -0600
Subject: [PATCH 19/44] =?UTF-8?q?=F0=9F=90=9B=20Allow=20computer=20to=20al?=
 =?UTF-8?q?ways=20set=20lights?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Characters.inf | 1 -
 Classes.inf    | 9 ++++++++-
 MoreVerbs.inf  | 0
 remontel.inf   | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 MoreVerbs.inf

diff --git a/Characters.inf b/Characters.inf
index 8d193bd..a6299dd 100644
--- a/Characters.inf
+++ b/Characters.inf
@@ -1,4 +1,3 @@
-! @todo fix talking to computer when lights are off
 Object computer "Computer"
     with name 'computer' 'ship',
         description "The computer of the ship uses non-sentient artificial intelligence^
diff --git a/Classes.inf b/Classes.inf
index 7475720..489c1ba 100644
--- a/Classes.inf
+++ b/Classes.inf
@@ -1,4 +1,11 @@
-Class Room has light;
+Class Room
+    with add_to_scope [;
+        AddToScope(computer);
+        PlaceInScope(computer);
+        AddToScope(lights);
+        PlaceInScope(lights);
+    ],
+    has light;
 
 ! Class Set
 !     with before [;
diff --git a/MoreVerbs.inf b/MoreVerbs.inf
new file mode 100644
index 0000000..e69de29
diff --git a/remontel.inf b/remontel.inf
index f00ab55..06c9781 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -28,10 +28,11 @@ Include "Characters.inf";
 Include "Items.inf";
 
 [ Initialise ;
-    location = bunk; ! @todo switch to bunk
+    location = bunk;
     player.description = "You are wearing an operations uniform,
             with a single pip.";
     move computer to bunk;
 ];
 
 Include "Grammar";
+Include "MoreVerbs.inf";
\ No newline at end of file

From 8a6446617d3fad3f546ac1347812eea799d7f741 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 11 Jan 2022 14:39:18 -0600
Subject: [PATCH 20/44] =?UTF-8?q?=F0=9F=9A=9A=20Move=20include=20files=20t?=
 =?UTF-8?q?o=20subdirectory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                  | 8 ++++----
 Characters.inf => includes/Characters.inf | 0
 Classes.inf => includes/Classes.inf       | 0
 Globals.inf => includes/Globals.inf       | 0
 Items.inf => includes/Items.inf           | 0
 MoreVerbs.inf => includes/MoreVerbs.inf   | 0
 Rooms.inf => includes/Rooms.inf           | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename Characters.inf => includes/Characters.inf (100%)
 rename Classes.inf => includes/Classes.inf (100%)
 rename Globals.inf => includes/Globals.inf (100%)
 rename Items.inf => includes/Items.inf (100%)
 rename MoreVerbs.inf => includes/MoreVerbs.inf (100%)
 rename Rooms.inf => includes/Rooms.inf (100%)

diff --git a/Makefile b/Makefile
index 95b7848..3b0a161 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,11 @@
 
 default: remontel.ulx remontel.z5
 
-remontel.ulx: remontel.inf *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
-	inform -G +include_path=,lib $<
+remontel.ulx: remontel.inf includes/*.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+	inform -G +include_path=,includes,lib $<
 
-remontel.z5: remontel.inf *.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
-	inform +include_path=,lib $<
+remontel.z5: remontel.inf includes/*.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+	inform +include_path=,includes,lib $<
 
 lib/Parser.h lib/VerbLib.h lib/Grammar.h:
 	$(MAKE) -C lib Parser.h
diff --git a/Characters.inf b/includes/Characters.inf
similarity index 100%
rename from Characters.inf
rename to includes/Characters.inf
diff --git a/Classes.inf b/includes/Classes.inf
similarity index 100%
rename from Classes.inf
rename to includes/Classes.inf
diff --git a/Globals.inf b/includes/Globals.inf
similarity index 100%
rename from Globals.inf
rename to includes/Globals.inf
diff --git a/Items.inf b/includes/Items.inf
similarity index 100%
rename from Items.inf
rename to includes/Items.inf
diff --git a/MoreVerbs.inf b/includes/MoreVerbs.inf
similarity index 100%
rename from MoreVerbs.inf
rename to includes/MoreVerbs.inf
diff --git a/Rooms.inf b/includes/Rooms.inf
similarity index 100%
rename from Rooms.inf
rename to includes/Rooms.inf

From 8afeaa18c5ce1efa8e62d191c03ea2adf2596c8f Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 11 Jan 2022 15:59:41 -0600
Subject: [PATCH 21/44] =?UTF-8?q?=F0=9F=91=B7=20Remove=20current=20directo?=
 =?UTF-8?q?ry=20from=20include=20path=20in=20Makefile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No longer needed since everything is in includes
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3b0a161..791c39d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 default: remontel.ulx remontel.z5
 
 remontel.ulx: remontel.inf includes/*.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
-	inform -G +include_path=,includes,lib $<
+	inform -G +include_path=includes,lib $<
 
 remontel.z5: remontel.inf includes/*.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
-	inform +include_path=,includes,lib $<
+	inform +include_path=includes,lib $<
 
 lib/Parser.h lib/VerbLib.h lib/Grammar.h:
 	$(MAKE) -C lib Parser.h

From 407d5c9d1b9b18d6ff510364e8491b282df32db4 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 11 Jan 2022 16:00:16 -0600
Subject: [PATCH 22/44] =?UTF-8?q?=F0=9F=90=9B=20Fix=20name=20of=20bunk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/Rooms.inf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/includes/Rooms.inf b/includes/Rooms.inf
index 7fdb8bf..54baa67 100644
--- a/includes/Rooms.inf
+++ b/includes/Rooms.inf
@@ -1,13 +1,11 @@
-! @todo fix "You stand" when in bunk
 Room lower_decks "Lower Decks Corridor"
     with description "You stand in a lower decks corridor.
                       This corridor contains several bunks
                       lining the walls where the lower deckers
                       sleep.";
 
-! @todo fix "in the Your bunk"
-Room bunk "Your bunk" lower_decks
+Room bunk "your bunk" lower_decks
     with name 'bunk' 'bunks',
       description "Your bunk is like every other bunk on the lower decks.^
            It's barely big enough to fit you. But it's home.",
-    has enterable container static ~open ~light;
+    has proper enterable container static ~open ~light;

From 2d4597002992fe32e752b6a9cd77bbdc16e47021 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 11 Jan 2022 16:08:48 -0600
Subject: [PATCH 23/44] =?UTF-8?q?=E2=9C=A8=20Add=20red=20alert=20that=20st?=
 =?UTF-8?q?ops=20after=20exiting=20bunk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/Items.inf | 5 +++++
 includes/Rooms.inf | 3 +++
 remontel.inf       | 1 +
 3 files changed, 9 insertions(+)

diff --git a/includes/Items.inf b/includes/Items.inf
index 8ce179a..f0376d0 100644
--- a/includes/Items.inf
+++ b/includes/Items.inf
@@ -5,3 +5,8 @@ Decoration poster "Starfleet recruitment poster" bunk
         with before [;
              Take: print_ret (The) self, " is stuck on the ceiling.";
         ];
+
+Decoration red_alert "Red alert"
+    with daemon [;
+        "A red alert sounds";
+    ];
\ No newline at end of file
diff --git a/includes/Rooms.inf b/includes/Rooms.inf
index 54baa67..9c83f7d 100644
--- a/includes/Rooms.inf
+++ b/includes/Rooms.inf
@@ -8,4 +8,7 @@ Room bunk "your bunk" lower_decks
     with name 'bunk' 'bunks',
       description "Your bunk is like every other bunk on the lower decks.^
            It's barely big enough to fit you. But it's home.",
+      after [;
+          Exit: StopDaemon(red_alert);
+      ],
     has proper enterable container static ~open ~light;
diff --git a/remontel.inf b/remontel.inf
index 06c9781..8cf8023 100644
--- a/remontel.inf
+++ b/remontel.inf
@@ -32,6 +32,7 @@ Include "Items.inf";
     player.description = "You are wearing an operations uniform,
             with a single pip.";
     move computer to bunk;
+    StartDaemon(red_alert);
 ];
 
 Include "Grammar";

From edcb4a08f9d597912fc27f6333f9fb9925a99242 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 11 Jan 2022 19:07:15 -0600
Subject: [PATCH 24/44] =?UTF-8?q?=F0=9F=9A=9A=20Move=20Computer=20into=20o?=
 =?UTF-8?q?wn=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/Characters.inf | 36 +-----------------------------------
 includes/Computer.inf   | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 35 deletions(-)
 create mode 100644 includes/Computer.inf

diff --git a/includes/Characters.inf b/includes/Characters.inf
index a6299dd..bb98e1f 100644
--- a/includes/Characters.inf
+++ b/includes/Characters.inf
@@ -1,38 +1,4 @@
-Object computer "Computer"
-    with name 'computer' 'ship',
-        description "The computer of the ship uses non-sentient artificial intelligence^
-            It can perform many tasks and answer questions.",
-        found_in [; rtrue; ],
-        orders [loc ;
-            loc = parent(player);
-            SetTo:
-                if (noun == lights && second == 'full') {
-                    give loc light;
-                    print_ret "Lights at full.";
-                }
-                if (noun == lights && (second == 'zero' || second == 'off')) {
-                    give loc ~light;
-                    print_ret "Lights are off.";
-                }
-                print_ret "I do not know how to set ", (the) noun, " to ", (address) second;
-            Open:
-                switch(noun) {
-                    bunk:
-                        give noun open;
-                        print_ret (The) noun, " is open.";
-                }
-            Close:
-                switch(noun) {
-                    bunk:
-                        give noun ~open;
-                        print_ret (The) noun, " is closed.";
-                }
-            Tell:
-                ! @todo fill this out for various things to talk about
-                print_ret "You want me to tell you about ", (string) second;
-            NotUnderstood: print_ret "I do not understand.";
-        ],
-    has animate scenery;
+Include "Computer.inf";
 
 Object lights "Lights"
     with name 'lights',
diff --git a/includes/Computer.inf b/includes/Computer.inf
new file mode 100644
index 0000000..150b545
--- /dev/null
+++ b/includes/Computer.inf
@@ -0,0 +1,35 @@
+Object computer "Computer"
+    with name 'computer' 'ship',
+        description "The computer of the ship uses non-sentient artificial intelligence^
+            It can perform many tasks and answer questions.",
+        found_in [; rtrue; ],
+        orders [loc ;
+            loc = parent(player);
+            SetTo:
+                if (noun == lights && second == 'full') {
+                    give loc light;
+                    print_ret "Lights at full.";
+                }
+                if (noun == lights && (second == 'zero' || second == 'off')) {
+                    give loc ~light;
+                    print_ret "Lights are off.";
+                }
+                print_ret "I do not know how to set ", (the) noun, " to ", (address) second;
+            Open:
+                switch(noun) {
+                    bunk:
+                        give noun open;
+                        print_ret (The) noun, " is open.";
+                }
+            Close:
+                switch(noun) {
+                    bunk:
+                        give noun ~open;
+                        print_ret (The) noun, " is closed.";
+                }
+            Tell:
+                ! @todo fill this out for various things to talk about
+                print_ret "You want me to tell you about ", (string) second;
+            NotUnderstood: print_ret "I do not understand.";
+        ],
+    has animate scenery;

From 4d93185b7565d2391dfba58799afb4371976a496 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 11 Jan 2022 19:08:28 -0600
Subject: [PATCH 25/44] =?UTF-8?q?=F0=9F=92=AC=20Add=20pirate's=20appearanc?=
 =?UTF-8?q?e=20to=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script.fountain | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/script.fountain b/script.fountain
index 7e8d6ec..602ba23 100644
--- a/script.fountain
+++ b/script.fountain
@@ -22,6 +22,8 @@ The lights come up, and we see the bunk. It is small, just big enough to fit a s
 It is sparsely decorated. There is a single poster affixed to the ceiling of the bunk. The poster is a Starfleet recruitement poster.
 Our protagonist keeps it in her bunk to remind herself of why she joined Starfleet.
 
+Red Alert continues to blare.
+
 The protagonist is dressed in the familiar operations uniform, and a single Ensign's pip.
 
 PROTAGONIST
@@ -33,3 +35,8 @@ The protagonist climbs out of her bunk. Hers is the second in a stack of three,
 
 As her feet step down, the alarm stops.
 
+PIRATE LEADER (ON SPEAKER)
+Attention crew of the USS Remontel. Your captain, bridge crew, and senior officers are in our custody. Your ship is under our control.
+
+PIRATE LEADER (CONT.)
+Anybody who attempts to oppose us will be met with a swift end. If you stay where you are and do not interfere in our plans, you will be released safely shortly.

From 270aa3ff3c3a53a306c4147d171b7712d9439ba3 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 11 Jan 2022 20:55:41 -0600
Subject: [PATCH 26/44] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Wake=20up=20routine?=
 =?UTF-8?q?=20runs=20once?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/Characters.inf |  5 +----
 includes/Classes.inf    | 14 ++++++++------
 includes/Globals.inf    |  8 ++++++++
 includes/Items.inf      |  7 ++++++-
 includes/Rooms.inf      |  2 +-
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/includes/Characters.inf b/includes/Characters.inf
index bb98e1f..0dae525 100644
--- a/includes/Characters.inf
+++ b/includes/Characters.inf
@@ -1,6 +1,3 @@
 Include "Computer.inf";
 
-Object lights "Lights"
-    with name 'lights',
-    found_in [; rtrue; ],
-    has static scenery;
\ No newline at end of file
+NPC pirate_leader "Pirate Leader";
diff --git a/includes/Classes.inf b/includes/Classes.inf
index 489c1ba..5a7e9d4 100644
--- a/includes/Classes.inf
+++ b/includes/Classes.inf
@@ -7,12 +7,12 @@ Class Room
     ],
     has light;
 
-! Class Set
-!     with before [;
-!         Examine: return false;
-!         default: print_ret "You can't do that with ", (the) self, ".";
-!     ],
-!     has scenery;
+Class Set
+    with before [;
+        Examine: return false;
+        default: print_ret "You can't do that with ", (the) self, ".";
+    ],
+    has scenery;
 
 Class Decoration
     with before [;
@@ -28,3 +28,5 @@ Class Decoration
 !             print_ret (the) self, " is too heavy for that.";
 !     ],
 !     has supporter;
+
+Class NPC has animate;
\ No newline at end of file
diff --git a/includes/Globals.inf b/includes/Globals.inf
index e69de29..150d128 100644
--- a/includes/Globals.inf
+++ b/includes/Globals.inf
@@ -0,0 +1,8 @@
+Global woke = false;
+
+[ OutOfBed;
+    if (woke) rfalse;
+    woke = true;
+    StopDaemon(red_alert);
+    print "Good morning^";
+];
\ No newline at end of file
diff --git a/includes/Items.inf b/includes/Items.inf
index f0376d0..1aaf2c9 100644
--- a/includes/Items.inf
+++ b/includes/Items.inf
@@ -9,4 +9,9 @@ Decoration poster "Starfleet recruitment poster" bunk
 Decoration red_alert "Red alert"
     with daemon [;
         "A red alert sounds";
-    ];
\ No newline at end of file
+    ];
+
+Set lights "Lights"
+    with name 'lights',
+    found_in [; rtrue; ],
+    has static concealed;
diff --git a/includes/Rooms.inf b/includes/Rooms.inf
index 9c83f7d..59f2576 100644
--- a/includes/Rooms.inf
+++ b/includes/Rooms.inf
@@ -9,6 +9,6 @@ Room bunk "your bunk" lower_decks
       description "Your bunk is like every other bunk on the lower decks.^
            It's barely big enough to fit you. But it's home.",
       after [;
-          Exit: StopDaemon(red_alert);
+          Exit: OutOfBed();
       ],
     has proper enterable container static ~open ~light;

From aa0aac798319a12f164c87fb5b14aa766a11ed83 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Wed, 12 Jan 2022 08:40:51 -0600
Subject: [PATCH 27/44] =?UTF-8?q?=F0=9F=91=B7=20Improve=20Makefiles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile     |  4 ++--
 lib/Makefile | 24 ++++++++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 791c39d..9f90261 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ remontel.ulx: remontel.inf includes/*.inf lib/Parser.h lib/VerbLib.h lib/Grammar
 remontel.z5: remontel.inf includes/*.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
 	inform +include_path=includes,lib $<
 
-lib/Parser.h lib/VerbLib.h lib/Grammar.h:
-	$(MAKE) -C lib Parser.h
+lib/%.h:
+	$(MAKE) -C '$(@D)' '$(@F)'
 
 script.pdf: script.fountain
 	screenplain $< $@
diff --git a/lib/Makefile b/lib/Makefile
index ca62c1b..fa6e32a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,15 +1,23 @@
 .PHONY: default
 
-default: Parser.h
+default: Parser.h Grammar.h VerbLib.h
 
-parser.h grammar.h verblib.h:
+parser.h grammar.h verblib.h version.h english.h:
 	wget https://ifarchive.org/if-archive/infocom/compilers/inform6/library/inform6lib-6.12.5.zip
 	unzip -u -j inform6lib-6.12.5.zip
 	rm -v inform6lib-6.12.5.zip
 
-Parser.h Grammar.h VerbLib.h: parser.h grammar.h verblib.h
-	ln -s parser.h Parser.h
-	ln -s grammar.h Grammar.h
-	ln -s verblib.h VerbLib.h
-	ln -s english.h English.h
-	ln -s version.h Version.h
+Parser.h: parser.h Version.h
+	ln -s $< $@
+
+Grammar.h: grammar.h English.h
+	ln -s $< $@
+
+VerbLib.h: verblib.h
+	ln -s $< $@
+
+Version.h: version.h
+	ln -s $< $@
+
+English.h: english.h
+	ln -s $< $@

From 01514006894045f5ab5a91a27a1c5af8832308fd Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Wed, 12 Jan 2022 09:39:54 -0600
Subject: [PATCH 28/44] =?UTF-8?q?=F0=9F=91=B7=20Update=20Makefile=20with?=
 =?UTF-8?q?=20external=20libs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9f90261..9b9185c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
 .PHONY: default
 
+libs = lib/Parser.h lib/VerbLib.h lib/Grammar.h
+
 default: remontel.ulx remontel.z5
 
-remontel.ulx: remontel.inf includes/*.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+remontel.ulx: remontel.inf includes/*.inf $(libs)
 	inform -G +include_path=includes,lib $<
 
-remontel.z5: remontel.inf includes/*.inf lib/Parser.h lib/VerbLib.h lib/Grammar.h
+remontel.z5: remontel.inf includes/*.inf $(libs)
 	inform +include_path=includes,lib $<
 
 lib/%.h:

From 22c55572f75eb7a0d008962f6d48d68a976c04d9 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Wed, 12 Jan 2022 16:44:49 -0600
Subject: [PATCH 29/44] =?UTF-8?q?=F0=9F=92=AC=20Add=20some=20internal=20di?=
 =?UTF-8?q?alog=20to=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script.fountain | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/script.fountain b/script.fountain
index 602ba23..6d440bc 100644
--- a/script.fountain
+++ b/script.fountain
@@ -40,3 +40,5 @@ Attention crew of the USS Remontel. Your captain, bridge crew, and senior office
 
 PIRATE LEADER (CONT.)
 Anybody who attempts to oppose us will be met with a swift end. If you stay where you are and do not interfere in our plans, you will be released safely shortly.
+
+The protagonist stands there, a bit dumbfounded. Why would someone capture this, of all ships? The Remontel is one of the most insignificant ships in the fleet.

From 3b3bd5fa0ed94242e4f81e2584714935edbdb383 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Wed, 12 Jan 2022 22:15:51 -0600
Subject: [PATCH 30/44] =?UTF-8?q?=F0=9F=92=AC=20Fill=20out=20pirate's=20an?=
 =?UTF-8?q?nouncement.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also add boatswain's call
---
 includes/Globals.inf | 13 ++++++++++++-
 script.fountain      |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/includes/Globals.inf b/includes/Globals.inf
index 150d128..f336beb 100644
--- a/includes/Globals.inf
+++ b/includes/Globals.inf
@@ -4,5 +4,16 @@ Global woke = false;
     if (woke) rfalse;
     woke = true;
     StopDaemon(red_alert);
-    print "Good morning^";
+    "^^The klaxon stops, and briefly, the ship is quiet. Eerily quiet.
+     The other officers and crewmen around you stand and stare, waiting.
+     ^^
+     A boatswain's call is briefly heard, and then an announcement begins.
+     The voice is unfamiliar.
+     ^^
+     ~Attention crew of the USS Remontel. Your captain, bridge crew,
+     and senior officers are in our custody. Your ship is under our control.~
+     ^^
+     ~Anybody who attempts to oppose us will be met with a swift end.
+     If you stay where you are and do not interfere in our plans,
+     you will be released safely shortly.~";
 ];
\ No newline at end of file
diff --git a/script.fountain b/script.fountain
index 6d440bc..7af4893 100644
--- a/script.fountain
+++ b/script.fountain
@@ -33,7 +33,7 @@ The bunk wall slides open, revealing a hallway which serves as the lower deck qu
 
 The protagonist climbs out of her bunk. Hers is the second in a stack of three, so there is some space to step down.
 
-As her feet step down, the alarm stops.
+As her feet step down, the alarm stops. A boatswain's call is briefly heard, followed by an announcement.
 
 PIRATE LEADER (ON SPEAKER)
 Attention crew of the USS Remontel. Your captain, bridge crew, and senior officers are in our custody. Your ship is under our control.
@@ -41,4 +41,4 @@ Attention crew of the USS Remontel. Your captain, bridge crew, and senior office
 PIRATE LEADER (CONT.)
 Anybody who attempts to oppose us will be met with a swift end. If you stay where you are and do not interfere in our plans, you will be released safely shortly.
 
-The protagonist stands there, a bit dumbfounded. Why would someone capture this, of all ships? The Remontel is one of the most insignificant ships in the fleet.
+The protagonist stands there, a dumbfounded. Why would someone capture this, of all ships? The Remontel is one of the most insignificant ships in the fleet.

From 90a1e7f117821484e0f53efffc0661c38270048a Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sat, 15 Jan 2022 11:30:03 -0600
Subject: [PATCH 31/44] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Move=20OutOfBed=20to?=
 =?UTF-8?q?=20lower=5Fdecks=20description?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's easier to read there
---
 includes/Globals.inf |  4 +++-
 includes/Rooms.inf   | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/includes/Globals.inf b/includes/Globals.inf
index f336beb..b8d6046 100644
--- a/includes/Globals.inf
+++ b/includes/Globals.inf
@@ -15,5 +15,7 @@ Global woke = false;
      ^^
      ~Anybody who attempts to oppose us will be met with a swift end.
      If you stay where you are and do not interfere in our plans,
-     you will be released safely shortly.~";
+     you will be released safely shortly.~
+     ^^
+     ";
 ];
\ No newline at end of file
diff --git a/includes/Rooms.inf b/includes/Rooms.inf
index 59f2576..2d8b0ad 100644
--- a/includes/Rooms.inf
+++ b/includes/Rooms.inf
@@ -1,14 +1,14 @@
 Room lower_decks "Lower Decks Corridor"
-    with description "You stand in a lower decks corridor.
-                      This corridor contains several bunks
-                      lining the walls where the lower deckers
-                      sleep.";
+    with description [;
+       if (player in lower_decks) OutOfBed();
+       "You stand in a lower decks corridor.
+        This corridor contains several bunks
+        lining the walls where the lower deckers
+        sleep.";
+     ];
 
 Room bunk "your bunk" lower_decks
     with name 'bunk' 'bunks',
       description "Your bunk is like every other bunk on the lower decks.^
            It's barely big enough to fit you. But it's home.",
-      after [;
-          Exit: OutOfBed();
-      ],
     has proper enterable container static ~open ~light;

From e1e27fbf119be86dabbd07138265c0d49e68f8b6 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sat, 15 Jan 2022 11:50:54 -0600
Subject: [PATCH 32/44] =?UTF-8?q?=F0=9F=92=AC=20Add=20to=20intro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/Globals.inf | 4 ++++
 script.fountain      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/includes/Globals.inf b/includes/Globals.inf
index b8d6046..4d73961 100644
--- a/includes/Globals.inf
+++ b/includes/Globals.inf
@@ -17,5 +17,9 @@ Global woke = false;
      If you stay where you are and do not interfere in our plans,
      you will be released safely shortly.~
      ^^
+     You stand there, a bit dumbfounded. Why would someone capture this,
+     of all ships? The Remontel is one of the most insignificant ships
+     in the fleet.
+     ^^
      ";
 ];
\ No newline at end of file
diff --git a/script.fountain b/script.fountain
index 7af4893..2c098e9 100644
--- a/script.fountain
+++ b/script.fountain
@@ -41,4 +41,4 @@ Attention crew of the USS Remontel. Your captain, bridge crew, and senior office
 PIRATE LEADER (CONT.)
 Anybody who attempts to oppose us will be met with a swift end. If you stay where you are and do not interfere in our plans, you will be released safely shortly.
 
-The protagonist stands there, a dumbfounded. Why would someone capture this, of all ships? The Remontel is one of the most insignificant ships in the fleet.
+The protagonist stands there, a bit dumbfounded. Why would someone capture this, of all ships? The Remontel is one of the most insignificant ships in the fleet.

From da7db84255efebd86ab7ff51678d2ec03f7d36ea Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 23 Jan 2022 12:10:11 -0600
Subject: [PATCH 33/44] =?UTF-8?q?=F0=9F=92=AC=20A=20few=20tweaks=20to=20sc?=
 =?UTF-8?q?ript?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script.fountain | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/script.fountain b/script.fountain
index 2c098e9..1185c23 100644
--- a/script.fountain
+++ b/script.fountain
@@ -4,13 +4,13 @@ Author: Dan Jones
 Notes:
   Story for "The Siege of Remontel" text adventure game.
 Contact: <danjones@goodevilgenius.org>
-Draft date: 2022-01-10
+Draft date: 2022-01-23
 
 ===
 
 INT. BUNK
 
-The bunk is closed. It is dark. Our protagonist is laying in her bed. A red alert klaxon is blaring, having woken her up.
+The bunk is closed. It is dark. Our protagonist lies in her bed. A red alert klaxon is blaring, having woken her up.
 
 PROTAGONIST (V.O.)
 What in the world is that?
@@ -37,8 +37,7 @@ As her feet step down, the alarm stops. A boatswain's call is briefly heard, fol
 
 PIRATE LEADER (ON SPEAKER)
 Attention crew of the USS Remontel. Your captain, bridge crew, and senior officers are in our custody. Your ship is under our control.
-
-PIRATE LEADER (CONT.)
+  
 Anybody who attempts to oppose us will be met with a swift end. If you stay where you are and do not interfere in our plans, you will be released safely shortly.
 
 The protagonist stands there, a bit dumbfounded. Why would someone capture this, of all ships? The Remontel is one of the most insignificant ships in the fleet.

From 27027475c8ec91ad3a04342a709eb90667970694 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 30 Jan 2022 15:53:03 -0600
Subject: [PATCH 34/44] =?UTF-8?q?=F0=9F=92=AC=20A=20bit=20more=20color?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/Globals.inf | 2 +-
 includes/Items.inf   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/Globals.inf b/includes/Globals.inf
index 4d73961..b8cffdc 100644
--- a/includes/Globals.inf
+++ b/includes/Globals.inf
@@ -8,7 +8,7 @@ Global woke = false;
      The other officers and crewmen around you stand and stare, waiting.
      ^^
      A boatswain's call is briefly heard, and then an announcement begins.
-     The voice is unfamiliar.
+     The voice, commanding but craggly, is unfamiliar.
      ^^
      ~Attention crew of the USS Remontel. Your captain, bridge crew,
      and senior officers are in our custody. Your ship is under our control.~
diff --git a/includes/Items.inf b/includes/Items.inf
index 1aaf2c9..c4b8276 100644
--- a/includes/Items.inf
+++ b/includes/Items.inf
@@ -8,7 +8,7 @@ Decoration poster "Starfleet recruitment poster" bunk
 
 Decoration red_alert "Red alert"
     with daemon [;
-        "A red alert sounds";
+        "^A red alert klaxon sounds";
     ];
 
 Set lights "Lights"

From 81c2bb55b0dd7cb17670c3c9135a3a2a90c1f9d6 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 30 Jan 2022 16:43:50 -0600
Subject: [PATCH 35/44] =?UTF-8?q?=F0=9F=92=AC=20More=20of=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script.fountain | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/script.fountain b/script.fountain
index 1185c23..0ec3551 100644
--- a/script.fountain
+++ b/script.fountain
@@ -41,3 +41,16 @@ Attention crew of the USS Remontel. Your captain, bridge crew, and senior office
 Anybody who attempts to oppose us will be met with a swift end. If you stay where you are and do not interfere in our plans, you will be released safely shortly.
 
 The protagonist stands there, a bit dumbfounded. Why would someone capture this, of all ships? The Remontel is one of the most insignificant ships in the fleet.
+
+She looks around and notices several other junior officers standing around, confused, scared, and unsure. Her friend, Ensign Christi Gomez, stands next to her.
+
+PROTAGONIST
+Christi, what are we going to do?
+
+GOMEZ
+I don't know. Should we try to contact Starfleet?
+
+Ensign Ruux, a Rhaandarite, stands nearby. He is soft-spoken, and very tall. His wide forehead is a prominent feature.
+
+RUUX
+I don't think we should do anything. You heard him. All the senior officers have been taken. Whoever our captors are, they've already outsmarted the best of us. We should do what they say and hope they'll let us go.

From 9ff44ba57efa4a285408ea0a0234b8eb46caf048 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 30 Jan 2022 20:11:09 -0600
Subject: [PATCH 36/44] =?UTF-8?q?=F0=9F=92=A1=20Add=20some=20notes=20for?=
 =?UTF-8?q?=20ideas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 notes.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 notes.md

diff --git a/notes.md b/notes.md
new file mode 100644
index 0000000..502cd0d
--- /dev/null
+++ b/notes.md
@@ -0,0 +1,23 @@
+# Notes
+
+## Character ideas
+
+- Christi Gomez
+    + Species: Human
+    + Ensign
+- Ruux
+    + Need first name, maybe
+    + Species: [Rhaandarite][]
+    + Young: 78 years old
+    + Naive, insecure
+- Dorkna Miklis
+    + Species: [Zakdorn][]
+    + Weasley, untrustworthy
+    + Probably another ensign
+- Need a Catian or Kzinti
+    + Kzinti pirate
+        - Maybe the leader
+    + Maybe Caitian crew member can relate to, or seduce, him
+
+[Zakdorn]: https://memory-alpha.fandom.com/wiki/Zakdorn
+[Rhaandarite]: https://memory-alpha.fandom.com/wiki/Rhaandarite

From 83facdc4d0803c659f7e76873f3d01e68b45686f Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Fri, 4 Feb 2022 11:17:40 -0600
Subject: [PATCH 37/44] =?UTF-8?q?=F0=9F=92=A1=20Add=20a=20few=20more=20not?=
 =?UTF-8?q?es=20regarding=20Kzinti?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 notes.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/notes.md b/notes.md
index 502cd0d..37ed75d 100644
--- a/notes.md
+++ b/notes.md
@@ -14,10 +14,16 @@
     + Species: [Zakdorn][]
     + Weasley, untrustworthy
     + Probably another ensign
-- Need a Catian or Kzinti
+- Need a Catian or [Kzinti][]
     + Kzinti pirate
         - Maybe the leader
+        - [Further resource][Kzinti-Theurgy]
     + Maybe Caitian crew member can relate to, or seduce, him
+        - Maybe not. Kzinti females are not intelligent
+        - Also Kzinti only mate for reproduction
+        - But, maybe might work
 
 [Zakdorn]: https://memory-alpha.fandom.com/wiki/Zakdorn
 [Rhaandarite]: https://memory-alpha.fandom.com/wiki/Rhaandarite
+[Kzinti]: https://memory-alpha.fandom.com/wiki/Kzinti
+[Kzinti-Theurgy]: https://uss-theurgy.com/w/index.php?title=Kzinti

From 6f44b6f01d5917c15fe93c101bf2f87919b3db00 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Wed, 9 Feb 2022 16:41:31 -0600
Subject: [PATCH 38/44] =?UTF-8?q?=E2=9C=A8=20Add=20characters=20in=20lower?=
 =?UTF-8?q?=5Fdecks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/Characters.inf | 24 +++++++++++++++++++++++-
 includes/Classes.inf    |  9 ++++++++-
 includes/MoreVerbs.inf  |  9 +++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/includes/Characters.inf b/includes/Characters.inf
index 0dae525..e4cf91b 100644
--- a/includes/Characters.inf
+++ b/includes/Characters.inf
@@ -1,3 +1,25 @@
 Include "Computer.inf";
 
-NPC pirate_leader "Pirate Leader";
+NPC pirate_leader "Pirate Leader"
+    with name 'pirate' 'leader' 'kzinti',
+         description "The pirate leader is a large, imposing, Kzinti male.^
+                     His fangs are clearly visible coming out of his mouth.^
+                     You'd heard that Kzinti were cat-like, but his imposing frame
+                     reminds you of a jaquar, ready to pounce on unsuspecting prey."
+    has ~proper male;
+
+NPC gomez "Christi Gomez" lower_decks
+    with name 'ensign' 'christi' 'gomez',
+         description "Ensign Christi Gomez is your best friend on the ship.^
+                     You and she attended the academy together, and were
+                     thrilled to be assigned to the same ship.",
+         found_in lower_decks
+    has female;
+
+NPC ruux "Ruux" lower_decks
+    with name 'ensign' 'ruux' 'rhaandarite',
+         description "Ensign Ruux is a Rhaandarite. He has a wide and high forehead.^
+                     He is calm and soft-spoken, and very tall by human standards.^
+                     At 78 years old, he is quite young for his species.",
+         found_in lower_decks
+    has male;
diff --git a/includes/Classes.inf b/includes/Classes.inf
index 5a7e9d4..3afa53e 100644
--- a/includes/Classes.inf
+++ b/includes/Classes.inf
@@ -29,4 +29,11 @@ Class Decoration
 !     ],
 !     has supporter;
 
-Class NPC has animate;
\ No newline at end of file
+Class NPC
+      with life [;
+           Answer,Ask,Order,Tell:
+              "Just Talk To ", (the) self, ".";
+           Talk:
+              "Hello, Ensign.";
+      ],
+      has animate proper;
diff --git a/includes/MoreVerbs.inf b/includes/MoreVerbs.inf
index e69de29..095bd4a 100644
--- a/includes/MoreVerbs.inf
+++ b/includes/MoreVerbs.inf
@@ -0,0 +1,9 @@
+[ TalkSub;
+  if (noun == player) print_ret "Nothing you hear surprises you.";
+  if (RunLife(noun,##Talk) ~= false) return;
+  "At the moment, you can't think of anything to say.";
+];
+
+Verb 'talk' 't//' 'converse' 'chat' 'gossip'
+     * 'to'/'with' creature        -> Talk
+     * creature                    -> Talk;

From e87d0f3e9626846906d31be6358ff73e9163598e Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 1 Mar 2022 20:55:16 -0600
Subject: [PATCH 39/44] =?UTF-8?q?=F0=9F=93=9D=20Jot=20some=20notes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 notes.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/notes.md b/notes.md
index 37ed75d..d1abf38 100644
--- a/notes.md
+++ b/notes.md
@@ -22,8 +22,13 @@
         - Maybe not. Kzinti females are not intelligent
         - Also Kzinti only mate for reproduction
         - But, maybe might work
+- [Cygnian][]
+    + Has some type of clairvoyance
+    + Maybe good pirate
+    + cat-like
 
 [Zakdorn]: https://memory-alpha.fandom.com/wiki/Zakdorn
 [Rhaandarite]: https://memory-alpha.fandom.com/wiki/Rhaandarite
 [Kzinti]: https://memory-alpha.fandom.com/wiki/Kzinti
 [Kzinti-Theurgy]: https://uss-theurgy.com/w/index.php?title=Kzinti
+[Cygnian]: https://memory-beta.fandom.com/wiki/Cygnian

From 3d9ce3bf2929fd6a4d2c5f52631d0d68d7abbbc4 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Wed, 23 Mar 2022 13:10:13 -0500
Subject: [PATCH 40/44] =?UTF-8?q?=F0=9F=93=9D=20Add=20idea=20for=20Tellari?=
 =?UTF-8?q?te=20character?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 notes.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/notes.md b/notes.md
index d1abf38..e7ce130 100644
--- a/notes.md
+++ b/notes.md
@@ -26,9 +26,17 @@
     + Has some type of clairvoyance
     + Maybe good pirate
     + cat-like
+- [Tellarite][]
+    + Should be one of the pirates
+    + Should have prominent tusks, like [Tevrin Krit][]
+        * Make a joke about being a Northern Tellarite
+    + Should have to insult him to beat some puzzle
+        * Similar to defeating the Sword Master in Monkey Island
 
 [Zakdorn]: https://memory-alpha.fandom.com/wiki/Zakdorn
 [Rhaandarite]: https://memory-alpha.fandom.com/wiki/Rhaandarite
 [Kzinti]: https://memory-alpha.fandom.com/wiki/Kzinti
 [Kzinti-Theurgy]: https://uss-theurgy.com/w/index.php?title=Kzinti
 [Cygnian]: https://memory-beta.fandom.com/wiki/Cygnian
+[Tellarite]: https://memory-alpha.fandom.com/wiki/Tellarite
+[Tevrin Krit]: https://memory-alpha.fandom.com/wiki/Tevrin_Krit

From aeba1996ba0c5113063186477f59c41d8aa8e97f Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Sun, 23 Oct 2022 13:50:50 -0500
Subject: [PATCH 41/44] =?UTF-8?q?=E2=9C=A8=20Demote=20Kzinti=20Pirate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/Characters.inf | 13 +++++++++++--
 notes.md                |  4 ++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/includes/Characters.inf b/includes/Characters.inf
index e4cf91b..8d094e1 100644
--- a/includes/Characters.inf
+++ b/includes/Characters.inf
@@ -1,8 +1,17 @@
 Include "Computer.inf";
 
 NPC pirate_leader "Pirate Leader"
-    with name 'pirate' 'leader' 'kzinti',
-         description "The pirate leader is a large, imposing, Kzinti male.^
+    with name 'pirate' 'leader' 'tellarite'
+         description "The Pirate Leader is a stout, but menacing Tellarite.^
+                     Her large tusks are very prominent, much larger than other 
+                     Tellarites you've known.^
+                     (She must be a northern Tellarite.)^
+                     Despite her small stature, you can see she's not to be taken lightly."
+    has ~proper female
+
+NPC pirate_second "Pirate Second in Command"
+    with name 'pirate' 'xo' 'kzinti',
+         description "The pirate XO is a large, imposing, Kzinti male.^
                      His fangs are clearly visible coming out of his mouth.^
                      You'd heard that Kzinti were cat-like, but his imposing frame
                      reminds you of a jaquar, ready to pounce on unsuspecting prey."
diff --git a/notes.md b/notes.md
index e7ce130..0f8676a 100644
--- a/notes.md
+++ b/notes.md
@@ -32,6 +32,10 @@
         * Make a joke about being a Northern Tellarite
     + Should have to insult him to beat some puzzle
         * Similar to defeating the Sword Master in Monkey Island
+- Pirates
+    + Maybe consists entirely of non-primate species
+    + Angry with primates taking lead in Federation
+    + maybe leader should be Tellarite
 
 [Zakdorn]: https://memory-alpha.fandom.com/wiki/Zakdorn
 [Rhaandarite]: https://memory-alpha.fandom.com/wiki/Rhaandarite

From 9c2142ea66988b3d49f825b976ed329305b39fd5 Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Tue, 25 Oct 2022 09:54:51 -0500
Subject: [PATCH 42/44] =?UTF-8?q?=F0=9F=90=9B=20Missing=20punctuation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/Characters.inf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/Characters.inf b/includes/Characters.inf
index 8d094e1..3cafb94 100644
--- a/includes/Characters.inf
+++ b/includes/Characters.inf
@@ -1,20 +1,20 @@
 Include "Computer.inf";
 
 NPC pirate_leader "Pirate Leader"
-    with name 'pirate' 'leader' 'tellarite'
+    with name 'pirate' 'leader' 'tellarite',
          description "The Pirate Leader is a stout, but menacing Tellarite.^
-                     Her large tusks are very prominent, much larger than other 
+                     Her large tusks are very prominent, much larger than other
                      Tellarites you've known.^
                      (She must be a northern Tellarite.)^
-                     Despite her small stature, you can see she's not to be taken lightly."
-    has ~proper female
+                     Despite her small stature, you can see she's not to be taken lightly.",
+    has ~proper female;
 
 NPC pirate_second "Pirate Second in Command"
     with name 'pirate' 'xo' 'kzinti',
          description "The pirate XO is a large, imposing, Kzinti male.^
                      His fangs are clearly visible coming out of his mouth.^
                      You'd heard that Kzinti were cat-like, but his imposing frame
-                     reminds you of a jaquar, ready to pounce on unsuspecting prey."
+                     reminds you of a jaquar, ready to pounce on unsuspecting prey.",
     has ~proper male;
 
 NPC gomez "Christi Gomez" lower_decks

From 0289dc1563504aa274f77ea1919b3ded5ad3a4ab Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Fri, 13 Jan 2023 12:14:31 -0600
Subject: [PATCH 43/44] =?UTF-8?q?=F0=9F=92=A1=20Update=20some=20info=20fro?=
 =?UTF-8?q?m=20#WritingWonders?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 notes.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/notes.md b/notes.md
index 0f8676a..848a1a9 100644
--- a/notes.md
+++ b/notes.md
@@ -3,7 +3,9 @@
 ## Character ideas
 
 - Christi Gomez
-    + Species: Human
+    + Species: Vissian
+    + Third gender
+    + Parents defected to Federation so that she could have a real life
     + Ensign
 - Ruux
     + Need first name, maybe

From a0790c1ea0c1299bed985d1df713d253ff5322dd Mon Sep 17 00:00:00 2001
From: Dan Jones <danjones@goodevilgenius.org>
Date: Fri, 13 Jan 2023 13:43:46 -0600
Subject: [PATCH 44/44] =?UTF-8?q?=F0=9F=92=A1=20More=20#WritingWonders=20n?=
 =?UTF-8?q?otes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 notes.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/notes.md b/notes.md
index 848a1a9..4f8fb95 100644
--- a/notes.md
+++ b/notes.md
@@ -39,6 +39,18 @@
     + Angry with primates taking lead in Federation
     + maybe leader should be Tellarite
 
+## Plot ideas
+
+Time period: couple years after the Khitomer Accords. There is peace with
+Klingons. Romulans have been relatively quiet. The Federation is at relative
+piece with the two known quadrants.
+
+Must defeat pirate captain with battle of insults. Could be modeled after Sword
+Master in Secret of Monkey Island.
+
+Should include a holodeck challenge. Holodeck should be a very new tecnology at
+this time.
+
 [Zakdorn]: https://memory-alpha.fandom.com/wiki/Zakdorn
 [Rhaandarite]: https://memory-alpha.fandom.com/wiki/Rhaandarite
 [Kzinti]: https://memory-alpha.fandom.com/wiki/Kzinti