From 1dbeda11c037be8bf24c9cff1acb2781d085df42 Mon Sep 17 00:00:00 2001 From: jennylihan Date: Mon, 19 Aug 2019 18:56:42 +0800 Subject: [PATCH 01/12] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a69b1e7..bf26304 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ bag treasure.png key.txt +.timer From 466d403d16f12c5d476540370c6594d8b6b2b08a Mon Sep 17 00:00:00 2001 From: jennylihan Date: Mon, 19 Aug 2019 18:57:45 +0800 Subject: [PATCH 02/12] Delete .timer --- adventure/seafloor/coral_reef/.timer | 1 - 1 file changed, 1 deletion(-) delete mode 100644 adventure/seafloor/coral_reef/.timer diff --git a/adventure/seafloor/coral_reef/.timer b/adventure/seafloor/coral_reef/.timer deleted file mode 100644 index e710d13..0000000 --- a/adventure/seafloor/coral_reef/.timer +++ /dev/null @@ -1 +0,0 @@ -2019-08-19 18:48:22.004554 \ No newline at end of file From 31b514c234392a2c0c5106b3cedf0ad8d8c3e200 Mon Sep 17 00:00:00 2001 From: jennylihan Date: Mon, 19 Aug 2019 18:58:02 +0800 Subject: [PATCH 03/12] Delete .chest.py.swp --- adventure/seafloor/coral_reef/.chest.py.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 adventure/seafloor/coral_reef/.chest.py.swp diff --git a/adventure/seafloor/coral_reef/.chest.py.swp b/adventure/seafloor/coral_reef/.chest.py.swp deleted file mode 100644 index 041bbb3b1a0d6b704d2e1ba4df5be24ac5c55626..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2v2N5r5Qg{Y11P+};53Q2*cU<(B84hKx*{SHArb|O*1oa5ioI)g*AZ@jg1iAd z1{EM0=xE>>s6dE{jt5}&;tL@}qDGn3{o3{1?Ci|9a&fvzN4w)KSc^x3#$_QseA|8S z`RUKW;kALtN~>J3|6^oLoGas&t!X{lxHL7Mx#RIPV6thlwnpt;a$|YB+)Q>*W~I_a zGQN8|DQ;#isbso08tqZAT4`DB$;kovw-%G%D~B?#jIl{(EV)?3JjqIQK5n`*PiG?& zIPV1J#On2x>8rjFU4<+2_s%;IuAd1o0Vco%m;e)C0!)AjoGSvp8HguT@rAzX`F7?s{P>k0KuQ=@ldP3Db_HTp!=vOt&Q#_q?BE}|hs-lBBWf<1j+I+eqH z(*iYP?*nCTz?TTqR&0=Z0uC{bLk^VctOQ!^96LEJ8waLAJp_vt9TUoSlpr;BL)jJx zQdvmbG_BBuNGgY-Mdx5+gZwh8XI+TiLMb$DkMI_dvpB(YtRa_~A0DM>CI}NHD+knD zuEEuYkXKy{JGKLAI7hmS0wiSQ7>+#=C=^WhVhy#f|6MOxB(bLoE0Ylv2Sko`hr+53 za%xrwlY?!kTRmiWR0C{4w7Rwu36Wb<16@?5(%9ldD%FFk8)JR2&aO|01)@m7=_6sg k^QF-Q*c4XQF@y|VY1(Q+=V(wK(hhvrgp#6JqkJTO0R?p!rT_o{ From 89012d7836131607afe3603a42a4efa95c63d881 Mon Sep 17 00:00:00 2001 From: jennylihan Date: Mon, 19 Aug 2019 19:12:13 +0800 Subject: [PATCH 04/12] Update chest.py --- adventure/seafloor/coral_reef/chest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adventure/seafloor/coral_reef/chest.py b/adventure/seafloor/coral_reef/chest.py index f0eb9a3..5684330 100644 --- a/adventure/seafloor/coral_reef/chest.py +++ b/adventure/seafloor/coral_reef/chest.py @@ -10,7 +10,7 @@ def treasure(): def monster1(): print(" *rumble* *rumble* *rumble* \n") - print(" You look around the reef, but nothing seems out of place.\n") + print(" You look around the reef and you notice treasure has appeared!\n") def monster2(): print(" *rumble* *rumble* *rumble* \n") @@ -18,8 +18,8 @@ def monster2(): print(" Without looking you grab the treasure from the chest.") print(" Quick, use mkdir to make a \"bag\" directory and mv to") print(" hide the treasure in the bag. ") - print(" Then get back to the surface ASAP! The moster is coming! \n") - print(" Don't forget to take your treasure bag with you!") + print(" Then get back to the surface ASAP! The monster is coming! \n") + print(" Don't forget to take your treasure bag with you up to the top directory!") now = datetime.datetime.now() with open(".timer", "w") as keyfile: keyfile.write(str(now)) From a18a38fc9e091f1a29133593e035280d2d3d9594 Mon Sep 17 00:00:00 2001 From: jennylihan Date: Mon, 19 Aug 2019 19:13:47 +0800 Subject: [PATCH 05/12] Update chest.py --- adventure/seafloor/coral_reef/chest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adventure/seafloor/coral_reef/chest.py b/adventure/seafloor/coral_reef/chest.py index 5684330..918db18 100644 --- a/adventure/seafloor/coral_reef/chest.py +++ b/adventure/seafloor/coral_reef/chest.py @@ -21,8 +21,8 @@ def monster2(): print(" Then get back to the surface ASAP! The monster is coming! \n") print(" Don't forget to take your treasure bag with you up to the top directory!") now = datetime.datetime.now() - with open(".timer", "w") as keyfile: - keyfile.write(str(now)) + with open(".timer", "w") as timerfile: + timerfile.write(str(now)) secret = "318" From b53a85d6174540c3ea83699bbecee0161164f8d8 Mon Sep 17 00:00:00 2001 From: jennylihan Date: Mon, 19 Aug 2019 19:15:01 +0800 Subject: [PATCH 06/12] Update chest.py --- adventure/seafloor/coral_reef/chest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adventure/seafloor/coral_reef/chest.py b/adventure/seafloor/coral_reef/chest.py index 918db18..6d35c29 100644 --- a/adventure/seafloor/coral_reef/chest.py +++ b/adventure/seafloor/coral_reef/chest.py @@ -10,12 +10,12 @@ def treasure(): def monster1(): print(" *rumble* *rumble* *rumble* \n") - print(" You look around the reef and you notice treasure has appeared!\n") + print(" If you look around the reef, you notice treasure has appeared!\n") def monster2(): print(" *rumble* *rumble* *rumble* \n") print(" A SEA MONSTER APPEARS FROM THE REEF! \n") - print(" Without looking you grab the treasure from the chest.") + print(" You look briefly and you grab the treasure from the chest.") print(" Quick, use mkdir to make a \"bag\" directory and mv to") print(" hide the treasure in the bag. ") print(" Then get back to the surface ASAP! The monster is coming! \n") From 5d950dc8f5a1c62869a6332fabf602e136b8099e Mon Sep 17 00:00:00 2001 From: jennylihan Date: Mon, 19 Aug 2019 19:19:53 +0800 Subject: [PATCH 07/12] Update chest.py --- adventure/seafloor/coral_reef/chest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adventure/seafloor/coral_reef/chest.py b/adventure/seafloor/coral_reef/chest.py index 6d35c29..d902042 100644 --- a/adventure/seafloor/coral_reef/chest.py +++ b/adventure/seafloor/coral_reef/chest.py @@ -10,12 +10,12 @@ def treasure(): def monster1(): print(" *rumble* *rumble* *rumble* \n") - print(" If you look around the reef, you notice treasure has appeared!\n") + print(" Around the reef, nothing seems out of place.\n") def monster2(): print(" *rumble* *rumble* *rumble* \n") print(" A SEA MONSTER APPEARS FROM THE REEF! \n") - print(" You look briefly and you grab the treasure from the chest.") + print(" All of a sudden, treasure has appeared! And the sea monster sees it too! No time to look. You grab the treasure from the chest.") print(" Quick, use mkdir to make a \"bag\" directory and mv to") print(" hide the treasure in the bag. ") print(" Then get back to the surface ASAP! The monster is coming! \n") From f1b1c83c4efce6539c3cb832b313d8aa0f9722ee Mon Sep 17 00:00:00 2001 From: jennylihan Date: Mon, 19 Aug 2019 19:20:15 +0800 Subject: [PATCH 08/12] Update chest.py --- adventure/seafloor/coral_reef/chest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adventure/seafloor/coral_reef/chest.py b/adventure/seafloor/coral_reef/chest.py index d902042..f7a139c 100644 --- a/adventure/seafloor/coral_reef/chest.py +++ b/adventure/seafloor/coral_reef/chest.py @@ -17,7 +17,7 @@ def monster2(): print(" A SEA MONSTER APPEARS FROM THE REEF! \n") print(" All of a sudden, treasure has appeared! And the sea monster sees it too! No time to look. You grab the treasure from the chest.") print(" Quick, use mkdir to make a \"bag\" directory and mv to") - print(" hide the treasure in the bag. ") + print(" hide the treasure.png in the bag. ") print(" Then get back to the surface ASAP! The monster is coming! \n") print(" Don't forget to take your treasure bag with you up to the top directory!") now = datetime.datetime.now() From 9bb7c14f520df1ff147cfac2b52f33eca1051708 Mon Sep 17 00:00:00 2001 From: jennylihan Date: Mon, 19 Aug 2019 19:21:02 +0800 Subject: [PATCH 09/12] Update chest.py --- adventure/seafloor/coral_reef/chest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adventure/seafloor/coral_reef/chest.py b/adventure/seafloor/coral_reef/chest.py index f7a139c..f72250c 100644 --- a/adventure/seafloor/coral_reef/chest.py +++ b/adventure/seafloor/coral_reef/chest.py @@ -15,7 +15,7 @@ def monster1(): def monster2(): print(" *rumble* *rumble* *rumble* \n") print(" A SEA MONSTER APPEARS FROM THE REEF! \n") - print(" All of a sudden, treasure has appeared! And the sea monster sees it too! No time to look. You grab the treasure from the chest.") + print(" All of a sudden, you realize there's treasure! And the sea monster sees it too! No time to look. You grab the treasure from the chest.") print(" Quick, use mkdir to make a \"bag\" directory and mv to") print(" hide the treasure.png in the bag. ") print(" Then get back to the surface ASAP! The monster is coming! \n") From 9a3646ffa3d3566b64cadc504fdb72576717cbc7 Mon Sep 17 00:00:00 2001 From: jennylihan Date: Mon, 19 Aug 2019 19:31:48 +0800 Subject: [PATCH 10/12] Update chest.py --- adventure/seafloor/coral_reef/chest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adventure/seafloor/coral_reef/chest.py b/adventure/seafloor/coral_reef/chest.py index f72250c..ff3f315 100644 --- a/adventure/seafloor/coral_reef/chest.py +++ b/adventure/seafloor/coral_reef/chest.py @@ -15,7 +15,8 @@ def monster1(): def monster2(): print(" *rumble* *rumble* *rumble* \n") print(" A SEA MONSTER APPEARS FROM THE REEF! \n") - print(" All of a sudden, you realize there's treasure! And the sea monster sees it too! No time to look. You grab the treasure from the chest.") + print(" The sea monster must have seen you open the chest!") + print(" There's no time to squander. You grab the treasure from the chest without taking a closer look!") print(" Quick, use mkdir to make a \"bag\" directory and mv to") print(" hide the treasure.png in the bag. ") print(" Then get back to the surface ASAP! The monster is coming! \n") From bb95aba9eedbe7ebb602a2b49d22bc75e4738983 Mon Sep 17 00:00:00 2001 From: jennylihan Date: Mon, 19 Aug 2019 19:32:59 +0800 Subject: [PATCH 11/12] Update end.py --- end.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/end.py b/end.py index 5cd6e39..befab94 100644 --- a/end.py +++ b/end.py @@ -26,7 +26,7 @@ def win(): print(" You are swimming as fast as you can towards the boat but you can") print(" feel the water begin to pull you back as the sea monster opens its") print(" giant mouth.") - print(" You kick with all your might, sure that you are about to breath your") + print(" You kick with all your might, sure that you are about to breathe your") print(" last breath.") print(" ") print(" ") @@ -35,6 +35,7 @@ def win(): print(" time to avoid the sea monster's vicious maw.") print(" You're safe at last!") print(" Now you can finally show off the treasure you risked your life for...") + print(" Use open treasure.png to take a peek.") now = datetime.now() From 20bbf84bb060fb4cd296407a17e71c800b6d8d67 Mon Sep 17 00:00:00 2001 From: Chris Proctor Date: Mon, 19 Aug 2019 13:52:06 -0400 Subject: [PATCH 12/12] Removing junk --- .gitignore~ | 1 - .../seafloor/sunken_ship/galley/.ghost.py.swp | Bin 12288 -> 0 bytes 2 files changed, 1 deletion(-) delete mode 100644 .gitignore~ delete mode 100644 adventure/seafloor/sunken_ship/galley/.ghost.py.swp diff --git a/.gitignore~ b/.gitignore~ deleted file mode 100644 index f749a1c..0000000 --- a/.gitignore~ +++ /dev/null @@ -1 +0,0 @@ -bag \ No newline at end of file diff --git a/adventure/seafloor/sunken_ship/galley/.ghost.py.swp b/adventure/seafloor/sunken_ship/galley/.ghost.py.swp deleted file mode 100644 index 2de728e72653c3a573a6617a53fa7a89bb2563fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2y>8S%5XbkZ37;L+;2>QNUF_qdfYbpI38Y8~ktk5Kw%7LR*1MK>9mhz70`UeE zl<*qR@B%yvUHUNVyCWn-N(;(ZH}cs#{?E*B*2U>2p6qPAfJfnk;c<;I^>gR-(TBsq zr{@Ef6t%Se{y9fdg_$&VwKk0tby%2EocY8-FBq+xq$!1VHhQ?aS*%Cff+vO4d9<^{@JJa2sykczIDlP~Aj;2oM1xKm>>Y5g-CY;6f5`)quUj$}i2U zzdkQv=y{lXy2C@J3xDjwuRQ~{f9g#Wg+32Uw{S0UNlA zlD1#gU2M`0QqyWEP`CR5SH3=rGv0-1k%Y96385?`rmU23LUo``U2+w| zHmdcr*bs|cYU@j~mEh9_rav<0I6bb@5MKFeRf{QWm3