archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Two more lines of coverage; more cleanup for macros

Browse source
This commit is contained in:
NHOrus 2017-07-09 20:03:30 +03:00
parent 6a27214470
commit 53b68161ff
5 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
advent.h
View file

@ -60,7 +60,7 @@
#define LIQUID() (game.prop[BOTTLE] == WATER_BOTTLE? WATER : game.prop[BOTTLE] == OIL_BOTTLE ? OIL : NO_OBJECT )
#define LIQLOC(LOC) (CNDBIT((LOC),COND_FLUID)? CNDBIT((LOC),COND_OILY) ? OIL : WATER : NO_OBJECT)
#define FORCED(LOC) CNDBIT(LOC, COND_FORCED)
#define DARK(DUMMY) ((!tstbit(conditions[game.loc],COND_LIT)) && (game.prop[LAMP] == LAMP_DARK || !HERE(LAMP)))
#define DARK(DUMMY) (!CNDBIT(game.loc,COND_LIT) && (game.prop[LAMP] == LAMP_DARK || !HERE(LAMP)))
#define PCT(N) (randrange(100) < (N))
#define GSTONE(OBJ) ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
#define FOREST(LOC) CNDBIT(LOC, COND_FOREST)

26
tests/illformed.chk
View file

@ -98,6 +98,18 @@ how much it will affect your score to accept the hints. Finally, to
save time, you may specify "brief", which tells me never to repeat the
full description of a place unless you explicitly ask me to.
> _
I don't know how to apply that word here.
You're in front of building.
> back
Sorry, but I no longer seem to remember how it was you got here.
You're in front of building.
> eat grate
Don't be ridiculous!
@ -242,7 +254,9 @@ Blasting requires dynamite.
> building
You're in front of building.
You are standing at the end of a road before a small brick building.
Around you is a forest. A small stream flows out of the building and
down a gully.
> cave
@ -271,9 +285,7 @@ Carry what?
I am unsure how you are facing. Use compass points or nearby objects.
You are standing at the end of a road before a small brick building.
Around you is a forest. A small stream flows out of the building and
down a gully.
You're in front of building.
> eat
@ -597,7 +609,7 @@ Okay, "boo".
> score
You have garnered 27 out of a possible 430 points, using 103 turns.
You have garnered 27 out of a possible 430 points, using 105 turns.
> z
@ -605,7 +617,7 @@ OK
> score
You have garnered 27 out of a possible 430 points, using 105 turns.
You have garnered 27 out of a possible 430 points, using 107 turns.
> quit keys
@ -654,7 +666,7 @@ Do you really want to quit now?
OK
You scored 27 out of a possible 430, using 113 turns.
You scored 27 out of a possible 430, using 115 turns.
You are obviously a rank amateur. Better luck next time.

2
tests/illformed.log
View file

@ -6,6 +6,8 @@ seed 1801426495
version
help
info
_
back
eat grate
eat building
in

6
tests/weirddwarf.chk
View file

@ -501,6 +501,10 @@ Carry what?
You can't be serious!
> find dwarf
I believe what you want is right here with you.
> attack
With what? Your bare hands?
@ -510,7 +514,7 @@ With what? Your bare hands?
Feed what?
You scored 103 out of a possible 430, using 87 turns.
You scored 103 out of a possible 430, using 88 turns.
Your score qualifies you as a novice class adventurer.

1
tests/weirddwarf.log
View file

@ -88,5 +88,6 @@ read dwarf
feed dwarf
carry
carry dwarf
find dwarf
attack
feed