Bladeren bron

[fixed] pcs_money to money and forgotten update to uni_library

anjuna krokus 3 maanden geleden
bovenliggende
commit
20eb437bdb
3 gewijzigde bestanden met toevoegingen van 25 en 16 verwijderingen
  1. 7 7
      locations/shoplifting.qsrc
  2. 2 2
      locations/therapist_hotel.qsrc
  3. 16 7
      locations/uni_library.qsrc

+ 7 - 7
locations/shoplifting.qsrc

@@ -126,7 +126,7 @@ if $ARGS[0] = 'securityroom':
 
 		act 'Masturbate for him': gt 'shoplifting', 'show'
 		act 'Offer him relief': gt 'shoplifting', 'bj'
-		if pcs_money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe'
+		if money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe'
 		act 'Keep quiet': gt 'shoplifting', 'quiet'
 	end
 	gs 'willpower', 'misc', 'self', 'medium'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'securityroom':
 
 			act 'Masturbate for him': gt 'shoplifting', 'show'
 			act 'Offer him relief': gt 'shoplifting', 'bj'
-			if pcs_money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe'
+			if money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe'
 			act 'Keep quiet': gt 'shoplifting', 'quiet'
 		end
 	end
@@ -451,7 +451,7 @@ if $ARGS[0] = 'bribe':
 		act 'Pay up':
 			*clr & cla
 			minut += 5
-			pcs_money -= 5000
+			money -= 5000
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/shoplift/offermoney.jpg"></center>'
@@ -741,7 +741,7 @@ if $ARGS[0] = 'securityroom_pav':
 			'Looking at you, the security guard starts pondering, and after a short moment, he speaks up, "So what would you be able to offer me?"'
 
 			act 'Offer him a blowjob': gt 'shoplifting', 'bj_pav'
-			if pcs_money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
+			if money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
 			act 'Keep quiet': gt 'shoplifting', 'quiet_pav'
 		end
 
@@ -763,7 +763,7 @@ if $ARGS[0] = 'securityroom_pav':
 				'The security guard crosses his hands, "Why not?"'
 
 				act 'Offer him blowjob': gt 'shoplifting', 'bj_pav'
-				if pcs_money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
+				if money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
 
 				act 'Keep quiet': gt 'shoplifting', 'quiet_pav'
 			end
@@ -930,7 +930,7 @@ if $ARGS[0] = 'bribe_pav':
 		act 'Pay up':
 			*clr & cla
 			minut += 5
-			pcs_money -= 5000
+			money -= 5000
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/shoplift/offermoney.jpg"></center>'
@@ -976,7 +976,7 @@ if $ARGS[0] = 'quiet_pav':
 	'"Well? Why did you go all quiet all of a sudden?" he demands. Then he walks out of the room.'
 
 	act 'Offer him blowjob': gt 'shoplifting', 'bj_pav'
-	if pcs_money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
+	if money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
 
 	act 'Wait':
 		*clr & cla

+ 2 - 2
locations/therapist_hotel.qsrc

@@ -619,8 +619,8 @@ if $ARGS[0] = 'event5_submit':
 		gs 'stat'
 		
 		'You come to and see that you are naked. "WHAT THE HELL?" you yell and slap the therapist. You quickly get up and grab your clothes and rush out of the hotel room to the front desk to ask them to call the police. After explaining everything, they send a single officer to the hotel room to find it empty. You are slapped with a 500 ₽ fine for public indecency, told not to waste their time, and sent on your way.'
-		pcs_money -= 500
-		if pcs_money < 0: pcs_money = 0
+		money -= 500
+		if money < 0: money = 0
 		'<center><font color="red"> ***Therapist is no longer an option for now*** </font></center>'
 
 		act 'Get dressed and leave':

+ 16 - 7
locations/uni_library.qsrc

@@ -447,14 +447,23 @@ if $ARGS[0] = 'loan':
 
 	if lib_debt > 0:
 		'You owe an outstanding debt of <<lib_debt>> <b>₽</b> to the library.'
-		if pcs_money >= lib_debt:
-			act 'Pay your debt':
-				pcs_money -= lib_debt
-				lib_debt = 0
-				gt 'uni_library', 'Pay_debt'			
-			end
-		else
+		if money < lib_debt and karta < lib_debt:
 			act '<font color="red">Pay your debt</font>': '<br><font color="red">You don''t have enough money to pay your debt.</font>'
+		else
+			if money >= lib_debt:
+				act 'Pay your debt (cash)':
+					money -= lib_debt
+					lib_debt = 0
+					gt 'uni_library', 'loan'
+				end
+			end
+			if karta >= lib_debt:
+				act 'Pay your debt (card)':
+					karta -= lib_debt
+					lib_debt = 0
+					gt 'uni_library', 'loan'
+				end
+			end
 		end
 	end