kennethreitz-archive/adventure
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/adventure.git synced 2026-06-05 23:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scoring now works, and your score increases when you find a treasure.

Browse Source
This commit is contained in:
Brandon Craig Rhodes
2010-12-29 11:28:21 -05:00
parent fdfca29e53
commit 227fe3df1b
4 changed files with 197 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adventure/data.py
+3 -3
View File
@@ -6,7 +6,7 @@ from .model import Hint, Message, Move, Object, Room, Word
# The Adventure data file knows only the first five characters of each
# word in the game, so we have to know the full verion of each word.
long_words = dict((w[:5], w) for w in u"""upstream downstream forest
long_words = { w[:5]: w for w in u"""upstream downstream forest
forward continue onward return retreat valley stairs outside stream
cobble inward inside surface nowhere passage tunnel canyon awkward
upward ascend downward descend outdoors barren across debris broken
@@ -14,12 +14,12 @@ examine describe slabroom depression entrance secret bedquilt plover
oriental cavern reservoir office headlamp lantern pillow velvet fissure
oyster magazine spelunker dwarves knives rations bottle mirror beanstalk
stalactite shadow figure drawings pirate dragon message volcano geyser
machine vending battery carpet nugget diamond silver treasure trident
machine vending battery carpet nugget diamond silver jewelry treasure trident
shards pottery emerald platinum pyramid pearl persian spices capture
release discard mumble unlock nothing extinguish placate travel proceed
continue explore follow attack strike devour inventory detonate ignite
blowup peruse shatter disturb suspend sesame opensesame abracadabra
shazam excavate information""".split())
shazam excavate information""".split() }
class Data(object):
def __init__(self):
adventure/game.py
+119 -36
View File
@@ -11,9 +11,13 @@ class Game(Data):
look_complaints = 3 # how many times to "SORRY, BUT I AM NOT ALLOWED..."
full_description_period = 5 # how often we use a room's full description
full_wests = 0 # how many times they have typed "west" instead of "w"
dwarf_flag = 0 # how active the dwarves are
gave_up = False
impossibles = 0 # how many treasures can never be retrieved
treasures_not_found = 0 # how many treasures have not yet been seen
impossible_treasures = 0 # how many treasures can never be retrieved
lamp_turns = 330
warned_about_dim_lamp = False
bonus = 0 # how they exited the final bonus round
deaths = 0 # how many times the player has died
max_deaths = 4 # how many times the player can die
@@ -54,10 +58,18 @@ class Game(Data):
@property
def inventory(self):
return [ obj for obj in self.object_list if obj.toting ]
return [ obj for obj in self.object_list if obj.is_toting ]
@property
def treasures(self):
return [ obj for obj in self.object_list if obj.n >= 50 ]
@property
def objects_here(self):
return [ obj for obj in self.object_list if self.loc in obj.rooms ]
def is_here(self, obj):
return obj.toting or (self.loc in obj.rooms)
return obj.is_toting or (self.loc in obj.rooms)
# Game startup
@@ -71,12 +83,15 @@ class Game(Data):
self.write_message(1)
self.hints[3].used = True
self.lamp_turns = 1000
else:
self.lamp_turns = 330
self.turns = 0
self.oldloc = self.loc = self.rooms[1]
self.describe_location()
treasures = self.treasures
self.treasures_not_found = len(treasures)
for treasure in treasures:
treasure.prop = -1
# Routines that handle the aftermath of "big" actions like movement.
# Although these are called at the end of each `do_command()` cycle,
# we place here at the top of `game.py` to mirror the order in the
@@ -109,8 +124,8 @@ class Game(Data):
self.die_here()
return
# if self.toting(bear):
# self.write_message(141)
if self.bear.is_toting:
self.write_message(141)
if self.is_dark and not loc.is_forced:
self.write_message(16)
@@ -130,23 +145,26 @@ class Game(Data):
self.speak_message(8)
if not self.is_dark:
for obj in self.object_list:
for obj in self.objects_here:
if loc not in obj.rooms:
continue
#IF(OBJ.GT.100)OBJ=OBJ-100
if obj == u'steps': #...and toting nugget
if obj is self.steps and self.gold.is_toting:
continue
if obj.prop < 0: # finding a treasure the first time
if self.is_closing:
if self.is_closed:
continue
obj.prop = 1 if (obj == u'rug' or obj == u'chain') else 0
#IF(TALLY.EQ.TALLY2.AND.TALLY.NE.0)LIMIT=MIN0(35,LIMIT)
obj.prop = 1 if obj in (self.rug, self.chain) else 0
self.treasures_not_found -= 1
if (self.treasures_not_found > 0 and
self.treasures_not_found == self.impossible_treasures):
self.lamp_turns = min(35, self.lamp_turns)
#if obj == u'steps' and AND.LOC.EQ.FIXED(STEPS))prop=1
self.write(obj.messages[obj.prop])
if obj is self.steps and self.loc is self.steps.rooms[1]:
prop = 1
else:
prop = obj.prop
self.write(obj.messages[prop])
self.finish_turn()
@@ -196,7 +214,7 @@ class Game(Data):
and self.battery.prop == 0 and self.is_here(self.lamp):
self.write_message(188)
self.battery.prop = 1
if self.battery.toting:
if self.battery.is_toting:
self.battery.drop(self.loc)
self.lamp_turns += 2500
self.warned_about_dim_lamp = False
@@ -278,18 +296,18 @@ class Game(Data):
if move.forced or word in move.verbs:
c = move.condition
if c[0] is None:
go = True
if c[0] is None or c[0] == 'not_dwarf':
allowed = True
elif c[0] == '%':
go = 100 * random() < c[1]
allowed = 100 * random() < c[1]
elif c[0] == 'carrying':
go = self.objects[c[1]].toting
allowed = self.objects[c[1]].is_toting
elif c[0] == 'carrying_or_in_room_with':
go = self.is_here(self.objects[c[1]])
allowed = self.is_here(self.objects[c[1]])
elif c[0] == 'prop!=':
go = self.objects[c[1]].prop != c[2]
allowed = self.objects[c[1]].prop != c[2]
if not go:
if not allowed:
continue
if isinstance(move.action, Room):
@@ -343,7 +361,7 @@ class Game(Data):
# drop all objects in oldloc2
# but lamp goes in location 1
for obj in self.object_list:
if not obj.toting:
if not obj.is_toting:
continue
if obj == u'lamp':
obj.drop(self.rooms[1])
@@ -360,7 +378,7 @@ class Game(Data):
# Verbs.
def t_carry(self, verb, obj): #9010
if obj.toting:
if obj.is_toting:
self.write_message(verb.default_message or 54)
self.finish_turn()
return
@@ -380,11 +398,11 @@ class Game(Data):
self.write_message(92)
self.finish_turn()
if obj is self.bird and obj.prop == 0:
if self.rod.toting:
if self.rod.is_toting:
self.write_message(26)
self.finish_turn()
return
if not self.cage.toting:
if not self.cage.is_toting:
self.write_message(27)
self.finish_turn()
return
@@ -398,9 +416,9 @@ class Game(Data):
self.say_okay_and_finish()
def t_drop(self, verb, obj): #9020
if obj is self.rod and not self.rod.toting and self.rod2.toting:
if obj is self.rod and not self.rod.is_toting and self.rod2.is_toting:
obj = self.rod2
if not obj.toting:
if not obj.is_toting:
self.write_message(verb.default_message)
self.finish_turn()
return
@@ -428,7 +446,7 @@ class Game(Data):
bird.destroy()
bird.prop = 0
if snake.rooms:
self.impossibles += 1
self.impossible_treasures += 1
elif obj is bear and troll.is_at(self.loc):
self.write_message(163)
@@ -492,7 +510,7 @@ class Game(Data):
else:
self.finish_turn()
def t_attack(self, verb, obj):
def t_attack(self, verb, obj): #9120
if obj is self.bird:
if self.is_closed:
self.write_message(137)
@@ -500,7 +518,7 @@ class Game(Data):
obj.destroy()
obj.prop = 0
if self.snake.rooms:
self.impossibles += 1
self.impossible_treasures += 1
self.write_message(45)
elif obj is self.clam or obj is self.oyster:
self.write_message(150)
@@ -509,6 +527,7 @@ class Game(Data):
elif obj is self.dwarf:
if self.is_closed:
die
return
self.write_message(49)
elif obj is self.dragon:
if self.dragon.prop != 0:
@@ -549,8 +568,72 @@ class Game(Data):
self.write_message(99)
first = False
self.write(obj.inventory_message)
if self.bear.toting:
if self.bear.is_toting:
self.write_message(141)
if not objs:
self.write_message(98)
self.finish_turn()
def i_score(self, verb): #8240
score, max_score = self.compute_score(for_score_command=True)
self.write('If you were to quit now, you would score %d'
' out of a possible %d.' % (score, max_score))
def callback(yes):
self.write_message(54)
if yes:
self.score_and_exit()
return
self.yesno(self.messages[143], callback)
def compute_score(self, for_score_command=False): #20000
score = maxscore = 2
for treasure in self.treasures:
# if ptext(0) is zero?
if treasure.n > self.chest.n:
value = 16
elif treasure is self.chest:
value = 14
else:
value = 12
maxscore += value
if treasure.prop >= 0:
score += 2
if treasure.rooms and treasure.rooms[0].n == 3 \
and treasure.prop == 0:
score += value - 2
maxscore += self.max_deaths * 10
score += (self.max_deaths - self.deaths) * 10
maxscore += 4
if not for_score_command and not self.gave_up:
score += 4
maxscore += 25
if self.dwarf_flag:
score += 25
maxscore += 25
if self.is_closing:
maxscore += 25
maxscore += 45
if self.is_closed:
score += {0: 10, 135: 25, 134: 30, 133: 45}[self.bonus]
maxscore += 1
if self.magazine.rooms[0].n == 108:
score += 1
for hint in self.hints.values():
if hint.used:
score -= hint.penalty
return score, maxscore
def score_and_exit(self):
self.compute_score()
# then do exit messages
adventure/model.py
+4 -4
View File
@@ -112,7 +112,7 @@ class Object(object):
self.names = []
self.prop = 0
self.rooms = []
self.toting = False
self.is_toting = False
def __repr__(self):
return '<Object %d %s %x>' % (self.n, '/'.join(self.names), id(self))
@@ -125,15 +125,15 @@ class Object(object):
def carry(self):
self.rooms[:] = []
self.toting = True
self.is_toting = True
def drop(self, room):
self.rooms[:] = [ room ]
self.toting = False
self.is_toting = False
def destroy(self):
self.rooms[:] = []
self.toting = False
self.is_toting = False
class Message(object):
"""A message for printing."""
adventure/tests/walkthrough1.txt
+71
View File
@@ -286,11 +286,15 @@ FROM EAST AND WEST SIDES OF THE CHAMBER.
AT YOUR FEET IS A SMALL PIT BREATHING TRACES OF WHITE MIST. AN EAST
PASSAGE ENDS HERE EXCEPT FOR A SMALL CRACK LEADING ON.
<BLANKLINE>
ROUGH STONE STEPS LEAD DOWN THE PIT.
<BLANKLINE>
>>> w
THE CRACK IS FAR TOO SMALL FOR YOU TO FOLLOW.
<BLANKLINE>
YOU'RE AT TOP OF SMALL PIT.
<BLANKLINE>
ROUGH STONE STEPS LEAD DOWN THE PIT.
<BLANKLINE>
>>> look
SORRY, BUT I AM NOT ALLOWED TO GIVE MORE DETAIL. I WILL REPEAT THE
LONG DESCRIPTION OF YOUR LOCATION.
@@ -298,6 +302,8 @@ LONG DESCRIPTION OF YOUR LOCATION.
AT YOUR FEET IS A SMALL PIT BREATHING TRACES OF WHITE MIST. AN EAST
PASSAGE ENDS HERE EXCEPT FOR A SMALL CRACK LEADING ON.
<BLANKLINE>
ROUGH STONE STEPS LEAD DOWN THE PIT.
<BLANKLINE>
>>> d
YOU ARE AT ONE END OF A VAST HALL STRETCHING FORWARD OUT OF SIGHT TO
THE WEST. THERE ARE OPENINGS TO EITHER SIDE. NEARBY, A WIDE STONE
@@ -305,6 +311,8 @@ STAIRCASE LEADS DOWNWARD. THE HALL IS FILLED WITH WISPS OF WHITE MIST
SWAYING TO AND FRO ALMOST AS IF ALIVE. A COLD WIND BLOWS UP THE
STAIRCASE. THERE IS A PASSAGE AT THE TOP OF A DOME BEHIND YOU.
<BLANKLINE>
ROUGH STONE STEPS LEAD UP THE DOME.
<BLANKLINE>
>>> w
YOU ARE ON THE EAST BANK OF A FISSURE SLICING CLEAR ACROSS THE HALL.
THE MIST IS QUITE THICK HERE, AND THE FISSURE IS TOO WIDE TO JUMP.
@@ -317,6 +325,8 @@ YOU'RE ON EAST BANK OF FISSURE.
>>> e
YOU'RE IN HALL OF MISTS.
<BLANKLINE>
ROUGH STONE STEPS LEAD UP THE DOME.
<BLANKLINE>
>>> n
YOU ARE IN THE HALL OF THE MOUNTAIN KING, WITH PASSAGES OFF IN ALL
DIRECTIONS.
@@ -333,6 +343,8 @@ A HUGE GREEN FIERCE SNAKE BARS THE WAY!
>>> up
YOU'RE IN HALL OF MISTS.
<BLANKLINE>
ROUGH STONE STEPS LEAD UP THE DOME.
<BLANKLINE>
>>> down
YOU'RE IN HALL OF MT KING
<BLANKLINE>
@@ -385,7 +397,66 @@ DIRECTIONS.
A CHEERFUL LITTLE BIRD IS SITTING HERE SINGING.
<BLANKLINE>
>>> score
If you were to quit now, you would score 27 out of a possible 360.
DO YOU INDEED WISH TO QUIT NOW?
<BLANKLINE>
>>> no
OK
<BLANKLINE>
>>> s
YOU ARE IN THE SOUTH SIDE CHAMBER.
<BLANKLINE>
THERE IS PRECIOUS JEWELRY HERE!
<BLANKLINE>
>>> score
If you were to quit now, you would score 29 out of a possible 360.
DO YOU INDEED WISH TO QUIT NOW?
<BLANKLINE>
>>> no
OK
<BLANKLINE>
>>> get(jewelry)
OK
<BLANKLINE>
>>> n
YOU'RE IN HALL OF MT KING
<BLANKLINE>
A CHEERFUL LITTLE BIRD IS SITTING HERE SINGING.
<BLANKLINE>
>>> w
YOU ARE IN THE WEST SIDE CHAMBER OF THE HALL OF THE MOUNTAIN KING.
A PASSAGE CONTINUES WEST AND UP HERE.
<BLANKLINE>
THERE ARE MANY COINS HERE!
<BLANKLINE>
>>> score
If you were to quit now, you would score 31 out of a possible 360.
DO YOU INDEED WISH TO QUIT NOW?
<BLANKLINE>
>>> no
OK
<BLANKLINE>
>>> w
YOU ARE AT A CROSSOVER OF A HIGH N/S PASSAGE AND A LOW E/W ONE.
<BLANKLINE>
>>> w
YOU ARE AT THE EAST END OF A VERY LONG HALL APPARENTLY WITHOUT SIDE
CHAMBERS. TO THE EAST A LOW WIDE CRAWL SLANTS UP. TO THE NORTH A
ROUND TWO FOOT HOLE SLANTS DOWN.
<BLANKLINE>
>>> w
YOU ARE AT THE WEST END OF A VERY LONG FEATURELESS HALL. THE HALL
JOINS UP WITH A NARROW NORTH/SOUTH PASSAGE.
<BLANKLINE>
>>> n
YOU ARE AT A CROSSOVER OF A HIGH N/S PASSAGE AND A LOW E/W ONE.
<BLANKLINE>
>>> s
YOU'RE AT WEST END OF LONG HALL.
<BLANKLINE>
>>> n
YOU ARE AT A CROSSOVER OF A HIGH N/S PASSAGE AND A LOW E/W ONE.
<BLANKLINE>
>>> n
DEAD END
<BLANKLINE>