瀏覽代碼

Updated to use the new way tattoos are handled by the main game.

netuttki 2 月之前
父節點
當前提交
608139eeb1
共有 3 個文件被更改,包括 36 次插入37 次删除
  1. 2 2
      locations/mod_wlife.qsrc
  2. 4 4
      locations/mod_wlife_iosif_sex.qsrc
  3. 30 31
      locations/mod_wlife_tattoo_piercing.qsrc

+ 2 - 2
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:
@@ -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
 

+ 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.'

+ 30 - 31
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>."'
@@ -643,7 +642,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 +655,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':