Browse Source

[fixed] < instead of <= and removed redundant code

hornguy6 2 weeks ago
parent
commit
f4c7fd4937
1 changed files with 13 additions and 32 deletions
  1. 13 32
      locations/booty_call.qsrc

+ 13 - 32
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:
@@ -18,22 +18,11 @@ if $ARGS[0] = 'fuckbuddy_scheduler2':
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
 
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and (npc_big_fight[$FuckBuddy[i]] < daystart - 7 and daystart > 7):
-		if $npc_rel_type[$FuckBuddy[i]] = 'sugar_daddy':
-			if npc_sugar_daddy_timer[$FuckBuddy[i]] - (npc_rel[$FuckBuddy[i]] / 10) > daystart:
-				npc_no_booty_call[$FuckBuddy[i]] = daystart
-				
-			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', 'fuckbuddy_scheduler3'
-			else
-				npc_no_booty_call[$FuckBuddy[i]] = daystart
-			end
+
+		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', 'fuckbuddy_scheduler3'
 		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', 'fuckbuddy_scheduler3'
-			else
-				npc_no_booty_call[$FuckBuddy[i]] = daystart
-			end
+			npc_no_booty_call[$FuckBuddy[i]] = daystart
 		end
 		i += 1
 		gs 'booty_call', 'fuckbuddy_scheduler2'
@@ -45,29 +34,21 @@ 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:
 
 !!		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
+		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
-			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
+			npc_no_booty_call[$sugar_daddy[i]] = daystart
 		end
 		i += 1
 		gs 'booty_call', 'sugar_daddy_scheduler2'