Parcourir la source

All locations beginning with U updated to version 1.1.4

heromaster il y a 10 ans
Parent
commit
43168c6470
1 fichiers modifiés avec 84 ajouts et 95 suppressions
  1. 84 95
      locations/univer

+ 84 - 95
locations/univer

@@ -2,15 +2,15 @@
 if $ARGS[0] = 'start':
 	$sexloc = $CURLOC
 	cla
-	*clr
-	set minut += 5
-	'<center><b><font color="maroon">The University of</font></b></center>'
-	'<center><img src="images/etogame/univer.jpg"></center>'
 	clr
+	*clr
+	minut += 5
 	gs 'stat'
 	fcolor = rgb(0, 0, 0)
 	bcolor = rgb(255, 255, 255)
 	lcolor = rgb(106, 90, 205)
+	'<center><b><font color="maroon">The University of</font></b></center>'
+	'<center><img src="images/etogame/univer.jpg"></center>'
 
 	if student = 0 and abiturient = 0:'Preparatory courses cost 15,000'
 
@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 
 	act 'Leave':
 		cla
-		set minut += 5
+		minut += 5
 		gt 'down'
 	end
 
@@ -32,22 +32,20 @@ if $ARGS[0] = 'start':
 
 		act 'Pay for training course (15,000 rubles)':
 			cla
-			set minut += 5
-			set money -= 15000
-			set abiturient = 1
+			minut += 5
+			money -= 15000
+			abiturient = 1
 			'You paid 15,000 for preparatory courses. Classes start in 21chas, on weekdays'
 
 			act 'Move away':gt 'univer', 'start'
 		end
-	end
-
-	if abiturient >= 1 and month < 9 and hour < 21 and week < 6:
+	elseif abiturient >= 1 and month < 9 and hour < 21 and week < 6:
 		act 'Attend preparatory courses (1:00)':
 			cla
 			*clr
-			set minut += 60
-			set abiturient += 1
-			set intel += 1
+			minut += 60
+			abiturient += 1
+			intel += 1
 			'<center><img src="images/etogame/Classroom.jpg"></center>'
 			'You were engaged in preparatory courses within an hour.'
 
@@ -61,15 +59,15 @@ if $ARGS[0] = 'start':
 		act 'Take the entrance exam (1:00)':
 			cla
 			*clr
-			set minut += 60
+			minut += 60
 			'<center><img src="images/etogame/Classroom.jpg"></center>'
 			'You passed the entrance exam to university.'
 
 			if intel + abiturient >= 100:
-				set student = 1
-				set kurs = 1
-				set semestr = 1
-				set abiturient = 0
+				student = 1
+				kurs = 1
+				semestr = 1
+				abiturient = 0
 				'You have successfully passed the entrance exams and can start training in September.'
 			else
 				'You failed the entrance exam.'
@@ -84,29 +82,23 @@ if $ARGS[0] = 'start':
 		act 'Go to the deanery':
 			cla
 
-			if semestr = 2 and examen = 0:set examen = 2
+			if semestr = 2 and examen = 0:examen = 2
 
 			gt 'univer', 'dekanat'
 		end
-	end
-
-	if week < 6 and student > 0 and month > 1 and month < 5:
+	elseif week < 6 and student > 0 and month > 1 and month < 5:
 		!! 2nd semester
 		act 'Go to the deanery':
 			cla
 
-			if semestr = 1 and examen = 0:set examen = 2
+			if semestr = 1 and examen = 0:examen = 2
 
 			gt 'univer', 'dekanat'
 		end
-	end
-
-	if week < 6 and student > 0 and month = 12 and examen = 0 and semestr = 1:
+	elseif week < 6 and student > 0 and month = 12 and examen = 0 and semestr = 1:
 		!! 1st semester exams
 		act 'Go for exams':gt 'univer', 'examen'
-	end
-
-	if week < 6 and student > 0 and month = 5 and examen = 0 and semestr = 2:
+	elseif week < 6 and student > 0 and month = 5 and examen = 0 and semestr = 2:
 		!! 2nd semester exams
 		act 'Go for exams':gt 'univer', 'examen'
 	end
@@ -115,66 +107,65 @@ end
 if $ARGS[0] = 'dekanat':
 	$sexloc = $CURLOC
 	cla
+	clr
 	*clr
+	minut += 5
 
 	if examen = 1:
-		set examen = 0
+		examen = 0
 
 		if semestr = 2:
-			set semestr = 1
-			set kurs += 1
+			semestr = 1
+			kurs += 1
+		elseif semestr = 1:
+			semestr = 2
 		end
-
-		if semestr = 1:set semestr = 2
+	elseif examen = 2:
+		student = 0
+		kurs = 0
+		semestr = 0
+		abiturient = 0
+		stipuha = 0
+		lektor = 0
+
+		'YOU expelled from university.'
 	end
 
 	if kurs = 2:
-		set diplom = 1
-		set student = 0
-		set kurs = 0
-		set semestr = 0
-		set abiturient = 0
-		set stipuha = 0
-		'You handed a diploma.'
-	end
-
-	if examen = 2:
-		set student = 0
-		set kurs = 0
-		set semestr = 0
-		set abiturient = 0
-		set stipuha = 0
-		set lektor = 0
-		'You are expelled from university.'
+		diplom = 1
+		student = 0
+		kurs = 0
+		semestr = 0
+		abiturient = 0
+		stipuha = 0
+		'YOU awarded a diploma.'
 	end
 
-	set minut += 5
+	gs 'stat'
 	'<center><b><font color="maroon">Dean</font></b></center>'
 	'<center><img src="images/etogame/dekanat.jpg"></center>'
-	clr
-	gs 'stat'
 	'You learn how to <<semestr>> semester <<kurs>> course'
 	'Prior to the session must pass <<kurs>> coursework. More welcomed and encouraged during the session.'
 
 	if kursovikD > 0:'You passed <<kursovikD>> coursework.'
 
-	act 'Escape from the dean´s office':gt 'univer', 'start'
+	act 'Escape from the dean''s office':gt 'univer', 'start'
 
 	if hour < 8 and student > 0:
 		act 'At the lecture':
 			cla
 			*clr
-			set minut += 360
-			set hour = 14
-			set minut = 0
-			set lektor += 1
-			set intel += 1
+			minut += 360
+			hour = 14
+			minut = 0
+			lektor += 1
+			intel += 1
 			'<center><img src="images/etogame/Classroom1.jpg"></center>'
 			'You were sitting in lectures and recorded for teacher notes.'
-			set zanrand = rand(0, 9)
+			zanrand = rand(0, 9)
 
 			if zanrand = 0:
-				set minut += 60
+				minut += 60
 				'During class lecturer starts you ask, but you did not really say you can not, and he says something to you stayed after school.'
 				'Classes are over, but you have to stay.'
 
@@ -191,9 +182,9 @@ if $ARGS[0] = 'dekanat':
 						cla
 						*clr
 
-						if zanpicrand = 1:set picrand = 44
-						if zanpicrand = 2:set picrand = 45
-						if zanpicrand = 3:set picrand = 46
+						if zanpicrand = 1:picrand = 44
+						if zanpicrand = 2:picrand = 45
+						if zanpicrand = 3:picrand = 46
 
 						'<center><img src="images/img/oldtown/zan1<<zanpicrand>>.jpg"></center>'
 						'You grab his penis, he reflexively pulls away, but then relaxes and allows you to continue.'
@@ -201,10 +192,8 @@ if $ARGS[0] = 'dekanat':
 						act 'Blow job':gt 'sex', 'minet'
 					end
 				end
-			end
-
-			if zanrand = 1:
-				set minut += 60
+			elseif zanrand = 1:
+				minut += 60
 				'During class lecturer starts you ask, but you did not really say you can not, and he says something to you stayed after school.'
 				'Classes are over, but you have to stay.'
 
@@ -221,9 +210,9 @@ if $ARGS[0] = 'dekanat':
 						cla
 						*clr
 
-						if zanpicrand = 4:set picrand = 20
-						if zanpicrand = 5:set picrand = 21
-						if zanpicrand = 6:set picrand = 22
+						if zanpicrand = 4:picrand = 20
+						if zanpicrand = 5:picrand = 21
+						if zanpicrand = 6:picrand = 22
 
 						'<center><img src="images/img/oldtown/zan1<<zanpicrand>>.jpg"></center>'
 						'You go down on your knees and grab his penis, the other girl looks at you with round eyes, but then also starts to stick to the teacher to design, he resists a little at first, but then completely given into your hand.'
@@ -241,9 +230,9 @@ if $ARGS[0] = 'dekanat':
 		act 'Pass the course work':
 			cla
 			*clr
-			set intel += 1
-			set kursovik = 0
-			set kursovikD += 1
+			intel += 1
+			kursovik = 0
+			kursovikD += 1
 			'<center><img src="images/etogame/Classroom1.jpg"></center>'
 			'You passed the course work.'
 
@@ -254,29 +243,29 @@ end
 
 if $ARGS[0] = 'examen':
 	cla
+	clr
 	*clr
-	set minut += 60
+	minut += 60
+	gs 'stat'
 	'<center><b><font color="maroon">Exam</font></b></center>'
 	'<center><img src="images/etogame/examen.jpg"></center>'
-	clr
-	gs 'stat'
 
 	if lektor > 55 and kursovikD >= kurs:
-		set examen = 1
-		set kursovikD = 0
-		set stipuha = 1
-		set lektor = 0
+		examen = 1
+		kursovikD = 0
+		stipuha = 1
+		lektor = 0
 		!!1200
 		'You are well attended classes and you have no outstanding coursework, exam so you put a gun.'
 		jump 'exitexamem'
 	end
 
 	if ((intel >= 80) or (lektor > 40 and lektor <= 55)) and kursovikD >= kurs:
-		set examen = 1
-		set kursovikD = 0
-		set stipuha = 0
+		examen = 1
+		kursovikD = 0
+		stipuha = 0
+		lektor = 0
 		'You answered all the questions in the ticket and you have no outstanding coursework, so you score? Exam.'
-		set lektor = 0
 
 		act 'Exit from the audience':gt 'univer', 'dekanat'
 
@@ -284,24 +273,24 @@ if $ARGS[0] = 'examen':
 	end
 
 	if (intel >= 100) and kursovikD >= kurs + 10:
-		set examen = 1
-		set kursovikD = 0
-		set stipuha = 1
+		examen = 1
+		kursovikD = 0
+		stipuha = 1
+		lektor = 0
 		'You showed great zeal and independence in learning, so you put a gun exam.'
-		set lektor = 0
 		jump 'exitexamem'
 		!!exit
 	end
 
 	if (intel < 70 and lektor <= 40) or kursovikD < kurs:
-		set examen = 2
-		set stipuha = 0
+		examen = 2
+		stipuha = 0
 		'You do not pass the exam.'
 	end
 
 	if examen = 0:
-		set examen = 2
-		set stipuha = 0
+		examen = 2
+		stipuha = 0
 		'You do not pass the exam.'
 	end