Merge branch 'ML-DEV'

locations/NikoSlut.qsrc

@@ -1314,12 +1314,10 @@ if $ARGS[0] = 'Diner Interior':
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/interior1.jpg"></center>'
 	if hour >= 7 and hour <= 17 and hour ! BorisDiner['Trucker']:
-		BorisDiner['Trucker'] = hour
 		'You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. Their is a <a href="exec:gt ''NikoSlut'', ''Truckers''">trucker</a> sitting on a stool, enjoying his meal.'
 	elseif hour >= 7 and hour <= 17 and hour = BorisDiner['Trucker']:
 		'You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. Their is a trucker sitting on a stool, enjoying his meal..'	
 	elseif hour ! BorisDiner['Biker']:
-		BorisDiner['Biker'] = hour
 		'You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. The stools and counters are nearly empty but you can see some <a href="exec:gt ''NikoSlut'', ''Bikers''">bikers</a> sitting at the tables, chatting and drinking beer.'
 	else
 		'You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. The stools and counters are nearly empty but you can see some bikers sitting at the tables, chatting and drinking beer.'
@@ -1476,6 +1474,7 @@ end
 if $ARGS[0] = 'Truckers':
 	*clr & cla
 	minut += 5
+	BorisDiner['Trucker'] = hour
 	gs'stat'
 	VK = rand (1,6)
 	if VK = 1:
@@ -1530,6 +1529,7 @@ end
 if $ARGS[0] = 'Bikers':
 	*clr & cla
 	minut += 5
+	BorisDiner['Biker'] = hour
 	gs'stat'
 	VK = rand (1,4)
 	if VK = 1:

locations/pav_shared_apt.qsrc

@@ -284,7 +284,7 @@ if $ARGS[0] = 'start':
 	end
 	
 	if rentPaid = 1:
-		'A large apartment currently serves as shared living. As well as the normal living spaces, there are four bedrooms, one rented by you and three occupied by <a href="exec: gt ''pavShared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pavShared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pavShared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>.'
+		'A large apartment currently serves as shared living. As well as the normal living spaces, there are four bedrooms, one rented by you and three occupied by <a href="exec: gt ''pav_shared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pav_shared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pav_shared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>.'
 		'You stand in the hallway. '
 		*nl
 		'From the hallway several doors lead to <a href="exec:gt ''pav_shared_apt'', ''ndRoom''"><<$nd_name>>''s</a>, <a href="exec:gt ''pav_shared_apt'', ''gpRoom''"><<$gp_name>>''s</a> and <a href="exec:gt ''pav_shared_apt'', ''spRoom''"><<$sp_name>>''s</a> rooms.'
@@ -549,7 +549,7 @@ if $ARGS[0] = 'list':
 	'---------------'
 	''
 	'Not having paid the full weekly rent at the beginning of a new week will lead to termination of the accommodation services.'
-	'Signed: <a href="exec: gt ''pavShared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pavShared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pavShared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>, <<$pcs_firstname>>.'
+	'Signed: <a href="exec: gt ''pav_shared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pav_shared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pav_shared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>, <<$pcs_firstname>>.'
 	''
 	'---------------'
 	act 'Continue':gt 'pav_shared_apt', 'start'
@@ -871,12 +871,12 @@ if $ARGS[0] = 'ndRoom':
 		'<<$nd_name>> is sleeping in his bed.'
 	elseif hour >= nd_wakes and hour < nd_leaves:
 		'<<$nd_name>> is already awake, getting ready to leave.'
-		act 'Approach him': gt 'pavShared_nd', 'nd'
+		act 'Approach him': gt 'pav_shared_nd', 'nd'
 	elseif hour >= nd_leaves and hour < nd_comes:
 		'<<$nd_name>> is not here.'
 	elseif hour >= nd_comes and hour < nd_sleeps:
 		'<<$nd_name>> is currently behind his desk, doing some clever IT stuff.'
-		act 'Approach him': gt 'pavShared_nd', 'nd'
+		act 'Approach him': gt 'pav_shared_nd', 'nd'
 	end
 	if servitudeLvl >= 1 and nd_cleaned = 0:
 		if poroshok >= 1:
@@ -902,12 +902,12 @@ if $ARGS[0] = 'gpRoom':
 
 	if hour >= gp_wakes and hour < gp_leaves:
 		'<<$gp_name>> is already awake, getting ready to leave.'
-		act 'Approach him': gt 'pavShared_gp', 'gp'
+		act 'Approach him': gt 'pav_shared_gp', 'gp'
 	elseif hour >= gp_leaves and hour < gp_comes:
 		'<<$gp_name>> is not here.'
 	elseif hour >= gp_comes and hour < gp_sleeps:
 		'<<$gp_name>> is currently on his bed, listing through some magazines.'
-		act 'Approach him': gt 'pavShared_gp', 'gp'
+		act 'Approach him': gt 'pav_shared_gp', 'gp'
 	elseif hour >= gp_sleeps or hour < gp_wakes:
 		'<<$gp_name>> is sleeping in his bed.'
 	end
@@ -935,14 +935,14 @@ if $ARGS[0] = 'spRoom':
 
 	if hour >= sp_wakes and hour < sp_leaves:
 		'<<$sp_name>> is already awake, packing his bags to leave.'
-		act 'Approach him': gt 'pavShared_sp', 'sp'
+		act 'Approach him': gt 'pav_shared_sp', 'sp'
 	elseif hour >= sp_leaves and hour < sp_comes:
 		'<<$sp_name>> is not here.'
 	elseif hour >= sp_comes and hour < sp_sleeps:
 		doesStuff = rand (0, 100)
 		if doesStuff < 50:'<<$sp_name>> is currently on his bed, listing through sport magazines.'
 		if doesStuff >= 50:'<<$sp_name>> is working out on the floor.'
-		act 'Approach him': gt 'pavShared_sp', 'sp'
+		act 'Approach him': gt 'pav_shared_sp', 'sp'
 	elseif hour >= sp_sleeps or hour < sp_wakes:
 		'<<$sp_name>> is sleeping in his bed.'
 	end

syntax/VSCode/qsrc/language-configuration.json

@@ -1,4 +1,7 @@
 {
+    "comments": {
+      "lineComment": "!"
+    },
     // symbols used as brackets
     "brackets": [
         ["{", "}"],