open-adventure.git
2 years agoFixed feed command and white space in tests
NHOrus [Wed, 5 Jul 2017 17:03:55 +0000 (20:03 +0300)]
Fixed feed command and white space in tests

2 years agoCapture correct behavior from seed
NHOrus [Wed, 5 Jul 2017 17:01:53 +0000 (20:01 +0300)]
Capture correct behavior from seed

2 years agoMade feeding a switch instead of elsif chain
NHOrus [Wed, 5 Jul 2017 16:55:52 +0000 (19:55 +0300)]
Made feeding a switch instead of elsif chain

2 years agoOne bit less math on states
NHOrus [Wed, 5 Jul 2017 16:33:01 +0000 (19:33 +0300)]
One bit less math on states

2 years agoMoved state_change to misc.c to start using it in main.c, too 215/head
NHOrus [Wed, 5 Jul 2017 17:23:34 +0000 (20:23 +0300)]
Moved state_change to misc.c to start using it in main.c, too

2 years agoTest cover all of discard 213/head
NHOrus [Wed, 5 Jul 2017 16:12:05 +0000 (19:12 +0300)]
Test cover all of discard

2 years agoTriggering more phrases
NHOrus [Wed, 5 Jul 2017 15:59:05 +0000 (18:59 +0300)]
Triggering more phrases

2 years agoMake a test more explicit.
Eric S. Raymond [Wed, 5 Jul 2017 15:47:10 +0000 (11:47 -0400)]
Make a test more explicit.

2 years agoRepair oilplant.log.
Eric S. Raymond [Wed, 5 Jul 2017 15:36:16 +0000 (11:36 -0400)]
Repair oilplant.log.

2 years agoReduce test makefile verbosity under Emacs.
Eric S. Raymond [Wed, 5 Jul 2017 08:35:58 +0000 (04:35 -0400)]
Reduce test makefile verbosity under Emacs.

2 years agoStatic analysis warnings squished 212/head
NHOrus [Wed, 5 Jul 2017 14:45:12 +0000 (17:45 +0300)]
Static analysis warnings squished

2 years agoMagic-number elimination.
Eric S. Raymond [Wed, 5 Jul 2017 07:17:24 +0000 (03:17 -0400)]
Magic-number elimination.

2 years agoFix dropped stitch in last commit.
Eric S. Raymond [Wed, 5 Jul 2017 06:55:51 +0000 (02:55 -0400)]
Fix dropped stitch in last commit.

2 years agoMagic-number elimination.
Eric S. Raymond [Wed, 5 Jul 2017 06:53:39 +0000 (02:53 -0400)]
Magic-number elimination.

2 years agoDocumentation polishing.
Eric S. Raymond [Wed, 5 Jul 2017 06:42:51 +0000 (02:42 -0400)]
Documentation polishing.

2 years agoUnder oldstyle, mangled echoed unknown text to simulate old behavior.
Eric S. Raymond [Wed, 5 Jul 2017 06:34:36 +0000 (02:34 -0400)]
Under oldstyle, mangled echoed unknown text to simulate old behavior.

2 years agoMinor clarifications.
Eric S. Raymond [Wed, 5 Jul 2017 06:02:39 +0000 (02:02 -0400)]
Minor clarifications.

2 years agoTrigger 'NO_EDIBLES' message 211/head
NHOrus [Wed, 5 Jul 2017 05:37:04 +0000 (08:37 +0300)]
Trigger 'NO_EDIBLES' message

2 years agoAdapt bottle object to use state_change().
Eric S. Raymond [Wed, 5 Jul 2017 05:15:40 +0000 (01:15 -0400)]
Adapt bottle object to use state_change().

2 years agoMagic number elimination 210/head
NHOrus [Wed, 5 Jul 2017 04:37:42 +0000 (07:37 +0300)]
Magic number elimination
Special state/locations for game.fixd object array

2 years agoSimplify vase-dropping logic using state_change().
Eric S. Raymond [Wed, 5 Jul 2017 04:40:14 +0000 (00:40 -0400)]
Simplify vase-dropping logic using state_change().

2 years agoMagic-number elimination.
Eric S. Raymond [Wed, 5 Jul 2017 03:46:16 +0000 (23:46 -0400)]
Magic-number elimination.

2 years agoMagic-number elimination in the olover/alcove pasage code.
Eric S. Raymond [Wed, 5 Jul 2017 02:56:02 +0000 (22:56 -0400)]
Magic-number elimination in the olover/alcove pasage code.

Wuth this change, the location table becomes order-independent (I think).

2 years agoCoverage -- more odd actions 209/head
Aaron Traas [Tue, 4 Jul 2017 21:41:42 +0000 (17:41 -0400)]
Coverage -- more odd actions

2 years agoRemoved equivocation between ROD and ROD2 in throw()
Aaron Traas [Tue, 4 Jul 2017 21:13:26 +0000 (17:13 -0400)]
Removed equivocation between ROD and ROD2 in throw()

Already dealt with in action(), so redundant and unreachable here.

2 years agoMagic-number elimination.
Eric S. Raymond [Tue, 4 Jul 2017 18:40:10 +0000 (14:40 -0400)]
Magic-number elimination.

2 years agoMagic-number elimination.
Eric S. Raymond [Tue, 4 Jul 2017 18:15:20 +0000 (14:15 -0400)]
Magic-number elimination.

2 years agoAbstract out some state arithmetic.
Eric S. Raymond [Tue, 4 Jul 2017 17:40:05 +0000 (13:40 -0400)]
Abstract out some state arithmetic.

2 years agoTest for filling full bottle with different liquid 208/head
NHOrus [Tue, 4 Jul 2017 17:35:03 +0000 (20:35 +0300)]
Test for filling full bottle with different liquid

2 years agoOops. Also, sometimes it's better be explicit in parameters 207/head
NHOrus [Tue, 4 Jul 2017 16:50:19 +0000 (19:50 +0300)]
Oops. Also, sometimes it's better be explicit in parameters

2 years agoLocalized spk in discard
NHOrus [Tue, 4 Jul 2017 16:45:00 +0000 (19:45 +0300)]
Localized spk in discard

2 years agoCompleted unspk'ing of vcarry.
NHOrus [Tue, 4 Jul 2017 16:41:06 +0000 (19:41 +0300)]
Completed unspk'ing of vcarry.

2 years agoUnspk'd (v)carry. Made logic more visible.
NHOrus [Tue, 4 Jul 2017 16:27:00 +0000 (19:27 +0300)]
Unspk'd (v)carry. Made logic more visible.
And tested some of newly exposed cases.

2 years agoUnspk'd and streamlined attack. Tested one of discovered gaps.
NHOrus [Tue, 4 Jul 2017 15:41:28 +0000 (18:41 +0300)]
Unspk'd and streamlined attack. Tested one of discovered gaps.

2 years agoEliminated bivalve function. 206/head
Aaron Traas [Tue, 4 Jul 2017 13:55:02 +0000 (09:55 -0400)]
Eliminated bivalve function.

Reason: only called in lock(), you can't be TOTING a clam, you can't
have the trident at a carryable oyster, and the code IMHO is more
readable this way.

2 years agoState-arithmetic elimination.
Eric S. Raymond [Tue, 4 Jul 2017 13:17:20 +0000 (09:17 -0400)]
State-arithmetic elimination.

2 years agoGrammar fix.
Eric S. Raymond [Tue, 4 Jul 2017 13:03:42 +0000 (09:03 -0400)]
Grammar fix.

2 years agoDrinking not from stream gets the same result 205/head
NHOrus [Tue, 4 Jul 2017 11:43:17 +0000 (14:43 +0300)]
Drinking not from stream gets the same result

2 years agoworkaround for eat grate bug in retrospective tests
NHOrus [Tue, 4 Jul 2017 08:02:58 +0000 (11:02 +0300)]
workaround for eat grate bug in retrospective tests

2 years agoUnspk'd chain action
NHOrus [Tue, 4 Jul 2017 12:16:36 +0000 (15:16 +0300)]
Unspk'd chain action

2 years agolinearized drink
NHOrus [Tue, 4 Jul 2017 11:38:43 +0000 (14:38 +0300)]
linearized drink

2 years agolinearized extinguish
NHOrus [Tue, 4 Jul 2017 11:33:30 +0000 (14:33 +0300)]
linearized extinguish

2 years agoUnspk'd and restructured fill
NHOrus [Tue, 4 Jul 2017 10:58:00 +0000 (13:58 +0300)]
Unspk'd and restructured fill

2 years agoPartial cleanup of fill
NHOrus [Tue, 4 Jul 2017 10:28:00 +0000 (13:28 +0300)]
Partial cleanup of fill

2 years agoRemoved magic from checks for liquids
NHOrus [Tue, 4 Jul 2017 10:04:04 +0000 (13:04 +0300)]
Removed magic from checks for liquids

2 years agoUnspk'd find
NHOrus [Tue, 4 Jul 2017 08:49:02 +0000 (11:49 +0300)]
Unspk'd find

2 years agoUnspk'd inventory lookup
NHOrus [Tue, 4 Jul 2017 08:37:30 +0000 (11:37 +0300)]
Unspk'd inventory lookup

2 years agoUnspk'd lock, cleaned up logic
NHOrus [Tue, 4 Jul 2017 08:30:39 +0000 (11:30 +0300)]
Unspk'd lock, cleaned up logic

2 years agoCleaned up unused variables
NHOrus [Tue, 4 Jul 2017 08:15:10 +0000 (11:15 +0300)]
Cleaned up unused variables

2 years agoUnspk'd Giant Words
NHOrus [Tue, 4 Jul 2017 08:12:38 +0000 (11:12 +0300)]
Unspk'd Giant Words

2 years agoAnother use of state_change().
Eric S. Raymond [Tue, 4 Jul 2017 12:16:10 +0000 (08:16 -0400)]
Another use of state_change().

2 years agoAnother use of state_change() and changes messages.
Eric S. Raymond [Tue, 4 Jul 2017 11:59:20 +0000 (07:59 -0400)]
Another use of state_change() and changes messages.

2 years agoYAML cleanup.
Eric S. Raymond [Tue, 4 Jul 2017 11:39:07 +0000 (07:39 -0400)]
YAML cleanup.

2 years agoBegin replacing tests on strings with tests on vocab IDs. 204/head
Jason S. Ninneman [Tue, 4 Jul 2017 01:21:25 +0000 (18:21 -0700)]
Begin replacing tests on strings with tests on vocab IDs.

2 years agoUpgrade get_vocab_id() to handle empty strings.
Jason S. Ninneman [Mon, 3 Jul 2017 17:37:44 +0000 (10:37 -0700)]
Upgrade get_vocab_id() to handle empty strings.

2 years agoImplement and document new state-label syntax.
Eric S. Raymond [Tue, 4 Jul 2017 00:27:56 +0000 (20:27 -0400)]
Implement and document new state-label syntax.

2 years agoComment polishing.
Eric S. Raymond [Mon, 3 Jul 2017 23:26:32 +0000 (19:26 -0400)]
Comment polishing.

2 years agoDiscard implementation of %L and %U format specifiers, now never used.
Eric S. Raymond [Mon, 3 Jul 2017 22:40:06 +0000 (18:40 -0400)]
Discard implementation of %L and %U format specifiers, now never used.

2 years agoReducing use of dynamic allocation forecloses many errors.
Eric S. Raymond [Mon, 3 Jul 2017 21:53:25 +0000 (17:53 -0400)]
Reducing use of dynamic allocation forecloses many errors.

2 years agoInformation hiding.
Eric S. Raymond [Mon, 3 Jul 2017 21:21:06 +0000 (17:21 -0400)]
Information hiding.

2 years agoSimplify tokenization code.
Eric S. Raymond [Mon, 3 Jul 2017 21:13:28 +0000 (17:13 -0400)]
Simplify tokenization code.

2 years agoEntirely eliminate wd1x and wd2x members of the command block.
Eric S. Raymond [Mon, 3 Jul 2017 20:49:33 +0000 (16:49 -0400)]
Entirely eliminate wd1x and wd2x members of the command block.

In the process, fix another case-smashing bug.

2 years agoCaptured output of help and info commands 203/head
NHOrus [Mon, 3 Jul 2017 18:54:27 +0000 (21:54 +0300)]
Captured output of help and info commands
Can't believe it wasn't done before

2 years agoUse DOWN rather thabnd D in YAML.
Eric S. Raymond [Mon, 3 Jul 2017 18:55:34 +0000 (14:55 -0400)]
Use DOWN rather thabnd D in YAML.

2 years agoUse the raw buffer in tr command structure for editing.
Eric S. Raymond [Mon, 3 Jul 2017 16:52:28 +0000 (12:52 -0400)]
Use the raw buffer in tr command structure for editing.

This fixes some minor bugs. Unknown words are no longer truncated
nor uppercased on echo.

2 years agoRemove a bad command from a check log.
Eric S. Raymond [Mon, 3 Jul 2017 14:10:14 +0000 (10:10 -0400)]
Remove a bad command from a check log.

It's interfering with a refactor, and pathological cases really
ought to be checked elsewhere.

2 years agoRefactor tokenization to save raw tokens and use static buffer space...
Eric S. Raymond [Mon, 3 Jul 2017 12:53:10 +0000 (08:53 -0400)]
Refactor tokenization to save raw tokens and use static buffer space...

...rather than dynamic storage.

As a side effect, this seems to have fixed a very ninor bug in the processing
of the bare word 'nothing'.  But I don't know where the bug was.  Not happy.

2 years agoMagic-number elimination.
Eric S. Raymond [Mon, 3 Jul 2017 11:14:15 +0000 (07:14 -0400)]
Magic-number elimination.

2 years agoNamed state labels for every not clause.
Eric S. Raymond [Mon, 3 Jul 2017 11:00:42 +0000 (07:00 -0400)]
Named state labels for every not clause.

2 years agoMake the YAML less fussy.
Eric S. Raymond [Mon, 3 Jul 2017 10:31:44 +0000 (06:31 -0400)]
Make the YAML less fussy.

Don't string-quote things that are semantically like enums.

2 years agoplayermove() never returns false; simplify accordingly
Eric S. Raymond [Mon, 3 Jul 2017 10:08:37 +0000 (06:08 -0400)]
playermove() never returns false; simplify accordingly

2 years agoVisit room with breathtaking view 201/head
NHOrus [Mon, 3 Jul 2017 04:30:53 +0000 (07:30 +0300)]
Visit room with breathtaking view
Try to extinguish a volcano
Closes #22

2 years agoBroke all logical or into multiline statement to show lcov's lies 200/head
NHOrus [Mon, 3 Jul 2017 04:20:37 +0000 (07:20 +0300)]
Broke all logical or into multiline statement to show lcov's lies
Results are weird, some things that need to be checked aren't and
at least my local lcov doesn't show them as unchecked

2 years agoUnspk'd bivalve action, exposing more untested surface 199/head
NHOrus [Mon, 3 Jul 2017 03:46:24 +0000 (06:46 +0300)]
Unspk'd bivalve action, exposing more untested surface

2 years agoUnspk'd fly command
NHOrus [Mon, 3 Jul 2017 03:29:02 +0000 (06:29 +0300)]
Unspk'd fly command

2 years agoUnspk'd listen and lock commands
NHOrus [Mon, 3 Jul 2017 03:21:38 +0000 (06:21 +0300)]
Unspk'd listen and lock commands

2 years agoUnspk'd pour command
NHOrus [Mon, 3 Jul 2017 03:12:19 +0000 (06:12 +0300)]
Unspk'd pour command

2 years agoUnspk and streamline eat command
NHOrus [Mon, 3 Jul 2017 03:07:57 +0000 (06:07 +0300)]
Unspk and streamline eat command

2 years agoRemoved helper function
NHOrus [Mon, 3 Jul 2017 02:59:57 +0000 (05:59 +0300)]
Removed helper function

2 years agoWake dwarves differently
NHOrus [Mon, 3 Jul 2017 02:41:49 +0000 (05:41 +0300)]
Wake dwarves differently

2 years agoCover branch last branch of bird action
NHOrus [Mon, 3 Jul 2017 02:30:46 +0000 (05:30 +0300)]
Cover branch last branch of bird action
And remove distracting line from tests

2 years agoCoverage -- attack bird after game closed 198/head
Aaron Traas [Mon, 3 Jul 2017 02:04:42 +0000 (22:04 -0400)]
Coverage -- attack bird after game closed

2 years agoRemove testing for intransitive seperate from NO_OBJECT in attact()
Aaron Traas [Mon, 3 Jul 2017 01:56:49 +0000 (21:56 -0400)]
Remove testing for intransitive seperate from NO_OBJECT in attact()

because we look for it immediately below, and this code is never
reached. If it were, intransitive attacks would never work.

2 years agoCoverage -- corner cases in lock and find
Aaron Traas [Mon, 3 Jul 2017 01:53:28 +0000 (21:53 -0400)]
Coverage -- corner cases in lock and find

2 years agoCoverage -- giant words
Aaron Traas [Mon, 3 Jul 2017 01:41:53 +0000 (21:41 -0400)]
Coverage -- giant words

2 years agoCoverage -- intransitive attack
Aaron Traas [Mon, 3 Jul 2017 01:32:47 +0000 (21:32 -0400)]
Coverage -- intransitive attack

2 years agoRemoved spk from wave, fixed compiler warning 197/head
NHOrus [Sun, 2 Jul 2017 22:01:01 +0000 (01:01 +0300)]
Removed spk from wave, fixed compiler warning

2 years agoUndid unspeaking of wave, fixed test again.
NHOrus [Sun, 2 Jul 2017 21:47:17 +0000 (00:47 +0300)]
Undid unspeaking of wave, fixed test again.
Changed property math to helper function.

2 years agoDon't spk in wave and action
NHOrus [Sun, 2 Jul 2017 21:04:44 +0000 (00:04 +0300)]
Don't spk in wave and action

2 years agoMore magic number elimination
NHOrus [Sun, 2 Jul 2017 19:57:12 +0000 (22:57 +0300)]
More magic number elimination

2 years agoUnfalsify coverage check
NHOrus [Sun, 2 Jul 2017 19:27:41 +0000 (22:27 +0300)]
Unfalsify coverage check

2 years agoMagic-number elimination.
Eric S. Raymond [Sun, 2 Jul 2017 19:32:50 +0000 (15:32 -0400)]
Magic-number elimination.

2 years agoMore tests, multilined yaml
NHOrus [Sun, 2 Jul 2017 19:13:14 +0000 (22:13 +0300)]
More tests, multilined yaml

2 years agoMagic-number elimination.
Eric S. Raymond [Sun, 2 Jul 2017 18:47:21 +0000 (14:47 -0400)]
Magic-number elimination.

2 years agoAttack content and dead bear 195/head
NHOrus [Sun, 2 Jul 2017 18:07:44 +0000 (21:07 +0300)]
Attack content and dead bear

2 years agoImprive coverage of cheat.
Eric S. Raymond [Sun, 2 Jul 2017 17:57:01 +0000 (13:57 -0400)]
Imprive coverage of cheat.

2 years agoCoverage - attack sitting bear
Aaron Traas [Sun, 2 Jul 2017 17:31:47 +0000 (13:31 -0400)]
Coverage - attack sitting bear

2 years agoEliminate the global game.blklin. 194/head
Jason S. Ninneman [Sun, 2 Jul 2017 17:36:51 +0000 (10:36 -0700)]
Eliminate the global game.blklin.

2 years agoRationalize attack logic 192/head
NHOrus [Sun, 2 Jul 2017 16:41:57 +0000 (19:41 +0300)]
Rationalize attack logic
Fix the compiler warnings about bunching ands with ors

2 years agoMagic-number elimination.
Eric S. Raymond [Sun, 2 Jul 2017 17:22:50 +0000 (13:22 -0400)]
Magic-number elimination.