Changed some of the gosubs to gotos as they fitted the use better, and corrected the 2x 'shulv_sexev1_sonya' error

locations/shulga_room

@@ -98,32 +98,29 @@ if $ARGS[0] = 'start':
 	!Svetku catch
 	roomsex_gang = RAND(0,100)
 	if roomsex_gang <= 2 and GorSlut >=3 and gangsexroom_count > 0 and week < 6 and hour >= 0 and hour <= 2: 
-		gs 'shulga_room', 'gang_sex_room_ev1'
+		gt 'shulga_room', 'gang_sex_room_ev1'
 	end	
 
 	!Sonya fuck boys
 	if roomsex_gang >= 97 and soniaPS >=3 and sexev_sonya_count > 0 and week < 6 and hour >= 0 and hour <= 2:
-		gs 'shulga_room', 'gang_sex_sonya'
+		gt 'shulga_room', 'gang_sex_sonya'
 	end
 
 	!Sonya and Shulga
 	roomsex_sonya = RAND(0,100)
-	if roomsex_sonya <= 5 and soniaPS >=1 and sexev_sonya_count > 0 and hour >= 10 and hour <= 16: 
-		gs 'shulga_room', 'shulv_sex_sonya'
-	end	
-	if roomsex_sonya <= 5 and soniaPS >=1 and sexev_sonya_count > 0 and hour >= 0 and hour <= 2: 
-		gs 'shulga_room', 'shulv_sex_sonya'
-	end	
+	if roomsex_sonya <= 5 and soniaPS >=1 and sexev_sonya_count > 0 and (hour >= 10 and hour <= 16) or (hour >= 0 and hour <= 2):
+		gt 'shulga_room', 'shulv_sex_sonya'
+	end
 
 	!If you came in dressed prostitutes
 	if odethooker = 1 and sh_hooker_count > 0 and week < 6 and hour >= 0 and hour <= 2:
-	 gs 'shulga_room', 'sh_hooker'
+	 gt 'shulga_room', 'sh_hooker'
 	end 
 	if odethooker = 1 and sh_hooker_count > 0 and week >= 6 and hour >= 0 and hour <= 2:
-	 gs 'shulga_room', 'sh_hooker'
+	 gt 'shulga_room', 'sh_hooker'
 	end 
 	if odethooker = 1 and sh_hooker_count > 0 and hour >= 10 and hour <= 16:
-	 gs 'shulga_room', 'sh_hooker'
+	 gt 'shulga_room', 'sh_hooker'
 	end 
 end
 
@@ -195,7 +192,7 @@ if $ARGS[0] = 'shulv_sexev1_sonya':
 	end
 end
 
-if $ARGS[0] = 'shulv_sexev1_sonya':
+if $ARGS[0] = 'shulv_sexev2_sonya':
 	cls
 	minut += 5
 	sexev_sonya_day = daystart
@@ -246,9 +243,9 @@ end
 if $ARGS[0] = 'shulv_sex_sonya':
 	shulv_sexev_sonya = RAND(0,100)
 	if shulv_sexev_sonya <= 40: 
-		gs 'shulga_room', 'shulv_sexev1_sonya'
+		gt 'shulga_room', 'shulv_sexev1_sonya'
 	else
-		gs 'shulga_room', 'shulv_sexev2_sonya'
+		gt 'shulga_room', 'shulv_sexev2_sonya'
 	end	
 end
 
@@ -333,12 +330,12 @@ end
 !the choice of the opening event 3
 if $ARGS[0] = 'gang_sex_sonya':
 	gang_sexev_sonya = RAND(0,100)
-	if gang_sexev_sonya < 40: 
-		gs 'shulga_room', 'gang_sexev1_sonya'
-	elseif gang_sexev_sonya >= 40 and gang_sexev_sonya < 70: 
-		gs 'shulga_room', 'gang_sexev2_sonya'
+	if RAND(0,100) < 40: 
+		gt 'shulga_room', 'gang_sexev1_sonya'
+	elseif RAND(40,100) < 70: 
+		gt 'shulga_room', 'gang_sexev2_sonya'
 	else
-		gs 'shulga_room', 'gang_sexev3_sonya'
+		gt 'shulga_room', 'gang_sexev3_sonya'
 	end	
 end