Merge remote-tracking branch 'netuttki/master'

locations/BurgerTip.qsrc

@@ -248,8 +248,7 @@ if $ARGS[0] = 'work':
 
 				if bburand = 0:
 					'The senior manager Ilyushkin shows up in your office.'
-					gs 'BurgerTip', 'ily_work'
-
+					
 					if $BurgerQW['IlyQWBlackmailPhoto'] = '' or BurgerQW['IlyQWBlackmail'] > 1:
 						'Ilyushkin grins, "Honey, I need you to put your stamp on these papers." You give Ilyushkin a sceptical look, as you find your company stamp. Then you put your stamp on the papers, and hand the back to Ilyushkin.'
 
@@ -258,6 +257,8 @@ if $ARGS[0] = 'work':
 						elseif BurgerQW['WorkShift'] = 2:
 							act 'Leave work': gs 'burgerWork', 'work2'
 						end
+					else
+						gs 'BurgerTip', 'ily_work'
 					end
 
 				elseif bburand = 1:

locations/HotelRoom.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'normal':
 	hotelWiFi = 1
 	gs 'themes', 'indoors'
 	gs 'stat'
-	gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
+	gs 'internet_mobile', 'get_access', 'free'
 
 	'<center><b><font color = maroon>Your normal hotel room</font></b></center>'
 	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
@@ -62,7 +62,7 @@ if $ARGS[0] = 'better':
 	$location_type = 'private'
 	gs 'themes', 'indoors'
 	gs 'stat'	
-	gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
+	gs 'internet_mobile', 'get_access', 'free'
 	'<center><b><font color = maroon>Your luxury room</font></b></center>'
 	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
@@ -108,7 +108,7 @@ if $ARGS[0] = 'best':
 	$location_type = 'private'
 	gs 'themes', 'indoors'
 	gs 'stat'	
-	gs 'internet_mobile', 'get_access'
+	gs 'internet_mobile', 'get_access', 'free'
 	'<center><b><font color = maroon>Your royal suite</font></b></center>'
 	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'

locations/internet_mobile.qsrc

@@ -34,7 +34,7 @@ subscription[<plan nam>-type]       The type of the subscription.
 Plan Names
 
 free:           A subscription that is freely available, libraries, friends and lovers apartment, etc. that has a computer.
-                The value of this plan is always 1 and the subscription_date is 0.
+                The value of this plan is always 1 and the subscription date is 0.
 
 mobile:         Mobile telephone (only internet or calls too?) and laptop if taken somewhere else. 
                 If at a location where subscription['free'] is used, she has to ask first to be able to use her own laptop
@@ -172,7 +172,7 @@ if $ARGS[0] = 'transfer_subscription':
     allowed = allowed and func('internet_mobile', 'check_allowed_location', $ARGS[2])
     if allowed:
         subscription[$ARGS[2]] = subscription[$ARGS[1]]
-        subscription_date['<<ARGS[2]>>-date'] = subscription['<<$ARGS[1]>>-date']
+        subscription['<<ARGS[2]>>-date'] = subscription['<<$ARGS[1]>>-date']
         subscription['<<ARGS[2]>>-price'] = subscription['<<$ARGS[1]>>-price']
         subscription['<<ARGS[2]>>-discount'] = subscription['<<$ARGS[1]>>-discount']
         !! This one is always 1 because only type 1 subscriptions can be transferred, but making it "future proof"
@@ -287,7 +287,8 @@ if $ARGS[0] = 'send_sms':
 end
 
 !! Using the internet - if metered, it lowers the minutes left
-!! $ARGS[1] - the name of the subscription used
+!! $ARGS[1] - the name of the subscription used (this could be completely unnecessary, at this point there is an active
+!!                                               $access which holds the subscription used.)
 !! ARGS[2] - the number of minutes used
 if $ARGS[0] = 'use_internet':
     if $subscription['<<$ARGS[1]>>-type'] = 'metered': 
@@ -300,7 +301,8 @@ end
 !! but monthly subscription can end abruptly too if she did not pay.
 !! Use it as a func() returns 1 or 0 based on the subscription[$ARGS[1]]  value
 !!
-!! $ARGS[1] - the name of the subscription
+!! $ARGS[1] - the name of the subscription (this could be completely unnecessary, at this point there is an active
+!!                                          $access which holds the subscription used.)
 if $ARGS[0] = 'check_internet_access':
     if subscription[$ARGS[1]] > 0: result = 1
 end

locations/shop.qsrc

@@ -607,7 +607,7 @@ if $shoplocation = 'megafon':
 	elseif home['internet_enabled'] = 0:
 		$line = '<tr><td align="center">You can''t buy an internet subscription for <<$home[''display'']>></td></tr>'
 	elseif subscription[$home['current']] = 1:
-		$line = '<tr><td align="center">You have an active internet subscription at <<$home[''display'']>> that will renew next month on day <<subscription[''<<$home[current]>>-date'']>> for <<price>> <b>₽</b></td></tr>'
+		$line = '<tr><td align="center">You have an active internet subscription at <<$home[''display'']>> that will renew next month on day <<subscription[''<<$home[''current'']>>-date'']>> for <<price>> <b>₽</b></td></tr>'
 	else
 		$line = '<tr><td style="padding-left: 10px; padding-right: 10px; align: left; ">Monthly internet subscription for <<price>><b>₽</b> at your <<$home[''display'']>>. Automatically renews every month</td>'
 		if bankAccount = 0:
@@ -748,7 +748,7 @@ if $shoplocation = 'megafon':
 	$title = '<center><h4>Mobile Calls and Texts</h4></center>'
 	price = 800
 	if subscription['monthly_calls'] = 1:
-		$line += '<tr><td align="center">You have an active mobile subscription that will renew next month on day <<subscription_date[''monthly_calls'']>> for <<price>> <b>₽</b></td></tr>'
+		$line += '<tr><td align="center">You have an active mobile subscription that will renew next month on day <<subscription[''monthly_calls-date'']>> for <<price>> <b>₽</b></td></tr>'
 	else
 		if subscription['metered_calls'] > 0:			
 			discount = subscription['metered_calls'] / 2