2 Commits b14b12ac00 ... fcabdb8880

Author SHA1 Message Date
  netuttki fcabdb8880 Updated to use the new way piercings are handled by the main game. 2 months ago
  netuttki 608139eeb1 Updated to use the new way tattoos are handled by the main game. 2 months ago

+ 8 - 8
locations/mod_wlife.qsrc

@@ -114,7 +114,7 @@ elseif wl_status['main'] > -1:
 		elseif wl_status['start'] = 4 and week < 7:
 			gt 'mod_wlife_story', 'start_4'
 		end
-	elseif wl_status['main'] > 8 and wl_iosif['tattoo'] = 1 and tatvag = 0 and $loc = 'pav_residential' and $menu_loc = 'pav_residential' and $menu_arg = '' and $loc_arg = '' and menu_off = 0 and (((hour = 7 or hour = 8) and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6) or (hour > 6 and (SchoolBlock > 0 or SchoolAtestat > 0))):
+	elseif wl_status['main'] > 8 and wl_iosif['tattoo'] = 1 and pcs_tattoos['pussy'] = 0 and $loc = 'pav_residential' and $menu_loc = 'pav_residential' and $menu_arg = '' and $loc_arg = '' and menu_off = 0 and (((hour = 7 or hour = 8) and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6) or (hour > 6 and (SchoolBlock > 0 or SchoolAtestat > 0))):
 		gt 'mod_wlife_tattoo_piercing', 'tattoo_0'
 	elseif wl_status['main'] > 0 and wl_in_pavlovsk and $menu_arg = '' and $ARGS[0] = '' and menu_off = 0:
 		if wl_status['main'] = 6 and wl_police['timer'] < daystart and hour > 6 and hour < 19 and week ! 7:
@@ -189,7 +189,7 @@ elseif wl_status['main'] > -1:
 
 	!!Location Checks 2
 	if menu_off = 0 and $loc = $wl_loc[0] and $loc_arg = $wl_loc[1] and $menu_arg ! 'garages':
-		if wl_status['main'] >= 5 and wl_whore['shifts_message'] = 1 and wl_whore['pirsA'] = 0:
+		if wl_status['main'] >= 5 and wl_whore['shifts_message'] = 1 and wl_whore['tongue_piercing'] = 0:
 			if hour = 16 and PCloStyle = 4 and ShoHeels > 3:
 !!ToDo: Activate if done if wl_party['status'] > 1 and wl_vadim['timer'] < daystart: gt 'mod_wlife_vadim', 'pick_up'
 				'Volya is waiting for you in his <a href="exec: minut += 1 & gt ''mod_wlife_volya'', ''shift_start''">car</a>.'
@@ -198,10 +198,10 @@ elseif wl_status['main'] > -1:
 			elseif hour < 16:
 				'Volya will pick you up between 16:00 and 17:00. You''ll have to wear an appropriate outfit and heels.'
 			end
-		elseif wl_status['main'] >= 5 and wl_whore['shifts_message'] = 1 and wl_whore['pirsA'] > 0:
-			if hour = 16 and PCloStyle = 4 and ShoHeels > 3 and pirsA < 10000:
+		elseif wl_status['main'] >= 5 and wl_whore['shifts_message'] = 1 and wl_whore['tongue_piercing'] > 0:
+			if hour = 16 and PCloStyle = 4 and ShoHeels > 3 and wl_whore['tongue_piercing'] < 10000:
 				'Volya is waiting for you in his <a href="exec: minut += 1 & gt ''mod_wlife_volya'', ''shift_start''">car</a>.'
-			elseif hour = 16 and (PCloStyle ! 4 or ShoHeels < 4 or pirsA = 10000):
+			elseif hour = 16 and (PCloStyle ! 4 or ShoHeels < 4 or wl_whore['tongue_piercing'] = 10000):
 				'Volya is waiting for you in his car, but you have to wear an appropriate outfit, heels and your tongue piercing.'
 			elseif hour < 16:
 				'Volya will pick you up between 16:00 and 17:00. You''ll have to wear an appropriate outfit, heels and your tongue piercing.'
@@ -244,7 +244,7 @@ elseif wl_status['main'] > -1:
 		else
 			wl_mother['clothes_chance'] += rand(3,6)
 		end
-	elseif wl_status['main'] > 8 and wl_iosif['tattoo'] = 1 and tatvag = 0 and $loc = 'pav_residential' and $menu_loc = 'pav_residential' and $menu_arg = '' and $loc_arg = '' and menu_off = 0 and (((hour = 7 or hour = 8) and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6) or (hour > 6 and (SchoolBlock > 0 or SchoolAtestat > 0))):
+	elseif wl_status['main'] > 8 and wl_iosif['tattoo'] = 1 and pcs_tattoos['pussy'] = 0 and $loc = 'pav_residential' and $menu_loc = 'pav_residential' and $menu_arg = '' and $loc_arg = '' and menu_off = 0 and (((hour = 7 or hour = 8) and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6) or (hour > 6 and (SchoolBlock > 0 or SchoolAtestat > 0))):
 		gt 'mod_wlife_tattoo_piercing', 'tattoo_0'
 	end
 
@@ -350,10 +350,10 @@ elseif wl_status['main'] > -1:
 			$wl_status_msg += '<td><a href="exec: gt ''mod_wlife_solicitation'', ''search''"><img title="Click to start working in Pavlovsk." height = 80 src="mod/wlife/images/objects/prostitute.png"></a></td>'
 		end
 
-		if wl_whore['pirsA'] = 0:
+		if wl_whore['tongue_piercing'] = 0:
 			if PCloStyle = 4 and ShoHeels > 3: $wl_status_msg += '<td><img title="Your outfit suits a whore perfectly." height = 80 src="mod/wlife/images/objects/whore'+iif(night_mode ! 3 and (($location_type = 'public_outdoors' and daystage = 5) or night_mode = 1 or night_mode = 2), '_night', '')+'.png"></td>'
 		else
-			if PCloStyle = 4 and ShoHeels > 3 and pirsA = wl_whore['pirsA']: $wl_status_msg += '<td><img title="Your outfit suits a whore perfectly." height = 80 src="mod/wlife/images/objects/whore'+iif(night_mode ! 3 and (($location_type = 'public_outdoors' and daystage = 5) or night_mode = 1 or night_mode = 2), '_night', '')+'.png"></td>'
+			if PCloStyle = 4 and ShoHeels > 3 and pcs_piercings['tongue'] = wl_whore['tongue_piercing']: $wl_status_msg += '<td><img title="Your outfit suits a whore perfectly." height = 80 src="mod/wlife/images/objects/whore'+iif(night_mode ! 3 and (($location_type = 'public_outdoors' and daystage = 5) or night_mode = 1 or night_mode = 2), '_night', '')+'.png"></td>'
 		end
 
 		$wl_status_msg += '</tr></table></center><br><br>'

+ 3 - 37
locations/mod_wlife_functions.qsrc

@@ -530,11 +530,11 @@ if $ARGS[0] = 'payment':
 
 	if ($wl_whore['client_scene'] = 'Blowjob') or ($wl_whore['pav_scene'] = 'blowjob'):
 		wl_whore['payment_mod'] = wl_whore['payment_mod'] / 2
-		if pirsA = 2:
+		if pcs_piercings['tongue'] = 2:
 			wl_whore['payment_mod'] += 50
-		elseif pirsA = 4:
+		elseif pcs_piercings['tongue'] = 4:
 			wl_whore['payment_mod'] += 75
-		elseif pirsA > 0 and pirsA < 10000:
+		elseif pcs_piercings['tongue'] > 0 and pcs_piercings['tongue'] < 10000:
 			wl_whore['payment_mod'] += 25
 		end
 	end
@@ -724,40 +724,6 @@ if $ARGS[0] = 'weed_check':
 	end
 end
 
-if $ARGS[0] = 'tat_pierce_count':
-	tattCount = 0
-
-	if tatarm >= 1: tattCount += 1
-	if tatass >= 1:	tattCount += 1
-	if tatback >= 1: tattCount += 1
-	if tatblly >= 1: tattCount += 1
-	if tatbrst >= 1: tattCount += 1
-	if tatchst >= 1: tattCount += 1
-	if tatfce >= 1:	tattCount += 1
-	if tatankle >= 1: tattCount += 1
-	if tatleg >= 1:	tattCount += 1
-	if tatlip >= 1:	tattCount += 1
-	if tatneck >= 1: tattCount += 1
-	if tatvag >= 1: tattCount += 1
-	if tatlech >= 1: tattCount += 1
-	if tatside >= 1: tattCount += 1
-	if tatupb >= 1: tattCount += 1
-	if tatunder >= 1: tattCount += 1
-	if tatwrist >= 1: tattCount += 1
-	if tathand >= 1: tattCount += 1
-
-	pierWearCount = 0
-
-	if pirsA > 0 and pirsA ! 10000:	pierWearCount += 1
-	if pirsB > 0 and pirsB ! 10000:	pierWearCount += 1
-	if pirsC > 0 and pirsC ! 10000:	pierWearCount += 1
-	if pirsD > 0 and pirsD ! 10000:	pierWearCount += 1
-	if pirsE > 0 and pirsE ! 10000:	pierWearCount += 1
-	if pirsF > 0 and pirsF ! 10000:	pierWearCount += 1
-	if pirsG > 0 and pirsG ! 10000:	pierWearCount += 1
-	if pirsN > 0 and pirsN ! 10000:	pierWearCount += 1
-end
-
 if $ARGS[0] = 'pav_client':
 	!!Reset
 	wl_whore['pav_internal'] = 0

+ 3 - 3
locations/mod_wlife_highway.qsrc

@@ -437,7 +437,7 @@ if $ARGS[0] = 'work':
 	end
 
 	'<center><video autoplay src="mod/wlife/images/prostitution/normal/negotiation/search.mp4"></video></center>'
-	'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'sexshop' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
+	'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pcs_piercings['tongue'] > 0 and pcs_piercings['tongue'] < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'sexshop' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
 
 	if wl_whore['enema'] = 0: '<br>Nearly all men won''t like dirty anal sex, even with a condom, and it''s probably a safe bet that they won''t pay a lot for it. You should start giving yourself an enema before going to work.'
 	if mesec > 0: '<br>You are having your period, most men will pay less for vaginal sex during that time of the month.'
@@ -537,9 +537,9 @@ if $ARGS[0] = 'work':
 end
 
 if $ARGS[0] = 'event_check':
-	if hour > 18 and ((wl_bad['counter'] > 0 and wl_bad['status'] = 1) or wl_whore['share_timer']> 0) and pirsA = 0:
+	if hour > 18 and ((wl_bad['counter'] > 0 and wl_bad['status'] = 1) or wl_whore['share_timer']> 0) and pcs_piercings['tongue'] = 0:
 		gt 'mod_wlife_tattoo_piercing', 'tongue_piercing_start'
-	elseif wl_bad['status'] = 1 and pirsA > 0:
+	elseif wl_bad['status'] = 1 and pcs_piercings['tongue'] > 0:
 		wl_bad['status'] = 2
 	end
 

+ 3 - 3
locations/mod_wlife_highway_sex.qsrc

@@ -129,9 +129,9 @@ if $ARGS[0] = 'rimjob_start':
 	cla & *nl
 	minut += 10
 	wl_whore['rim_pity_counter'] = 0
-	wl_whore['payment'] = 500 + hotcat * 5 + iif(wl_whore['pirsA']= pirsA and pirsA < 10000, pirsA * 15, 0)
+	wl_whore['payment'] = 500 + hotcat * 5 + iif(wl_whore['tongue_piercing']= pcs_piercings['tongue'] and pcs_piercings['tongue'] < 10000, pcs_piercings['tongue'] * 15, 0)
 	gs 'stat'
-	iif(rand(0,1) = 0 or $wl_fetish['rimjob'] = '', 'Even after ten more minutes he still doesn''t seem to be close to shooting his load. "Something wrong?" you ask. He shakes his head. "Not really, but this will take a while." You let out an involuntary sigh. "There is something that will get me off quickly if you''re willing to do it." You send him a questioning look. "Lick my ass, that always get''s me off quickly,"', '"This isn''t working," he says after ten more minutes. "Could you maybe eat my ass? It''s a sure way for me to cum,"')+' he continues and quickly adds. "I pay extra, of course. How about <<wl_whore[''payment'']>> <b>₽</b>? I would really love to feel '+iif(pirsA > 0 and pirsA < 10000, 'that piercing', 'your tongue')+' on my asshole."'
+	iif(rand(0,1) = 0 or $wl_fetish['rimjob'] = '', 'Even after ten more minutes he still doesn''t seem to be close to shooting his load. "Something wrong?" you ask. He shakes his head. "Not really, but this will take a while." You let out an involuntary sigh. "There is something that will get me off quickly if you''re willing to do it." You send him a questioning look. "Lick my ass, that always get''s me off quickly,"', '"This isn''t working," he says after ten more minutes. "Could you maybe eat my ass? It''s a sure way for me to cum,"')+' he continues and quickly adds. "I pay extra, of course. How about <<wl_whore[''payment'']>> <b>₽</b>? I would really love to feel '+iif(pcs_piercings['tongue'] > 0 and pcs_piercings['tongue'] < 10000, 'that piercing', 'your tongue')+' on my asshole."'
 
 	if $wl_fetish['rimjob'] = '':
 		'<br>He wants you to do what? Licking his ass? You think shocked and look down to his ass. You knew that anal would be a possibility, but this? You don''t even have time to think about it more, before he asks, "and?" He clearly wants you to quickly make a decision.'
@@ -415,7 +415,7 @@ if $ARGS[0] = 'rimjob_end':
 			'<center><video autoplay loop src="mod/wlife/images/prostitution/normal/sex/rimjob/rimjob_s1.mp4"></video></center>'
 			'In contrast to most guys he''s completely shaved. Not a single hair is left on his ass, balls and crotch which makes the whole experience a bit more enjoyable for you.'+iif(wl_thought['rimjob'] < 2, ' You give yourself a mental shake. It isn''t as if you like giving guys a rimjob... or do you? You ask yourself, but immediately push the thought aside and concentrate on the task in front of you. ', ' ')+'He also tastes like nothing, not even sweat as if he stepped right out of the shower. "That''s great, keep doing that," he says with a blissful smile on his face, when you flick your tongue through the puckered meat of his hole.'
 			*nl
-			'You continue to tease his ass with your '+iif(pirsA > 0 and pirsA < 10000, 'piercing', 'tongue')+' for the next few minutes and stroking his cock with your hands. "Damn, that''s...," he stops talking as cum erupts from the tip of his cock coating your hand in it.'
+			'You continue to tease his ass with your '+iif(pcs_piercings['tongue'] > 0 and pcs_piercings['tongue'] < 10000, 'piercing', 'tongue')+' for the next few minutes and stroking his cock with your hands. "Damn, that''s...," he stops talking as cum erupts from the tip of his cock coating your hand in it.'
 		elseif wl_whore['rim_counter'] = 2 or (wl_whore['rim_counter'] = 6 and wl_rand = 2):
 			'<center><video autoplay loop src="mod/wlife/images/prostitution/normal/sex/rimjob/rimjob_s2.mp4"></video></center>'
 			'You push your face into his shaved ass-crack and dig in. "That feels nice," he says with a grin and strokes his cock as your tongue moves up and down his ass-crack. "Sounds even nicer," he adds, when the air is filled with the slobbery sounds your mouth and tongue make on his ass.'

+ 4 - 4
locations/mod_wlife_iosif_sex.qsrc

@@ -343,8 +343,8 @@ if $ARGS[0] = 'warehouse_part_4':
 			gs 'stat'
 			'<center><img height = 480 src="mod/wlife/images/sex/iosif/warehouse/creampie.jpg"></center><br>'
 			'"Wait here and don''t even think about moving a muscle," Iosif says to you sternly. You hear him rummage through some clothes, before he reappears with your phone in hand in your field of vision. "Unlock it," he commands as he holds the phone in front of you. '+iif(wl_pictures['iosif_2'] = 0, 'What does he want with your phone? You ask yourself not daring to ask him the question. Instead you slide your index finger over the screen unlocking it.', 'It''s picture time again you think as you slide your index finger over the screen unlocking it.')
-			'"Spread you cheeks, I want to see my cum dripping out of your cunt." He aims the phone at your ass as you obey grabbing your ass with both hands and pulling your asscheeks to the side to give him a better view of your creampied pussy. "Perfect," he says'+iif(wl_pictures['start'] = 1 and tatvag = 0 and wl_iosif['tattoo'] = 0, ' and takes a few moments to look at something else on your phone. Suddenly a broad grin appears on his face, but he only says,' , ',')+' "and now clean yourself up."'
-			if wl_pictures['start'] = 1 and tatvag = 0 and wl_iosif['tattoo'] = 0: wl_iosif['tattoo'] = 1
+			'"Spread you cheeks, I want to see my cum dripping out of your cunt." He aims the phone at your ass as you obey grabbing your ass with both hands and pulling your asscheeks to the side to give him a better view of your creampied pussy. "Perfect," he says'+iif(wl_pictures['start'] = 1 and pcs_tattoos['pussy'] = 0 and wl_iosif['tattoo'] = 0, ' and takes a few moments to look at something else on your phone. Suddenly a broad grin appears on his face, but he only says,' , ',')+' "and now clean yourself up."'
+			if wl_pictures['start'] = 1 and pcs_tattoos['pussy'] = 0 and wl_iosif['tattoo'] = 0: wl_iosif['tattoo'] = 1
 
 			act 'Get dressed': gt 'mod_wlife_iosif_sex', 'warehouse_part_end'
 		elseif (wl_temp > 0 and wl_temp < 5 and $wl_fetish['pissed_on'] ! 'blocked') or wl_iosif['status'] = 5:
@@ -595,8 +595,8 @@ if $ARGS[0] = 'warehouse_end_piss':
 		wl_pictures['count'] += 1
 		gs 'stat'
 		'"Wait here and don''t even think about turning on the shower," Iosif says to you sternly and leaves the room for a few minutes. You can''t exactly tell how long he''s gone, but it feels like an eternity and sitting in a cold bathtub drenched in piss isn''t exactly comfortable. He finally returns with your phone in hand. "Unlock it," he commands as he holds the phone in front of you.'+iif(wl_pictures['iosif_2'] = 0, 'What does he want with your phone? You ask yourself not daring to ask him the question. You wipe your piss-covered fingers on a still dry part of your body before sliding your index finger over the screen unlocking it.', ' It''s picture time again you think as you slide your index finger over the screen unlocking it.')
-		'"Hold still, I want you to have a memento." He aims the phone at you. "Smile bitch." You do and he takes the photo. "Perfect," he says '+iif(wl_pictures['start'] = 1 and tatvag = 0 and wl_iosif['tattoo'] = 0, 'and takes a few moments to look at something else on your phone. Suddenly a broad grin appears on his face, but he only says, "clean yourself up,"' , 'before putting down the phone on the edge of the tub "Clean yourself up," is the last thing he says to you')+' before he leaves the bathroom.'
-		if wl_pictures['start'] = 1 and tatvag = 0 and wl_iosif['tattoo'] = 0: wl_iosif['tattoo'] = 1
+		'"Hold still, I want you to have a memento." He aims the phone at you. "Smile bitch." You do and he takes the photo. "Perfect," he says '+iif(wl_pictures['start'] = 1 and pcs_tattoos['pussy']  = 0 and wl_iosif['tattoo'] = 0, 'and takes a few moments to look at something else on your phone. Suddenly a broad grin appears on his face, but he only says, "clean yourself up,"' , 'before putting down the phone on the edge of the tub "Clean yourself up," is the last thing he says to you')+' before he leaves the bathroom.'
+		if wl_pictures['start'] = 1 and pcs_tattoos['pussy'] = 0 and wl_iosif['tattoo'] = 0: wl_iosif['tattoo'] = 1
 	end
 	*nl
 	'After it''s over you take a quick shower and let the warm water rain down on you to wash away Iosif piss.'

+ 8 - 8
locations/mod_wlife_phone.qsrc

@@ -110,10 +110,10 @@ if $ARGS[0] = 'start':
 		'<br><font color="red">You can''t work today. You have to go to Volya''s apartment today (19:00) to get ready for the party at Vadim Bely''s house</font>.'
 	end
 
-	if wl_status['main'] > 4 and PCloStyle = 4 and ShoHeels > 3 and (wl_whore['pirsA'] = 0 or (wl_whore['pirsA'] > 0 and pirsA < 10000)):
-		'<br>You are ready to work. Outfit'+iif(wl_whore['pirsA'] > 0, ', heels and tongue piercing', ' and heels')+' are an appropriate choice to work as a street whore.'
+	if wl_status['main'] > 4 and PCloStyle = 4 and ShoHeels > 3 and (wl_whore['tongue_piercing'] = 0 or (wl_whore['tongue_piercing'] > 0 and pcs_piercings['tongue'] < 10000)):
+		'<br>You are ready to work. Outfit'+iif(wl_whore['tongue_piercing'] > 0, ', heels and tongue piercing', ' and heels')+' are an appropriate choice to work as a street whore.'
 	elseif wl_status['main'] > 4:
-		iif(PCloStyle = 4, '<br>Your outfit is an appropriate choice for a prostitute.', '<br>You need to change your outfit to work as a prostitute.')+iif(pirsA < 10000, '', iif(wl_whore['pirsA'] > 0, ' You''ll have to wear your tongue piercing to be able to work.', ''))
+		iif(PCloStyle = 4, '<br>Your outfit is an appropriate choice for a prostitute.', '<br>You need to change your outfit to work as a prostitute.')+iif(pcs_piercings['tongue'] < 10000, '', iif(wl_whore['tongue_piercing'] > 0, ' You''ll have to wear your tongue piercing to be able to work.', ''))
 		iif(ShoHeels > 3, 'Your shoes are a good choice', 'You should think about your choice of shoes')+' if you want to go to work today.'
 	end
 
@@ -282,13 +282,13 @@ if $ARGS[0] = 'character':
 	if $wl_fetish['rimjob'] ! '' and $wl_fetish['rimjob'] ! 'undecided': '- Giving rimjobs: '+iif($wl_fetish['rimjob'] = 'yes', '<b>Yes</b>', '<a href="exec: $wl_fetish[''rimjob''] = ''yes'' & gt ''mod_wlife_phone'', ''character''">Yes</a>')+'|'+iif($wl_fetish['rimjob'] = 'no', '<b>No</b>', '<a href="exec: $wl_fetish[''rimjob''] = ''no'' & gt ''mod_wlife_phone'', ''character''">No</a>')+'|'+iif($wl_fetish['rimjob'] = 'blocked', '<b>Blocked</b>', '<a href="exec: $wl_fetish[''rimjob''] = ''blocked'' & gt ''mod_wlife_phone'', ''character''">Blocked</a>')
 	if $wl_fetish['atm'] ! '': '- Ass to mouth: '+iif($wl_fetish['atm'] = 'yes', '<b>Yes</b>', '<a href="exec: $wl_fetish[''atm''] = ''yes'' & gt ''mod_wlife_phone'', ''character''">Yes</a>')+'|'+iif($wl_fetish['atm'] = 'no', '<b>No</b>', '<a href="exec: $wl_fetish[''atm''] = ''no'' & gt ''mod_wlife_phone'', ''character''">No</a>')+'|'+iif($wl_fetish['atm'] = 'blocked', '<b>Blocked</b>', '<a href="exec: $wl_fetish[''atm''] = ''blocked'' & gt ''mod_wlife_phone'', ''character''">Blocked</a>')
 
-	if $wl_brand['type'] ! '' or wl_whore['pirsA'] > 0:
+	if $wl_brand['type'] ! '' or wl_whore['tongue_piercing'] > 0:
 		*nl
 		'<b>Tattoos and Piercings:</b>'
 		if $wl_brand['type'] ! '': 'You have been branded as a whore with a <a href="exec: gt ''mod_wlife_phone'', ''tattoo'', ''brand''"><<$wl_brand[''type'']>> tattoo</a>.'
 		if $wl_brand['text_pubic'] ! '': 'Iosif forced you to get a <a href="exec: gt ''mod_wlife_phone'', ''tattoo'', ''iosif''">pubic tattoo</a>.'
-		if wl_whore['pirsA'] > 0: 'The Bely''s forced you to get a <a href="exec: gt ''mod_wlife_phone'', ''tongue_piercing''">tongue piercing</a>.'
-		if wl_whore['pirsF'] > 0: 'Irina forced you to get a <a href="exec: gt ''mod_wlife_phone'', ''nipple_piercing''">nipple piercing</a>.'
+		if wl_whore['tongue_piercing'] > 0: 'The Bely''s forced you to get a <a href="exec: gt ''mod_wlife_phone'', ''tongue_piercing''">tongue piercing</a>.'
+		if $wl_whore['nipple_piercing'] > 0: 'Irina forced you to get a <a href="exec: gt ''mod_wlife_phone'', ''nipple_piercing''">nipple piercing</a>.'
 		*nl
 	end
 
@@ -442,7 +442,7 @@ end
 
 if $ARGS[0] = 'tongue_piercing':
 	*clr & cla
-	'<center><img  height = 334 src="images/pc/body/piercings/a<<wl_whore[''pirsA'']>>.jpg"></center>'
+	'<center><img  height = 334 src="<<func(''piercing_management'', ''nipples_image'', $wl_whore[''tongue_piercing''])>>"></center>'
 	'The Bely''s forced you to buy this piercing.'
 
 	act 'Continue': gt 'mod_wlife_phone', 'start'
@@ -450,7 +450,7 @@ end
 
 if $ARGS[0] = 'nipple_piercing':
 	*clr & cla
-	'<center><img  height = 480 src="images/pc/body/piercings/a<<wl_whore[''pirsF'']>>.jpg"></center>'
+	'<center><img  height = 480 src="<<func(''piercing_management'', ''nipples_image'',$wl_whore[''nipple_piercing''])>>"></center>'
 	'Irina forced you to get this piercing.'
 
 	act 'Continue': gt 'mod_wlife_phone', 'start'

+ 43 - 48
locations/mod_wlife_tattoo_piercing.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'branding_0':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="mod/wlife/images/characters/volya_sokolov_car.jpg"></center>'
 		'"Branding? What do you mean?" You ask remembering Vadim and the others writing ''whore'' and ''slut'' on you body the day you met them for the first time. "Every girl that works for us gets a tattoo that marks her as one of our own."'
-		'You don''t know how to react to that. A tattoo '+iif(tattCount > 0, 'isn''t a problem, it wouldn''t be your first', 'is something you maybe considered')+', but they want to brand you like cattle or a slave in the ancient times.'
+		'You don''t know how to react to that. A tattoo '+iif(pcs_tattoos['total'] > 0, 'isn''t a problem, it wouldn''t be your first', 'is something you maybe considered')+', but they want to brand you like cattle or a slave in the ancient times.'
 		'"I''m sorry," he says but this time it''s you who stops him. "No, I get it."'+iif(npc_rel['A904'] < 40, ' you tell him truthfully. Maybe you were wrong about him? He tried to protect you.', ' you tell him. Even if it didn''t work out, he at least tried to protect you.')
 		'"Really?" He asks cautiously. "Yeah," and without really wanting to know the answer you ask. "But I have to get marked now, don''t I?" You sigh when he nods and turn your eyes away from him. A brand to mark you as a whore? It will protect you, but at the same time it''s more than that. It will mark you as a whore for life. Or does it? Tattoos can be removed as far as you know and if your ordeal is over at some point, you can just erase it. Or can you?'
 
@@ -89,23 +89,23 @@ if $ARGS[0] = 'branding_2':
 	'<center><img src="images/locations/city/industrial/salon/pirsingstudia.jpg"></center>'
 
 	'<center><table border=1><TH>View tattoos</TH>'
-	if tatarm = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''arms/tatarm'' & gt ''mod_wlife_tattoo_piercing'', ''arm''">Arm</TD></tr>'
-	if tatneck = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''neck/tatnck'' & gt ''mod_wlife_tattoo_piercing'', ''neck''">Neck</TD></tr>'
-	if tatlech = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''shoulder/tatshldr'' & gt ''mod_wlife_tattoo_piercing'', ''shoulder''">Shoulder</TD></tr>'
-	if tatfce = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''face/tatfce'' & gt ''mod_wlife_tattoo_piercing'', ''face''">Face</TD></tr>'
-	if tatankle = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''foot/tatankle'' & gt ''mod_wlife_tattoo_piercing'', ''foot''">Foot</TD></tr>'
-	if tatwrist = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''wrists/tatwrst'' & gt ''mod_wlife_tattoo_piercing'', ''wrist''">Wrist</TD></tr>'
-	if tathand = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''hand/tathnd'' & gt ''mod_wlife_tattoo_piercing'', ''hand''">Hand</TD></tr></table></center>'
+	if pcs_tattoos['arm'] = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''arm'' & gt ''mod_wlife_tattoo_piercing'', ''arm''">Arm</TD></tr>'
+	if pcs_tattoos['neck'] = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''neck'' & gt ''mod_wlife_tattoo_piercing'', ''neck''">Neck</TD></tr>'
+	if pcs_tattoos['shoulder'] = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''shoulder'' & gt ''mod_wlife_tattoo_piercing'', ''shoulder''">Shoulder</TD></tr>'
+	if pcs_tattoos['face'] = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''face'' & gt ''mod_wlife_tattoo_piercing'', ''face''">Face</TD></tr>'
+	if pcs_tattoos['ankle'] = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''ankle'' & gt ''mod_wlife_tattoo_piercing'', ''foot''">Ankle</TD></tr>'
+	if pcs_tattoos['wrist'] = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''wrists'' & gt ''mod_wlife_tattoo_piercing'', ''wrist''">Wrist</TD></tr>'
+	if pcs_tattoos['hand'] = 0: *p '<tr><TD><a href="exec: $wl_brand[''type''] = ''hand'' & gt ''mod_wlife_tattoo_piercing'', ''hand''">Hand</TD></tr></table></center>'
 	*nl
 	'<b>Developer Note</b>: You can freely choose between any tattoo to represent your whore brand. If you already have a tattoo in one or all of these spots, you can set one of your existing tattoos as your whore brand.'
 
-	if tatarm >= 1: act 'Look at your arm tattoo': $wl_temp = 'arm' & $wl_brand['type'] = 'arms/tatarm' & wl_brand['number'] = tatarm & gt 'mod_wlife_tattoo_piercing', 'branding_3'
-	if tatneck >= 1: act 'Look at your neck tattoo': $wl_temp = 'neck' & $wl_brand['type'] = 'neck/tatnck' & wl_brand['number'] = tatneck & gt 'mod_wlife_tattoo_piercing', 'branding_3'
-	if tatlech >= 1: act 'Look at your shoulder tattoo': $wl_temp = 'shoulder' & $wl_brand['type'] = 'shoulder/tatshldr' & wl_brand['number'] = tatlech & gt 'mod_wlife_tattoo_piercing', 'branding_3'
-	if tatfce >= 1: act 'Look at your face tattoo': $wl_temp = 'face' & $wl_brand['type'] = 'face/tatfce' & wl_brand['number'] = tatfce & gt 'mod_wlife_tattoo_piercing', 'branding_3'
-	if tatankle >= 1: act 'Look at your foot tattoo': $wl_temp = 'foot' & $wl_brand['type'] = 'foot/tatankle' & wl_brand['number'] = tatankle & gt 'mod_wlife_tattoo_piercing', 'branding_3'
-	if tatwrist >= 1: act 'Look at your wrist tattoo': $wl_temp = 'wrist' & $wl_brand['type'] = 'wrists/tatwrst' & wl_brand['number'] = tatwrist & gt 'mod_wlife_tattoo_piercing', 'branding_3'
-	if tathand >= 1: act 'Look at your hand tattoo': $wl_temp = 'hand' & $wl_brand['type'] = 'hand/tathnd' & wl_brand['number'] = tathand & gt 'mod_wlife_tattoo_piercing', 'branding_3'
+	if pcs_tattoos['arm'] >= 1: act 'Look at your arm tattoo': $wl_brand['type'] = 'arm' & wl_brand['number'] = pcs_tattoos['arm'] & gt 'mod_wlife_tattoo_piercing', 'branding_3'
+	if pcs_tattoos['neck'] >= 1: act 'Look at your neck tattoo': $wl_brand['type'] = 'neck' & wl_brand['number'] = pcs_tattoos['neck'] & gt 'mod_wlife_tattoo_piercing', 'branding_3'
+	if pcs_tattoos['shoulder'] >= 1: act 'Look at your shoulder tattoo': $wl_brand['type'] = 'shoulder' & wl_brand['number'] = pcs_tattoos['shoulder'] & gt 'mod_wlife_tattoo_piercing', 'branding_3'
+	if pcs_tattoos['face'] >= 1: act 'Look at your face tattoo': $wl_brand['type'] = 'face' & wl_brand['number'] = pcs_tattoos['face'] & gt 'mod_wlife_tattoo_piercing', 'branding_3'
+	if pcs_tattoos['ankle'] >= 1: act 'Look at your foot tattoo': $wl_brand['type'] = 'ankle' & wl_brand['number'] = pcs_tattoos['ankle'] & gt 'mod_wlife_tattoo_piercing', 'branding_3'
+	if pcs_tattoos['wrist'] >= 1: act 'Look at your wrist tattoo':$wl_brand['type'] = 'wrist' & wl_brand['number'] = pcs_tattoos['wrist'] & gt 'mod_wlife_tattoo_piercing', 'branding_3'
+	if pcs_tattoos['hand'] >= 1: act 'Look at your hand tattoo': $wl_brand['type'] = 'hand' & wl_brand['number'] = pcs_tattoos['hand'] & gt 'mod_wlife_tattoo_piercing', 'branding_3'
 end
 
 if $ARGS[0] = 'branding_3':
@@ -133,7 +133,7 @@ if $ARGS[0] = 'arm_get':
 	'<center><img src="images/pc/body/tattoos/arms/tatarm<<n>>.jpg"></center>'
 
 	act 'Choose another tattoo': gt 'mod_wlife_tattoo_piercing', 'arm'
-	act 'Set this tattoo as your whore brand': wl_brand['price'] = 8000 & wl_brand['number'] = n & tatarm = n & $wl_temp = 'arm' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
+	act 'Set this tattoo as your whore brand': wl_brand['price'] = 8000 & wl_brand['number'] = n & gs 'tattoo_management', 'add', 'arm', wl_brand['number'] & $wl_brand['type'] = 'arm' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
 end
 
 if $ARGS[0] = 'face':
@@ -152,7 +152,7 @@ if $ARGS[0] = 'face_get':
 	'<center><img src="images/pc/body/tattoos/face/tatfce<<n>>.jpg"></center>'
 
 	act 'Choose another tattoo': gt 'mod_wlife_tattoo_piercing', 'face'
-	act 'Set this tattoo as your whore brand': wl_brand['price'] = 10000 & wl_brand['number'] = n & tatfce = n & $wl_temp = 'face' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
+	act 'Set this tattoo as your whore brand': wl_brand['price'] = 10000 & wl_brand['number'] = n &  gs 'tattoo_management', 'add', 'face', wl_brand['number']  & $wl_brand['type'] = 'face' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
 end
 
 if $ARGS[0] = 'foot':
@@ -171,7 +171,7 @@ if $ARGS[0] = 'foot_get':
 	'<center><img src="images/pc/body/tattoos/foot/tatankle<<n>>.jpg"></center>'
 
 	act 'Choose another tattoo': gt 'mod_wlife_tattoo_piercing', 'foot'
-	act 'Set this tattoo as your whore brand': wl_brand['price'] = 8000 & wl_brand['number'] = n & tatankle = n & $wl_temp = 'foot' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
+	act 'Set this tattoo as your whore brand': wl_brand['price'] = 8000 & wl_brand['number'] = n &  gs 'tattoo_management', 'add', 'ankle', wl_brand['number'] & $wl_brand['type'] = 'ankle' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
 end
 
 if $ARGS[0] = 'neck':
@@ -190,7 +190,7 @@ if $ARGS[0] = 'neck_get':
 	'<center><img src="images/pc/body/tattoos/neck/tatnck<<n>>.jpg"></center>'
 
 	act 'Choose another tattoo': gt 'mod_wlife_tattoo_piercing', 'neck'
-	act 'Set this tattoo as your whore brand': wl_brand['price'] = 8000 & wl_brand['number'] = n & tatneck = n & $wl_temp = 'neck' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
+	act 'Set this tattoo as your whore brand': wl_brand['price'] = 8000 & wl_brand['number'] = n &  gs 'tattoo_management', 'add', 'neck', wl_brand['number']  & $wl_brand['type'] = 'neck' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
 end
 
 if $ARGS[0] = 'shoulder':
@@ -209,7 +209,7 @@ if $ARGS[0] = 'shoulder_get':
 	'<center><img src="images/pc/body/tattoos/shoulder/tatshldr<<n>>.jpg"></center>'
 
 	act 'Choose another tattoo': gt 'mod_wlife_tattoo_piercing', 'shoulder'
-	act 'Set this tattoo as your whore brand': wl_brand['price'] = 8000 & wl_brand['number'] = n & tatlech = n & $wl_temp = 'shoulder' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
+	act 'Set this tattoo as your whore brand': wl_brand['price'] = 8000 & wl_brand['number'] = n &  gs 'tattoo_management', 'add', 'shoulder', wl_brand['number']  & $wl_brand['type'] = 'shoulder' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
 end
 
 if $ARGS[0] = 'wrist':
@@ -228,7 +228,7 @@ if $ARGS[0] = 'wrist_get':
 	'<center><img src="images/pc/body/tattoos/wrists/tatwrst<<n>>.jpg"></center>'
 
 	act 'Choose another tattoo': gt 'mod_wlife_tattoo_piercing', 'wrist'
-	act 'Set this tattoo as your whore brand': wl_brand['price'] = 7000 & wl_brand['number'] = n & tatwrist = n & $wl_temp = 'wrist' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
+	act 'Set this tattoo as your whore brand': wl_brand['price'] = 7000 & wl_brand['number'] = n &  gs 'tattoo_management', 'add', 'wrist', wl_brand['number']  & $wl_brand['type'] = 'wrist' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
 end
 
 if $ARGS[0] = 'hand':
@@ -247,19 +247,18 @@ if $ARGS[0] = 'hand_get':
 	'<center><img src="images/pc/body/tattoos/hand/tathnd<<n>>.jpg"></center>'
 
 	act 'Choose another tattoo': gt 'mod_wlife_tattoo_piercing', 'hand'
-	act 'Set this tattoo as your whore brand': wl_brand['price'] = 7000 & wl_brand['number'] = n & tathand = n & $wl_temp = 'hand' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
+	act 'Set this tattoo as your whore brand': wl_brand['price'] = 7000 & wl_brand['number'] = n &  gs 'tattoo_management', 'add', 'hand', wl_brand['number']  & $wl_brand['type'] = 'hand' & gt 'mod_wlife_tattoo_piercing', 'branding_end'
 end
 
 if $ARGS[0] = 'branding_end':
 	*clr & cla
 	minut += 5
 	wl_brand['timer'] = daystart + rand(1,3)
-	$wl_brand['image'] = 'images/pc/body/tattoos/<<$wl_brand[''type'']>><<wl_brand[''number'']>>.jpg'
-	$wl_brand['type'] = $wl_temp
-	killvar '$wl_temp'
+	$wl_brand['image'] = func('tattoo_management', "<<$wl_brand['type']>>_image", $wl_brand['number'])
+
 	killvar 'n'
 	if wl_whore['shifts_week'] > 0: wl_whore['shifts_week'] -= 1
-	gs 'mod_wlife_functions', 'tat_pierce_count'
+	gs 'tattoo_management', 'count'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="mod/wlife/images/characters/volya_sokolov_car.jpg"></center>'
 	'"I''ll drive you home," he says when you are back inside the car. "What about work?" You ask him, but he immediately shakes his head. "No, it could get infected. I''ll tell Georgiy that you will only have to work <<wl_whore[''shifts_week'']>> shifts this week and that he should cut the amount you have to earn this week by 2500 <b>₽</b>."'
@@ -408,22 +407,22 @@ if $ARGS[0] = 'tongue_piercing_1':
 		*clr & cla
 		minut += 5
 		gs 'stat'
-		'<center><table cellspacing="3"><tr><td><img  height = 480 src="images/pc/body/piercings/a2.jpg"></td><td><img  height = 334 src="images/pc/body/piercings/a4.jpg"></td></tr></table></center>'
+		'<center><table cellspacing="3"><tr><td><img  height = 480 src="<<func(''piercing_management'', ''tongue_image'', 2)>>"></td><td><img  height = 334 src="<<func(''piercing_management'', ''tongue_image'', 4)>>"></td></tr></table></center>'
 		'"You should take the one on the right," Volya says pointing to the three smaller studs sitting inside a plush dummy tongue. "This would be the best choice for you."'
-		'You take your time looking at both of them. Maybe Volya is right the three studs probably would be more stimulating, but'+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsG + pirsN > 0, ' ', ' this is your first piercing and ')+'the one on the left is less conspicuous and slutty.'
+		'You take your time looking at both of them. Maybe Volya is right the three studs probably would be more stimulating, but'+iif(pcs_piercings['total'] > 0, ' ', ' this is your first piercing and ')+'the one on the left is less conspicuous and slutty.'
 
 		gs 'willpower', 'misc', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Choose the left one (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
-				wl_whore['pirsA'] = 2
+				wl_whore['tongue_piercing'] = 2
 				gt 'mod_wlife_tattoo_piercing', 'tongue_piercing_2'
 			end
 		else
 			act 'Choose the left one (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Follow Volya''s advise and choose the one on the right':
-			wl_whore['pirsA'] = 4
+			wl_whore['tongue_piercing'] = 4
 			gt 'mod_wlife_tattoo_piercing', 'tongue_piercing_2'
 		end
 	end
@@ -435,7 +434,7 @@ if $ARGS[0] = 'tongue_piercing_2':
 	wl_total_price = 5000
 	gs 'stat'
 	'<center><table cellspacing="3"><tr><td><img  height = 334 src="images/pc/body/piercings/a2.jpg"></td><td><img  height = 334 src="images/pc/body/piercings/a4.jpg"></td></tr></table></center>'
-	'"I take the one on the '+iif(wl_whore['pirsA'] = 2, 'left', 'right')+'," you say pointing at it. "'+iif(wl_whore['pirsA'] = 2, 'Really?" Volya asks. "Don''t you want the other one?" You shake your head and point again at the one on the left. "I want the left one."', 'Good choice." Volya and the tattoo artist say at the same time.')
+	'"I take the one on the '+iif(wl_whore['tongue_piercing'] = 2, 'left', 'right')+'," you say pointing at it. "'+iif(wl_whore['tongue_piercing'] = 2, 'Really?" Volya asks. "Don''t you want the other one?" You shake your head and point again at the one on the left. "I want the left one."', 'Good choice." Volya and the tattoo artist say at the same time.')
 	'"Alright, that costs 5.000 <b>₽</b>," the tattooist says and walks towards the cash register. At the same time you look to Volya, but he gives you a non-committal shrug. "It''s your piercing," he whispers and shots you a warning look, when you open your mouth. "Georgiy made it clear. Since it''s your piercing you''ll have to pay for it." You narrow your eyes, but don''t say anything. Making a scene in public would be a bad idea. "Fine," you hiss and follow the tattooist to the counter.'
 
 	act 'Let Volya pay and increase your debt':
@@ -469,19 +468,18 @@ end
 
 if $ARGS[0] = 'tongue_piercing_3':
 	*clr & cla
-	minut += 10 * wl_whore['pirsA']
+	minut += 10 * wl_whore['tongue_piercing']
 	'<center><video autoplay src="mod/wlife/images/player/tongue_piercing.mp4"></video></center>'
-	'You grow more tense with every passing second as you wait for the tattooist to begin his work. '+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsG + pirsN > 0, 'Since it''s not your first piercing, you know that it''s going to hurt and especially if it''s a more sensitive area like your tongue. "How bad is it going to hurt?"', '"Is it going to hurt?"')+' you ask.'
+	'You grow more tense with every passing second as you wait for the tattooist to begin his work. '+iif(pcs_piercings['total'] > 0, 'Since it''s not your first piercing, you know that it''s going to hurt and especially if it''s a more sensitive area like your tongue. "How bad is it going to hurt?"', '"Is it going to hurt?"')+' you ask.'
 	'"Most people say it''s a 4 or 5 on a scale from 1 to 10," he answers as he disinfects the piercings and his tools. "Even if it hurts, the pain will subside in seconds. Your tongue will feel irritated for a day or two, but it shouldn''t hurt."'
 	'"Shouldn''t?" you inquire further. "If it hurts, it would mean you have an infection, but let us not worry about that. It basically never happens." He holds up the bottle of disinfected to prove his point.'
 	*nl
 	'You close your eyes and breathe through your nose, when he grabs your tongue with the cold metal forceps. Suddenly pain shoots through your tongue as the sharp metal goes through the sensitive flesh. "Ahh...," you exhale sharply and your eyes fly open. "Already done," he says and offers you a sympathetic smile. "I only have to attach the stud," he explains, but it doesn''t take long and after an additional minute he''s finally done.'
-	if wl_whore['pirsA'] = 4: '"And now for the other two," he reminds you and another sharp pain rushes through your tongue and another...'
-	pirsA = wl_whore['pirsA']
-	dynamic 'pirsA<<wl_whore[''pirsA'']>>_owned = 1'
-	pierWearCount += 1
+	if wl_whore['tongue_piercing'] = 4: '"And now for the other two," he reminds you and another sharp pain rushes through your tongue and another...'
+	gs 'piercing_management', 'add', 'tongue', wl_whore['tongue_piercing']
+	
 	gs 'pain', rand(4,5), 'tongue', 'pierce'
-	if wl_whore['pirsA'] = 4:
+	if wl_whore['tongue_piercing'] = 4:
 		gs 'pain', rand(4,5), 'tongue', 'pierce'
 		gs 'pain', rand(4,5), 'tongue', 'pierce'
 	end
@@ -497,7 +495,6 @@ if $ARGS[0] = 'tongue_piercing_3':
 
 		act 'Get out of the car':
 			*clr & cla
-			gs 'mod_wlife_functions', 'tat_pierce_count'
 			'<center><img <<$set_imgh>> src="mod/wlife/images/objects/info.gif"></center>'
 			'From now on you''ll have to wear your tongue piercing in addition to a prostitution outfit and high heels.'
 			'<br><center><img height = 100 src="mod/wlife/images/objects/whore'+iif(night_mode ! 3 and (($location_type = 'public_outdoors' and daystage = 5) or night_mode = 1 or night_mode = 2), '_night', '')+'.png"></center>'
@@ -643,7 +640,7 @@ if $ARGS[0] = 'tattoo_2':
 		minut += 2
 		wl_total_price = 20000
 		gs 'stat'
-		'<center><table cellspacing="3"><tr><td><img  height = 334 src="images/pc/body/tattoos/pubic/tatvag1.jpg"></td><td><img height = 334 src="images/pc/body/tattoos/pubic/tatvag2.jpg"></td></tr></table></center>'
+		'<center><table cellspacing="3"><tr><td><img  height = 334 src="<<func(''tattoo_management'', ''pussy_image'', 1)>>"></td><td><img height = 334 src="<<func(''tattoo_management'', ''pussy_image'', 2)>>"></td></tr></table></center>'
 
 		'<b>Developer Note</b>: The left tattoo should show the word ''Owned'' the one on the right ''Cumslut''. If that''s not the case, you have not installed the replacement image pack for girl life correctly.'
 		'Which of those two tattoo''s has Iosif chosen for you?'
@@ -656,11 +653,11 @@ end
 if $ARGS[0] = 'tattoo_3':
 	*clr & cla
 	minut += 5
-	tatvag = wl_temp
-	$wl_brand['image_pubic'] = 'images/pc/body/tattoos/pubic/tatvag<<tatvag>>.jpg'
-	gs 'mod_wlife_functions', 'tat_pierce_count'
+	gs 'tattoo_management', 'add', 'pussy', wl_temp
+	$wl_brand['image_pubic'] = func('tattoo_management', 'pussy_image')
+	gs 'tattoo_management', 'count'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="<<$wl_brand[''image_pubic'']>>"></center>'
+	'<center><img <<$set_imgh>> src="<<func(''tattoo_management'', ''pussy_image'')>>"></center>'
 	'You open your eyes and instinctively your eyes look down at your pubic area. It takes you a moment to decipher the upside down word... <<$wl_brand[''text_pubic'']>>. You stare at it, stare at it a bit longer until you...'
 
 	act '... start to cry':
@@ -899,10 +896,8 @@ if $ARGS[0] = 'third_visit':
 					act 'Get pierced':
 						*clr & cla
 						minut += 20
-						wl_whore['pirsF'] = 1
-						pirsF = wl_whore['pirsF']
-						dynamic 'pirsF<<wl_whore[''pirsF'']>>_owned = 1'
-						pierWearCount += 1
+						$wl_whore['nipple_piercing'] = 1						
+						gs 'piercing_management', 'add', 'nipples', wl_whore['piercing_nipples']
 						gs 'pain', 9, 'nipples', 'pierce'
 						gs 'pain', 9, 'nipples', 'pierce'
 						gs 'stat'