1
0
Эх сурвалжийг харах

[Bug Fix] Image path incorrect in {mc} bedroom in gad due to changes in core_library, added new leave function to take you to the dacha instead of yard and allow {mc} to have sexy times.

Hooded Silence 1 сар өмнө
parent
commit
5a2f614425
1 өөрчлөгдсөн 20 нэмэгдсэн , 9 устгасан
  1. 20 9
      locations/gadsarai.qsrc

+ 20 - 9
locations/gadsarai.qsrc

@@ -301,8 +301,7 @@ end
 if $ARGS[0] = 'barn_room':
 	$location_type = 'private'
 	$setloc['StageTitle'] = 'Guest Room'
-	$setloc['StageImage'] =   '<<$default_img_path>>village/gad_room'
-	minut += 5
+	$setloc['StageImage'] =   '<<$default_img_path>>village/gad_room.jpg'
 	gs 'shortgs', 'setloc', 'gadsarai', $ARGS[0]
 	gs 'themes', 'indoors'
 	gs 'stat'
@@ -311,24 +310,36 @@ if $ARGS[0] = 'barn_room':
 	gs 'core_library', 'stage_title'
 	act '<b>Leave and go to the yard</b>':
 		if $clothingworntype ! 'nude':
+			minut += 5
 			gt 'gaddvor'
 		else
 			msg'<b><font color = red>You need to get dressed.</font></b>'
 			gt $loc, $loc_arg
 		end
 	end
+	act '<b>Leave and enter the dacha</b>':
+		if $clothingworntype ! 'nude':
+			minut += 5
+			gt 'gadhouse', 'start'
+		else
+			msg'<b><font color = red>You need to get dressed.</font></b>'
+			gt $loc, $loc_arg
+		end
+	end
 	
 	'A small rustic loft space converted from your grandparents barn. A pair of sleeping pallets of dubious comfort is laid out for guests. The room walls are whitewashed with some clothes lines to dry your clothes with some farming tools. It''s not much to look at but it''s somewhere you can call home and have some privacy.'
 
-
 	!! Activities - basic only. There is no internet so laptop is consigned to grandparents only. Room is too small for exercise, use yard or forest meadow.
-
-
 	gs 'events', 'read'
+	act 'Relax on your bed': gt 'bed', 'start'
+	if pcs_horny >= 50:
+		act 'Masturbate':gt 'selfplay', 'start'
+	end
+	if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
+	if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 	gs 'music_actions', 'music_icon'
-
 	!! Activities End
-	act 'Relax on your bed': gt 'bed', 'start'
+	!! TODO: if winter create task for chopping wood for log stove.
 	!! act 'light log stove': gt  'gadsarai', 'log_stove' 
 
 	!! Game functions
@@ -337,9 +348,9 @@ if $ARGS[0] = 'barn_room':
 	'<table><tr><td valign="top">Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
 
 	if mc_inventory['contraceptive_pill'] > 0 and mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
-		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
+		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> are hidden a small nook, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
 	elseif mc_inventory['contraceptive_pill'] > 0:
-		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in a small box under your pallet.'
+		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> are hidden in a small box under your pallet.'
 	elseif mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 		'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden behind a loose brick.'
 	end