release version

evan-erdos · Sep 21, 2015 · f3ae8bc · f3ae8bc
1 parent 8baa0a5
commit f3ae8bc
Show file tree

Hide file tree

Showing 54 changed files with 21 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-CMU-ADV
+CMU.ADV
 =======
 
 A "Multi-User Dungeon" (if you think CMU is a dungeon...) Text Adventure!
@@ -27,13 +27,11 @@ A "Multi-User Dungeon" (if you think CMU is a dungeon...) Text Adventure!
 
 Above are the first few lines of cmu.adv, a file which probably still exists on the CMU afs server. Apparently, a similar attempt at writing a CMU text adventure was made in 1986, in some arcane, lisp-like language.
 
-This is a repository for the soon-to-be coolest text adventure on campus! *CMU-ADV* is written in TADS3, and compiles to a *.t3 format, readable by the [frob](https://github.com/realnc/frobtads "FrobTADS") interpreter.
+This is a repository for the soon-to-be coolest text adventure on campus! *CMU.ADV* is written in TADS3, and compiles to a *.t3 format, readable by the [frob](https://github.com/realnc/frobtads "FrobTADS") interpreter.
 
 ---
 You can play this online! Click the image below!
-[![cmu_adv](bescott.org/rsc/if/cmu-adv.png)][cmu-adv]
-
-[cmu-adv]: http://gs.tads.io/?storyfile=http://www.andrew.cmu.edu/user/bescott/cmu.adv/cmu_adv.t3
+[![cmu_adv](bescott.org/rsc/if/cmu-adv.png)](http://gs.tads.io/?storyfile=http://www.andrew.cmu.edu/user/bescott/cmu.adv/cmu_adv.t3)
 ---
 
 Todo:

diff --git a/obj/cmd/about.t3o b/obj/cmd/about.t3o
diff --git a/obj/cmd/baker.t3o b/obj/cmd/baker.t3o
diff --git a/obj/cmd/campus.t3o b/obj/cmd/campus.t3o
diff --git a/obj/cmd/cfa.t3o b/obj/cmd/cfa.t3o
diff --git a/obj/cmd/combat.t3o b/obj/cmd/combat.t3o
diff --git a/obj/cmd/dijkstra.t3o b/obj/cmd/dijkstra.t3o
diff --git a/obj/cmd/doherty.t3o b/obj/cmd/doherty.t3o
diff --git a/obj/cmd/ghc.t3o b/obj/cmd/ghc.t3o
diff --git a/obj/cmd/hammerschlag.t3o b/obj/cmd/hammerschlag.t3o
diff --git a/obj/cmd/hints.t3o b/obj/cmd/hints.t3o
diff --git a/obj/cmd/init.t3o b/obj/cmd/init.t3o
diff --git a/obj/cmd/items.t3o b/obj/cmd/items.t3o
diff --git a/obj/cmd/macros.t3o b/obj/cmd/macros.t3o
diff --git a/obj/cmd/main.t3o b/obj/cmd/main.t3o
diff --git a/obj/cmd/npcs.t3o b/obj/cmd/npcs.t3o
diff --git a/obj/cmd/officer.t3o b/obj/cmd/officer.t3o
diff --git a/obj/cmd/people.t3o b/obj/cmd/people.t3o
diff --git a/obj/cmd/rooms.t3o b/obj/cmd/rooms.t3o
diff --git a/obj/cmd/user.t3o b/obj/cmd/user.t3o
diff --git a/obj/cmd/util.t3o b/obj/cmd/util.t3o
diff --git a/obj/cmd/warner.t3o b/obj/cmd/warner.t3o
diff --git a/obj/web/about.t3o b/obj/web/about.t3o
diff --git a/obj/web/baker.t3o b/obj/web/baker.t3o
diff --git a/obj/web/campus.t3o b/obj/web/campus.t3o
diff --git a/obj/web/cfa.t3o b/obj/web/cfa.t3o
diff --git a/obj/web/combat.t3o b/obj/web/combat.t3o
diff --git a/obj/web/dijkstra.t3o b/obj/web/dijkstra.t3o
diff --git a/obj/web/doherty.t3o b/obj/web/doherty.t3o
diff --git a/obj/web/ghc.t3o b/obj/web/ghc.t3o
diff --git a/obj/web/hammerschlag.t3o b/obj/web/hammerschlag.t3o
diff --git a/obj/web/hints.t3o b/obj/web/hints.t3o
diff --git a/obj/web/init.t3o b/obj/web/init.t3o
diff --git a/obj/web/items.t3o b/obj/web/items.t3o
diff --git a/obj/web/macros.t3o b/obj/web/macros.t3o
diff --git a/obj/web/main.t3o b/obj/web/main.t3o
diff --git a/obj/web/npcs.t3o b/obj/web/npcs.t3o
diff --git a/obj/web/officer.t3o b/obj/web/officer.t3o
diff --git a/obj/web/people.t3o b/obj/web/people.t3o
diff --git a/obj/web/rooms.t3o b/obj/web/rooms.t3o
diff --git a/obj/web/user.t3o b/obj/web/user.t3o
diff --git a/obj/web/util.t3o b/obj/web/util.t3o
diff --git a/obj/web/warner.t3o b/obj/web/warner.t3o
diff --git a/src/about.t b/src/about.t
@@ -11,7 +11,7 @@ versionInfo : GameID {
 	original_byline = 'by Galloway & Kuehner & Pawlinger';
 	authorEmail = '[email protected]';
 	genre = 'Adventure';
-	version = 'v2.0.1';
+	version = 'v2.0.2';
 	firstPublished = '1986 (2015)';
 	IFID = 'TADS3CMU-ADV3-77C6-042E-278CEDED4BDC';
 
@@ -23,7 +23,7 @@ versionInfo : GameID {
 	} /* titleScreen */
 
 	showAbout() {
-		"\b<center><b><u>; <<versionInfo.name.toUpper()>></u></b>
+		"\b<b><u>; <<versionInfo.name.toUpper()>></u></b>
 		\n; <<versionInfo.tagline>>
 		\n; <<'&lt;'+versionInfo.original_byline+'&gt;'>>
 		\b<<versionInfo.byline>>, <<versionInfo.authorEmail>>

diff --git a/src/items.t b/src/items.t
@@ -27,20 +27,20 @@ flashlight : Flashlight 'flashlight' @root
 	weight = 2;
 }
 
-leaflet : Thing '(small) leaflet' 'the leaflet' @root
+leaflet : Thing '(small) leaflet' 'the leaflet' @the_cut
 "The leaflet is quite short, and has a tear along the top edge. It reads \"... the most amazing territory ever seen by mortals. No computer should be without one!\" At the end is what looks like a serial number, <b>69105</b>. Typical." {
 	initSpecialDesc = "There's a leaflet here, held down by a rock. An edge flutters in the breeze.";
 	initDesc = "It's just a small piece of paper. You have no idea how it hasn't blown away yet.";
 }
 
 futuristic_leaflet : Thing '(small) note/email' 'futuristic leaflet' @root
-"Hi guys, Homework 1 has been posted. Please start it right away. Note that, as opposed to other courses, you can think about most of these problems while waking around and doing mechanical errands. Cheers, Irina " {
+"It reads:\b \"Hi guys, Homework 1 has been posted. Please start it right away. Note that, as opposed to other courses, you can think about most of these problems while waking around and doing mechanical errands. Cheers, Irina\"\b You think you can see tears on the bottom, but those could just as easily be from the rain. " {
 	initSpecialDesc = "There's a really well printed note on the ground here. The resolution is like nothing you've ever seen come out of your dot-matrix printers.";
 	initDesc = "It's just a note. You wonder why it hasn't blown away yet.";
 }
 
 newspaper : Readable, Thing
-'tartan/newspaper' 'an issue of "The Tartan"' @dh_entrance
+'news/paper/tartan/newspaper' 'an issue of "The Tartan"' @dh_entrance
 "It's what passes for a newspaper at this school. " {
 	initSpecialDesc = "A newspaper lies discarded on the ground. ";
 	readDesc {

diff --git a/src/main.t b/src/main.t
@@ -12,7 +12,7 @@ gameMain : GameMainDef { // impugn
 		[15, 'a dumb corgi (this is a holdover from a different game, don\'t mind this, just get some more points, you\'ll stop being a dog)'],
 		[20, 'such a good boy, yes you *ARE*! (yeah, no, just one more)'],
 		[32, 'a silly senior'],
-		[63, 'a bachelor of something or, uh, sure why not, ahdunno.'],
+		[63, 'a bachelor of something or, uh, sure why not, I don\'t know.'],
 		[82, 'a PH.D, you\'z got that fancy title now, dockta. '],
 		[99, 'a coked-out professor']];
 	maxScore = null;

diff --git a/src/officer.t b/src/officer.t
@@ -37,7 +37,10 @@ cmu_officer : Readable, Person 'police/officer/cop' 'Campus Officer'  @the_cut
 	['The campus cop squints at you from behind his mirror shades and rasps, "You\'ll have to move along, <<user.engender('son','little missy')>>."',
 	'The cop taps his foot impatiently.',
 	'He says, "Five more minutes of this, I\'m gonna get mad!"',
-	'"Not <b>my</b> fault this is happening..."',' ',' ',' ',
+	'"Not <b>my</b> fault this is happening..."',
+	'The cop gives you a weird look. You\'re not sure what to make of it.',
+	'The officer grumbles, and looks like he\'s about to make his move. ',
+	'He\'s going to do something any moment now. "One more chance, come on!"',
 	'The cop is all worked up now. "Last chance to get outta here!"']
 	[{: say('<<user.engender('The cop hauls you up by the collar. "Okay, wise guy, beat it!"','The cop says "Sorry to have to do this, ma\'am." and then carries you off.')>> '), cmu_officer.harass(user), isDone = true }];
 
diff --git a/src/people.t b/src/people.t
@@ -35,8 +35,8 @@ ben_scott : Person 'ben/scott/bescott/ben scott/cool kid'
 }
 
 ben_scott_list : ShuffledEventList
-['He seats himself in the weird chair, but just as soon as he leans into his computer, he leans back out again, and put\'s his feet up. You glance at his screen, and you can tell that he\'s rewritten his entire kernel from memory, or something, I mean, I dunno, does that sound like an impressive thing? Asking for a friend.\"<b>cd ../;2D;2D;2D;2C</b>whoops<b>:quit:q</b>how do i...<b>C-c C-c is undefined</b>come on<b>C-x C-c</b>']
-['He gets up to strech, and looks out the window. It is an exceptional view. ',
- 'He just starts speaking to you out of nowhere. "I once killed a man in the desert, just because I wanted to see if it would inspire me, artistically. It didn\'t. Do you know the elevator trick? That\'s how I got here. You take the bigger elevator down to the first floor, and when the door opens, you can reach outside to a button on the frame to your left, and then get to any floor you want! I think it\'s pretty neat. Do you like coffeecake? I don\'t know how I feel about it, really..." You stop listening.<<ghc_button.achievement.awardPointsOnce()>> '];
+['He seats himself in the weird chair, but just as soon as he leans into his computer, he leans back out again, and put\'s his feet up. You glance at his screen, and you can tell that he\'s rewritten his entire kernel from memory, or something, I mean, I dunno, does that sound like an impressive thing? Asking for a friend.\"<b>cd ../;2D;2D;2D;2C</b>whoops<b>:quit:q</b>how do i...<b>C-c C-c is undefined</b>come on<b>C-x C-c</b>',
+'He just starts speaking to you out of nowhere. "I once killed a man in the desert, just because I wanted to see if it would inspire me, artistically. It didn\'t. Do you know the elevator trick? That\'s how I got here. You take the bigger elevator down to the first floor, and when the door opens, you can reach outside to a button on the frame to your left, and then get to any floor you want! I think it\'s pretty neat. Do you like coffeecake? I don\'t know how I feel about it, really..." You stop listening.<<ghc_button.achievement.awardPointsOnce()>> ']
+['He gets up to strech, and looks out the window. It is an exceptional view. '];
 
 
diff --git a/src/user.t b/src/user.t
@@ -75,7 +75,7 @@ user : BagOfHolding, Mortal {
 				user.firstname = util.capitalize(s[0]);
 				user.lastname = util.capitalize(s[1]);
 			}
-		}"FUCKFUCK";
+		}
 	}
 
 	setGender() {

diff --git a/src/util.t b/src/util.t
@@ -1,4 +1,4 @@
-/* Ben Scott - 201505142021 - vividity - util */
+/* Ben Scott - bescott@andrew.cmu.edu - 2015-09-21 - CMU.ADV - util */
 
 #include <adv3.h>
 #include <en_us.h>
@@ -59,7 +59,8 @@ Events : object {
 		eventList = ['The fog glowers at your plight. ',
 			'You think you noticed it get slightly brighter for a moment. ',
 			'The fog glowers at your plight. ',
-			{: say('<b>lo! but you are saved!</b>'), user.reset() }]
+			{: say('<b>lo! but you are saved!</b>'),
+				user.reset(), Events.stop_limbo() }]
 		eventPercent = 80;
 	}
 }

diff --git a/tgt/GameInfo.txt b/tgt/GameInfo.txt
@@ -3,7 +3,7 @@ Name: CMU.ADV
 Byline: by Ben Scott
 AuthorEmail: [email protected]
 Version: v2.0.1
-ReleaseDate: 2015-09-20
+ReleaseDate: 2015-09-21
 FirstPublished: 1986 (2015)
 Language: en-US
 LicenseType: Freeware

diff --git a/tgt/cmu_adv.t3 b/tgt/cmu_adv.t3
diff --git a/tgt/cmu_adv_cmd.t3 b/tgt/cmu_adv_cmd.t3
diff --git a/tgt/cmu_adv_web.t3 b/tgt/cmu_adv_web.t3