Browse Source

[Fixed] a few bugs in the mansion

Alaratt 2 years ago
parent
commit
789e67fe4f

+ 1 - 1
locations/city_mansion_residence_1.qsrc

@@ -98,9 +98,9 @@ if $ARGS[0] = 'ybathroom':
 	$loc = 'city_mansion_residence_1'
 	$locM_arg = 'ybathroom'
 	$locM = 'city_mansion_residence_1'
-	$location_type = 'ybathroom'
 	$menu_loc = 'city_mansion_residence_1'
 	$menu_arg = 'ybathroom'
+	$location_type = 'bathroom'
 	$bathtype = 'bathtub shower'
 	
 	menu_off = 0

+ 23 - 1
locations/city_mansion_residence_2.qsrc

@@ -307,7 +307,29 @@ if $ARGS[0] = 'yoffice':
 			end
 
 			if ml_guitar['hasguitar'] = 1 and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
-				act 'Practice guitar': gt 'music_bedroomPractice', 'guitar'
+				if pcs_inhib < 30:
+					if pcs_inhib < 10:
+						$diff = 'hard'
+					elseif pcs_inhib < 20:
+						$diff = 'medium'
+					else
+						$diff = 'easy'
+					end
+					gs 'willpower', 'skill', 'self', $diff
+					will_cost = (will_cost * 3) - (pcs_perform)
+					if will_cost <= pcs_willpwr:
+						act 'Practice guitar (<<will_cost>> Willpower)':
+							inhib_exp += rand(1,2)
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+							gt 'music_bedroomPractice', 'guitar'
+						end
+					else
+						act 'Practice guitar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
+					end
+				else
+					act 'Practice guitar': gt 'music_bedroomPractice', 'guitar'
+				end
 			end
 
 			!! Streaming music

+ 1 - 2
locations/sitr.qsrc

@@ -82,7 +82,6 @@ elseif ml_guitar['hasguitar'] and ml_guitar['carried'] = 0:
 	end
 end
 
-			
 if ml_online['account'] = 0 and internet > 0: 
 	act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount'
 end
@@ -126,7 +125,7 @@ if hour > 8 and hour < 22:
 	end
 
 	if ml_guitar['hasguitar'] = 1 and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
-		if sisterHere = 1 and pcs_inhib < 30:
+		if pcs_inhib < 30:
 			if pcs_inhib < 10: 
 				$diff = 'hard'
 			elseif pcs_inhib < 20: