Browse Source

[fixed] sugar daddies have been added to their own array to make it easier to track and hopefully fix the issue with them not contacting you

hornguy6 7 months ago
parent
commit
c2228405e5
3 changed files with 143 additions and 22 deletions
  1. 141 14
      locations/booty_call.qsrc
  2. 1 2
      locations/lover.qsrc
  3. 1 6
      locations/sex_ev_leave.qsrc

+ 141 - 14
locations/booty_call.qsrc

@@ -6,12 +6,13 @@ if $ARGS[0] = 'scheduler':
 	killvar 'npc_booty_call'
 	killvar 'npc_booty_call_time'
 	i = 0
-	gs 'booty_call', 'scheduler2'
+	gs 'booty_call', 'fuckbuddy_scheduler2'
 end
 
-if $ARGS[0] = 'scheduler2':
+if $ARGS[0] = 'fuckbuddy_scheduler2':
 	if i <= arrsize('$fuckbuddy'):
-		gs 'booty_call', 'npc_stat_update'
+		$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:
 
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
@@ -23,24 +24,57 @@ if $ARGS[0] = 'scheduler2':
 				
 			elseif (npc_booty_call_date[$FuckBuddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or rand(1,100) <= npc_rel[$FuckBuddy[i]]) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
 				sugar_daddy_call[$FuckBuddy[i]] = 1
-				gs 'booty_call', 'scheduler3'
+				gs 'booty_call', 'fuckbuddy_scheduler3'
 			else
 				npc_no_booty_call[$FuckBuddy[i]] = daystart
 			end
 		else
 			if (npc_booty_call_date[$FuckBuddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or rand(1,100) <= npc_rel[$FuckBuddy[i]]) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
-				gs 'booty_call', 'scheduler3'
+				gs 'booty_call', 'fuckbuddy_scheduler3'
 			else
 				npc_no_booty_call[$FuckBuddy[i]] = daystart
 			end
 		end
 		i += 1
-		gs 'booty_call', 'scheduler2'
+		gs 'booty_call', 'fuckbuddy_scheduler2'
+	else
+		i = 0
+		gs 'booty_call', 'sugar_daddy_scheduler2'
 	end
 end
 
 
-if $ARGS[0] = 'scheduler3':
+if $ARGS[0] = 'sugar_daddy_scheduler2':
+	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:
+
+!!		temporary removal of npc_rel requirement until boy initiated breakups can occur
+
+!!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$sugar_daddy[i]] = daystart) and npc_no_booty_call[$sugar_daddy[i]] ! daystart and (npc_big_fight[$sugar_daddy[i]] < daystart - 7 and daystart > 7):
+		if $npc_rel_type[$sugar_daddy[i]] = 'sugar_daddy':
+			if npc_sugar_daddy_timer[$sugar_daddy[i]] - (npc_rel[$sugar_daddy[i]] / 10) > daystart:
+				npc_no_booty_call[$sugar_daddy[i]] = daystart
+				
+			elseif (npc_booty_call_date[$sugar_daddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$sugar_daddy[i]] or rand(1,100) <= npc_rel[$sugar_daddy[i]]) and npc_no_booty_call[$sugar_daddy[i]] ! daystart:
+				sugar_daddy_call[$sugar_daddy[i]] = 1
+				gs 'booty_call', 'sugar_daddy_scheduler3'
+			else
+				npc_no_booty_call[$sugar_daddy[i]] = daystart
+			end
+		else
+			if (npc_booty_call_date[$sugar_daddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$sugar_daddy[i]] or rand(1,100) <= npc_rel[$sugar_daddy[i]]) and npc_no_booty_call[$sugar_daddy[i]] ! daystart:
+				gs 'booty_call', 'sugar_daddy_scheduler3'
+			else
+				npc_no_booty_call[$sugar_daddy[i]] = daystart
+			end
+		end
+		i += 1
+		gs 'booty_call', 'sugar_daddy_scheduler2'
+	end
+end
+
+if $ARGS[0] = 'fuckbuddy_scheduler3':
 	if npc_booty_call[$FuckBuddy[i]] = daystart:
 		booty_call_time[$FuckBuddy[i]] = ((npc_booty_call_time[$FuckBuddy[i]] * 60) + rand(0,180))
 	elseif week = npc_day_off[$FuckBuddy[i]]:
@@ -52,6 +86,18 @@ if $ARGS[0] = 'scheduler3':
 	end
 end
 
+if $ARGS[0] = 'sugar_daddy_scheduler3':
+	if npc_booty_call[$sugar_daddy[i]] = daystart:
+		booty_call_time[$sugar_daddy[i]] = ((npc_booty_call_time[$sugar_daddy[i]] * 60) + rand(0,180))
+	elseif week = npc_day_off[$sugar_daddy[i]]:
+		booty_call_time[$sugar_daddy[i]] = (600 + rand(0,720))
+	elseif week ! npc_day_off[$sugar_daddy[i]]:
+		booty_call_time[$sugar_daddy[i]] = (rand(npc_start_free_time[$sugar_daddy[i]],(npc_end_free_time[$sugar_daddy[i]] - 1)) * 60) + rand(0,180)
+	else
+		booty_call_time[$sugar_daddy[i]] = 2000
+	end
+end
+
 !!	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0 or npc_end_free_time[$FuckBuddy[i]] = 0: 
 !!		$boy = $FuckBuddy[i]
 		
@@ -89,7 +135,7 @@ end
 
 if $ARGS[0] = 'SMS raiser':
 	i = 0
-	:booty_call_sms_raiser_loop
+	:fuckbuddy_sms_raiser_loop
 	if i < arrsize('$FuckBuddy'):
 		if booty_call_time[$FuckBuddy[i]] < ((hour * 60) + minut) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_last_booty_call[$FuckBuddy[i]] ! daystart:
 			gs 'booty_call_sms', 'start', $FuckBuddy[i]
@@ -98,14 +144,27 @@ if $ARGS[0] = 'SMS raiser':
 			booty_call_invite[$FuckBuddy[i]] = daystart
 		end
 		i += 1
-		jump 'booty_call_sms_raiser_loop'
+		jump 'fuckbuddy_sms_raiser_loop'
+	end
+	
+	i = 0
+	:sugar_daddy_sms_raiser_loop
+	if i < arrsize('$sugar_daddy'):
+		if booty_call_time[$sugar_daddy[i]] < ((hour * 60) + minut) and npc_no_booty_call[$sugar_daddy[i]] ! daystart and npc_last_booty_call[$sugar_daddy[i]] ! daystart:
+			gs 'booty_call_sms', 'start', $sugar_daddy[i]
+			booty_call_time[$sugar_daddy[i]] = 2399
+			!! this is a bit superfluous, but it makes the code run faster.
+			booty_call_invite[$sugar_daddy[i]] = daystart
+		end
+		i += 1
+		jump 'sugar_daddy_sms_raiser_loop'
 	end
 end
 
 if $ARGS[0] = 'home_links':
 	i=0
 	*nl
-	:loopBC_homes
+	: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.'' ')
 		!! ''''
@@ -113,20 +172,43 @@ if $ARGS[0] = 'home_links':
 	!!		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 'loopBC_homes'
+	if i < arrsize('$Fuckbuddy') : jump 'loopFB_homes'
+	
+	i=0
+	*nl
+	: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.'' ')
+		!! ''''
+	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
-	:loopBC_hotel
+	: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.'' ')
 		!! ''''
 	end
 	
 	i +=1
-	if i < arrsize('$Fuckbuddy') : jump 'loopBC_hotel'
+	if i < arrsize('$Fuckbuddy') : jump 'loopFB_hotel'
+	
+	i=0
+	*nl
+	: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.'' ')
+		!! ''''
+	end
+	
+	i +=1
+	if i < arrsize('$sugar_daddy') : jump 'loopSD_hotel'
 end
 
 !! booty_call_invite['B0']
@@ -400,7 +482,7 @@ end
 
 !! ------------ NPC Stat Updater ------------------------
 
-if $ARGS[0] = 'npc_stat_update':
+if $ARGS[0] = 'fb_npc_stat_update':
 	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0:
 		if npc_finance[$FuckBuddy[i]] = 0:
 			if rand(1,3) = 1:
@@ -445,6 +527,51 @@ if $ARGS[0] = 'npc_stat_update':
 	end
 end
 
+if $ARGS[0] = 'sd_npc_stat_update':
+	if npc_start_free_time[$sugar_daddy[i]] = 0 or npc_day_off[$sugar_daddy[i]] = 0:
+		if npc_finance[$sugar_daddy[i]] = 0:
+			if rand(1,3) = 1:
+				npc_start_free_time[$sugar_daddy[i]] = 9
+				npc_end_free_time[$sugar_daddy[i]] = 12
+			elseif rand(1,2) = 1:
+				npc_start_free_time[$sugar_daddy[i]] = 16
+				npc_end_free_time[$sugar_daddy[i]] = 20
+			else
+				npc_start_free_time[$sugar_daddy[i]] = 20
+				npc_end_free_time[$sugar_daddy[i]] = 23
+			end
+		elseif npc_finance[$sugar_daddy[i]] = 1:
+			if rand(1,2) = 1:
+				npc_start_free_time[$sugar_daddy[i]] = 9
+				npc_end_free_time[$sugar_daddy[i]] = 12
+			else
+				npc_start_free_time[$sugar_daddy[i]] = 20
+				npc_end_free_time[$sugar_daddy[i]] = 23
+			end
+		elseif npc_finance[$sugar_daddy[i]] = 2:
+			if rand(1,2) = 1:
+				npc_start_free_time[$npclastgenerated] = 8
+				npc_end_free_time[$npclastgenerated] = 12
+				
+				npc_work_start[$npclastgenerated] = 13
+				npc_work_end[$npclastgenerated] = 21
+			else
+				npc_start_free_time[$npclastgenerated] = 18
+				npc_end_free_time[$npclastgenerated] = 22
+				
+				npc_work_start[$npclastgenerated] = 9
+				npc_work_end[$npclastgenerated] = 17
+			end
+			npc_apt_type[$sugar_daddy[i]] = 5
+			!!npc_apt_type[$npclastgenerated] = rand(5,6)
+			!! apt_type 6 is disabled until pictures are added
+			npc_occupation[$sugar_daddy[i]] = rand(14,18)
+			npc_car[$sugar_daddy[i]] = rand(0,1)
+		end
+		npc_day_off[$sugar_daddy[i]] = rand(1,7)
+	end
+end
+
 !! ------------ Legacy Backup ------------------------
 
 if $ARGS[0] = 'draw':

+ 1 - 2
locations/lover.qsrc

@@ -148,7 +148,7 @@ if $ARGS[0] = 'remove':
 end
 
 if $ARGS[0] = 'add_fuckbuddy':
-	if mid($ARGS[1],1,1) = 'C' :
+	if mid($ARGS[1],1,1) = 'C':
 		gs 'npcpreservec', $ARGS[1]
 		gs 'boyStat', $npclastsaved
 	else
@@ -216,7 +216,6 @@ if $ARGS[0] = 'clear_all':
 		gs 'lover', 'remove_sugar_daddy', $sugar_daddy[0]
 		jump 'clear_sd_loop'
 	end
-	
 end
 
 

+ 1 - 6
locations/sex_ev_leave.qsrc

@@ -123,12 +123,7 @@ if $ARGS[0] = 'fuckbuddy_add':
 end
 
 if $ARGS[0] = 'sugar_daddy_add':
-	if $npc_rel_type[$boy] ! 'fuckbuddy':
-		gs 'lover', 'add_sugar_daddy', $boy
-		npc_fuckbuddy[$boy] = 1
-		npc_no_booty_call[$boy] = daystart
-		sex_ev['sugar_daddy_count'] += 1
-	end
+	gs 'lover', 'add_sugar_daddy', $boy
 	npc_sugar_daddy_price[$boy] = sex_ev['sugar_daddy_offer'] * 100
 	if $npc_rel_type[$boy] ! 'sugar_daddy':
 		$npc_rel_type[$boy] = 'sugar_daddy'