Two more lines of coverage; more cleanup for macros
This commit is contained in:
NHOrus
parent
6a27214470
commit
53b68161ff
5 changed files with 28 additions and 9 deletions
2
advent.h
2
advent.h
|
|
@ -60,7 +60,7 @@
|
||||||
#define LIQUID() (game.prop[BOTTLE] == WATER_BOTTLE? WATER : game.prop[BOTTLE] == OIL_BOTTLE ? OIL : NO_OBJECT )
|
#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 LIQLOC(LOC) (CNDBIT((LOC),COND_FLUID)? CNDBIT((LOC),COND_OILY) ? OIL : WATER : NO_OBJECT)
|
||||||
#define FORCED(LOC) CNDBIT(LOC, COND_FORCED)
|
#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 PCT(N) (randrange(100) < (N))
|
||||||
#define GSTONE(OBJ) ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
|
#define GSTONE(OBJ) ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
|
||||||
#define FOREST(LOC) CNDBIT(LOC, COND_FOREST)
|
#define FOREST(LOC) CNDBIT(LOC, COND_FOREST)
|
||||||
|
|
|
||||||
|
|
@ -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
|
save time, you may specify "brief", which tells me never to repeat the
|
||||||
full description of a place unless you explicitly ask me to.
|
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
|
> eat grate
|
||||||
|
|
||||||
Don't be ridiculous!
|
Don't be ridiculous!
|
||||||
|
|
@ -242,7 +254,9 @@ Blasting requires dynamite.
|
||||||
|
|
||||||
> building
|
> 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
|
> cave
|
||||||
|
|
||||||
|
|
@ -271,9 +285,7 @@ Carry what?
|
||||||
|
|
||||||
I am unsure how you are facing. Use compass points or nearby objects.
|
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.
|
You're in front of building.
|
||||||
Around you is a forest. A small stream flows out of the building and
|
|
||||||
down a gully.
|
|
||||||
|
|
||||||
> eat
|
> eat
|
||||||
|
|
||||||
|
|
@ -597,7 +609,7 @@ Okay, "boo".
|
||||||
|
|
||||||
> score
|
> 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
|
> z
|
||||||
|
|
||||||
|
|
@ -605,7 +617,7 @@ OK
|
||||||
|
|
||||||
> score
|
> 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
|
> quit keys
|
||||||
|
|
||||||
|
|
@ -654,7 +666,7 @@ Do you really want to quit now?
|
||||||
|
|
||||||
OK
|
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.
|
You are obviously a rank amateur. Better luck next time.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,8 @@ seed 1801426495
|
||||||
version
|
version
|
||||||
help
|
help
|
||||||
info
|
info
|
||||||
|
_
|
||||||
|
back
|
||||||
eat grate
|
eat grate
|
||||||
eat building
|
eat building
|
||||||
in
|
in
|
||||||
|
|
|
||||||
|
|
@ -501,6 +501,10 @@ Carry what?
|
||||||
|
|
||||||
You can't be serious!
|
You can't be serious!
|
||||||
|
|
||||||
|
> find dwarf
|
||||||
|
|
||||||
|
I believe what you want is right here with you.
|
||||||
|
|
||||||
> attack
|
> attack
|
||||||
|
|
||||||
With what? Your bare hands?
|
With what? Your bare hands?
|
||||||
|
|
@ -510,7 +514,7 @@ With what? Your bare hands?
|
||||||
Feed what?
|
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.
|
Your score qualifies you as a novice class adventurer.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,5 +88,6 @@ read dwarf
|
||||||
feed dwarf
|
feed dwarf
|
||||||
carry
|
carry
|
||||||
carry dwarf
|
carry dwarf
|
||||||
|
find dwarf
|
||||||
attack
|
attack
|
||||||
feed
|
feed
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue