Selaa lähdekoodia

[fixed] Hopefully cigarettes should not decrease if you bum one during the lover events

anjuna krokus 6 kuukautta sitten
vanhempi
sitoutus
b1ce63e466
2 muutettua tiedostoa jossa 22 lisäystä ja 17 poistoa
  1. 13 11
      locations/sex_ev_after.qsrc
  2. 9 6
      locations/sex_ev_events.qsrc

+ 13 - 11
locations/sex_ev_after.qsrc

@@ -2100,27 +2100,29 @@ end
 
 
 if $ARGS[0] = 'smoke_ciga1':
-	act'Never mind': cla & gs'sex_ev_after', 'after_sex2'
+	act 'Never mind': cla & gs 'sex_ev_after', 'after_sex2'
 
 	if mc_inventory['cigarettes'] > 0 and sex_ev['angry_after'] = 0:
-		act'One of yours':gt'sex_ev_after', 'smoke_ciga2'
+		act 'One of yours':
+			sex_ev['bum_cigarette'] = 0
+			gt 'sex_ev_after', 'smoke_ciga2'
+		end
 
-		act'Play with your phone':
+		act 'Play with your phone':
+			sex_ev['bum_cigarette'] = 0
 			sex_ev['phone'] = 2
-			gt'sex_ev_after', 'smoke_ciga2'
+			gt 'sex_ev_after', 'smoke_ciga2'
 		end
 	end
 	if sex_ev['boy_in_shower'] ! 1:
-		act'Bum a cigarette':
+		act 'Bum a cigarette':
 			sex_ev['bum_cigarette'] = 1
-			mc_inventory['cigarettes'] += 1
 			gt 'sex_ev_after', 'smoke_ciga_bum'
 		end
 		
-		act'Bum a cigarette and play with your phone':
+		act 'Bum a cigarette and play with your phone':
 			sex_ev['bum_cigarette'] = 1
 			sex_ev['cigarette'] = 3
-			mc_inventory['cigarettes'] += 1
 			gt 'sex_ev_after', 'smoke_ciga_bum'
 		end
 	end
@@ -2140,7 +2142,7 @@ if $ARGS[0] = 'smoke_ciga2':
 		'You pull a cigarette from your purse and place it in your mouth, sparking it with your lighter while inhaling deeply.'
 	end
 	
-	gs'sex_ev_after', 'smoke_ciga_act'
+	gs 'sex_ev_after', 'smoke_ciga_act'
 end
 
 if $ARGS[0] = 'smoke_ciga_bum':
@@ -2172,8 +2174,8 @@ end
 
 if $ARGS[0] = 'smoke_ciga_act':
 	act'Smoke':
-		gs 'drugs', 'smoke'
-		if sex_ev['phone'] = 2:gt'sex_ev_after', 'smoke_phone'
+		gs 'drugs', 'smoke', sex_ev['bum_cigarette']
+		if sex_ev['phone'] = 2: gt'sex_ev_after', 'smoke_phone'
 		cla & *clr
 		if sex_ev['boy_in_shower'] ! 1:
 			if npc_smoker[$boy] > 0 and sex_ev['boy_smoked'] ! 1:

+ 9 - 6
locations/sex_ev_events.qsrc

@@ -305,25 +305,28 @@ if $ARGS[0] = 'offer_ciga1':
 		end
 	end
 	
-	act'Yes please':
+	act 'Yes please':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
 		'"Sure," you smile. <<$npc_firstname[$boy]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
-		gs'sex_ev_after', 'smoke_ciga_act'
+		sex_ev['bum_cigarette'] = 1
+		gs 'sex_ev_after', 'smoke_ciga_act'
 	end
 	
-	act'Love one':
+	act 'Love one':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
 		'"I''d love one," you smile. <<$npc_firstname[$boy]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
-		gs'sex_ev_after', 'smoke_ciga_act'
+		sex_ev['bum_cigarette'] = 1
+		gs 'sex_ev_after', 'smoke_ciga_act'
 	end
 	
-	act'Read my mind':
+	act 'Read my mind':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
 		'"You read my mind," you grin as <<$npc_firstname[$boy]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
-		gs'sex_ev_after', 'smoke_ciga_act'
+		sex_ev['bum_cigarette'] = 1
+		gs 'sex_ev_after', 'smoke_ciga_act'
 	end
 	
 	if drugVars['cigarettes_used'] = 0: