projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6a27214
)
Two more lines of coverage; more cleanup for macros
author
NHOrus
<jy6x2b32pie9@yahoo.com>
Sun, 9 Jul 2017 17:03:30 +0000
(20:03 +0300)
committer
NHOrus
<jy6x2b32pie9@yahoo.com>
Sun, 9 Jul 2017 17:25:28 +0000
(20:25 +0300)
advent.h
patch
|
blob
|
history
tests/illformed.chk
patch
|
blob
|
history
tests/illformed.log
patch
|
blob
|
history
tests/weirddwarf.chk
patch
|
blob
|
history
tests/weirddwarf.log
patch
|
blob
|
history
diff --git
a/advent.h
b/advent.h
index f902a3eb5e36222c4672d5323d6c261703437c40..553d1c71a4ae98ec986373533ba0278608ffa75d 100644
(file)
--- a/
advent.h
+++ b/
advent.h
@@
-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 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)
#define PCT(N) (randrange(100) < (N))
#define GSTONE(OBJ) ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
#define FOREST(LOC) CNDBIT(LOC, COND_FOREST)
diff --git
a/tests/illformed.chk
b/tests/illformed.chk
index 73ca685774901b68e10d15657fa0af61768fdc5d..57dff92da85465455e245472202312808564f889 100644
(file)
--- a/
tests/illformed.chk
+++ b/
tests/illformed.chk
@@
-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.
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!
> eat grate
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.
-Around you is a forest. A small stream flows out of the building and
-down a gully.
+You're in front of building.
> eat
> eat
@@
-597,7
+609,7
@@
Okay, "boo".
> score
> score
-You have garnered 27 out of a possible 430 points, using 10
3
turns.
+You have garnered 27 out of a possible 430 points, using 10
5
turns.
> z
> z
@@
-605,7
+617,7
@@
OK
> score
> score
-You have garnered 27 out of a possible 430 points, using 10
5
turns.
+You have garnered 27 out of a possible 430 points, using 10
7
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 11
3
turns.
+You scored 27 out of a possible 430, using 11
5
turns.
You are obviously a rank amateur. Better luck next time.
You are obviously a rank amateur. Better luck next time.
diff --git
a/tests/illformed.log
b/tests/illformed.log
index 13821c48a0518d2c86d23c14f5ca6b14dbdede66..65d49cc047df38665abf1d60d8d7096ccebcfea3 100644
(file)
--- a/
tests/illformed.log
+++ b/
tests/illformed.log
@@
-6,6
+6,8
@@
seed 1801426495
version
help
info
version
help
info
+_
+back
eat grate
eat building
in
eat grate
eat building
in
diff --git
a/tests/weirddwarf.chk
b/tests/weirddwarf.chk
index 84731c2b2b1c4543a5caecad0593ec2788f70877..90104c8ee20ab9935ddc8f535e8c89a84a758779 100644
(file)
--- a/
tests/weirddwarf.chk
+++ b/
tests/weirddwarf.chk
@@
-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
With what? Your bare hands?
> attack
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 8
7
turns.
+You scored 103 out of a possible 430, using 8
8
turns.
Your score qualifies you as a novice class adventurer.
Your score qualifies you as a novice class adventurer.
diff --git
a/tests/weirddwarf.log
b/tests/weirddwarf.log
index 70c6e5379b56db605f858a7ab4f3e98ff42ccf62..b7af3a0d462adb5f39e9c6f755ed0727186a3721 100644
(file)
--- a/
tests/weirddwarf.log
+++ b/
tests/weirddwarf.log
@@
-88,5
+88,6
@@
read dwarf
feed dwarf
carry
carry dwarf
feed dwarf
carry
carry dwarf
+find dwarf
attack
feed
attack
feed