open-adventure.git
7 years agoEliminated multiple reassigments
NHOrus [Fri, 7 Jul 2017 07:20:32 +0000 (10:20 +0300)]
Eliminated multiple reassigments

7 years agoMagic Number Elimination
NHOrus [Fri, 7 Jul 2017 07:04:26 +0000 (10:04 +0300)]
Magic Number Elimination

7 years agoMore readable dungeon.c output.
Eric S. Raymond [Thu, 6 Jul 2017 20:41:06 +0000 (16:41 -0400)]
More readable dungeon.c output.

7 years agoMake the travel table in the dungeon.c output easier to read.
Eric S. Raymond [Thu, 6 Jul 2017 19:55:28 +0000 (15:55 -0400)]
Make the travel table in the dungeon.c output easier to read.

7 years agoTowards a more readable generated file.
Eric S. Raymond [Thu, 6 Jul 2017 12:47:27 +0000 (08:47 -0400)]
Towards a more readable generated file.

7 years agoStop overwriting obj by dragon check 219/head
NHOrus [Thu, 6 Jul 2017 16:12:16 +0000 (19:12 +0300)]
Stop overwriting obj by dragon check

7 years agoSemantic type for verb
NHOrus [Thu, 6 Jul 2017 15:35:43 +0000 (18:35 +0300)]
Semantic type for verb

7 years agoClear login in bvreak
NHOrus [Thu, 6 Jul 2017 15:23:07 +0000 (18:23 +0300)]
Clear login in bvreak
Test double-breaking of vase

7 years agoPrevent multiple assigment to game.bonus in blast
NHOrus [Thu, 6 Jul 2017 15:18:31 +0000 (18:18 +0300)]
Prevent multiple assigment to game.bonus in blast

7 years agoBe explicitely intransitive
NHOrus [Thu, 6 Jul 2017 15:11:02 +0000 (18:11 +0300)]
Be explicitely intransitive

7 years agoMagic-number elimination and fix
NHOrus [Thu, 6 Jul 2017 14:55:56 +0000 (17:55 +0300)]
Magic-number elimination and fix
More test coverage for some of the cases

7 years agoMagic-number elimination.
Eric S. Raymond [Thu, 6 Jul 2017 11:42:41 +0000 (07:42 -0400)]
Magic-number elimination.

7 years agoSome test improvements 218/head
NHOrus [Thu, 6 Jul 2017 08:04:07 +0000 (11:04 +0300)]
Some test improvements

7 years agoImprove readability
NHOrus [Thu, 6 Jul 2017 07:32:33 +0000 (10:32 +0300)]
Improve readability

7 years agoCleaned up light and extinguish
NHOrus [Thu, 6 Jul 2017 07:27:49 +0000 (10:27 +0300)]
Cleaned up light and extinguish

7 years agoCleaned up eat
NHOrus [Thu, 6 Jul 2017 07:18:18 +0000 (10:18 +0300)]
Cleaned up eat

7 years agoPruned out special case of discarding the vase
NHOrus [Thu, 6 Jul 2017 07:13:43 +0000 (10:13 +0300)]
Pruned out special case of discarding the vase

7 years agoCleared up lock/unlock logic
NHOrus [Thu, 6 Jul 2017 07:12:55 +0000 (10:12 +0300)]
Cleared up lock/unlock logic

7 years agoobj_t in actions. And some more magical word removal
NHOrus [Thu, 6 Jul 2017 06:56:14 +0000 (09:56 +0300)]
obj_t in actions. And some more magical word removal
Also, reindented everything, as usual

7 years agoMagic-number elimination.
Eric S. Raymond [Thu, 6 Jul 2017 01:45:55 +0000 (21:45 -0400)]
Magic-number elimination.

7 years agoRemove arithmetic on a location number.
Eric S. Raymond [Thu, 6 Jul 2017 00:51:45 +0000 (20:51 -0400)]
Remove arithmetic on a location number.

7 years agoLocation arithmetic elimination.
Eric S. Raymond [Thu, 6 Jul 2017 00:29:50 +0000 (20:29 -0400)]
Location arithmetic elimination.

7 years agoactions[] now has strings instead of enums. 217/head
Jason S. Ninneman [Wed, 5 Jul 2017 21:32:08 +0000 (14:32 -0700)]
actions[] now has strings instead of enums.

7 years agoRepair tests to track previous change.
Eric S. Raymond [Wed, 5 Jul 2017 23:26:32 +0000 (19:26 -0400)]
Repair tests to track previous change.

7 years agoImprove giant-words failure message.
Eric S. Raymond [Wed, 5 Jul 2017 21:32:44 +0000 (17:32 -0400)]
Improve giant-words failure message.

7 years agoRemove the specials[] duplicates of the 'big' words. 216/head
Jason S. Ninneman [Wed, 5 Jul 2017 18:30:29 +0000 (11:30 -0700)]
Remove the specials[] duplicates of the 'big' words.

7 years agoWorking but unpolished refactor of bigwords().
Jason S. Ninneman [Wed, 5 Jul 2017 18:28:15 +0000 (11:28 -0700)]
Working but unpolished refactor of bigwords().

7 years agoFurther infiltrare semantic types. takebird
Eric S. Raymond [Wed, 5 Jul 2017 20:55:16 +0000 (16:55 -0400)]
Further infiltrare semantic types.

7 years agoTest for bear, from tag seed
NHOrus [Wed, 5 Jul 2017 17:35:26 +0000 (20:35 +0300)]
Test for bear, from tag seed

7 years agosame with bear, but without test
NHOrus [Wed, 5 Jul 2017 17:06:08 +0000 (20:06 +0300)]
same with bear, but without test

7 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

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

7 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

7 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

7 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

7 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

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

7 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.

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

7 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.

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

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

7 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.

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

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

7 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.

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

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

7 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().

7 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

7 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().

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

7 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).

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

7 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.

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

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

7 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.

7 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

7 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

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

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

7 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.

7 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.

7 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.

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

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

7 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

7 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

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

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

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

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

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

7 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

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

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

7 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

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

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

7 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().

7 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.

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

7 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.

7 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.

7 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.

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

7 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.

7 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.

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

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

7 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.

7 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

7 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.

7 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.

7 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.

7 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.

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

7 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.

7 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.