Browse Source

Merge remote-tracking branch 'Hooded_Silence/master'

Kevin_Smarts 3 weeks ago
parent
commit
0e81d0f23d
1 changed files with 30 additions and 28 deletions
  1. 30 28
      locations/korrPar.qsrc

+ 30 - 28
locations/korrPar.qsrc

@@ -2,11 +2,13 @@
 !! Date refactored: 31st March, 2024
 !! Author: Myles
 !!
-!! Version: .01 - initial refactoring
-!! 
+!! Version: .01 - Initial refactoring
+!! Version: .02 - Bug fixes and further code refactoring
+!!
 !! Desc: Family home kitchen links to family flat corridor
 
 !! Set location header - img path is set in init
+if $default_img_path = '': $default_img_path = 'locations/pavlovsk/resident/apartment/home'
 $setloc['StageTitle'] = 'Corridor'
 $setloc['StageImage'] = '<<$default_img_path>>/korrpar.jpg'
 
@@ -23,7 +25,7 @@ boycherdaksex = 0
 bonusZ = 0
 display_bb = 0
 !! Set up game location data
-gs 'shortgs', 'setloc', 'korrPar', $ARGS[0]
+gs 'shortgs', 'setloc', 'korrPar'
 
 !! Set up location trackers
 gs 'home_family_init', 'trackers'
@@ -51,41 +53,40 @@ if (hour ! 16 or hour ! 17) and blockBedrPar = 1:blockBedrPar = 0
 
 if locat['Mother'] = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 > daystart and rand(1,5) = 1: gt 'mother', 'condom_steal', 'talk'
 
-act '<b>Leave and go to the stairwell</b>':
-	if $clothingworntype ! 'nude':
-		$default_img_path = 'reset'
+!! check clothes
+gs 'core_library', 'clothing_status'
+
+if $apparel['status'] = 'nude':
+	act 'Leave': 		
+		msg'<b><font color = red>You need to get dressed.</font></b>'
+		gt 'korrPar'
+	end
+else
+	act '<b>Leave and go to the stairwell</b>':
+		killvar '$default_img_path' 
 		killvar '$mother_img_path'
 		minut += 5
 		gt'pod_ezd','etaj_2'
-	else
-		msg'<b><font color = red>You need to get dressed.</font></b>'
-		gt 'korrPar'
 	end
-end
-
-act '<b>Leave and go to the courtyard</b>':
-	if $clothingworntype ! 'nude':
-		if hour < 5 and motherWorry = 0 and age < 18 and locat['Fam_inGad'] = 0:
-			'<font color=red>Are you sure? Your mother will worry.</b></font>'
-			cla
-			act '<font color=red><b>Yes, go outside</b></font>': 
-				minut += 5 
-				!! Reset vars - temp until other parts of game migrated
-				killvar '$default_img_path'
-				killvar '$mother_img_path'
-				gt'pav_complex', 'start'
-			end
-			act 'No, stay inside':gt 'korrPar'
-		else
-			minut += 5
+	if hour < 5 and motherWorry = 0 and age < 18 and locat['Fam_inGad'] = 0:
+		'<font color=red>Are you sure? Your mother will worry.</b></font>'
+		cla
+		act '<font color=red><b>Yes, go outside</b></font>': 
+			minut += 5 
 			!! Reset vars - temp until other parts of game migrated
 			killvar '$default_img_path'
 			killvar '$mother_img_path'
 			gt'pav_complex', 'start'
 		end
+		act 'No, stay inside':gt 'korrPar'
 	else
-		msg'<b><font color = red>You need to get dressed.</font></b>'
-		gt 'korrPar'
+		act '<b>Leave and go to the courtyard</b>':
+			minut += 5
+			!! Reset vars - temp until other parts of game migrated
+			killvar '$default_img_path'
+			killvar '$mother_img_path'
+			gt'pav_complex', 'start'
+		end
 	end
 end
 
@@ -499,5 +500,6 @@ end
 
 !!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
+
 --- korrPar ---------------------------------