[fixed] mentats and aphrodisiac messages weren't displayed in din_bad, changed dynamics into gosubs and moved mentats and aphrodisiac into drugs

locations/din_bad.qsrc

@@ -177,10 +177,14 @@ if $ARGS[0] = 'd_bag':
 	else
 		'You are out of birth control pills.'
 	end
-	if mentats_have > 0:'<a href="exec:dynamic $use_mentats & gs ''din_bad'', ''d_bag''">Use a neurobooster pill in your purse.</a> There are <b><<mentats_have>></b> pills left. The warning label says not to take more than one per day.'
+	if mentats_have > 0 and mentats_dose < 3:
+		'<a href="exec: gs ''drugs'', ''mentats'' & gs ''din_bad'', ''d_bag'' & *pl ''<font color = green><br>You swallow the neurobooster pill.</font>''">Use a neurobooster pill in your purse.</a> There are <b><<mentats_have>></b> pills left. The warning label says not to take more than one per day.'
+	elseif mentats_have > 0:
+		'There are <b><<mentats_have>></b> neurobooster pills left. You really shouldn''t take any more pills today.'
+	end
 	if steroid_have > 0:'<a href="exec:dynamic $use_steroids & gs ''din_bad'', ''d_bag''">Use steroids.</a> You have <b><<steroid_have>></b> steroids left in your purse.'
 	if bcream_have > 0:'<a href="exec:dynamic $use_bcream & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<bcream_have>></b> cream left in your purse.'
-	if aphrodisiac_have > 0:'<a href="exec:dynamic $use_aphrodisiac & gs ''din_bad'', ''d_bag''">Chew aphrodisiac gum.</a> You have <b><<aphrodisiac_have>></b> gum left in your purse.'
+	if aphrodisiac_have > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $aphrodisiac_msg & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<aphrodisiac_have>></b> gum left in your purse.'
 
 	if lubri > 0:'There''s a tube of lubricant in your purse, enough for <b><<lubri>></b> applications.'
 	if refillable_bottle = 3: 
@@ -811,15 +815,6 @@ $d_pregmovement = {
 	end
 }
 
-$use_mentats = {
-	if mentats_dose < 3:
-		'<font color = green>You swallow the pill.</font>'
-		mentats_dose += 1
-		mentats_have -= 1
-	else
-		'You really shouldn''t take any more pills today.'
-	end
-}
 $use_steroids = {
 	if steroid_dose < 3:
 		'<font color = blue>You swallow the orange pill.</font>'
@@ -840,36 +835,6 @@ $use_bcream = {
 		'Using any more cream won''t have any effect.'
 	end
 }
-$use_aphrodisiac = {
-	if aphrodisiac_overdose = 1:
-		'You''ve had enough for today.'
-	elseif aphrodisiac_timer = 0:
-		'<font color = #DB7093>You take a gum and chew it. It tastes like strawberry, but is also kind of spicy.</font>'
-		aphrodisiac_have -= 1
-		aphrodisiac_timer += 8
-		pcs_horny = 80
-	elseif aphrodisiac_timer > 0 and aphrodisiac_timer <= 8:
-		'<font color = #DB7093>You take another gum and chew it. It makes your mouth feel kinda tingly.</font>'
-		aphrodisiac_have -= 1
-		aphrodisiac_timer += 8
-		pcs_horny = 100
-	elseif aphrodisiac_timer > 8 and min_arousal < 60:
-		'<font color = red><b>You take yet another gum and start chewing it. Suddenly you find yourself in grip of an intense orgasm!<br> It goes on and on and you sink to the ground and do your best to endure it.</b></font>'
-		aphrodisiac_have -= 1
-		orgasm += 1
-		min_arousal += 10
-		aphrodisiac_overdose = 1
-		if min_arousal = 10:'<font color = #DB7093>That was intense! You can still feel the tingles.</font>'
-		if min_arousal = 20:'<font color = #DB7093>You are really starting to enjoy these! Your crotch still feels kinda hot though.</font>'
-		if min_arousal = 30:'<font color = #DB7093>As you are trying to get back to your feet you notice that you are still horny. What is happening to you?</font>'
-		if min_arousal = 40:'<font color = #DB7093>You are certain of it. Every time those gums give you an orgasm they also increase your libido.</font>'
-		if min_arousal = 50:'<font color = #DB7093>You run a finger across your slit and shudder. You really should stop chewing these gums while you can still think of something other than sex.</font>'
-		if min_arousal = 60:'<font color = #DB7093>You are burning up. You feel like you could fuck anything and everything all day long.</font>'
-	else
-		'<font color = #DB7093>You chew another gum with trepidation, looking forward to more orgasms but nothing happens. Huh. Have you become immune?</font>'
-		aphrodisiac_have -= 1
-	end
-}
 
 if $ARGS[0] = 'takepill':
 

locations/drugs.qsrc

@@ -6,6 +6,8 @@
 !! Heroin: gs 'drugs', 'heroin'
 !! Cocaine: gs 'drugs', 'cocaine' (if it isn''t svetas cocaine, you have to add dur += 1)
 !! Amphetamine: gs 'drugs', 'amphetamine' (if it isn''t svetas amphetamine, you have to add amphetamine += 1)
+!! Neurobooster: gs 'drugs', 'mentats' (if it isn''t svetas mentats, you have to add mentats_have += 1)
+!! Aphrodisiac: gs 'drugs', 'aphrodisiac' (if it isn''t svetas aphrodisiac, you have to add aphrodisiac_have += 1)
 
 !! Alcohol: gs 'drugs', 'alcohol', 'type', count
 !! Types: beer, champagne, moonshine, rum, scotch, vodka, wine, whiskey
@@ -158,6 +160,52 @@ elseif $ARGS[0] = 'alcohol':
 	if alc_count > 0: jump 'alcohol_jump'
 	killvar 'alc_count'
 	gs 'stat'
+elseif $ARGS[0] = 'mentats':
+	mentats_dose += 1
+	mentats_have -= 1
+elseif $ARGS[0] = 'aphrodisiac':
+	if aphrodisiac_overdose = 1:
+		$aphrodisiac_msg = '<br>You''ve had enough aphrodisiac for today.'
+	elseif aphrodisiac_timer = 0:
+		$aphrodisiac_msg = '<font color = #DB7093><br>You take a gum and chew it. It tastes like strawberry, but is also kind of spicy.</font>'
+		aphrodisiac_have -= 1
+		aphrodisiac_timer += 8
+		pcs_horny = 80
+	elseif aphrodisiac_timer > 0 and aphrodisiac_timer <= 8:
+		$aphrodisiac_msg = '<font color = #DB7093><br>You take another gum and chew it. It makes your mouth feel kinda tingly.</font>'
+		aphrodisiac_have -= 1
+		aphrodisiac_timer += 8
+		pcs_horny = 100
+	elseif aphrodisiac_timer > 8 and min_arousal < 60:
+		$aphrodisiac_msg = '<font color = red><b><br>You take yet another gum and start chewing it. Suddenly you find yourself in grip of an intense orgasm!<br>It goes on and on and you sink to the ground and do your best to endure it.</b></font>'
+		aphrodisiac_have -= 1
+		orgasm += 1
+		pcs_mood = 100
+		min_arousal += 10
+		aphrodisiac_overdose = 1
+		if min_arousal = 10:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>That was intense! You can still feel the tingles.</font>'
+		elseif min_arousal = 20:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>You are really starting to enjoy these! Your crotch still feels kinda hot though.</font>'
+		elseif min_arousal = 30:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>As you are trying to get back to your feet you notice that you are still horny. What is happening to you?</font>'
+		elseif min_arousal = 40:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>You are certain of it. Every time those gums give you an orgasm they also increase your libido.</font>'
+		elseif min_arousal = 50:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>You run a finger across your slit and shudder. You really should stop chewing these gums while you can still think of something other than sex.</font>'
+		elseif min_arousal = 60:
+			pcs_horny = min_arousal
+			$min_arousal_msg = '<font color = #DB7093>You are burning up. You feel like you could fuck anything and everything all day long.</font>'
+		end
+	else
+		$aphrodisiac_msg = '<font color = #DB7093>You chew another gum with trepidation, looking forward to more orgasms but nothing happens. Huh. Have you become immune?</font>'
+		aphrodisiac_have -= 1
+	end
 else
 	'<br><font color = red>Developer note: The type of drug is wrong or missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 end