Merge branch 'master' into working

changes from 0_8_5 to 0_8_6.txt

@@ -38,6 +38,7 @@ rex_party_events
 rex_party_boys_events
 rex_party_girls_events
 rex_party_sister_events
+$phone_theme
 
 
 

glife.qproj

@@ -190,7 +190,6 @@
 		<Location name="telefon"/>
 		<Location name="phone_selfies"/>
 		<Location name="phone_selfies_popup"/>
-		<Location name="$phone_theme"/>
 	</Folder>
 	<Folder name="Prostitution">
 		<Location name="street_walker"/>

locations/Cheatmenu_din.qsrc

@@ -2202,7 +2202,7 @@ $cheatmenu['status'] = {
 		end
 	end
 
-	!<a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''status''] & gs ''stat''"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png"></a>
+	!<a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''status''] & gs ''stat''"><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_settings.png"></a>
 	'</tr></table></b></center>'
 }
 

locations/budilnik.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/bedroom/bed2.jpg"></center>'
-	'Enter time using number pad and click set to change alarm times, don''t forget to turn your alarm on.'
+	'<center>Enter time using number pad and click set to change alarm times, don''t forget to turn your alarm on.</center>'
 	*nl
 
 	if numbud = 4:'<center><b><<bud1>><<bud2>>:<<bud3>><<bud4>></b></center>'

locations/gschool_lunch.qsrc

@@ -134,7 +134,7 @@ if $ARGS[0] = 'break':
 		gt 'nerd_game_night', 'invite', 'lunch'
 	end
 
-	if katjaQW['QWstage'] = 0 and npc_rel['A14'] >= 60 and fame['pav_slut'] < 25 and class['school_grade_average'] >= 65 and pcs_makupskl >= 40 and hotcat >= 6: gt 'gschool_coolkid_chats', 'Katjaproblems'
+	if katjaQW['QWstage'] = 0 and npc_rel['A14'] >= 60 and fame['pav_slut'] < 50 and class['school_grade_average'] >= 65 and pcs_makupskl >= 40 and hotcat >= 6: gt 'gschool_coolkid_chats', 'Katjaproblems'
 
 	if $breaktype ! 'long':
 		if dimaRevenge = 4 and dimaRevChoice = 2 and hour < 10: '<br>"Hi Nat, did you happen to see Dimka?" "Hey <<$pcs_nickname>>, he was here earlier, speaking with Lena and Lera.'

locations/journal_quests.qsrc

@@ -331,7 +331,7 @@ if $ARGS[0] = 'start':
 		'<center><h1>Katja Meynold</h1></center>'
 		*nl
 		if katjaQW['QWstage'] = 0:
-			'Katja is both cute, smart and popular. If I want to be her friend'+iif(npc_rel['A14'] < 60, ', I need to get to know her better by talking with her at school or the disco', '')+ +iif(pcs_makupskl < 40, ', I need to improve my make up skill since she is very into make up', '')+ +iif(class['school_grade_average'] < 65, ', I need to improve my grades since being good at school is important to her', '')+ +iif(fame['pav_slut'] >= 25, ', I need to be seen as less of a slut', '')+ +iif(hotcat < 6, ', I need to improve my looks', '')+ +iif(npc_rel['A14'] >= 60 and fame['pav_slut'] < 25 and class['school_grade_average'] >= 65 and pcs_makupskl >= 40 and hotcat >= 6, ', I should probably go to school and see if somthing happens.', '.')
+			'Katja is both cute, smart and popular. If I want to be her friend'+iif(npc_rel['A14'] < 60, ', I need to get to know her better by talking with her at school or the disco', '')+ +iif(pcs_makupskl < 40, ', I need to improve my make up skill since she is very into make up', '')+ +iif(class['school_grade_average'] < 65, ', I need to improve my grades since being good at school is important to her', '')+ +iif(fame['pav_slut'] >= 50, ', I need to be seen as less of a slut', '')+ +iif(hotcat < 6, ', I need to improve my looks', '')+ +iif(npc_rel['A14'] >= 60 and fame['pav_slut'] < 50 and class['school_grade_average'] >= 65 and pcs_makupskl >= 40 and hotcat >= 6, ', I should probably go to school and see if somthing happens.', '.')
 		elseif katjaQW['QWstage'] = 1:
 			'Katja has agreed to hang out after school. I should do this more often to see where this leads.'
 		elseif katjaQW['QWstage'] = 2:

locations/mod_setting.qsrc

@@ -26,16 +26,15 @@ if mod_list > 0:
 	:mod_alllist
 	if $mod_name[mod_i] ! '':
 		!name
-		gs 'mod_<<$mod_name[mod_i]>>_setup'
-		*p '<tr><td><<mod_i>></td><td><<$mod_info[0]>></td>'
+		*p '<tr><td><<mod_i>></td><td><<$mod_name[mod_i]>></td>'
 		!version
-		*p '<td><<val($mod_info[1])/10000>>.<<(val($mod_info[1]) mod 10000)/100>> <<iif(val($mod_info[1]) mod 100 > 0, ''fix <<val($mod_info[1]) mod 100>> '', '' '')>></td>'
+		*p '<td><<val($mod_version[mod_i])/10000>>.<<(val($mod_version[mod_i]) mod 10000)/100>> <<iif(val($mod_version[mod_i]) mod 100 > 0, ''fix <<val($mod_version[mod_i]) mod 100>> '', '' '')>></td>'
 		!author
-		*p '<td><<$mod_info[2]>></td>'
+		*p '<td><<$mod_author[mod_i]>></td>'
 		!description and readme
-		*p '<td><a href="exec:gs ''mod_<<$mod_info[0]>>_readme''"><img src="images/system/icons/anptekainfo.jpg"></a> <<$mod_info[3]>></td>'
+		*p '<td><a href="exec:gs ''mod_<<$mod_name[mod_i]>>_readme''"><img src="images/system/icons/anptekainfo.jpg"></a> <<$mod_desc[mod_i]>></td>'
 		!mod options page
-		*p '<td>'+iif($mod_opt[mod_i] ! '','<a href="exec:gs ''mod_<<$mod_info[0]>>_options''"><<$mod_info[4]>></a>','')+'</td></tr>'
+		*p '<td>'+iif($mod_opt[mod_i] ! '','<a href="exec:gs ''mod_<<$mod_name[mod_i]>>_options''"><<$mod_opt[mod_i]>></a>','')+'</td></tr>'
 	else
 		'ERROR loading mod id <<mod_i>>, no mod name available'
 	end
@@ -68,8 +67,24 @@ act ''+iif(settingmode = 1, '<center><b>Install new mod</b></center>','Install n
 	$mod_opt[mod_list] = $mod_info[4]
 	gt 'mod_setting'
 end
+
 act ''+iif(settingmode = 1, '<center><b>Disable all mods</b></center>','Disable all mods')+'':
 	if input('Are you sure? ALL mod will be disabled!<br>please input <b>qqq</B> to confirm') = 'qqq':
+		if mod_list > 0:
+			mod_i=mod_list
+			:mod_data_remover
+			if $mod_name[mod_i] ! '':
+				$mod_su_name = 'mod_<<$mod_name[mod_i]>>_onremove'
+				if LOC($mod_su_name): gs $mod_su_name
+			end
+			if mod_i > 0:
+				mod_i-=1
+				jump 'mod_data_remover'
+			end
+			killvar '$mod_su_name'
+			killvar 'mod_i'
+		end
+
 		killqst
 		set mod_list=0
 		killvar '$mod_name'

locations/onobjsel.qsrc

@@ -42,7 +42,7 @@ if INSTR($selobj,':') > 0:
 	$tmpVal = INPUT('Enter a value for <<$tmpVar>>')
 	if $tmpVal <> '':
 		if instr($tmpVar,'$') = 1:
-			dyneval('<<$tmpVar>> = ''<<$tmpVal>>''')
+			dyneval('<<$tmpVar>> = "<<$tmpVal>>"')
 		else
 			dyneval('<<$tmpVar>> = <<VAL($tmpVal)>>')
 		end 
@@ -58,15 +58,6 @@ if $selobj = '<center>+1 Hour</center>':gs 'obj_din', '+1 Hour'
 if $selobj = '<center><font color = red>Emergency</font></center>':gs 'obj_din', 'emergency'
 if $selobj = '<center>Remove debug info</center>': debug_warning_closed = 1 & gs 'stat'
 
-!The old menu: end
-
-if $selobj = 'Player':
-	clr
-	pl'Your name is Mikhail Kuznetsov. You <<age>> years. <<$vneshPRE>>'
-	pl'You have short black hair with flashes of gray starting, little brown eyes and willed jaw covered by blue bristle shave.'
-	pl'Growth <<pcs_hgt>> see, weight 100 kg.'
-end
-
 unselect
 
 --- onobjsel ---------------------------------

locations/stat_display.qsrc

@@ -104,7 +104,7 @@ if menu_off = 0:
 	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''description''"><img title="Character description" height = <<set_miconht>> src="images/system/icons/menu/icon_character.png"></a></td>'
 	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs ''obj_din'', ''face''"><img title="Looks (Face, body, clothing,...)"height = <<set_miconht>> src="images/system/icons/menu/icon_lookself.png"></a></td>'
 	if bag > 0: $menuBarTab += '<td><a href="exec:gs ''din_bad'', ''d_bag''"><img title="Your purse"height = <<set_miconht>> src="images/system/icons/menu/icon_purse.png"></a></td>'
-	$menuBarTab += '<td><a href="exec:gs ''telefon'',''Phone_menu''"><img title="Your phone" height = <<set_miconht>> src="images/system/icons/menu/icon_phone.png"></a></td>'
+	$menuBarTab += '<td><a href="exec:gs ''telefon'',''Phone_menu''"><img title="Your phone" height = <<set_miconht>> src="images/system/icons/menu/<<iif(telefon[''UnreadSMS'']=0,''icon_phone.png'',''icon_phone_sms.gif'')>>"></a></td>'
 	$menuBarTab += '<td><a href="exec:gs ''obj_din'', ''records''"><img title="<<$journal_tooltip>>" height = <<set_miconht>> src="images/system/icons/menu/<<$journalIcon>>"></a></td>'
 	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs''$menu_setting''"><img title="Menu & Cheatmenu" height = <<set_miconht>> src="images/system/icons/menu/icon_menu.png"></a></td>'
 	$menuBarTab += '</tr></table>'
@@ -117,7 +117,7 @@ elseif menu_off = 1:
 	if bag > 0:
 		$menuBarTab += '<td><a href="exec:gs ''obj_din'', ''menu_disabled''"><img title="<<$stat_disable_msg>>" height = <<set_miconht>> src="images/system/icons/menu/icon_purse.png"></a></td>'
 	end
-	$menuBarTab += '<td><a href="exec:gs ''telefon'',''Phone_menu''"><img title="<<$stat_disable_msg>>" height = <<set_miconht>> src="images/system/icons/menu/icon_phone.png"></a></td>'
+	$menuBarTab += '<td><a href="exec:gs ''telefon'',''Phone_menu''"><img title="<<$stat_disable_msg>>" height = <<set_miconht>> src="images/system/icons/menu/<<iif(telefon[''UnreadSMS'']=0,''icon_phone.png'',''icon_phone_sms.gif'')>>"></a></td>'
 	$menuBarTab += '<td><a href="exec:gs ''obj_din'', ''menu_disabled''"><img title="<<$stat_disable_msg>>" height = <<set_miconht>> src="images/system/icons/menu/<<$journalIcon>>"></a></td>'
 	$menuBarTab += '<td><a href="exec:killvar ''menu_page'' & gs''obj_din'', ''menu_disabled''"><img title="<<$stat_disable_msg>>" height = <<set_miconht>> src="images/system/icons/menu/icon_menu.png"></a></td>'
 	$menuBarTab += '</tr></table>'

locations/telefon.qsrc

@@ -144,7 +144,7 @@ end &! --- AddContact ---
 if $ARGS[0] = 'ContactList':
 	$telefon['body'] = '
 	<font size=6>Contacts</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"><br><br>
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_call.png" height="80" width="80"><br><br>
 	<TABLE cellspacing="0" width="80%">'
 
 	!!iterating all Contacts
@@ -705,7 +705,7 @@ end &! --- phone_call_reject ---
 if $ARGS[0] = 'Phone_megafon':
 	$telefon['body'] = '
 	<font size=6>MegaFon</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"><br><br>
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_megafon.png" height="80" width="80"><br><br>
 	<b>The balance in the account:</b>
 	<font size=5><<balans>> ₽.</font><br>'
 	dynamic $telefon['print']
@@ -1211,7 +1211,7 @@ if $ARGS[0] = 'Phone_notebook':
 	gs 'housing', 'rent'
 	$telefon['body'] = '
 	<font size=6>Planner</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"><br>
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_notebook.png" height="80" width="80"><br>
 	<<year>>-<<$month>>-<<day>>, <<$week[week]>><br><br>'
 	rent1 = -1
 	rent4 = -1
@@ -1541,7 +1541,7 @@ if $ARGS[0] = 'Phone_camera':
 		$phone_loc = ''
 	end
 	$telefon['body'] = '<font size=6>Camera</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"><br><br>'
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_camera.png" height="80" width="80"><br><br>'
 	!! Take a selfie depending on which clothes you are wearing
 	$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'', ''<<$phone_loc>>'' "><b>Take a selfie</b></a><br>'
 	!! Flashing selfie
@@ -1606,7 +1606,7 @@ end
 if $ARGS[0] = 'Phone_sms':
 	$telefon['body'] = '
 	<font size=6>SMS</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"><br>'
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 	
 	$telefon['body'] += '<b><a href="exec:gs ''telefon'', ''send_sms''">Send new SMS</a></b><br>'
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%"><TR><TH>icon</TH><TH>Name</TH><TH align="right">Received</TH><TH></TH></TR>'
@@ -1704,7 +1704,7 @@ if $ARGS[0] = 'show_sms':
 
 	$telefon['body'] = '
 	<font size=6>SMS</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"><br>'
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
 	$telefon['body'] += '<TR><TD><img src="<<$telefonCon[''Icon'']>>"></TD><TD><<$telefonCon[''NPCName'']>></TD></TR>'
@@ -1771,7 +1771,7 @@ if $ARGS[0] = 'send_sms':
 	$telefon['backButton'] = 'gs ''telefon'', ''Phone_sms'''
 	$telefon['body'] = '
 	<font size=6>Send SMS</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"><br>'
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
 	!!iterating all Contacts
@@ -1819,7 +1819,7 @@ if $ARGS[0] = 'npcSendListSms':
 	$telefon['backButton'] = 'gs ''telefon'', ''send_sms'''
 	$telefon['body'] = '
 	<font size=6>Send SMS</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"><br>'
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
 	!!iterating all send sms messages
@@ -1907,7 +1907,7 @@ end
 if $ARGS[0] = 'Phone_wheather':
 	$telefon['body'] = '
 	<font size=6>Weather</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"><br><br>
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_weather.png" height="80" width="80"><br><br>
 	<b>Temperature:</b><br>
 	<<$temperature>>. <<$osadki>><br>
 	P.O.P. today is <<weatherFall>>%<br>'
@@ -1917,7 +1917,7 @@ end &! --- Phone_wheather ---
 if $ARGS[0] = 'Phone_calendar':
 	$telefon['body'] = '
 	<font size=6>Calendar</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"><br><br>
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_calendar.png" height="80" width="80"><br><br>
 	<B>Today:</B><br>
 	<<$week[week]>>, <<day>> <<$month>> <<year>><br>'
 	dynamic $telefon['print']
@@ -1926,7 +1926,7 @@ end &! --- Phone_calendar ---
 if $ARGS[0] = 'Phone_media':
 	$telefon['body'] = '
 	<font size=6>Media</font><br>
-	<img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"><br>
+	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_music.png" height="80" width="80"><br>
 	<b>This option is not active</b><br>'
 	dynamic $telefon['print']
 end &! --- Phone_media ---
@@ -1934,22 +1934,22 @@ end &! --- Phone_media ---
 if $ARGS[0] = 'Phone_menu':
 	if phone_off = 0:
 		$telefon['body'] = '
-		<a href="exec:gs ''telefon'', ''Phone_camera'' "><img src="<<FUNC(''$phone_theme'')>>icon_camera.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_calendar'' "><img src="<<FUNC(''$phone_theme'')>>icon_calendar.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_pictures'' "><img src="<<FUNC(''$phone_theme'')>>icon_pictures.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''Phone_camera'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_camera.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''Phone_calendar'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_calendar.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''Phone_pictures'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_pictures.png" height="80" width="80"></a>
 		<br>
-		<a href="exec:gs ''telefon'', ''Phone_media'' "><img src="<<FUNC(''$phone_theme'')>>icon_music.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_notebook'' "><img src="<<FUNC(''$phone_theme'')>>icon_notebook.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="<<FUNC(''$phone_theme'')>>icon_weather.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''Phone_media'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_music.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''Phone_notebook'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_notebook.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''Phone_wheather'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_weather.png" height="80" width="80"></a>
 		<br>
-		<a href="exec:gs ''telefon'', ''ContactList'' "><img src="<<FUNC(''$phone_theme'')>>icon_call.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_sms'' "><img src="<<FUNC(''$phone_theme'')>>icon_sms.png" height="80" width="80"></a>
-		<a href="exec:gs ''telefon'', ''Phone_megafon'' "><img src="<<FUNC(''$phone_theme'')>>icon_megafon.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''ContactList'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_call.png" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''Phone_sms'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"></a>
+		<a href="exec:gs ''telefon'', ''Phone_megafon'' "><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_megafon.png" height="80" width="80"></a>
 		<br>'
 		if menu_off = 1:
-			$telefon['body'] += '<a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a><br>'
+			$telefon['body'] += '<a href="exec:gs ''obj_din'', ''menu_disabled''"><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_settings.png" height="80" width="80"></a><br>'
 		else
-			$telefon['body'] += '<a href="exec:killvar ''menu_page'' & gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']"><img src="<<FUNC(''$phone_theme'')>>icon_settings.png" height="80" width="80"></a><br>'
+			$telefon['body'] += '<a href="exec:killvar ''menu_page'' & gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']"><img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_settings.png" height="80" width="80"></a><br>'
 		end
 		dynamic $telefon['print']
 	else

locations/traits.qsrc

@@ -153,7 +153,7 @@ if $ARGS[0] = 'menu':
 	!!exp earned from anal sex but degrades over time. Level 3 can be lost but lvl1 and 2 cannot
 	'<center><b>Buttslut</b></center>'
 	if traits['buttslut_lvl'] = 0:
-		'You need to have more anal orgasms to gain this trait. To reach lvl 1 you need to have more anal than 10 anal orgasms.'
+		'You need to have more anal orgasms to gain this trait. To reach lvl 1 you need to have more than 10 anal orgasms.'
 		'You currently have had <<orgasm_anal>> anal orgasms.'
 	elseif traits['buttslut_lvl'] = 1:
 		'You have this trait at level 1. To reach lvl 2 you need to gain more anal orgasm exp.'