Browse Source

[fixed] bug fixes in `booty_call` related to the booty call schedulars and hotel and home links

anjuna krokus 2 weeks ago
parent
commit
41f4893ea0
1 changed files with 42 additions and 38 deletions
  1. 42 38
      locations/booty_call.qsrc

+ 42 - 38
locations/booty_call.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'scheduler':
 end
 
 if $ARGS[0] = 'fuckbuddy_scheduler2':
-	if i <= arrsize('$fuckbuddy'):
+	if i < arrsize('$fuckbuddy'):
 		$temp = 'FuckBuddy'
 		gs 'booty_call', 'fb_npc_stat_update'
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_rel[$FuckBuddy[i]] > 0 and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
@@ -45,7 +45,7 @@ end
 
 
 if $ARGS[0] = 'sugar_daddy_scheduler2':
-	if i <= arrsize('$sugar_daddy'):
+	if i < arrsize('$sugar_daddy'):
 		gs 'booty_call', 'sd_npc_stat_update'
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_rel[$FuckBuddy[i]] > 0 and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
 
@@ -146,7 +146,7 @@ if $ARGS[0] = 'SMS raiser':
 		i += 1
 		jump 'fuckbuddy_sms_raiser_loop'
 	end
-	
+
 	i = 0
 	:sugar_daddy_sms_raiser_loop
 	if i < arrsize('$sugar_daddy'):
@@ -162,53 +162,57 @@ if $ARGS[0] = 'SMS raiser':
 end
 
 if $ARGS[0] = 'home_links':
-	i=0
-	*nl
+	i = 0
 	:loopFB_homes
-	if (npc_residence[$Fuckbuddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$Fuckbuddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$Fuckbuddy[i]] = 4 and $loc = 'city_center'):
-		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
-		!! ''''
+	if i < arrsize('$Fuckbuddy'):
+		*nl
+		if (npc_residence[$Fuckbuddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$Fuckbuddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$Fuckbuddy[i]] = 4 and $loc = 'city_center'):
+			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
+			!! ''''
+		end
+		!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
+		i +=1
+		jump 'loopFB_homes'
 	end
-	!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
 
-	i +=1
-	if i < arrsize('$Fuckbuddy') : jump 'loopFB_homes'
-	
-	i=0
-	*nl
+	i = 0
 	:loopSD_homes
-	if (npc_residence[$sugar_daddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$sugar_daddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$sugar_daddy[i]] = 4 and $loc = 'city_center'):
-		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
-		!! ''''
+	if i < arrsize('$sugar_daddy'):
+		*nl
+		if (npc_residence[$sugar_daddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$sugar_daddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$sugar_daddy[i]] = 4 and $loc = 'city_center'):
+			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
+			!! ''''
+		end
+		!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
+		i +=1
+		jump 'loopSD_homes'
 	end
-	!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
-
-	i +=1
-	if i < arrsize('$sugar_daddy') : jump 'loopSD_homes'
 end
 
 if $ARGS[0] = 'hotel_links':
-	i=0
-	*nl
+	i = 0
 	:loopFB_hotel
-	if $booty_call_hotel[$Fuckbuddy[i]] = $region and booty_call_invite[$FuckBuddy[i]] = daystart:
-		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>></a> booked a hotel room to meet you in.'' ')
-		!! ''''
+	if i < arrsize('$Fuckbuddy'):
+		*nl
+		if $booty_call_hotel[$Fuckbuddy[i]] = $region and booty_call_invite[$FuckBuddy[i]] = daystart:
+			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>></a> booked a hotel room to meet you in.'' ')
+			!! ''''
+		end
+		i +=1
+		jump 'loopFB_hotel'
 	end
-	
-	i +=1
-	if i < arrsize('$Fuckbuddy') : jump 'loopFB_hotel'
-	
-	i=0
-	*nl
+
+	i = 0
 	:loopSD_hotel
-	if $booty_call_hotel[$sugar_daddy[i]] = $region and booty_call_invite[$sugar_daddy[i]] = daystart:
-		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>></a> booked a hotel room to meet you in.'' ')
-		!! ''''
+	if i < arrsize('$sugar_daddy'):
+		*nl
+		if $booty_call_hotel[$sugar_daddy[i]] = $region and booty_call_invite[$sugar_daddy[i]] = daystart:
+			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>></a> booked a hotel room to meet you in.'' ')
+			!! ''''
+		end
+		i +=1
+		jump 'loopSD_hotel'
 	end
-	
-	i +=1
-	if i < arrsize('$sugar_daddy') : jump 'loopSD_hotel'
 end
 
 !! booty_call_invite['B0']