Bläddra i källkod

[fixed] workaround for `pornstack` desyncing from `pfilmday`

LinaHirata 6 månader sedan
förälder
incheckning
e1395d2a68
3 ändrade filer med 51 tillägg och 35 borttagningar
  1. 14 16
      locations/journal_work.qsrc
  2. 13 0
      locations/pornschedule.qsrc
  3. 24 19
      locations/stat_display.qsrc

+ 14 - 16
locations/journal_work.qsrc

@@ -121,25 +121,23 @@ if $ARGS[0] = 'start':
 
 
 	if pornstack > 0:
-		*nl
-		porndays = 0
-		:pfilmtime
-		if porndays < 200 and pfilmday[porndays] = 0: porndays += 1 & jump 'pfilmtime'
-	end
-	if pornstack > 0 and pfilmday[0] = 0:
-		if pfilmday[1] = 0:
-			'<br><b>You are scheduled for a porn shoot in <<porndays>> days.</b>'
+		if pfilmday[0] = 0:
+			if pfilmday[1] = 0:
+				'<br><b>You are scheduled for a porn shoot in <<porndays>> days.</b>'
+			else
+				'<br><b>You have a porn shoot scheduled tomorrow.</b>'
+			end
 		else
-			'<br><b>You have a porn shoot scheduled tomorrow.</b>'
+			if hour < 11:
+				'<br>You are expected to be in the porn studio at 10:00.'
+			elseif hour >= 11 and hour < 13:
+				'<br>You should be at the porn studio!'
+			elseif hour >= 13:
+				'<br>You missed a scheduled porn shoot!'
+			end
 		end
 	end
-	if pfilmday[0] > 0 and hour < 11:
-		'<br>You are expected to be in the porn studio at 10:00.'
-	elseif pfilmday[0] > 0 and hour >= 11 and hour < 13:
-		'<br>You should be at the porn studio!'
-	elseif pfilmday[0] > 0 and hour >= 13:
-		'<br>You missed a scheduled porn shoot!'
-	end
+
 	if pornmiss = 1: '<br><b>You missed a scheduled porn shoot!</b>'
 	if prodcosttrue > 0: '<br><b>You owe money to the porn studio <<prodcost>>?</b>'
 	if firstkasting > 0 and pfilmNO < 1:

+ 13 - 0
locations/pornschedule.qsrc

@@ -12,6 +12,19 @@ end
 
 if $ARGS[0] = 'schedule':
 	killvar 'pfilmday', 0
+
+	pornstack = 0
+	porndays = -1
+	days = 0
+	:pfilmtime
+		if pfilmday[days] > 0:
+			pornstack += 1
+			if porndays = -1:
+				porndays = days
+			end
+		end
+	if days < 200: days += 1 & jump 'pfilmtime'
+
 	days = 0
 	:fillschedule
 		porns = 0

+ 24 - 19
locations/stat_display.qsrc

@@ -979,11 +979,11 @@ end
 
 !!---------------- Messages for Icons/Texts (End)----------------------------
 
-if pornstack > 0:
-	porndays = 0
-	:pfilmtime
-	if porndays < 200 and pfilmday[porndays] = 0: porndays += 1 & jump 'pfilmtime'
-end
+! if pornstack > 0:
+! 	porndays = 0
+! 	:pfilmtime
+! 	if porndays < 200 and pfilmday[porndays] = 0: porndays += 1 & jump 'pfilmtime'
+! end
 
 !!-----------------Status Icons (Start)------------------
 
@@ -2303,26 +2303,31 @@ if enable_extra_msg = 1:
 		$stat_msg += '<BR><b>You can get paid for 2 modeling jobs this week.</b>'
 	end
 
-	if pornstack > 0 and pfilmday[0] = 0:
-		if pfilmday[1] = 0:
-			$stat_msg += '<br><b>You will star in another porno in <<porndays>> days.</b>'
-		else
-			$stat_msg += '<br><b>You have a porno shoot scheduled tomorrow.</b>'
-		end
-	end
-	if pfilmday[0] > 0:
-		if pornnow = 1:
-			$stat_msg += '<br><b>You are at a porn shooting.</b>'
+	if pornstack > 0:
+		if pfilmday[0] = 0:
+			if pfilmday[1] = 0:
+				$stat_msg += '<br><b>You will star in another porno in <<porndays>> days.</b>'
+			else
+				$stat_msg += '<br><b>You have a porno shoot scheduled tomorrow.</b>'
+			end
 		else
-			if hour < 11: $stat_msg += '<br><b>You are expected in the porno studio at 10:00.</b>'
-			if hour >= 11 and hour < 13: $stat_msg += '<br><b>You should be at the porno studio, shooting!</b>'
-			if hour >= 13: $stat_msg += '<br><b>You missed a scheduled porno shoot!</b>'
+			if pornnow = 1:
+				$stat_msg += '<br><b>You are at a porn shooting.</b>'
+			else
+				if hour < 11:
+					$stat_msg += '<br><b>You are expected in the porno studio at 10:00.</b>'
+				elseif hour >= 11 and hour < 13:
+					$stat_msg += '<br><b>You should be at the porno studio, shooting!</b>'
+				elseif hour >= 13:
+					$stat_msg += '<br><b>You missed a scheduled porno shoot!</b>'
+				end
+			end
 		end
 	end
 	if pornmiss = 1: $stat_msg += '<br><b>You missed a scheduled porno shoot!</b>'
 	if prodcosttrue > 0: $stat_msg += '<br><b>You owe money to the porn studio <<prodcost>>?</b>'
 	if firstkasting > 0 and pfilmNO < 1:
-		if pornstack <= 10:
+		if pornstack >= 10:
 			$stat_msg += '<br>You are currently unable to book any more porn shoots at the Porn Studio.'
 		elseif pornstack = 11:
 			$stat_msg += '<br>You can contract <<10-pornstack>> porn shoot at the Porn Studio.'