Browse Source

Merge remote-tracking branch 'upstream/master' into ML-DEV

Netuttki 4 năm trước cách đây
mục cha
commit
a8a23240c2
2 tập tin đã thay đổi với 5 bổ sung2 xóa
  1. 2 2
      locations/NikoSlut.qsrc
  2. 3 0
      syntax/VSCode/qsrc/language-configuration.json

+ 2 - 2
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:

+ 3 - 0
syntax/VSCode/qsrc/language-configuration.json

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