Browse Source

[fixes] if the player already has a tattoo at the random position it will loop through the code again to find an empty body part

julzor 5 years ago
parent
commit
c54d9eda2a
1 changed files with 34 additions and 65 deletions
  1. 34 65
      locations/lover_change.qsrc

+ 34 - 65
locations/lover_change.qsrc

@@ -201,7 +201,7 @@ if $ARGS[0] = 'Pier':
 					'He sees you are a little bit concerned about the needles and laughs, "Don''t worry ma ''am, it will be all over before you know it!"'
 					'He takes out a clean needle and proceeds with his job.'
 					act 'Continue':
-						cls
+						*clr & cla
 						:alreadyGotPierLoop
 						randchan = rand(0, 7)
 						if randchan = 0 and pirsC = 0:
@@ -435,23 +435,6 @@ if $ARGS[0] = 'Pier':
 	end
 end
 if $ARGS[0] = 'Tatt':
-	!! Arm Slot tatarm4, tatarm
-	!! ass slot tatass21, tatass
-	!! back slot tatback2, tatback
-	!! belly slot tatblly1, tatblly
-	!! Breast Slot tatbrst8, tatbrst
-	!! Chest Slot tatchst1, tatchst
-	!! face slot tatfce1, tatfce
-	!! Foot Slot tatankle5, tatankle
-	!! Leg Slot tatleg2, tatleg
-	!! Lip Slot tatlip1, tatlip
-	!! Neck Slot tatnck12, tatneck
-	!! Pubic Slot tatvag6, tatvag
-	!! Shoulder Slot tatshldr7 ,tatlech
-	!! Side Slot tatside9 ,tatside
-	!! Tramp Slot tatlowbck16 , tatupb
-	!! UnderBreast Slot tatundbreast5 , tatunder
-	!! Wrist Slot tatwrst8 , tatwrist
 	act 'Enter Tattoo Parlor':
 		cla
 		'As you arrive at the tattoo parlor, <<$loverdesc[lover_number]>> looks you up and down to decide what needs to be done about your tattoos.'
@@ -465,15 +448,16 @@ if $ARGS[0] = 'Tatt':
 				'You know you can''t pull out now, so you meekly nod.'
 				'The man shrugs and says "Head over to the chair over there okay?"'
 				act 'Head over to the chair':
-					cls 
+					*clr & cla 
 					'As you sit down you see the man come over with the various needles he needs to do his job.'
 					'He sees you are a little bit concerned about the needles and laughs, "Don''t worry ma ''am, it will be all over before you know it!"'
 					'He takes out a clean needle and proceeds with his job.'	
-					randchan = rand(0, 17)
+					
+					:tattoo_loop
+					randchan = rand(0,17)
 					
 					if randchan = 0 and tatarm = 0:	
-						randchan = rand(1, 82)
-						!!randchan = 4
+						randchan = rand(1,82)
 						if tatarm = 0 and tattCount < tattPrefTmpMin:
 							tatarm = randchan
 							tattCount += 1
@@ -481,8 +465,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/arms/tatarm<<tatarm>>.jpg"></center>'
 						end
 					elseif randchan = 1 and tatass = 0:
-						randchan = rand(1, 25)
-						!!randchan = 21
+						randchan = rand(1,25)
 						if tatass = 0 and tattCount < tattPrefTmpMin:
 							tatass = randchan
 							tattCount += 1
@@ -490,19 +473,15 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/ass/tatass<<tatass>>.jpg"></center>'
 						end
 					elseif randchan = 2 and tatback = 0:
-						randchan = rand(1, 61)
-						!!randchan = 2
+						randchan = rand(1,61)
 						if tatback = 0 and tattCount < tattPrefTmpMin:
 							tatback = randchan
 							tattCount += 1
 							'He gives you a tattoo on your back.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/back/tatback<<tatback>>.jpg"></center>'
 						end
-					
-					!!
 					elseif randchan = 3 and tatblly = 0:
-						randchan = rand(1, 21)
-						!!randchan = 1
+						randchan = rand(1,21)
 						if tatblly = 0 and tattCount < tattPrefTmpMin:
 							tatblly = randchan
 							tattCount += 1
@@ -510,8 +489,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/belly/tatblly<<tatblly>>.jpg"></center>'
 						end
 					elseif randchan = 4 and tatbrst = 0:
-						randchan = rand(1, 11)
-						!!randchan = 8
+						randchan = rand(1,11)
 						if tatbrst = 0 and tattCount < tattPrefTmpMin:
 							tatbrst = randchan
 							tattCount += 1
@@ -519,8 +497,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/breasts/tatbrst<<tatbrst>>.jpg"></center>'
 						end
 					elseif randchan = 5 and tatchst = 0:
-						randchan = rand(1, 15)
-						!!randchan = 1
+						randchan = rand(1,15)
 						if tatchst = 0 and tattCount < tattPrefTmpMin:
 							tatchst = randchan
 							tattCount += 1
@@ -528,8 +505,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/chest/tatchst<<tatchst>>.jpg"></center>'
 						end
 					elseif randchan = 6 and tatfce = 0:
-						randchan = rand(1, 8)
-						!!randchan = 1
+						randchan = rand(1,8)
 						if tatfce = 0 and tattCount < tattPrefTmpMin:
 							tatfce = randchan
 							tattCount += 1
@@ -537,8 +513,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/face/tatfce<<tatfce>>.jpg"></center>'
 						end
 					elseif randchan = 7 and tatankle = 0:
-						randchan = rand(1, 25)
-						!!randchan = 5
+						randchan = rand(1,25)
 						if tatankle = 0 and tattCount < tattPrefTmpMin:
 							tatankle = randchan
 							tattCount += 1
@@ -546,8 +521,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/foot/tatankle<<tatankle>>.jpg"></center>'
 						end
 					elseif randchan = 8 and tatleg = 0:
-						randchan = rand(1, 47)
-						!!randchan = 2
+						randchan = rand(1,47)
 						if tatleg = 0 and tattCount < tattPrefTmpMin:
 							tatleg = randchan
 							tattCount += 1
@@ -555,8 +529,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/legs/tatleg<<tatleg>>.jpg"></center>'
 						end
 					elseif randchan = 9 and tatlip = 0:
-						randchan = rand(1, 9)
-						!!randchan = 1
+						randchan = rand(1,9)
 						if tatlip = 0 and tattCount < tattPrefTmpMin:
 							tatlip = randchan
 							tattCount += 1
@@ -564,8 +537,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/lip/tatlip<<tatlip>>.jpg"></center>'
 						end
 					elseif randchan = 10 and tatneck = 0:
-						randchan = rand(1, 30)
-						!!randchan = 12
+						randchan = rand(1,30)
 						if tatneck = 0 and tattCount < tattPrefTmpMin:
 							tatneck = randchan
 							tattCount += 1
@@ -573,8 +545,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/neck/tatnck<<tatneck>>.jpg"></center>'
 						end
 					elseif randchan = 11 and tatvag = 0:
-						randchan = rand(1, 53)
-						!!randchan = 6
+						randchan = rand(1,53)
 						if tatvag = 0 and tattCount < tattPrefTmpMin:
 							tatvag = randchan
 							tattCount += 1
@@ -582,8 +553,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/pubic/tatvag<<tatvag>>.jpg"></center>'
 						end
 					elseif randchan = 12 and tatlech = 0:
-						randchan = rand(1, 25)
-						!!randchan = 7
+						randchan = rand(1,25)
 						if tatlech = 0 and tattCount < tattPrefTmpMin:
 							tatlech = randchan
 							tattCount += 1
@@ -591,8 +561,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/shoulder/tatshldr<<tatlech>>.jpg"></center>'
 						end
 					elseif randchan = 13 and tatside = 0:
-						randchan = rand(1, 19)
-						!!randchan = 9
+						randchan = rand(1,19)
 						if tatside = 0 and tattCount < tattPrefTmpMin:
 							tatside = randchan
 							tattCount += 1
@@ -600,8 +569,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/side/tatside<<tatside>>.jpg"></center>'
 						end
 					elseif randchan = 14 and tatupb = 0:
-						randchan = rand(1, 32)
-						!!randchan = 16
+						randchan = rand(1,32)
 						if tatupb = 0 and tattCount < tattPrefTmpMin:
 							tatupb = randchan
 							tattCount += 1
@@ -609,8 +577,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/trampstamp/tatlowbck<<tatupb>>.jpg"></center>'
 						end
 					elseif randchan = 15 and tatunder = 0:
-						randchan = rand(1, 22)
-						!!randchan = 5
+						randchan = rand(1,22)
 						if tatunder = 0 and tattCount < tattPrefTmpMin:
 							tatunder = randchan
 							tattCount += 1
@@ -618,8 +585,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/underbreast/tatundbreast<<tatunder>>.jpg"></center>'
 						end
 					elseif randchan = 16 and tatwrist = 0:
-						randchan = rand(1, 51)
-						!!randchan = 8
+						randchan = rand(1,51)
 						if tatwrist = 0 and tattCount < tattPrefTmpMin:
 							tatwrist = randchan
 							tattCount += 1
@@ -627,14 +593,17 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/wrists/tatwrst<<tatwrist>>.jpg"></center>'
 						end
 					elseif randchan = 17 and tathand = 0:
-						randchan = rand(1, 9)
-						!!randchan = 8
+						randchan = rand(1,9)
 						if tathand = 0 and tattCount < tattPrefTmpMin:
 							tathand = randchan
 							tattCount += 1
 							'He gives you a tattoo on your hand.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/hand/tathnd<<tathand>>.jpg"></center>'
 						end
+					elseif tattCount = 18:
+						''
+					else
+						jump 'tattoo_loop'					
 					end
 
 					gs'stat'
@@ -642,7 +611,7 @@ if $ARGS[0] = 'Tatt':
 					'"I must say, your body looks amazing with the art on you!"'
 					'You are reluctant to admit it, but having these tattoos feels like they do make you look sexier for some people, though a bit more slutty too.'
 					act 'Go back towards your <<$tBoyGirlfriend>>':
-						cls
+						*clr & cla
 						'As you go back towards him, <<$tXe>> looks you up and down.'
 						'"There we go!", <<$tXe>> says with a smile.'
 						if pierPrefTmp = 2:
@@ -684,7 +653,7 @@ if $ARGS[0] = 'Tatt':
 				'You know you can''t pull out now, so you meekly nod.'
 				'The man shrugs and says "Head over to the chair over there okay?"'
 				act 'Head over to the chair':
-					cls 
+					*clr & cla 
 					'As you sit down you see the man come over with the various needles and lasers he needs to do his job.'
 					'He sees you are a little bit concerned about the laser and laughs, "Don''t worry ma ''am, it will be all over before you know it!"'
 					'He takes he turns on the mini laser and proceeds with his job.'	
@@ -863,7 +832,7 @@ if $ARGS[0] = 'Lips':
 		'"Y-yes.", you manage to squeek out, your face turning slightly red at the topic of the conversation.'
 		'"All right, lets get started right away", he says as he looks at his clipboard.'
 		act 'Go with doctor to operating room':
-			cls
+			*clr & cla
 			'The doctor motions for you to sit on the operating table, and you reluctantly comply.'
 			'"Don''t worry it will just be a quick injection and we will be done, its perfectly safe.", the doctor says.'
 			'As you try to get confortable on the table the doctor comes up to you with the injection.'
@@ -952,7 +921,7 @@ if $ARGS[0] = 'Tits':
 			end
 			'"If you would follow me, I will take you to the operating room.", the doctor says indifferently.'
 			act 'Go with doctor to operating room':
-				cls
+				*clr & cla
 				'The doctor motions for you to lay on the operating table, and you reluctantly comply.'
 				'"Now this is going to take about 2 hours for us to do the procedure, but do not worry, the procedure is safe, I have done this dozens of times." the doctor says.'
 				'As you try to get confortable on the table the doctor comes up to you with the anesthesia.'
@@ -1018,7 +987,7 @@ if $ARGS[0] = 'Tits':
 			titAmount = (tits - titMax) * 5 + 9
 			'"If you would follow me, I will take you to the operating room.", the doctor says indifferently.'
 			act 'Go with doctor to operating room':
-				cls
+				*clr & cla
 				'The doctor motions for you to lay on the operating table, and you reluctantly comply.'
 				'"Now this is going to take about 2 hours for us to do the procedure, but do not worry, the procedure is safe, I have done this dozens of times." the doctor says.'
 				'As you try to get confortable on the table the doctor comes up to you with the anesthesia.'
@@ -1107,7 +1076,7 @@ if $ARGS[0] = 'Figure':
 			'You know you can''t back out now. "Y-yes.", you manage to squeek out, your face turning slightly red at the topic of the conversation.'
 			'"All right, lets get started right away, if you can follow me into the operating room.'
 			act 'Go with doctor to operating room':
-				cls
+				*clr & cla
 				'The doctor motions for you to lay on the operating table, and you reluctantly comply.'
 				'"Now this is going to take about 2 hours for us to do the procedure, but do not worry, the procedure is safe, I have done this dozens of times." the doctor says.'
 				'As you try to get confortable on the table the doctor comes up to you with the anesthesia.'
@@ -1142,7 +1111,7 @@ if $ARGS[0] = 'Figure':
 						' ''Wait... I''m awake?'' It seemed just a couple of seconds ago you were laying down on the operating table about to have surgery.'
 						'You aren''t paying attention to the doctor as he finishes up, and you slowly get off the operating table and head over to your <<$tBoyGirlfriend>>.'
 						act 'Head over to your <<$tBoyGirlfriend>>':
-							cls
+							*clr & cla
 							'As you go back towards <<$tXem>>, <<$tXe>> looks you up and down.'
 							'"There we go!", <<$tXe>> says with a smile.'
 							gs 'obj_din', 'body'