1
0
Prechádzať zdrojové kódy

[added]Salon and Fit fully migrated to new payments system. Massage services remains cash only. New payments system using the epayments array and now allows for custom banners for payments. From Hooded Silence

Kevin_Smarts 2 rokov pred
rodič
commit
27294b3c61
3 zmenil súbory, kde vykonal 234 pridanie a 184 odobranie
  1. 16 10
      locations/fit.qsrc
  2. 211 174
      locations/salon.qsrc
  3. 7 0
      locations/sportShop.qsrc

+ 16 - 10
locations/fit.qsrc

@@ -38,8 +38,8 @@ if $ARGS[0] = 'start':
 	*nl
 	'Sportswear is required for all available classes.'
 
-	act 'Leave': minut += 5 & gt 'city_center'
-
+	act 'Leave': killvar 'epayments' & minut += 5 & gt 'city_center'
+	
 	if abonement > 0:
 		act 'Go to the dressing room': gt 'fit', 'dressing room'
 	elseif money > 100:
@@ -50,25 +50,31 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-!! Pay cash or card - Hooded Silence.
+	!! Pay cash or card - Hooded Silence.
 
 	*nl
 	if abonement = 0:
 		'How long do you want to subscribe for?'
 	else
 		'Extend your subscription:'
-	end
-	'<center>'
-	'<table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top">'
-	
+	end	
+
+	$epayments['method'] = ''
+	$epayments['item_variable'] = 'abonement'
+	$epayments['description'] = 'lesson subscriptions and facilities access'
+	$epayments['loc'] = 'fit'
+	$epayments['loc_arg'] = 'start'
+	$epayments['banner']= 'locations/city/citycenter/gym/desk.jpg'
+
+	'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top">'	
 	if money >= 3000 or karta + bankDebtLimit => 3000:
-		'<tr><td> <a href="exec: gs ''shortgs'',''payments'', 3000, '''', ''abonement'', 30, ''lesson subscriptions and facilities access'', ''fit'', ''start''">3,000<b> ₽</b> for 30 lessons</a></td>'
+		'<tr><td> <a href="exec: epayments[''value''] = 3000 & epayments[''quantity''] = 30 & gs ''shortgs'',''payments'' ">3,000<b> ₽</b> for 30 lessons</a></td>'
 	end
 	if money >= 2250 or karta + bankDebtLimit => 2250:
-		'<td> <a href="exec: gs ''shortgs'',''payments'', 2250, '''', ''abonement'', 20, ''lesson subscriptions and facilities access'', ''fit'', ''start''">2,250<b> ₽</b> for 20 lessons</a></td>'
+		'<td> <a href="exec: epayments[''value''] = 2250 & epayments[''quantity''] = 20 & gs ''shortgs'',''payments'' ">2,250<b> ₽</b> for 20 lessons</a></td>'
 	end
 	if money >= 1500 or karta + bankDebtLimit => 1500:
-		'<td><a href="exec: gs ''shortgs'',''payments'', 1500, '''', ''abonement'', 10, ''lesson subscriptions and facilities access'', ''fit'', ''start''">1,500<b> ₽</b> for 10 lessons</a></td>'
+		'<td><a href="exec: epayments[''value''] = 1500 & epayments[''quantity''] = 10 & gs ''shortgs'',''payments'' ">1,500<b> ₽</b> for 10 lessons</a></td>'
 	end
 	'</tr></table></center>'
 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 211 - 174
locations/salon.qsrc


+ 7 - 0
locations/sportShop.qsrc

@@ -33,6 +33,13 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	act 'View purses': minut += 5 & gt 'sportshop', 'purses'
 
 	act 'View coats': minut += 5 & gt 'sportshop', 'coats'
+		!! output from purchase
+	if $message ! '':
+		$message
+		killvar '$message'
+	else
+		'A tall muscular man stands next to the counter, showing a perfect smile. "Welcome, do you need any assistance in selecting equipment or tips how to improve your workout?"'
+	end
 
 	*pl '<center><table align="center" width=80%>'
 	if skak = 0 and money >= 500:

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov