소스 검색

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

Myles Croft (Hooded Silence) 3 달 전
부모
커밋
7c418dfc47
3개의 변경된 파일309개의 추가작업 그리고 339개의 파일을 삭제
  1. 301 337
      locations/drugs.qsrc
  2. 7 1
      locations/npcstatic6.qsrc
  3. 1 1
      qsrc2tw/twine-code/start/start.tw

+ 301 - 337
locations/drugs.qsrc

@@ -24,8 +24,6 @@ if $ARGS[0] = 'cikl':
 	gs 'drugs', 'aphrodisiac', 'cikl'
 	gs 'drugs', 'hair_extensioncream', 'cikl'
 	gs 'drugs', 'butt_injection', 'cikl'
-	exit
-
 elseif $ARGS[0] = 'hourly_events':
 	gs 'drugs', 'smoke', 'hourly_events'
 	gs 'drugs', 'joint', 'hourly_events'
@@ -33,15 +31,11 @@ elseif $ARGS[0] = 'hourly_events':
 	gs 'drugs', 'cocaine', 'hourly_events'
 	gs 'drugs', 'amphetamine', 'hourly_events'
 	gs 'drugs', 'aphrodisiac', 'hourly_events'
-	exit
-
 elseif $ARGS[0] = 'stat':
 	gs 'drugs', 'heroin', 'stat'
 	gs 'drugs', 'alcohol', 'stat'
 	gs 'drugs', 'cocaine', 'stat'
 	gs 'drugs', 'amphetamine', 'stat'
-	exit
-
 elseif $ARGS[0] = 'pain_relief':
 	if alko > 9:
 		pain['relief'] = 70
@@ -58,11 +52,7 @@ elseif $ARGS[0] = 'pain_relief':
 	elseif pain['killer'] > 12 and alko <= 9:
 		pain['relief'] = 50
 	end
-	exit
-end
-
-
-if $ARGS[0] = 'smoke':
+elseif $ARGS[0] = 'smoke':
 	if $ARGS[1] = 'hourly_events':
 		if cheatVars['drugs_immune'] = 0:
 			if drugVars['cigarettes_used'] >= 20: drugVars['cigarettes_need'] += 1
@@ -73,78 +63,74 @@ if $ARGS[0] = 'smoke':
 			drugVars['cigarettes_need'] = 0
 			drugVars['cigarettes_used'] = 0
 		end
-		exit
-	end
+	else
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['cigarettes'] -= 1
+			if mc_inventory['cigarettes'] <= 0: mc_inventory['cigarettes'] = 0 & msg 'That was your last cigarette.'
+		end
 
-	if ARGS[1] = 0 and $ARGS[1] = '':
-		mc_inventory['cigarettes'] -= 1
-		if mc_inventory['cigarettes'] <= 0: mc_inventory['cigarettes'] = 0 & msg 'That was your last cigarette.'
-	end
+		if cheatVars['drugs_immune'] = 0:
+			drugVars['cigarettes_used'] += 1
+			if drugVars['cigarettes_used'] > 20 and drugVars['cigarettes_exp'] = 0: drugVars['cigarettes_exp'] = 1
+		end
 
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['cigarettes_used'] += 1
-		if drugVars['cigarettes_used'] > 20 and drugVars['cigarettes_exp'] = 0: drugVars['cigarettes_exp'] = 1
-	end
+		stat['cigarettes_smoked'] += 1
+		drugVars['cigarettes_day'] = daystart
+		drugVars['cigarettes_hour'] = hour
+		drugVars['cigarettes_minute'] = minut + 3
+		drugVars['cigarettes_need'] = 0
+		teeth['smoked'] += 1
+
+		pcs_breath = 0
+		pcs_mood += 100
+		if pcs_hydra >= 100:
+			pcs_hydra -= 5
+		else
+			pcs_hydra -= 10
+		end
+		if pcs_energy < 80: pcs_energy += 4
 
-	stat['cigarettes_smoked'] += 1
-	drugVars['cigarettes_day'] = daystart
-	drugVars['cigarettes_hour'] = hour
-	drugVars['cigarettes_minute'] = minut + 3
-	drugVars['cigarettes_need'] = 0
-	teeth['smoked'] += 1
-
-	pcs_breath = 0
-	pcs_mood += 100
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		gs 'stat'
 	end
-	if pcs_energy < 80: pcs_energy += 4
-
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	gs 'stat'
-
 
 elseif $ARGS[0] = 'joint':
 	if $ARGS[1] = 'hourly_events':
 		if drugVars['weed_high'] > 0: drugVars['weed_high'] -= 1
-		exit
-	end
+	else
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['joints'] -= 1
+			if mc_inventory['joints'] <= 0: mc_inventory['joints'] = 0 & msg 'That was your last joint.'
+		end
 
-	if ARGS[1] = 0 and $ARGS[1] = '':
-		mc_inventory['joints'] -= 1
-		if mc_inventory['joints'] <= 0: mc_inventory['joints'] = 0 & msg 'That was your last joint.'
-	end
+		if cheatVars['drugs_immune'] = 0:
+			drugVars['weed_used'] += 1
+			if drugVars['weed_used'] > 5 and drugVars['weed_exp'] = 0: drugVars['weed_exp'] = 1
+		end
 
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['weed_used'] += 1
-		if drugVars['weed_used'] > 5 and drugVars['weed_exp'] = 0: drugVars['weed_exp'] = 1
-	end
+		if minut > 30:
+			drugVars['weed_high'] = 2
+		else
+			drugVars['weed_high'] = 1
+		end
+		drugVars['weed_day'] = daystart
+		drugVars['weed_hour'] = hour
+		drugVars['weed_minute'] = minut + 2
+
+		pcs_breath = 0
+		pcs_mood += 100
+		if pcs_hydra >= 100:
+			pcs_hydra -= 5
+		else
+			pcs_hydra -= 10
+		end
+		pcs_energy = max(0, pcs_energy - 20)
 
-	if minut > 30:
-		drugVars['weed_high'] = 2
-	else
-		drugVars['weed_high'] = 1
-	end
-	drugVars['weed_day'] = daystart
-	drugVars['weed_hour'] = hour
-	drugVars['weed_minute'] = minut + 2
-
-	pcs_breath = 0
-	pcs_mood += 100
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		gs 'stat'
 	end
-	pcs_energy = max(0, pcs_energy - 20)
-
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	gs 'stat'
-
 
 elseif $ARGS[0] = 'heroin':
 	if $ARGS[1] = 'hourly_events':
@@ -161,7 +147,6 @@ elseif $ARGS[0] = 'heroin':
 			drugVars['heroin_need'] = 0
 			drugVars['heroin_used'] = 0
 		end
-		exit
 	elseif $ARGS[1] = 'stat':
 		if drugVars['heroin_high'] >= 20 and alko > 0: alko = 0
 		if drugVars['heroin_high'] <= 0:
@@ -174,21 +159,20 @@ elseif $ARGS[0] = 'heroin':
 			if drugVars['heroin_penalty'] > 0: vidage += 1
 			drugVars['heroin_penalty'] += 1
 		end
-		exit
-	end
-
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['heroin_used'] += 1
-		if drugVars['heroin_used'] > 1 and drugVars['heroin_exp'] = 0: drugVars['heroin_exp'] = 1
-	end
+	else
 
-	drugVars['heroin_high'] += 25
-	drugVars['heroin_day'] = daystart
+		if cheatVars['drugs_immune'] = 0:
+			drugVars['heroin_used'] += 1
+			if drugVars['heroin_used'] > 1 and drugVars['heroin_exp'] = 0: drugVars['heroin_exp'] = 1
+		end
 
-	pcs_mood = 100
-	pcs_health -= 10
-	gs 'stat'
+		drugVars['heroin_high'] += 25
+		drugVars['heroin_day'] = daystart
 
+		pcs_mood = 100
+		pcs_health -= 10
+		gs 'stat'
+	end
 
 elseif $ARGS[0] = 'cocaine':
 	if $ARGS[1] = 'cikl':
@@ -199,7 +183,6 @@ elseif $ARGS[0] = 'cocaine':
 		elseif drugVars['cocaine_system'] > 0:
 			drugVars['cocaine_system'] -= 1
 		end
-		exit
 	elseif $ARGS[1] = 'hourly_events':
 		if drugVars['cocaine_addict'] = 1 and drugVars['cocaine_day'] ! daystart:
 			pcs_health -= 5
@@ -211,7 +194,6 @@ elseif $ARGS[0] = 'cocaine':
 				pcs_mood = 5
 			end
 		end
-		exit
 	elseif $ARGS[1] = 'stat':
 		if cheatVars['drugs_immune'] = 1:
 			if drugVars['cocaine_addict'] ! 0: drugVars['cocaine_addict'] = 0
@@ -220,28 +202,27 @@ elseif $ARGS[0] = 'cocaine':
 		elseif drugVars['cocaine_system'] = 0 and drugVars['cocaine_addict'] = 1:
 			drugVars['cocaine_addict'] = 0
 		end
-		exit
-	end
-
-	if ARGS[1] = 0 and $ARGS[1] = '':
-		mc_inventory['cocaine'] -= 1
-		if mc_inventory['cocaine'] <= 0: mc_inventory['cocaine'] = 0 & msg 'That was your last line of cocaine.'
-	end
+	else
 
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['cocaine_used'] += 1
-		if drugVars['cocaine_used'] > 3 and drugVars['cocaine_exp'] = 0: drugVars['cocaine_exp'] = 1
-	end
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['cocaine'] -= 1
+			if mc_inventory['cocaine'] <= 0: mc_inventory['cocaine'] = 0 & msg 'That was your last line of cocaine.'
+		end
 
-	drugVars['cocaine_system'] += 10
-	drugVars['cocaine_day'] = daystart
-	if drugVars['cocaine_willday'] ! daystart: drugVars['cocaine_willday'] = daystart & pcs_willpwr += 10
+		if cheatVars['drugs_immune'] = 0:
+			drugVars['cocaine_used'] += 1
+			if drugVars['cocaine_used'] > 3 and drugVars['cocaine_exp'] = 0: drugVars['cocaine_exp'] = 1
+		end
 
-	pcs_health = pcs_vital * 10 + pcs_stren * 5
-	pcs_mood = 100
-	pcs_horny = 100
-	gs 'stat'
+		drugVars['cocaine_system'] += 10
+		drugVars['cocaine_day'] = daystart
+		if drugVars['cocaine_willday'] ! daystart: drugVars['cocaine_willday'] = daystart & pcs_willpwr += 10
 
+		pcs_health = pcs_vital * 10 + pcs_stren * 5
+		pcs_mood = 100
+		pcs_horny = 100
+		gs 'stat'
+	end
 
 elseif $ARGS[0] = 'amphetamine':
 	if $ARGS[1] = 'hourly_events':
@@ -297,7 +278,6 @@ elseif $ARGS[0] = 'amphetamine':
 			drugVars['amphetamine_bonus'] = 1
 			drugVars['amphetamine_used'] = 0
 		end
-		exit
 
 	elseif $ARGS[1] = 'stat':
 		if drugVars['amphetamine_used'] > 3 and drugVars['amphetamine_high'] <= 0:
@@ -307,30 +287,27 @@ elseif $ARGS[0] = 'amphetamine':
 			end
 			killvar 'temp_addictChance'
 		end
-		exit
-	end
 
-	if drugVars['amphetamine_intake'] >= 2:
+	elseif drugVars['amphetamine_intake'] >= 2:
 		'Your heart is already beating uncontrollably in your chest, you should avoid taking anymore pills.'
-		exit
-	end
-
-	'<font color= blue>You swallow the white pill.</font>'
+	else
 
-	if ARGS[1] = 0 and $ARGS[1] = '':
-		mc_inventory['amphetamine'] -= 1
-		if mc_inventory['amphetamine'] <= 0: mc_inventory['amphetamine'] = 0 & msg 'That was your last amphetamine pill.'
-	end
+		'<font color= blue>You swallow the white pill.</font>'
 
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['amphetamine_used'] += 1
-		if drugVars['amphetamine_used'] > 5 and drugVars['amphetamine_exp'] = 0: drugVars['amphetamine_exp'] = 1
-	end
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['amphetamine'] -= 1
+			if mc_inventory['amphetamine'] <= 0: mc_inventory['amphetamine'] = 0 & msg 'That was your last amphetamine pill.'
+		end
 
-	drugVars['amphetamine_intake'] += 1
-	drugVars['amphetamine_high'] = 12
-	gs 'stat'
+		if cheatVars['drugs_immune'] = 0:
+			drugVars['amphetamine_used'] += 1
+			if drugVars['amphetamine_used'] > 5 and drugVars['amphetamine_exp'] = 0: drugVars['amphetamine_exp'] = 1
+		end
 
+		drugVars['amphetamine_intake'] += 1
+		drugVars['amphetamine_high'] = 12
+		gs 'stat'
+	end
 
 elseif $ARGS[0] = 'mentats':
 	if $ARGS[1] = 'cikl':
@@ -340,21 +317,20 @@ elseif $ARGS[0] = 'mentats':
 			pain['head'] += 20 * drugVars['mentats_dose']
 			drugVars['mentats_dose'] = 0
 		end
-		exit
-	end
-
-	if ARGS[1] = 0 and $ARGS[1] = '':
-		mc_inventory['mentats'] -= 1
-		if mc_inventory['mentats'] <= 0: mc_inventory['mentats'] = 0 & msg 'That was your last neurobooster pill.'
-	end
+	else
 
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['mentats_used'] += 1
-	end
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['mentats'] -= 1
+			if mc_inventory['mentats'] <= 0: mc_inventory['mentats'] = 0 & msg 'That was your last neurobooster pill.'
+		end
 
-	drugVars['mentats_dose'] += 1
-	gs 'stat'
+		if cheatVars['drugs_immune'] = 0:
+			drugVars['mentats_used'] += 1
+		end
 
+		drugVars['mentats_dose'] += 1
+		gs 'stat'
+	end
 
 elseif $ARGS[0] = 'steroids':
 	if $ARGS[1] = 'cikl':
@@ -365,27 +341,25 @@ elseif $ARGS[0] = 'steroids':
 			end
 			drugVars['steroids_dose'] = 0
 		end
-		exit
-	end
 
-	if drugVars['steroids_dose'] >= 3:
+	elseif drugVars['steroids_dose'] >= 3:
 		'You really shouldn''t take any more pills today.'
-		exit
-	end
+	else
+		'<font color = blue>You swallow the orange pill.</font>'
 
-	'<font color = blue>You swallow the orange pill.</font>'
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['steroids'] -= 1
+			if mc_inventory['steroids'] <= 0: mc_inventory['steroids'] = 0 & msg 'That was your last steroid pill.'
+		end
 
-	if ARGS[1] = 0 and $ARGS[1] = '':
-		mc_inventory['steroids'] -= 1
-		if mc_inventory['steroids'] <= 0: mc_inventory['steroids'] = 0 & msg 'That was your last steroid pill.'
-	end
+		if cheatVars['drugs_immune'] = 0:
+			drugVars['steroids_used'] += 1
+		end
 
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['steroids_used'] += 1
-	end
+		drugVars['steroids_dose'] += 1
+		gs 'stat'
 
-	drugVars['steroids_dose'] += 1
-	gs 'stat'
+	end
 
 
 elseif $ARGS[0] = 'breastcream':
@@ -402,28 +376,24 @@ elseif $ARGS[0] = 'breastcream':
 			end
 			killvar 'temp'
 		end
-		exit
-	end
-
-	if drugVars['breastcream_dose'] >= 1:
+	elseif drugVars['breastcream_dose'] >= 1:
 		'Using any more cream won''t have any effect.'
-		exit
-	end
-
-	'<font color = #DB7093>You smear the cream onto your breasts and rub it in.</font>'
+	else
 
-	if ARGS[1] = 0 and $ARGS[1] = '':
-		mc_inventory['breastcream'] -= 1
-		if mc_inventory['breastcream'] <= 0: mc_inventory['breastcream'] = 0 & msg 'That was your last bit of breast cream.'
-	end
+		'<font color = #DB7093>You smear the cream onto your breasts and rub it in.</font>'
 
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['breastcream_used'] += 1
-	end
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['breastcream'] -= 1
+			if mc_inventory['breastcream'] <= 0: mc_inventory['breastcream'] = 0 & msg 'That was your last bit of breast cream.'
+		end
 
-	drugVars['breastcream_dose'] = 1
-	gs 'stat'
+		if cheatVars['drugs_immune'] = 0:
+			drugVars['breastcream_used'] += 1
+		end
 
+		drugVars['breastcream_dose'] = 1
+		gs 'stat'
+	end
 
 elseif $ARGS[0] = 'painkiller':
 	if ARGS[1] = 0 and $ARGS[1] = '':
@@ -448,113 +418,112 @@ elseif $ARGS[0] = 'alcohol':
 		elseif alko > 3:
 			pain['relief'] = 15
 		end
-		exit
-	end
-
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['alcohol_used'] += 1
-		if drugVars['alcohol_used'] > 15 and drugVars['alcohol_exp'] = 0: drugVars['alcohol_exp'] = 1
-	end
-
-	if ARGS[2] <= 1:
-		temp_alc_count = 1
 	else
-		temp_alc_count = ARGS[2]
-	end
-
-	:alcohol_jump
-		temp_alc_count -= 1
-		pcs_health -= 5
-		pcs_energy -= 5
 
-		if $ARGS[1] = 'beer':
-			if pcs_traits['alko_status'] = -1:
-				alko += rand(1,2)
-			elseif pcs_traits['alko_status'] = 1:
-				alko += rand(0,1)
-			else
-				alko += 1
-			end
-			pcs_traits['alko_day'] += 1
-
-			fat += 3
-			pcs_mood += 10
-			if pcs_hydra >= 100:
-				pcs_hydra += 5
-			else
-				pcs_hydra += 10
-			end
-
-		elseif $ARGS[1] = 'wine' or $ARGS[1] = 'champagne':
-			if pcs_traits['alko_status'] = -1:
-				alko += 3
-			elseif pcs_traits['alko_status'] = 1:
-				alko += 1
-			else
-				alko += 2
-			end
-			pcs_traits['alko_day'] += 2
-
-			fat += 4
-			pcs_mood += 20
-			if pcs_hydra >= 100:
-				pcs_hydra += 5
-			else
-				pcs_hydra += 10
-			end
-
-		elseif $ARGS[1] = 'vodka' or $ARGS[1] = 'whiskey' or $ARGS[1] = 'scotch' or $ARGS[1] = 'rum':
-			if pcs_traits['alko_status'] = -1:
-				alko += rand(4,5)
-			elseif pcs_traits['alko_status'] = 1:
-				alko += rand(1,2)
-			else
-				alko += 3
-			end
-			pcs_traits['alko_day'] += 3
+		if cheatVars['drugs_immune'] = 0:
+			drugVars['alcohol_used'] += 1
+			if drugVars['alcohol_used'] > 15 and drugVars['alcohol_exp'] = 0: drugVars['alcohol_exp'] = 1
+		end
 
-			fat += 6
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
-			else
-				pcs_hydra -= 10
-			end
+		if ARGS[2] <= 1:
+			temp_alc_count = 1
+		else
+			temp_alc_count = ARGS[2]
+		end
 
-		elseif $ARGS[1] = 'moonshine':
-			if pcs_traits['alko_status'] = -1:
-				alko += rand(7,8)
-			elseif pcs_traits['alko_status'] = 1:
-				alko += rand(2,3)
-			else
-				alko += 5
-			end
-			pcs_traits['alko_day'] += 5
+		:alcohol_jump
+			temp_alc_count -= 1
+			pcs_health -= 5
+			pcs_energy -= 5
+
+			if $ARGS[1] = 'beer':
+				if pcs_traits['alko_status'] = -1:
+					alko += rand(1,2)
+				elseif pcs_traits['alko_status'] = 1:
+					alko += rand(0,1)
+				else
+					alko += 1
+				end
+				pcs_traits['alko_day'] += 1
+
+				fat += 3
+				pcs_mood += 10
+				if pcs_hydra >= 100:
+					pcs_hydra += 5
+				else
+					pcs_hydra += 10
+				end
+
+			elseif $ARGS[1] = 'wine' or $ARGS[1] = 'champagne':
+				if pcs_traits['alko_status'] = -1:
+					alko += 3
+				elseif pcs_traits['alko_status'] = 1:
+					alko += 1
+				else
+					alko += 2
+				end
+				pcs_traits['alko_day'] += 2
+
+				fat += 4
+				pcs_mood += 20
+				if pcs_hydra >= 100:
+					pcs_hydra += 5
+				else
+					pcs_hydra += 10
+				end
+
+			elseif $ARGS[1] = 'vodka' or $ARGS[1] = 'whiskey' or $ARGS[1] = 'scotch' or $ARGS[1] = 'rum':
+				if pcs_traits['alko_status'] = -1:
+					alko += rand(4,5)
+				elseif pcs_traits['alko_status'] = 1:
+					alko += rand(1,2)
+				else
+					alko += 3
+				end
+				pcs_traits['alko_day'] += 3
+
+				fat += 6
+				if pcs_hydra >= 100:
+					pcs_hydra -= 5
+				else
+					pcs_hydra -= 10
+				end
+
+			elseif $ARGS[1] = 'moonshine':
+				if pcs_traits['alko_status'] = -1:
+					alko += rand(7,8)
+				elseif pcs_traits['alko_status'] = 1:
+					alko += rand(2,3)
+				else
+					alko += 5
+				end
+				pcs_traits['alko_day'] += 5
+
+				fat += 6
+				if pcs_hydra >= 100:
+					pcs_hydra -= 5
+				else
+					pcs_hydra -= 10
+				end
 
-			fat += 6
-			if pcs_hydra >= 100:
-				pcs_hydra -= 5
 			else
-				pcs_hydra -= 10
+				'<br><font color = red>Developer note: The type of alcohol: (<<$ARGS[1]>>) is missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 			end
+		if temp_alc_count > 0: jump 'alcohol_jump'
+		killvar 'temp_alc_count'
 
-		else
-			'<br><font color = red>Developer note: The type of alcohol: (<<$ARGS[1]>>) is missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
-		end
-	if temp_alc_count > 0: jump 'alcohol_jump'
-	killvar 'temp_alc_count'
-
-	frost = 0
-	pcs_breath = 0
-	cumspclnt = 2
-	gs 'cum_cleanup'
-	gs 'stat'
+		frost = 0
+		pcs_breath = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		gs 'stat'
+	end
 
 
 elseif $ARGS[0] = 'aphrodisiac':
 	if $ARGS[1] = 'cikl':
 		if drugVars['aphrodisiac_overdose'] = 1: drugVars['aphrodisiac_overdose'] = 0
 		if drugVars['aphrodisiac_timer'] ! 0: drugVars['aphrodisiac_timer']	= 0
-		exit
 	elseif $ARGS[1] = 'hourly_events':
 		if drugVars['aphrodisiac_timer'] >= 1:
 			!! Changed from pcs_horny < 80 -> pcs_horny < 70 to ensure a minimum increase of +10. Blame Anjuna
@@ -565,57 +534,57 @@ elseif $ARGS[0] = 'aphrodisiac':
 			end
 			drugVars['aphrodisiac_timer'] -= 1
 		end
-		exit
-	end
-
-	if drugVars['aphrodisiac_overdose'] = 1:
-		$drugVars['aphrodisiac_msg'] = '<br>You''ve had enough aphrodisiac for today.'
-		exit
-	end
+	else
+		if drugVars['aphrodisiac_overdose'] = 1:
+			$drugVars['aphrodisiac_msg'] = '<br>You''ve had enough aphrodisiac for today.'
 
-	if ARGS[1] = 0 and $ARGS[1] = '':
-		mc_inventory['aphrodisiac'] -= 1
-		if mc_inventory['aphrodisiac'] <= 0: mc_inventory['aphrodisiac'] = 0 & msg 'That was your last aphrodisiac pill.'
-	end
+		else
 
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['aphrodisiac_used'] += 1
-	end
+			if ARGS[1] = 0 and $ARGS[1] = '':
+				mc_inventory['aphrodisiac'] -= 1
+				if mc_inventory['aphrodisiac'] <= 0: mc_inventory['aphrodisiac'] = 0 & msg 'That was your last aphrodisiac pill.'
+			end
 
-	if drugVars['aphrodisiac_timer'] = 0:
-		$drugVars['aphrodisiac_msg'] = '<font color = #DB7093><br>You take a gum and chew it. It tastes like strawberry, but is also kind of spicy.</font>'
-		drugVars['aphrodisiac_timer'] += 8
-		pcs_horny = 80
-	elseif drugVars['aphrodisiac_timer'] > 0 and drugVars['aphrodisiac_timer'] <= 8:
-		$drugVars['aphrodisiac_msg'] = '<font color = #DB7093><br>You take another gum and chew it. It makes your mouth feel kinda tingly.</font>'
-		drugVars['aphrodisiac_timer'] += 8
-		pcs_horny = 100
-	elseif drugVars['aphrodisiac_timer'] > 8 and min_arousal < 60:
-		$drugVars['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>'
-		drugVars['aphrodisiac_overdose'] = 1
-		pcs_horny = min_arousal
+			if cheatVars['drugs_immune'] = 0:
+				drugVars['aphrodisiac_used'] += 1
+			end
 
-		orgasm += 1
-		pcs_mood = 100
-		min_arousal += 10
-
-		if min_arousal <= 10:
-			$min_arousal_msg = '<font color = #DB7093>That was intense! You can still feel the tingles.</font>'
-		elseif min_arousal <= 20:
-			$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:
-			$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:
-			$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:
-			$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>'
-		else
-			$min_arousal_msg = '<font color = #DB7093>You are burning up. You feel like you could fuck anything and everything all day long.</font>'
+			if drugVars['aphrodisiac_timer'] = 0:
+				$drugVars['aphrodisiac_msg'] = '<font color = #DB7093><br>You take a gum and chew it. It tastes like strawberry, but is also kind of spicy.</font>'
+				drugVars['aphrodisiac_timer'] += 8
+				pcs_horny = 80
+			elseif drugVars['aphrodisiac_timer'] > 0 and drugVars['aphrodisiac_timer'] <= 8:
+				$drugVars['aphrodisiac_msg'] = '<font color = #DB7093><br>You take another gum and chew it. It makes your mouth feel kinda tingly.</font>'
+				drugVars['aphrodisiac_timer'] += 8
+				pcs_horny = 100
+			elseif drugVars['aphrodisiac_timer'] > 8 and min_arousal < 60:
+				$drugVars['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>'
+				drugVars['aphrodisiac_overdose'] = 1
+				pcs_horny = min_arousal
+
+				orgasm += 1
+				pcs_mood = 100
+				min_arousal += 10
+
+				if min_arousal <= 10:
+					$min_arousal_msg = '<font color = #DB7093>That was intense! You can still feel the tingles.</font>'
+				elseif min_arousal <= 20:
+					$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:
+					$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:
+					$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:
+					$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>'
+				else
+					$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
+				$drugVars['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>'
+			end
+			gs 'stat'
 		end
-	else
-		$drugVars['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>'
 	end
-	gs 'stat'
 
 
 elseif $ARGS[0] = 'hair_extensioncream':
@@ -628,27 +597,24 @@ elseif $ARGS[0] = 'hair_extensioncream':
 				'Feels like your hair has grown slightly.'
 			end
 		end
-		exit
-	end
-
-	if drugVars['hair_extensioncream_dose'] >= 1:
+	elseif drugVars['hair_extensioncream_dose'] >= 1:
 		'Using any more hair extension shampoo won''t have any effect.'
-		exit
-	end
+	else
 
-	'<font color = #DB7093>You smear the shampoo into your hair and rub it in, then wash it out shortly later.</font>'
+		'<font color = #DB7093>You smear the shampoo into your hair and rub it in, then wash it out shortly later.</font>'
 
-	if ARGS[1] = 0 and $ARGS[1] = '':
-		mc_inventory['hair_extensioncream'] -= 1
-		if mc_inventory['hair_extensioncream'] <= 0: mc_inventory['hair_extensioncream'] = 0 & msg 'That was your last bit of hair extension shampoo.'
-	end
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['hair_extensioncream'] -= 1
+			if mc_inventory['hair_extensioncream'] <= 0: mc_inventory['hair_extensioncream'] = 0 & msg 'That was your last bit of hair extension shampoo.'
+		end
 
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['hair_extensioncream_used'] += 1
-	end
+		if cheatVars['drugs_immune'] = 0:
+			drugVars['hair_extensioncream_used'] += 1
+		end
 
-	drugVars['hair_extensioncream_dose'] = 1
-	gs 'stat'
+		drugVars['hair_extensioncream_dose'] = 1
+		gs 'stat'
+	end
 
 
 elseif $ARGS[0] = 'butt_injection':
@@ -665,27 +631,25 @@ elseif $ARGS[0] = 'butt_injection':
 			end
 			killvar 'temp'
 		end
-		exit
-	end
-
-	if drugVars['butt_injection_dose'] >= 1:
+	elseif drugVars['butt_injection_dose'] >= 1:
 		'Using any more injections won''t have any effect.'
-		exit
-	end
+	else
 
-	'<font color = #DB7093>You inject the KBI formula into your ass.</font>'
+		'<font color = #DB7093>You inject the KBI formula into your ass.</font>'
 
-	if ARGS[1] = 0 and $ARGS[1] = '':
-		mc_inventory['butt_injection'] -= 1
-		if mc_inventory['butt_injection'] <= 0: mc_inventory['butt_injection'] = 0 & msg 'That was your last KBI shot.'
-	end
+		if ARGS[1] = 0 and $ARGS[1] = '':
+			mc_inventory['butt_injection'] -= 1
+			if mc_inventory['butt_injection'] <= 0: mc_inventory['butt_injection'] = 0 & msg 'That was your last KBI shot.'
+		end
 
-	if cheatVars['drugs_immune'] = 0:
-		drugVars['butt_injection_used'] += 1
-	end
+		if cheatVars['drugs_immune'] = 0:
+			drugVars['butt_injection_used'] += 1
+		end
 
-	drugVars['butt_injection_dose'] = 1
-	gs 'stat'
+		drugVars['butt_injection_dose'] = 1
+		gs 'stat'
+
+	end
 
 
 else

+ 7 - 1
locations/npcstatic6.qsrc

@@ -543,7 +543,7 @@ gs 'npcstaticdefaults', 'skills', 'dance', 'sport'
 gs 'npcstaticdefaults', 'body', 'model'
 
 npctemp = 275
-!! Kima Agapova - The dance critic and fanatical to become a dancer, no matter the cost. Keeps a 'black book' of contacts and information. Arguably the best dancer in the school alongside Maya. She will try and gather information on Sveta's activities.
+!! Kima Agapova - The dance critic and fanatical to become a dancer, no matter the cost. Keeps a 'black book' of contacts and information. Arguably the best dancer in the school alongside Maya. She will try and gather information on Sveta''s activities.
 !! will try and blackmail Sveta into either giving up if she learns she has dirty secrets such as prostitution, slut rep, etc or passing the information to Rudolph to destroy her career and remove her as competition.
 $npc_firstname['A<<npctemp>>'] = 'Kima'
 $npc_nickname['A<<npctemp>>'] = 'Kima'
@@ -662,6 +662,7 @@ $npc_nickname['A<<npctemp>>'] = ''
 $npc_lastname['A<<npctemp>>'] = 'Ananiashvili'
 $npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
 gs 'npcstaticdefaults', 'defaults'
+
 !! class teacher/pianist: Sofia Solovyova
 npctemp = 285
 $npc_firstname['A<<npctemp>>'] = 'Sofia'
@@ -669,6 +670,7 @@ $npc_nickname['A<<npctemp>>'] = 'Sofia'
 $npc_lastname['A<<npctemp>>'] = 'Solovyova'
 $npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
 gs 'npcstaticdefaults', 'defaults'
+
 !! Residential Warden: Bronya Volkova and former violinist. Strict but fair. Has two daughters, with Nikita, the youngest, training to be a ballet dancer and her eldest in Germany training to be a surgeon.
 npctemp = 286
 $npc_firstname['A<<npctemp>>'] = 'Bronya'
@@ -678,6 +680,7 @@ $npc_usedname['A<<npctemp>>'] = 'Bronya'
 gs 'npcstaticdefaults', 'defaults'
 $npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
 gs 'npcstaticdefaults', 'defaults'
+
 !! reserved for future content
 !! NPC temp: 287 - Physio - Pelageya Makarova
 
@@ -686,6 +689,9 @@ gs 'npcstaticdefaults', 'defaults'
 !! NPC temp: 288 Staff Physio -  Syuzanna Zakharova / Klavdii Frolov (Klavdii is a pun)
 !! NPC temp: 289 Mistress of Ballet - Zarya Popova
 
+
+
 !! {Keep this at the end of file of the npcstatics.}
 aarraynumber = npctemp
+
 --- npcstatic6 ---------------------------------

+ 1 - 1
qsrc2tw/twine-code/start/start.tw

@@ -11,7 +11,7 @@
 <center>Version <<=`${QSP.version_major[0]}.${QSP.version_minor[0]}.${QSP.version_revision[0]}.${QSP.version_patch[0]}`>></center>
 <center><font color="red"><b>Children under 18 years are strictly forbidden to play</b></font>
 <br/>
-<<='<center><img '+(QSP.$set_imgh[0])+' src="images/system/1_openings/splashes/splash' + setup.qsp_rand(1 , 30) + '.jpg" ></center>'>>
+<<='<center><img '+(QSP.$set_imgh[0])+' src="images/system/1_openings/splashes/splash' + setup.qsp_rand(1 , 30) + '.jpg" alt="If you see this message, your images-folder is set up incorrectly." style="color: red;font-size: 2em;font-weight: bold;" ></center>'>>
 <center>Based on the Russian game ЭТО by DeGross.</center>
 <br/>
 This game is about the simulated life of a woman containing elements of RPG, strategy, porn and magical combat.