소스 검색

[changed] balanced some rands, blocked petkas homework event from happening more than once per day [fixed] fedor going to the wrong location

julzor 5 년 전
부모
커밋
9059d51d4f
4개의 변경된 파일7개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      locations/FedorMisc.qsrc
  2. 3 2
      locations/gschool_break.qsrc
  3. 2 1
      locations/gschool_events.qsrc
  4. 1 1
      locations/gschool_grounds.qsrc

+ 1 - 1
locations/FedorMisc.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'Fedor Intro':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/5.jpg"></center>'
 		'You turn to see Fedor Kozlov smiling at you. You return the smile and say, "I am now, thanks to you." Fedor responds, "Well I couldn''t let such a pretty girl like you get hurt." you lower your head; trying to hide your flushing cheeks, as you reply, "I bet you say that to all the girls." Fedor chuckles, "I not going to lie, if all the girls looked like you then I would." a few members of the school faculty begin breaking up the fight, as Fedor says, "It seems that everything has been taken care of. If you would like to chat then feel free to stop by the hallway, and you can usually catch me at the sports center, after school. Hopefully I will see you again soon." Fedor then walks away while waving at you.'
 
-		act 'Wave back':gt 'gschool_lunch', 'lunch'
+		act 'Wave back':gt 'gschool_lessons', 'short_break'
 	end
 end
 

+ 3 - 2
locations/gschool_break.qsrc

@@ -44,6 +44,7 @@ if $ARGS[0] = 'watercooler':
 		end
 		cumspclnt = 2
 		gs 'cum_cleanup'
+		'<br>You drink some water.'
 		act 'Leave': 
 			if $breaktype = 'long':
 				gt 'gschool_lunch', 'break'
@@ -69,7 +70,7 @@ if $ARGS[0] = 'boys_restroom':
 	
 	gs 'gschool_break', 'restroom_actions'
 	
-	if school_boy_restday ! daystart and rand(0,3) = 3:
+	if school_boy_restday ! daystart and rand(0,2) = 2:
 		school_boy_restday = daystart
 		gt 'gschool_break', 'boys_restroom_events'
 	end
@@ -88,7 +89,7 @@ if $ARGS[0] = 'girls_restroom':
 	
 	gs 'gschool_break', 'restroom_actions'
 	
-	if school_girl_restday ! daystart and rand(0,3) = 3:
+	if school_girl_restday ! daystart and rand(0,2) = 2:
 		school_girl_restday = daystart
 		gt 'gschool_break', 'girls_restroom_events'
 	end

+ 2 - 1
locations/gschool_events.qsrc

@@ -1051,8 +1051,9 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand = 33:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/walkaround.jpg"></center>'
 		'As walk down the hall, you see Paulina, Lena and Lera practically laying in the middle of the hallway. Which forces the other students to carefully walk around them, while they berate the students who step to close to them. Though you are sure they are just enjoying making the other students life harder by just being in the way.'
-	elseif break_rand <= 36:
+	elseif break_rand <= 36 and petka_homework_day ! daystart:
 		*clr & cla
+		petka_homework_day = daystart
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 		if grupTipe = 1 or grupTipe = 2 or grupTipe = 4:

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -292,7 +292,7 @@ if $ARGS[0] = 'main':
 	
 	if week < 6 and hour = 14 and kanikuli = 0 and afterschool_day ! daystart:		
 		afterschool_day = daystart
-		if rand(0,2) = 0:
+		if rand(0,3) = 0:
 			$eventtype = 'after_school'
 			gt 'gschool_events', 'break_events'
 		else