From 52c18c317447c59f00585a2dee82ef8a11a5fb81 Mon Sep 17 00:00:00 2001
From: Christopher Pedersen <12384786+topherPedersen@users.noreply.github.com>
Date: Wed, 29 Aug 2018 23:59:43 -0500
Subject: [PATCH] Update oregon.bas

---
 oregon.bas | 67 ++++++++++--------------------------------------------
 1 file changed, 12 insertions(+), 55 deletions(-)

diff --git a/oregon.bas b/oregon.bas
index c0a20d4..c5ad9a9 100644
--- a/oregon.bas
+++ b/oregon.bas
@@ -17,10 +17,7 @@
 241 PRINT "MILE TRIP OVER THE OREGON TRAIL"
 242 PRINT "FROM INDEPENDENCE, MO TO"
 243 PRINT "OREGON CITY, OR IN 1847."
-280 PRINT
-281 PRINT PE$;
-282 INPUT CT$
-283 PRINT
+280 PRINT: PRINT PE$: INPUT CT$: PRINT
 290 PRINT "YOU'VE SAVED $700 TO SPEND FOR"
 291 PRINT "THE TRIP. YOU WILL NEED TO"
 292 PRINT "PURCHASE THE FOLLOWING"
@@ -31,38 +28,23 @@
 410 PRINT "  * AMMUNITION"
 450 PRINT "  * CLOTHING" 
 490 PRINT "  * MISC. SUPPLIES"
-530 PRINT
-531 PRINT PE$;
-532 INPUT CT$
-533 PRINT
+530 PRINT: PRINT PE$: INPUT CT$: PRINT
 540 PRINT "YOU CAN SPEND ALL YOUR MONEY"
 541 PRINT "NOW, OR SAVE SOME FOR ALONG"
 542 PRINT "THE WAY"
-550 PRINT
-551 PRINT PE$;
-552 INPUT CT$
-553 PRINT
+550 PRINT: PRINT PE$: INPUT CT$: PRINT
 239 REM T "1234567890123456789012345678901"
 590 PRINT "WHENEVER YOU HAVE TO USE YOUR"
 591 PRINT "RIFLE, YOU WILL BE ASKED TO"
 592 PRINT "TYPE IN A WORD (ONE THAT SOUNDS"
 593 PRINT "LIKE A GUNSHOT) AND PRESS"
 594 PRINT "<ENTER> IN ORDER TO FIRE"
-630 PRINT
-631 PRINT PE$;
-632 INPUT CT$
+630 PRINT: PRINT PE$: INPUT CT$: PRINT
 633 D9=1
 770 IF D9>5 THEN 790
 780 GOTO 810
-790 D9=0
+790 D9=D3=M9=M=F2=F1=S4=K8=0
 810 X1=-1
-823 D3=0
-824 M9=0
-825 M=0
-826 F2=0
-827 F1=0
-828 S4=0
-829 K8=0
 840 PRINT
 849 Z9$="HOW MUCH DO YOU WANT TO SPEND"
 850 PRINT Z9$: PRINT "ON YOUR OXEN TEAM"
@@ -104,10 +86,7 @@
 1210 PRINT
 1220 GOTO 1750
 1230 IF M >= 2040 THEN 5430
-1241 PRINT
-1242 PRINT PE$;
-1243 INPUT CT$
-1244 PRINT
+1241 PRINT: PRINT PE$: INPUT CT$: PRINT
 1250 D3=D3+1
 1260 PRINT
 1270 PRINT "MON ";
@@ -486,10 +465,7 @@
 5140 PRINT "PNEUMONIA..."
 5150 GOTO 5170
 5160 PRINT "INJURIES..."
-5170 PRINT
-5171 PRINT PE$;
-5172 INPUT CT$
-5173 PRINT
+5170 PRINT: PRINT PE$: INPUT CT$: PRINT
 5310 PRINT "DEAR INTREPID TRAVELER,"
 5320 PRINT
 5331 PRINT "WE ARE DEEPLY SADDENED THAT"
@@ -505,32 +481,13 @@
 5430 F9=(2040-M2)/(M-M2)
 5440 F=F+(1-F9)*(8+5*E)
 5450 PRINT
-5470 PRINT "YOU FINALLY ARRIVED AT OREGON"
-5471 PRINT "CITY AFTER 2040 LONG MILES,"
-5480 PRINT "HOORAY!!!!! A REAL PIONEER!"
-5500 PRINT
-5501 PRINT PE$;
-5502 INPUT CT$
-5503 PRINT
+5470 PRINT "YOU FINALLY ARRIVED IN OREGON!"
+5500 PRINT: PRINT PE$: INPUT CT$: PRINT
 5510 F9=INT(F9*14)
 5520 D3=D3*14+F9
 5530 F9=F9+1
 5540 IF F9<8 THEN 5560
 5550 F9=F9-7
-5560 ON F9 GOTO 5570,5590,5610,5630,5650,5670,5690
-5570 PRINT "MON ";
-5580 GOTO 5700
-5590 PRINT "TUE ";
-5600 GOTO 5700
-5610 PRINT "WED ";
-5620 GOTO 5700
-5630 PRINT "THU ";
-5640 GOTO 5700
-5650 PRINT "FRI ";
-5660 GOTO 5700
-5670 PRINT "SAT ";
-5680 GOTO 5700
-5690 PRINT "SUN ";
 5700 IF D3>124 THEN 5740
 5710 D3=D3-93
 5720 PRINT "JUL ";D3;" 1847"
@@ -613,16 +570,16 @@
 6302 IF E=2 THEN E2=40/4
 6303 IF E=3 THEN E2=40/16
 6310 IF 100*RND(0)<100-(E2) THEN 6410
-6320 PRINT: PRINT "SERIOUS ILLNESS--- YOU MUST"
+6320 PRINT: PRINT "SERIOUS ILLNESS, YOU MUST"
 6330 PRINT "STOP FOR MEDICAL ATTENTION": PRINT
 6340 M1=M1-10
 6350 S4=1
 6360 GOTO 6440
-6370 PRINT: PRINT "WILD ILLNESS---MEDICINE USED": PRINT
+6370 PRINT: PRINT "WILD ILLNESS, MEDICINE USED": PRINT
 6380 M=M-5
 6390 M1=M1-2
 6400 GOTO 6440
-6410 PRINT: PRINT "BAD ILLNESS---MEDICINE USED": PRINT
+6410 PRINT: PRINT "BAD ILLNESS, MEDICINE USED": PRINT
 6420 M=M-5
 6430 M1=M1-5
 6440 IF M1<0 THEN 5110