From e696fed6dbd36555548aba77fb754d87f282a564 Mon Sep 17 00:00:00 2001 From: Aaron Traas Date: Thu, 13 Jul 2017 14:44:55 -0400 Subject: [PATCH] Prompt and taunt you after 3rd and final death Fixed a bug where you'd not be asked about whether to be resurrected a final time. Now you are. --- main.c | 4 +-- tests/coverage_dungeon.html.tpl | 40 +++++++++++++------------- tests/pitfall.chk | 50 +++++++++++++++++++++++++++++++-- tests/pitfall.log | 7 +++++ 4 files changed, 77 insertions(+), 24 deletions(-) diff --git a/main.c b/main.c index 37461f7..61f7585 100644 --- a/main.c +++ b/main.c @@ -487,8 +487,8 @@ static void croak(void) * death and exit. */ rspeak(DEATH_CLOSING); terminate(endgame); - } else if (game.numdie == NDEATHS || - !yes(query, yes_response, arbitrary_messages[OK_MAN])) + } else if ( !yes(query, yes_response, arbitrary_messages[OK_MAN]) + || game.numdie == NDEATHS) terminate(endgame); else { game.place[WATER] = game.place[OIL] = LOC_NOWHERE; diff --git a/tests/coverage_dungeon.html.tpl b/tests/coverage_dungeon.html.tpl index dc01a52..a3607b0 100644 --- a/tests/coverage_dungeon.html.tpl +++ b/tests/coverage_dungeon.html.tpl @@ -39,19 +39,19 @@ % Coverage - Test: + Test: adventure.yaml - Locations: + Locations: {} {} {}% - Date: + Date: 2017-07-07 21:47:56 - Arbitrary Messages: + Arbitrary Messages: {} {} {}% @@ -60,7 +60,7 @@ - Objects: + Objects: {} {} {}% @@ -69,7 +69,7 @@ - Hints: + Hints: {} {} {}% @@ -78,7 +78,7 @@ - Classes: + Classes: {} {} {}% @@ -87,7 +87,7 @@ - Turn threshold: + Turn threshold: {} {} {}% @@ -96,7 +96,7 @@ - Obituaries: + Obituaries: {} {} {}% @@ -105,7 +105,7 @@ - Actions: + Actions: {} {} {}% @@ -114,7 +114,7 @@ - Specials: + Specials: {} {} {}% @@ -128,7 +128,7 @@
- +
@@ -138,7 +138,7 @@
Location long

- +
@@ -147,7 +147,7 @@
Arbitrary Message Covered?

- +
@@ -156,7 +156,7 @@
Objects Covered?

- +
@@ -166,7 +166,7 @@
Hint Name Question

- +
@@ -175,7 +175,7 @@
Class threshold Message

- +
@@ -184,7 +184,7 @@
Turn threshold Message

- +
@@ -194,7 +194,7 @@
Obituary Query

- +
@@ -203,7 +203,7 @@
Action ID Message

- +
diff --git a/tests/pitfall.chk b/tests/pitfall.chk index ce55f55..23d4859 100644 --- a/tests/pitfall.chk +++ b/tests/pitfall.chk @@ -57,9 +57,55 @@ There is food here. There is a bottle of water here. +> xyzzy + +>>Foof!<< + +It is now pitch dark. If you proceed you will likely fall into a pit. + +> n + +There is no way to go that direction. + +You fell into a pit and broke every bone in your body! + +You clumsy oaf, you've done it again! I don''t know how long I can +keep this up. Do you want me to try reincarnating you again? + +> y + +Okay, now where did I put my orange smoke?.... >POOF!< +Everything disappears in a dense cloud of orange smoke. + +You're inside building. + +There are some keys on the ground here. + +There is a shiny brass lamp nearby. + +There is food here. + +There is a bottle of water here. + +> xyzzy + +>>Foof!<< + +It is now pitch dark. If you proceed you will likely fall into a pit. + +> w + +You fell into a pit and broke every bone in your body! + +Now you''ve really done it! I'm out of orange smoke! You don''t expect +me to do a decent reincarnation without any orange smoke, do you? + +> y + +Okay, if you're so smart, do it yourself! I'm leaving! -You scored 22 out of a possible 430, using 3 turns. +You scored 6 out of a possible 430, using 7 turns. You are obviously a rank amateur. Better luck next time. -To achieve the next higher rating, you need 24 more points. +To achieve the next higher rating, you need 40 more points. diff --git a/tests/pitfall.log b/tests/pitfall.log index 8342e37..6c5adc7 100644 --- a/tests/pitfall.log +++ b/tests/pitfall.log @@ -1,7 +1,14 @@ ## Death by pitfall +# Die 3 times so we can cover all the opituary messages n seed 780351908 enter building xyzzy s y +xyzzy +n +y +xyzzy +w +y -- 2.31.1
Special ID Message