Browse Source

[fixed] The amount of money Pavlin takes was sometimes doubled due to bad coding. Cleaned it up.

CroWke 4 years ago
parent
commit
01dc499a7c
2 changed files with 21 additions and 18 deletions
  1. 14 18
      locations/HotelWork.qsrc
  2. 7 0
      locations/saveupdater.qsrc

+ 14 - 18
locations/HotelWork.qsrc

@@ -391,36 +391,32 @@ if $ARGS[0] = 'maid':
 					'<center><video autoplay loop src="images/shared/sex/sequence/kotovsexbonus21.mp4"></video></center>'
 					'"This little slut was curious to see what goes on in this room." says the first man as he sets the ice bucket on a counter.'
 					'His friend grins evilly, never slowing his pace as he continues driving his prick into the euphoric woman in bed with him. "Let''s satisfy her curiosity then and give this skank a show."'
-					'"Of course this is not a free show." The first man says as he takes your wallet from you.'
-					'"Hey!" You exclaim, instinctively reaching out to take it back, but the glare he shoots your way freezes you in your tracks. He opens the wallet and removes some of your cash, stuffing it into his pocket before roughly throwing your now emptied accessory back to you.'
-					if money < 1000:
-						montake = money
+					'"Of course this is not a free show." The first man says as he takes your purse from you.'
+
+					! if total money paid is over 1000 then jump to fire the event below instead
+					! for example paying 500 rubles twice will cause the quest to continue even though each individual time Sveta does not have 1000 rubles on her
+					if money < 1000 and money + montake < 1000:
+						montake += money
 						money = 0
-						totalmon = totalmon + montake
-						mongiveback = totalmon - 1000
-						! if total money paid is over 1000 then jump to fire the event below instead
-						! for example paying 500 rubles twice will cause the quest to continue even though each individual time Sveta does not have 1000 rubles on her
-						if totalmon => 1000:
-							money = money + mongiveback
-							jump 'enoughmoney'
-						end
 						gs 'pain', 5, 'asscheeks', 'hit'
+						gs 'stat'
+						'"Hey!" You exclaim, instinctively reaching out to take it back, but the glare he shoots your way freezes you in your tracks. He rummages through your purse until he finds your wallet and takes all of your cash, giving it a disdainful glance before stuffing it into his pocket, before roughly throwing your purse back to you.'
 						'"What the hell, only <<montake>> <b>₽</b>? Our show is worth much more than this. The only thing you get for this chump change is one slap on the ass." He then forcefully turns you around and gives you a hard smack on the ass before gripping your arm and pushing you out the door.'
 						threesomewatched = 0
 						threesometojoin = 0
 						pavhotprosQW = 2
 
 						act'Continue':gt 'hotelhole'
-					end
-					if money => 1000:
-						money -= 1000
-						if totalmon = 0:
+					else	
+						if montake = 0:
 							money -= 1000
 						else
-							money = money + totalmon - 1000
+							money -= 1000 
+							money += montake
 						end
-						:enoughmoney
+						gs 'stat'
 						pavhotprosQW = 3
+						'"Hey!" You exclaim, instinctively reaching out to take it back, but the glare he shoots your way freezes you in your tracks. He rummages through your purse until he finds your wallet and takes some of your cash, stuffing it into his pocket, before roughly throwing your purse back to you.'
 						'"Now sit your pretty ass down and enjoy the show." He says as he pushes you onto a chair in the corner of the room.'
 
 						act 'Sit and enjoy the show':

+ 7 - 0
locations/saveupdater.qsrc

@@ -672,5 +672,12 @@ end
 
 if $npc_usedname['A<<npctemp>>'] = 'Inna': $npc_usedname['A<<npctemp>>'] = 'Irina'
 
+!! Killing some useless variables used to trigger the Pavlin storyline
+if totalmon ! 0:
+	montake = totalmon
+	killvar 'totalmon'
+	killvar 'mongiveback'
+end
+
 --- saveupdater ---------------------------------