Parcourir la source

Merge branch 'planned-september-update' of https://git.tfgames.site/netuttki/glife into planned-september-update

netuttki il y a 3 mois
Parent
commit
65dda43bf9

+ 1 - 1
locations/artem_sex.qsrc

@@ -1361,7 +1361,7 @@ if $ARGS[0] = 'strapon_first_bj':
 				end
 				act 'Ease up':
 					*clr & cla
-					artemQW['strapon'] = 1
+					artemQW[strapon] = 1
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
 					'You ease up a little, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
 					'You grin. "You like taking my cock in your ass, don''t you?"'

+ 1 - 1
locations/homes_properties.qsrc

@@ -770,7 +770,7 @@ if $ARGS[0] = 'has_access':
 	$hasaccesscode = iif($ARGS[1] = '', $home_name[$loc], $ARGS[1])
 	RESULT = accessible_property[$hasaccesscode] > 0 and accessible_property[$hasaccesscode] ! 3
 	killvar 'hasaccesscode'
-
+end
 !! Call: `func('homes_properties', 'homes_in_town', $ARGS[1], ..., $ARGS[N])
 !! Return: The total number of accessible homes in the cities passed in the arguments
 !! $ARGS[1]..$ARGS[N]: The town we check for available places to sleep

+ 1 - 1
locations/katja_nightclub_sex.qsrc

@@ -145,7 +145,7 @@ if $ARGS[0] = 'private_room1':
 							gs 'willpower', 'pay', 'force'
 							gs 'drugs', 'cocaine', 1
 							gs 'katja_procedural', 'take_cocaine'
-							gs 'stat'
+							gs 'stat'										
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/joint_coke.jpg"></center>'
 							'"Come on, Katja. Let''s do it together," you say as you take the tube from <<$npc_nickname[$npclastgenerated]>>.'
 							'She still looks skeptical. "I don''t know, <<$pcs_nickname>>. I''m not sure it''s a good idea," she replies.'

+ 2 - 2
locations/uni_dorm.qsrc

@@ -996,21 +996,21 @@ if $ARGS[0] = 'dorm_room':
 	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_inroom = 1
 		vika_sleep = 0
+        gs 'music_actions', 'no_music'
 		if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
 			$vikatext = '<a href="exec:gt''Vika''">Vika</a> seems excited when she notices you. She''s trying to hide a box behind her back.'
 		else
 			$vikatext = '<a href="exec:gt''Vika''">Vika</a> is lying on her bed.'
 		end
-		gs 'music_actions', 'not_alone'
 	elseif hour > func('bordel', 'close_hour') and hour < 8:
 		vika_inroom = 1
 		vika_sleep = 1
+        gs 'music_actions', 'no_music'
 		if vikaslut = 0:
 			$vikatext = '<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after being out the whole night.'
 		elseif vikaslut = 1:
 			$vikatext = '<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working in the brothel all night.'
 		end
-		gs 'music_actions', 'no_music'
 	end
 
 	if mc_inventory['tech_computer'] = 1: