Pārlūkot izejas kodu

Renamed "function" to avoid clash with a similar name.

netuttki 1 gadu atpakaļ
vecāks
revīzija
38bfbbc764

+ 1 - 1
locations/HotelRoom.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = 'better':
 	gs 'stat'	
 	if komp = 1:
 		!!TODO: Can Sveta do camshow from the hotelroom?
-		gs 'internet_mobile', 'set_access', 'free', 'nocamshow'
+		gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
 	end
 	'<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>'

+ 9 - 4
locations/agentned.qsrc

@@ -27,15 +27,16 @@ if $ARGS[0] = 'start':
 
 	!! Get a list of the properties and their attributes that the player rented:
 
-	iif(func('homes_properties', 'get_rented_count', 'home') > 0, count = func('homes_properties', 'get_rented_count'), count = 0)
-
+	!!temp = func('homes_properties', 'get_rented_property_count', 'home') <- will get right next
+	count = owned_property['rental_home_count']
 	if count > 0:
 		!! Returns: $rental_name[i], $rental_code[i], rental_amount[i], rental_days[i]
 		gs 'homes_properties', 'get_rented_homes'
 		i = 0
 		'<h4>Rent Information</h4>'
 		:loop_rental_info
-			'You have <B><<rental_days[i]]>> days</B> remaining on the lease of your <<$rental_name[i]>>, and your monthly rent is <<rental_amount[i]>> <b>₽</b>. '+iif(money >= rental_amount[i],'You can make a rent <a href="exec:money -= <<rental_amount[i]>> & gs ''homes_properties'', ''add_rental_days'', ''<<$rental_code[i]>>'' & gt ''agentned'', ''start''">payment</a> in cash to extend it.','You can''t afford to pay your rent at the moment')
+			'You have <B><<rental_days[i]>> days</B> remaining on the lease of your <<$rental_name[i]>>, and your monthly rent is <<rental_amount[i]>> <b>₽</b>. '+iif(money >= rental_amount[i],'You can make a rent &lt;a href="exec:money -= <<rental_amount[i]>> & gs ''homes_properties'', ''add_rental_days'', ''<<$rental_code[i]>>'' & gt ''agentned'', ''start''"&gt;payment&lt;/a&gt; in cash to extend it.','You can''t afford to pay your rent at the moment')
+			'You have <B><<rental_days[i]>> days</B> remaining on the lease of your <<$rental_name[i]>>, and your monthly rent is <<rental_amount[i]>> <b>₽</b>. '+iif(money >= rental_amount[i],'You can make a rent <a href="exec:money -= <<rental_amount[i]>> & gs ''homes_properties'', ''add_rental_days'', ''<<$rental_code[i]>>'' & gt ''agentned'', ''start''">payment</a> in cash to extend it.','You can''t afford to pay your rent at the moment')
 			act 'Cancel the lease of the <<$rental_name[i]>>':
 				cla & *nl
 				'Attention: You won''t be able to return to your apartment when you cancel the lease.'
@@ -45,7 +46,11 @@ if $ARGS[0] = 'start':
 			end
 			i += 1
 		if i < count: jump 'loop_rental_info'
-		killvar 'rental_due', 'rental_days', 'rental_name', 'rental_code'}
+		killvar 'rental_due'
+		killvar 'rental_days' 
+		killvar 'rental_name' 
+		killvar 'rental_code' 
+		killvar 'i'
 	end
 	killvar 'count'
 	

+ 1 - 1
locations/bedr.qsrc

@@ -215,7 +215,7 @@ end
 dynamic $palelady
 !! Computer and internet use.
 if komp = 1:
-	gs 'internet_mobile', 'set_access'
+	gs 'internet_mobile', 'get_access'
 	!!TODO: Need to build a check for husband being at home or something.			
 	'On the other bedside table is your <a href="exec:gt ''Komp'',''start''">laptop</a>.'
 end

+ 1 - 1
locations/bedr2x.qsrc

@@ -32,7 +32,7 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 !! Computer and internet use.
 if komp = 1:
 	!!TODO: Need to build a check for husband being at home or something.			
-	gs 'internet_mobile', 'set_access'
+	gs 'internet_mobile', 'get_access'
 	'On the other bedside table is your <a href="exec:gt ''Komp'',''start''">laptop</a>.'
 end
 

+ 1 - 1
locations/bedrPar.qsrc

@@ -145,7 +145,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		!! Computer and internet use.
 		if komp = 1:
-			gs 'internet_mobile', 'set_access'
+			gs 'internet_mobile', 'get_access'
 			if locat['Anya_inroom'] = 1:
 				if sisboytrio = 0: access['noporn'] = 1
 				access['nocamshow'] = 1

+ 1 - 1
locations/city_house_res_misc.qsrc

@@ -144,7 +144,7 @@ if $ARGS[0] = 'livroom':
 
 	!! Computer and internet use.
 	if komp = 1:
-		gs 'internet_mobile', 'set_access'
+		gs 'internet_mobile', 'get_access'
 		!!TODO: Need to build a check for husband being at home or something.			
 		'There''s a <a href="exec:gt ''Komp'', ''start''">computer</a> sitting on your <a href="exec:gt ''stol'', ''start''">desk</a>.'
 	else

+ 1 - 1
locations/city_mansion_residence_2.qsrc

@@ -250,7 +250,7 @@ if $ARGS[0] = 'yoffice':
 	if ymanrem[12] = 2:
 		'Your work room where you spend most of the time signing important papers and handling your business needs.'
 		!!TODO: Code to check if Sveta is not alone
-		gs 'internet_mobile', 'set_access', 'free'
+		gs 'internet_mobile', 'get_access', 'free'
 		'There''s a <a href="exec:gt ''Komp'', ''start''">computer</a> sitting on your antique <a href="exec:gt ''stol'', ''start''">desk</a>.'
 
 	!! IMPORTANT: if there is anything added later that could mean that others are in the room, gs 'music_actions', 'not_alone' should be added with the correct conditions.

+ 1 - 1
locations/dachain.qsrc

@@ -31,7 +31,7 @@ if $args[0] = 'start':
 	'In front of the window there is <<$stol>>.'
 	*nl
 	if komp = 1:
-		gs 'internet_mobile', 'set_access'
+		gs 'internet_mobile', 'get_access'
 		'Your <a href="exec: internet_free = 2 & gt ''Komp'',''start''">laptop</a> is on the table, but there is no internet coverage here.'
 	end
 	*nl

+ 1 - 1
locations/internet_mobile.qsrc

@@ -195,7 +195,7 @@ end
 !! $ARGS[1] - this is expected only if the location allows the use of subscription['free']
 !! $ARGS[2] - Limitation code: : 'noporn', 'nocamshow'
 !! and on...can be up to 10 arguments.
-if $ARGS[0] = 'set_access':
+if $ARGS[0] = 'get_access':
     if £ARGS[1] = '': 
         $subsname = func('homes_properties', 'get_home_name')
     else

+ 1 - 1
locations/mey_home.qsrc

@@ -234,7 +234,7 @@ if $ARGS[0] = '3':
 	if komp = 1:
 		!! TODO: for now, if Sveta is at the Meynolds'' she can''t use their internet for porn and camshows. 
 		!! Need an agreement on the final options with everyone
-		gs 'internet_mobile', 'set_access', 'free', 'noporn', 'nocamshow'
+		gs 'internet_mobile', 'get_access', 'free', 'noporn', 'nocamshow'
 		'Your <a href="exec:gt ''Komp'',''start''">laptop</a> is on the desk.'
 	end
 

+ 1 - 1
locations/music_actions.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'start': 
     if ml_not_alone = 0: gs 'music_actions', 'willpower_cost'
-    if $access = '': gs 'internet_mobile', 'set_access'
+    if $access = '': gs 'internet_mobile', 'get_access'
 
     !! $location_type = ''private'' = these are usually homes. ''indoors'' usually an office, shop or an NPC''s home. Same for ''public_indoors'' For those locations
     !! anything music related should be part of a storyline/quest, or some prewritten scene, like in the room of Anushka

+ 1 - 1
locations/nichBedroomServant.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
 	if komp = 1:
 		!! TODO: Sveta can''t do camshows from this place - unless Gala makes her at some point, but unlikely.
-		gs 'internet_mobile', 'set_access', 'free', 'nocamshow'
+		gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
 		$komp = ' with your <a href="exec:gt ''Komp'', ''start''">laptop</a>.'
 	else
 		$komp = '.'

+ 1 - 1
locations/pav_library.qsrc

@@ -14,7 +14,7 @@ gs 'themes', 'indoors'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
 'For such a small town, the library is surprisingly large - containing many interesting books on a wide variety of subjects.'
 *nl
-'Between the bookshelves are some tables which can be used for studying. Some of them have <a href="exec: gs ''internet_mobile'', ''set_access'', ''free'', ''noporn'',''nocamshow''  & gt ''Komp'',''start''">computers</a> for public use.'
+'Between the bookshelves are some tables which can be used for studying. Some of them have <a href="exec: gs ''internet_mobile'', ''get_access'', ''free'', ''noporn'',''nocamshow''  & gt ''Komp'',''start''">computers</a> for public use.'
 if lernHome > 0:
 'You could do your homework with the help of one of the computers.'
 end

+ 1 - 1
locations/pav_shared_apt.qsrc

@@ -736,7 +736,7 @@ if $ARGS[0] = 'pcsRoom':
 
 	if komp = 1:
 		!! Sveta can''t do camshows unless she is blowing the guys for rent.
-		gs 'internet_mobile', 'set_access', 'free', 'nocamshow'
+		gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
 		if servitudeLvl = 2: access['nocamshow'] = 0
 		'Your <a href="exec:gorodokKomp = 1 & gt ''Komp'',''start''">laptop</a> is sitting on small table.'
 	end

+ 1 - 1
locations/sitr.qsrc

@@ -40,7 +40,7 @@ if divan = 1:$divan = '<a href="exec:gt ''divan'', ''start''">a luxurious leathe
 if komp = 0:$komp = ''
 if komp = 1:
 	!!TODO: Code to check if Sveta is not alone or something.
-	gs 'internet_mobile', 'set_access'
+	gs 'internet_mobile', 'get_access'
 	$komp = ' with a <a href="exec:gt ''Komp'', ''start''">computer</a> on top of it'
 end