Browse Source

[changed] moved the surrender action to the bottom
[fixed] wrong minut gains, dead end in kafe

julzor 5 years ago
parent
commit
ac65730ef7
3 changed files with 15 additions and 18 deletions
  1. 1 2
      locations/fight.qsrc
  2. 13 15
      locations/kafe.qsrc
  3. 1 1
      locations/pavaptcourtev.qsrc

+ 1 - 2
locations/fight.qsrc

@@ -493,8 +493,6 @@ if $ARGS[0] = 'player':
 	else
 	else
 		TargetNumber = 2
 		TargetNumber = 2
 	end
 	end
-
-	act 'Surrender': gt 'ender', 'surrender'
 		
 		
 	if pcs_magik > 0:
 	if pcs_magik > 0:
 		act 'Cast a Spell': gs 'fight', 'spellcast'
 		act 'Cast a Spell': gs 'fight', 'spellcast'
@@ -538,6 +536,7 @@ if $ARGS[0] = 'player':
 			gs 'fight', 'Attack', 'Jab', 'opp', 0, 2
 			gs 'fight', 'Attack', 'Jab', 'opp', 0, 2
 		end
 		end
 	end	
 	end	
+	act 'Surrender': gt 'ender', 'surrender'
 end
 end
 
 
 
 

+ 13 - 15
locations/kafe.qsrc

@@ -874,7 +874,7 @@ if $ARGS[0] = 'razvod':
 			act 'Leave (<<will_cost>> Willpower)':
 			act 'Leave (<<will_cost>> Willpower)':
 				*clr & cla
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'willpower', 'pay', 'resist'
-				minut +5
+				minut += 5
 				gs 'stat'
 				gs 'stat'
 				gt 'street'
 				gt 'street'
 			end
 			end
@@ -889,7 +889,7 @@ if $ARGS[0] = 'razvod':
 			act 'Leave (<<will_cost>> Willpower)':
 			act 'Leave (<<will_cost>> Willpower)':
 				*clr & cla
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'willpower', 'pay', 'resist'
-				minut +5
+				minut += 5
 				gs 'stat'
 				gs 'stat'
 				gt 'street'
 				gt 'street'
 			end
 			end
@@ -904,29 +904,27 @@ if $ARGS[0] = 'razvod':
 			act 'Leave (<<will_cost>> Willpower)':
 			act 'Leave (<<will_cost>> Willpower)':
 				*clr & cla
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'willpower', 'pay', 'resist'
-				minut +5
+				minut += 5
 				gs 'stat'
 				gs 'stat'
 				if hotcat >= 6:
 				if hotcat >= 6:
 					'"Come on, baby, I will give you two thousand <b>₽</b>. Daddy wants to have fun."'
 					'"Come on, baby, I will give you two thousand <b>₽</b>. Daddy wants to have fun."'
+					gs 'willpower', 'prostitution', 'resist', 'medium'
+					if will_cost <= pcs_willpwr:
+						act 'Tell him to fuck off (<<will_cost>> Willpower)':
+							gs 'willpower', 'pay', 'resist'
+							gt 'street'
+						end
+					else
+						act 'Tell him to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end	
 					act 'Meet in bathroom':
 					act 'Meet in bathroom':
 						money += 2000
 						money += 2000
 						gt 'cafe3', 'toilet'
 						gt 'cafe3', 'toilet'
 					end
 					end
 				else
 				else
 					'"Well, okay, get out of here, you are ugly anyway."'
 					'"Well, okay, get out of here, you are ugly anyway."'
+					act 'Continue': gt 'street'
 				end
 				end
-				gs 'willpower', 'prostitution', 'resist', 'medium'
-				if will_cost <= pcs_willpwr:
-					act 'Tell him to fuck off (<<will_cost>> Willpower)':
-						*clr & cla
-						gs 'willpower', 'pay', 'resist'
-						minut +5
-						gs 'stat'
-						gt 'street'
-					end
-				else
-					act 'Tell him to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
 			end
 			end
 		else
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 1 - 1
locations/pavaptcourtev.qsrc

@@ -1633,7 +1633,7 @@ if $ARGS[0] = 'two_boys':
 							act 'Go home':
 							act 'Go home':
 								*clr & cla
 								*clr & cla
 								killvar 'pavapt_boyrand'
 								killvar 'pavapt_boyrand'
-								minut +2
+								minut += 2
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/homedoornaked.jpg"></center>'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/homedoornaked.jpg"></center>'
 								'You leave the apartment behind and walk back to your apartment. You unlock the door and walk down the hall to your bedroom and are finally able to get cleaned up and dressed.'
 								'You leave the apartment behind and walk back to your apartment. You unlock the door and walk down the hall to your bedroom and are finally able to get cleaned up and dressed.'
 !!this option should only show up if Sveta has another uniform	
 !!this option should only show up if Sveta has another uniform