Browse Source

[changed] more UNI travel stuff based on feedback

Anya 1 year ago
parent
commit
863b693495
3 changed files with 15 additions and 19 deletions
  1. 2 2
      locations/city_island.qsrc
  2. 12 16
      locations/uni_dorm.qsrc
  3. 1 1
      locations/uni_grounds.qsrc

+ 2 - 2
locations/city_island.qsrc

@@ -44,7 +44,7 @@ if streetevent_hour + 2 < hour:gt'street_event','city_island', 'main'
 
 gs 'street_event', 'city_island', 'extras'
 
-if owned_property['university_dorm'] = 4 :act '<b>GO HOME</b> (University dorm)':gt 'uni_dorm', 'start'
+if owned_property['university_dorm'] = 4 :act '<b>GO HOME</b> (University dorm)': minut += 15 & gt 'uni_dorm', 'start'
 
 if car > 0 and cardrive = 25:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
@@ -80,7 +80,7 @@ act 'Go to the University campus':
 	gt 'uni_grounds', 'main'
 end
 
-if owned_property['university_dorm'] = 4 or university['student'] = 1 or hour >= 6:'The <a href="exec:gt ''uni_dorm'', ''start''">University dorms</a> offers small, but cheap, living space, for university students.'
+if owned_property['university_dorm'] = 4 or university['student'] = 1 or hour >= 6:'The <a href="exec: minut += 5 & gt ''uni_dorm'', ''start''">University dorms</a> offers small, but cheap, living space, for university students.'
 
 if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,3) = 'uni':
 	*clr & cla

+ 12 - 16
locations/uni_dorm.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 		gt 'uni_grounds', 'main'
 	end
 
-	if owned_property['university_dorm'] = 1 or university['student'] = 1:
+	if owned_property['university_dorm'] = 4 or university['student'] = 1:
 		act 'Show her your student ID':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
@@ -121,11 +121,6 @@ if $ARGS[0] = 'second_floor':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 	'Before you is the usual dorm hallway with the dilapidated walls of the second floor. You can hear music and loud talking from drunk students escaping from some rooms.'
 
-	act 'Go outside':
-		killvar 'university_dorm'
-		minut += 6
-		gt 'uni_grounds', 'main'
-	end
 	act 'Elevator': gt 'uni_dorm', 'elevator'
 
 	if katjaQW['knows_dorm_room_number'] > 0 and yearstart > 1:
@@ -167,11 +162,6 @@ if $ARGS[0] = 'sixth_floor':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 	'Before you is the usual dorm hallway with the dilapidated walls of the sixth floor. You can hear music and loud talking from drunk students escaping from some rooms.'
 
-	act 'Go outside':
-		killvar 'university_dorm'
-		minut += 6
-		gt 'uni_grounds', 'main'
-	end
 	act 'Elevator': gt 'uni_dorm', 'elevator'
 
 	if gosh > 0:
@@ -208,11 +198,6 @@ if $ARGS[0] = 'eighth_floor':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 	'Before you is the usual dorm hallway with the dilapidated walls of the eighth floor. You can hear music and loud talking from drunk students escaping from some rooms.'
 
-	act 'Go outside':
-		killvar 'university_dorm'
-		minut += 6
-		gt 'uni_grounds', 'main'
-	end
 	act 'Elevator': gt 'uni_dorm', 'elevator'
 
 	if DjibrilQW['invite'] = 1:
@@ -498,6 +483,17 @@ if $ARGS[0] = 'dorm_room':
 		end
 	end
 
+	act 'Leave the campus':
+		if $clothingworntype ! 'nude':
+			minut += 15
+			odkomp = 0
+			gt 'city_island'
+		else
+			msg'<b><font color = red>You need to get dressed first.</font></b>'
+			gt 'uni_dorm', 'dorm_room'
+		end
+	end
+
 	act 'Relax on your bed': gt 'bed', 'start'
 
 	dynamic $wearpan

+ 1 - 1
locations/uni_grounds.qsrc

@@ -94,7 +94,7 @@ if $ARGS[0] = 'main':
 	if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 	if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 
-	if owned_property['university_dorm'] = 1 or university['student'] = 1:
+	if owned_property['university_dorm'] = 4 or university['student'] = 1:
 		act 'Go to your room': minut += 7 & gt 'uni_dorm', 'dorm_room'
 	end