Commit graph

297 commits

Author SHA1 Message Date
Aaron Traas
9b3be62aaa 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.
2017-07-02 21:56:49 -04:00
NHOrus
c7aecb7249 Removed spk from wave, fixed compiler warning 2017-07-03 01:01:01 +03:00
NHOrus
993194bd4d Undid unspeaking of wave, fixed test again.
Changed property math to helper function.
2017-07-03 00:47:17 +03:00
NHOrus
eeda78a210 Don't spk in wave and action 2017-07-03 00:04:44 +03:00
NHOrus
8fcbc8ecba More magic number elimination 2017-07-02 22:57:26 +03:00
NHOrus
fbc80f0363 Unfalsify coverage check 2017-07-02 22:57:25 +03:00
Eric S. Raymond
89e1833d8f Magic-number elimination. 2017-07-02 15:32:50 -04:00
Eric S. Raymond
e712f4c0e0 Magic-number elimination. 2017-07-02 14:47:21 -04:00
Jason S. Ninneman
6af38a92f6 Eliminate the global game.blklin. 2017-07-02 10:37:10 -07:00
NHOrus
8456b866ff Rationalize attack logic
Fix the compiler warnings about bunching ands with ors
2017-07-02 20:29:51 +03:00
Eric S. Raymond
346bcf9458 Magic-number elimination. 2017-07-02 13:22:50 -04:00
Aaron Traas
dd50e7c9d3 Eliminate unreachable code in lock() 2017-07-02 12:52:17 -04:00
NHOrus
29672a6447 Fixed logic, documented it in notes and tests 2017-07-02 17:50:42 +03:00
NHOrus
e91742e1b9 Fixed regression in #21 Cleaned up logic of light/extinguish 2017-07-02 10:16:13 -04:00
NHOrus
73af0e3a55 Fix for issue #21, hopefully 2017-07-02 10:16:13 -04:00
NHOrus
a5478639b6 Capture wonkyness of extinguishing urn 2017-07-02 10:16:13 -04:00
Eric S. Raymond
4f08537e2d More magic-number elimination. 2017-07-01 23:07:23 -04:00
Eric S. Raymond
5c2b76f762 Magic-number elimination. 2017-07-01 22:50:08 -04:00
NHOrus
3c8482a613 Change state of vase
Clear temporary save where it needs to be cleared instead of random places
2017-07-01 18:25:39 +03:00
NHOrus
ab79fc7814 Do not compare state to magic numbers 2017-07-01 18:25:39 +03:00
NHOrus
b8d86b840d Little more less magic in dragon state 2017-07-01 18:25:39 +03:00
Eric S. Raymond
f47f3a4603 Magic-number elimination for dragon and rug. 2017-07-01 10:01:39 -04:00
NHOrus
45820bc8cd Reindend, compile out all save stuff 2017-07-01 16:46:51 +03:00
Eric S. Raymond
ab94051da1 Magic-number and state-arithmetic removal. 2017-07-01 09:21:47 -04:00
Jason S. Ninneman
2328739e51 Interim magic number replacement. 2017-07-01 06:15:54 -07:00
Eric S. Raymond
8675c4facd Less magical numbers. 2017-06-30 12:10:26 -04:00
Eric S. Raymond
1f45966dec Magic-number ellimination, contiguity warnings, cleanup. 2017-06-30 12:06:41 -04:00
NHOrus
0f15c9e0f3 Breaking one-line conditionals 2017-06-29 22:51:30 +03:00
NHOrus
bf2fa227f0 Unshadowed k2 into k3 in main.c
Reindented everything
2017-06-29 20:11:53 +03:00
Jason S. Ninneman
1ee0e5c7b0 Finish newdb -> dungeon renaming. 2017-06-29 08:54:55 -07:00
Jason S. Ninneman
83fb64b5a8 Jettison MAKEWD(), GETTXT(), vocab(), GETIN(), and the old db compiler. 2017-06-29 08:54:35 -07:00
Jason S. Ninneman
50435465a6 Completely wire vocab words in YAML to the code.
This massive patch:
* Finishes working all the vocab words into YAML structures.
* Adds vocab ID generator functions.
* Redoes the input-getting system, removing the need for GETIN(),
  GETTXT(), etc.
* Changes advent<->ascii mapping to avoid the special 'shift'
  character.
* Works around some bad behavior in the dragon attack logic.
* Handles the reservoir magic word without changing the database
  contents.
2017-06-29 01:59:37 -07:00
Eric S. Raymond
d96d5db51f More magic-number removal. 2017-06-28 17:29:33 -04:00
Eric S. Raymond
b5260417dd Magic-number elimination. 2017-06-28 17:07:15 -04:00
Eric S. Raymond
1ed8126912 Implement and document state-changes messages in YAML.
Examples at the lamp and grate.  This is a way to pull strings out of
arbitrary_messages and make them part of the object definition.
2017-06-28 16:14:23 -04:00
NHOrus
aca6d79087 Some more linter warnings 2017-06-28 15:09:05 -04:00
Aaron Traas
6521d49c07 Test coverage: make LCOV ignore bug() and all calls to BUG()
In theory, these should be unreachable, so they shouldn't be covered
with testing.
2017-06-28 13:23:34 -04:00
Eric S. Raymond
f5719f1aba Magic-number elimination. 2017-06-28 11:45:53 -04:00
Jason S. Ninneman
004fe76917 Clean up missed actspk[] references. 2017-06-26 22:03:42 -07:00
Jason S. Ninneman
a76cbeccbb Use actions[].message instead of actspk[]. 2017-06-26 22:01:23 -07:00
Jason S. Ninneman
2fac8d1aef object_descriptions[] is now objects[]. 2017-06-26 09:43:11 -07:00
Eric S. Raymond
59243cf8bc Take FORTRANish upper-case function names to C-style lowercase...
...except for a few we're planning to get rid of.  This will avoid some
upcoming collisions with macros defined from YAML.
2017-06-26 10:19:33 -04:00
Eric S. Raymond
b626371b6c Wire Section 8 YAML to runtime. 2017-06-26 00:09:50 -04:00
Eric S. Raymond
8a6e6aae7d Fully subsume section 7 into YAML. 2017-06-24 20:28:22 -04:00
Eric S. Raymond
c3a2816821 Replace magic MINTRS/MAXTRS with a treasure attribute in YAML. 2017-06-24 10:47:59 -04:00
Eric S. Raymond
07207420a2 Elimination of OBJTXT.
This means eveything in Section 13 of adventure.text has moved to YAML.
2017-06-24 09:41:39 -04:00
Eric S. Raymond
3a93b2b5f0 Elimination of OBJSND. 2017-06-24 09:08:48 -04:00
Eric S. Raymond
ea70341cfe Eliminate setting of OBJTXT sell for oyster - OBJTXT is now static.
A necessary step towards getting rid of it.
2017-06-23 15:50:15 -04:00
Eric S. Raymond
15b7c00e0a Abolish unclean operation on OBJSOUND - it's now static.
Save/Restore no longer needs to treat it specially.
2017-06-23 15:13:47 -04:00
Eric S. Raymond
ecff53d3a8 Name the lamp, grate, and bird states. 2017-06-23 14:59:32 -04:00