From 3c93d5e0cc5876bd011ee9a804ffb8af1cd7cdcf Mon Sep 17 00:00:00 2001
From: Martha Corcoran <corcoranm2@cardiff.ac.uk>
Date: Tue, 25 Oct 2022 22:48:02 +0000
Subject: [PATCH] Basic grammar and punctuation fixes
---
Group_game/game.py | 12 ++++++------
Group_game/hangman.py | 2 +-
Group_game/items.py | 8 ++++----
Group_game/level_1.py | 12 ++++++------
Group_game/level_2.py | 14 +++++++-------
Group_game/map.py | 18 +++++++++---------
6 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/Group_game/game.py b/Group_game/game.py
index 67459fa..d89fbfa 100644
--- a/Group_game/game.py
+++ b/Group_game/game.py
@@ -152,7 +152,7 @@ def execute_go(direction):
current_room = new_room
return current_room
else:
- print("you cannot go there")
+ print("You cannot go there")
time.sleep(0.8)
def execute_take(item_id):
@@ -204,7 +204,7 @@ def unlock_door():
if item_key in inventory:
while True:
print("WELL DONE! You've escaped LEVEL 1 in a time of", minutes, "minutes and", seconds,"seconds")
- print("type CONTINUE to begin the next level")
+ print("Type CONTINUE to begin the next level")
response = input()
if normalise_input(response)[0] == "continue":
location_door["locked"] = False
@@ -262,7 +262,7 @@ def execute_command(command):
if command[1] == "note":
read_note()
else:
- print("read what?")
+ print("Read what?")
elif command[0] == "open":
if command[1] == "diary":
@@ -272,7 +272,7 @@ def execute_command(command):
elif command[1] == "trap door":
open_trapdoor()
else:
- print("open what?")
+ print("Open what?")
elif command[0] == "check":
if len(command) > 1:
@@ -375,14 +375,14 @@ def main():
gastime = current_time - gas_starttime
gastime_left = 180 - gastime.total_seconds()
if gastime_left < 0:
- print("OH NO! the floor was filled with gas and you died")
+ print("OH NO! The floor was filled with gas and you died")
break
# Display game status (room description, inventory etc.)
if current_room == location_entrance:
if not location_entrance["entered"]:
location_boileroom["valve_open"] = True
print("You immediately start hearing a high pitched hissing sound. You look around and see a valve needs to be closed. If only you had come sort of utensil to shut it.")
- print("You've got 3 minutes to close the valve in the boiling room before the room fills with gas")
+ print("You've got 3 minutes to close the valve in the boiling room before the room fills with gas.")
time.sleep(5)
gas_starttime = datetime.now()
location_entrance["entered"] = True
diff --git a/Group_game/hangman.py b/Group_game/hangman.py
index 3e58003..98bb5a6 100644
--- a/Group_game/hangman.py
+++ b/Group_game/hangman.py
@@ -20,7 +20,7 @@ def hangman(word):
try:
while (chances != 0) and flag == 0: # flag is updated when the word is correctly guessed
print()
- print("you have " + str(chances) + " guesses left!")
+ print("You have " + str(chances) + " guesses left!")
chances -= 1
try:
diff --git a/Group_game/items.py b/Group_game/items.py
index 4d2b1be..66f9a10 100644
--- a/Group_game/items.py
+++ b/Group_game/items.py
@@ -4,7 +4,7 @@ item_batteries = {
"name": "a pair of batteries",
- "description": "You've found some batteries, I wonder what they might be used for",
+ "description": "You've found some batteries, I wonder what they might be used for?",
"pick-up": True
}
item_safe = {
@@ -31,7 +31,7 @@ item_key = {
"name": "a key",
- "description": "You found something hidden in the dust and spiderwebs it seems to be...a key! It's a bit rusty but it can still do the job.",
+ "description": "You found something hidden in the dust and cobwebs, it seems to be...a key! It's a bit rusty but you think it can still work.",
"pick-up": True
}
@@ -40,7 +40,7 @@ unpowered_torch = {
"name": "a torch",
- "description": "A torch, capable of lighting up dark areas but it looks like the torch is empty perhaps there are some batteries laying around",
+ "description": "A torch, capable of lighting up dark areas, but it looks like the torch is empty perhaps there are some batteries laying around.",
"pick-up": True
}
powered_torch = {
@@ -97,4 +97,4 @@ item_lock = {
"pick-up": False,
"batteries": False
-}
\ No newline at end of file
+}
diff --git a/Group_game/level_1.py b/Group_game/level_1.py
index 953420a..64878c5 100644
--- a/Group_game/level_1.py
+++ b/Group_game/level_1.py
@@ -17,18 +17,18 @@ def open_diary(room_items):
def open_safe(room_items):
- print("To open this safe you need a passcode")
- print("please enter the passcode")
+ print("To open this safe you need a passcode.")
+ print("Please enter the passcode.")
passcode = input()
if passcode == "042":
print("THE PASSCODE WAS CORRECT!")
- print("inside the safe you found a pair of batteries")
+ print("Inside the safe you found a pair of batteries.")
time.sleep(0.8)
room_items.append(item_batteries)
item_safe.update({"open": True})
else:
- print("you try the code", passcode, "but the safe wouldn't open")
- print("TRY AGAIN")
+ print("You try the code", passcode, "but the safe wouldn't open.")
+ print("TRY AGAIN.")
time.sleep(0.8)
@@ -63,7 +63,7 @@ def use_torch(room):
"(try finding some batteries to power the torch)")
time.sleep(0.8)
else:
- print("you cannot do that")
+ print("You cannot do that")
def read_note():
diff --git a/Group_game/level_2.py b/Group_game/level_2.py
index e22351e..c3a0ee1 100644
--- a/Group_game/level_2.py
+++ b/Group_game/level_2.py
@@ -15,7 +15,7 @@ def drink_wine():
while counter < 3:
if counter < 1:
time.sleep(1)
- print('You drink a glass of the wine, but have not got much closer the clue.')
+ print('You drink a glass of the wine, but have not got much closer to getting the clue.')
print('Would you like to drink another glass?')
print('YES or NO')
more = str(input('> '))
@@ -55,9 +55,9 @@ def close_valve():
if item_screwdriver in inventory:
if location_boileroom["valve_open"]:
location_boileroom["valve_open"] = False
- print("Well done! You stopped the leakage")
+ print("Well done! You stopped the leak!")
else:
- print("valve is closed")
+ print("Valve is closed")
else:
print("You need a screwdriver to close the valve")
@@ -69,9 +69,9 @@ def open_trapdoor():
if key_card in inventory:
trap_door["open"] = True
else:
- print("You need a key card to open the lock")
+ print("You need a key card to open the lock.")
else:
- print("The electrical lock requires batteries to open")
+ print("The electrical lock requires batteries to open.")
def use_battery_lock():
@@ -79,7 +79,7 @@ def use_battery_lock():
if item_batteries in inventory:
item_lock["batteries"] = True
inventory.remove(item_batteries)
- print("You placed the batteries in the electrical lock")
+ print("You placed the batteries in the electrical lock.")
time.sleep(1)
def gas_timer(timer):
@@ -89,4 +89,4 @@ def gas_timer(timer):
minutes = time_left//60
seconds = time_left%60
if time_left > 0:
- print("You have", round(minutes), "minutes and", round(seconds), "seconds before the room fills with gas")
\ No newline at end of file
+ print("You have", round(minutes), "minutes and", round(seconds), "seconds before the room fills with gas.")
diff --git a/Group_game/map.py b/Group_game/map.py
index 8df17fd..addd2da 100644
--- a/Group_game/map.py
+++ b/Group_game/map.py
@@ -4,7 +4,7 @@ location_centre = {
"name": "Centre of the room",
"description": """Find a way to escape the room! To the SOUTH there is a Fireplace.
-from the WEST there is a Bookshelf. From NORTH of the room there is a locked door with a keypad.
+from the WEST of the room there is a Bookshelf. From NORTH of the room there is a locked door with a keypad.
You also see an office desk NORTH-EAST. There is a mysterious dark corner SOUTH-EAST of the room.
Good luck you have 20 minutes!""",
@@ -37,7 +37,7 @@ location_bookshelf = {
Location_desk = {
"name": "The office desk",
- "description": "I see a desk with what looks to be a safe underneath it. I open the drawer, and sure enough, there is a small safe.",
+ "description": "You see a desk with what looks to be a safe underneath it. You open the drawer, and sure enough, there is a small safe.",
"exits": {"west": "door", "south-west": "centre", "south" : "dark corner"},
@@ -47,7 +47,7 @@ Location_desk = {
location_dark_corner = {
"name": "a dark corner of the room",
- "description": "The dark corner is filled with dust, cobwebs and old papers. There are also some old computers that no one uses anymore, probably the remnants of old computer science students",
+ "description": "The dark corner is filled with dust, cobwebs and old papers. There are also some old computers that no one uses anymore, probably the remnants of old computer science students.",
"exits": {"west": "fireplace", "north": "office desk", "north-west": "centre"},
@@ -56,7 +56,7 @@ location_dark_corner = {
location_door = {
"name": "level 1 Escape door",
- "description": "The door is locked, the keypad has a red light that’s blinking. You press the buttons randomly only to no avail. You press more random buttons and the red light blinks faster. :( ",
+ "description": "The door is locked, the keypad has a red light that’s blinking. You press the buttons randomly to no avail. You press more random buttons and the red light blinks faster. :( ",
"exits": {"south": "centre"},
"locked": True,
@@ -67,7 +67,7 @@ location_entrance = {
"name": "level 2 Entrance",
"description": "You find yourself in another level of the basement. "
- "It takes a minute for your eyes to adjust to this new, brighter room. In this room there is a trap door with stairs leading to it with a desk underneath the stairs. There are multiple different rooms leading away. Once again you have 20 minutes, be careful and good luck.",
+ "It takes a minute for your eyes to adjust to this new, brighter room. In this room there is a trap door with stairs leading up to it. there seems to be a desk underneath the stairs. There are multiple different rooms to the NORTH, WEST, SOUTH, EAST, SOUTH-EAST and then back DOWNSTAIRS. Once again you have 20 minutes, be careful and good luck.",
"exits": {"north": "wine cellar", "west": "storage room", "south": "boiler room", "east": "trap door", "south-east": "desk", "downstairs": "door"},
@@ -77,7 +77,7 @@ location_entrance = {
location_winecellar = {
"name": "Wine Cellar",
- "description": "The wine cellar is filled wall to wall with the finest lambrini and echo falls known to man. As you inspect the lambrini closer, something shiny at the bottom catches your eye. ",
+ "description": "The wine cellar is filled wall to wall with the finest Lambrini and Echo Falls known to man. As you inspect the Lambrini closer, something shiny at the bottom catches your eye. ",
"exits": {"south": "entrance"},
@@ -86,7 +86,7 @@ location_winecellar = {
location_storage = {
"name": "Storage Room",
- "description": "Infront of you a closet looms large but there is no handle to open the doors. Confused you scan the room to see if there is anything else useful.",
+ "description": "Infront of you a closet looms large but there are no handles to open the doors. Confused, you scan the room to see if there is anything else useful.",
"exits": {"north": "closet", "east": "entrance"},
@@ -105,13 +105,13 @@ location_boileroom = {
}
desk = {
"name": "desk",
- "description": "the desk is similar to the one in the other room, there are many drawers that could hold important items. Sure enough in one of the drawers there is a lock box that has a password. To unlock you must guess the word.",
+ "description": "The desk is similar to the one in the other room, there are many drawers that could hold important items. Sure enough in one of the drawers there is a lock box that has a password. To unlock this box you must guess the word.",
"exits": {"north-west": "entrance"},
"items": []
}
trap_door = {
"name": "trap door",
- "description": "The trap door is locked! There is an electrocated lock, you could use your key again but there is no guarantee it would work and there is no power in this lock. ",
+ "description": "The trap door is locked! There is an electronic lock, you could use your key again but there is no guarantee it seems unlikely it will work again. The lock also seems to have no power. ",
"exits": {"west": "entrance"},
"open": False,
"items": [item_lock]
--
GitLab