瀏覽代碼

[Fixes] Errors found by the analyser

KevinSmarts 6 年之前
父節點
當前提交
d4f0710261
共有 3 個文件被更改,包括 30 次插入24 次删除
  1. 1 1
      locations/etoexhib.qsrc
  2. 1 1
      locations/foto.qsrc
  3. 28 22
      locations/husb.qsrc

+ 1 - 1
locations/etoexhib.qsrc

@@ -1624,7 +1624,7 @@ if $ARGS[0] = 'pos53':
 			cla
 			*clr
 			minut += 60
-			if inhib_exp += rand(1,3)
+			inhib_exp += rand(1,3)
 			if pcs_sweat < 35 : pcs_sweat += 5
 			pcs_mood += 5
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/zagar1.jpg"></center>'

+ 1 - 1
locations/foto.qsrc

@@ -969,7 +969,7 @@ if $ARGS[0] = 'practicemodel':
 					mdlng_exp += rand(3,5)
 					fashionshoot = rand(1,4)
 					gs 'stat'
-					if fashionshoot <= 2:'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion<<rand(1,2>>.mp4"></video></center>'
+					if fashionshoot <= 2:'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion<<rand(1,2)>>.mp4"></video></center>'
 					if fashionshoot >= 3 and fashionshoot < 5:'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fashion<<rand(1,3)>>.jpg"></center>'
 					if fashionshoot < 5:'	You dress up in the latest in fashion wear and spend the next two hours sexily posing for the photographer.'
 					if fashionshoot = 5:

+ 28 - 22
locations/husb.qsrc

@@ -16,7 +16,32 @@ CLOSE ALL
 	end
 	'<<$husb_loc>>'
 !! {end}
-$d_husb_discription = {
+
+if $ARGS[0] = 'start':
+	cls
+	cla
+	gs'stat'
+	'<center><B><font color = maroon><<$husName>></font></B></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/<<HusbPic>>.jpg"></center>'
+	gs 'husb', 'husb_discription'
+	gs 'husb', 'husb_action'
+
+	if $clothingworntype = 'nude':
+		if $braworntype = 'none' and $pantyworntype = 'none':
+			'Your husband, seeing you naked, says - "You are very beautiful."'
+		else
+			'Your husband smiles, "It''s always nice to see you in your underwear honey."'
+		end
+	end
+
+	act '<B>Move away</B>':gt $loc, $metka
+
+	if husbandsexday < 4:
+		act 'Sex with your husband':gt'husbsex','room'
+	end
+end
+
+if $ARGS[0] = 'husb_discription':
 	if birthyear < husb_birth_year:
 		age_diff = husbAge - age
 		$h_age = '<<$husName>> was born in <<husb_birth_year>>, he is <<husbAge>> years old. He is <<age_diff>> years older than you.'
@@ -33,9 +58,9 @@ $d_husb_discription = {
 	if husband>=60 and husband<80:'You have a good relationship with your husband.'
 	if husband>=80:'You have a great relationship with your husband.'
 	''
-}
+end
 
-$d_husb_action = {
+if $ARGS[0] = 'husb_action':
 	if $loc = 'korr':$husb_action = ''
 	if $loc = 'bedr':
 		if hour > 22 or hour < 7: $husb_action = 'Your husband <<$husName>> is lying in bed, eyes open. "What do you want? It is late, go to sleep."'
@@ -49,26 +74,7 @@ $d_husb_action = {
 		if hour = 17 or hour = 7:$husb_action = '<<$husName>> is sitting at the kitchen table.'
 	end
 	'<<$husb_action>>'
-}
-
-if $ARGS[0] = 'start':
-	cls
-	cla
-	gs'stat'
-	'<center><B><font color = maroon><<$husName>></font></B></center>'
-	'<center><img <<$set_imgh>> src="images/characters/shared/<<HusbPic>>.jpg"></center>'
-	dynamic $d_husb_discription
-	dynamic $d_husb_action
-
-	if nude = 1:'Your husband, seeing you naked, says - "You are very beautiful."'
-
-	act '<B>Move away</B>':gt $loc, $metka
-
-	if husbandsexday < 4:
-		act 'Sex with your husband':gt'husbsex','room'
-	end
 end
 
-
 --- husb ---------------------------------