Prechádzať zdrojové kódy

[fixed] in webcam_site, fix some issues with the anal dildo conditional logic that arose from poorly copypasting from the vaginal dildo logic, remove some *clr calls that shouldn't be there as well as some colons after elses, and fix the condition for the double penetration dildo action being visible as the previous version was running into the 100 expression limit QSP has for conditional expressions

Spackled Lanturn 3 rokov pred
rodič
commit
32773050be
1 zmenil súbory, kde vykonal 12 pridanie a 19 odobranie
  1. 12 19
      locations/webcam_site.qsrc

+ 12 - 19
locations/webcam_site.qsrc

@@ -258,7 +258,6 @@ $webcam_show = {
 				*clr
 				!!Enormous dildos 35cm and 40cm
 				if (pcs_throat >= 35 and superdildo = 1) or (pcs_throat >= 40 and maddildo = 1):
-					*clr
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/extrthroat'+rand(1,2)+'.mp4" ></video></center>'		
 
 					'You take out your enormous ' + iif(pcs_throat >= 40 and maddildo = 1, '40cm', '35cm') + ' dildo and start trusting it into your throat.'
@@ -267,7 +266,6 @@ $webcam_show = {
 					if pcs_throat < 40: pcs_throat += 1
 				!!Giant dildos 25cm and 30cm
 				elseif (pcs_throat >= 25 and bigdildo = 1) or (pcs_throat >= 30 and extradildo = 1):
-					*clr
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/bigthroat'+rand(1,3)+'.mp4" ></video></center>'		
 
 					'You get out your giant ' + iif(pcs_throat >= 30 and extradildo = 1, '30cm', '25cm') + ' dildo and begin to rhythmically drive it into your throat.'
@@ -282,7 +280,7 @@ $webcam_show = {
 					my_show_tip = rand(100, 500)
 					if pcs_throat < 20 or (pcs_throat < 25 and largedildo = 1): pcs_throat += 1
 				!!Normal dildo 10cm
-				else:
+				else
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/throat'+rand(1,3)+'.mp4" ></video></center>'
 					'You get out your 10cm dildo and start to gently suck it.'
 					
@@ -312,7 +310,6 @@ $webcam_show = {
 				*clr
 				!!Enormous dildos 35cm and 40cm
 				if (pcs_vag >= 35 and superdildo = 1) or (pcs_vag >= 40 and maddildo = 1):
-					*clr
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/extrvagin'+rand(1,2)+'.mp4" ></video></center>'		
 
 					'You take out your enormous ' + iif(pcs_vag >= 40 and maddildo = 1, '40cm', '35cm') + ' dildo and start thrusting it into your pussy.'
@@ -321,7 +318,6 @@ $webcam_show = {
 					if pcs_vag < 40: pcs_vag += 1
 				!!Giant dildos 25cm and 30cm
 				elseif (pcs_vag >= 25 and bigdildo = 1) or (pcs_vag >= 30 and extradildo = 1):
-					*clr
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/bigvagin'+rand(1,3)+'.mp4" ></video></center>'		
 
 					'You get out your giant ' + iif(pcs_vag >= 30 and extradildo = 1, '30cm', '25cm') + ' dildo and begin rhythmically driving it into your pussy.'
@@ -336,7 +332,7 @@ $webcam_show = {
 					my_show_tip = rand(200, 700)
 					if pcs_vag < 20 or (pcs_vag < 25 and largedildo = 1): pcs_vag += 1
 				!!Normal dildo 10cm
-				else:
+				else
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/vagin'+rand(1,3)+'.mp4" ></video></center>'
 					'You get out your 10cm dildo and begin rhythmically driving it into your pussy.'
 					
@@ -381,34 +377,31 @@ $webcam_show = {
 					lubri -= 1
 					'You squeeze some lube onto your hand and begin to spread it on your hole. After that, you smear a little on your dildo.'
 				end
-					if pcs_ass < 40: pcs_ass += 1
-				!!Giant dildos 25cm and 30cm
-				elseif (pcs_ass >= 25 and bigdildo = 1) or (pcs_ass >= 30 and extradildo = 1):
-					*clr
+				!!Enormous dildos 35cm and 40cm
+				if (pcs_ass >= 35 and superdildo = 1) or (pcs_ass >= 40 and maddildo = 1):
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/extranal'+rand(1,3)+'.mp4" ></video></center>'		
 
 					'You then take your enormous ' + iif(pcs_ass >= 40 and maddildo = 1, '40cm', '35cm') + ' dildo and start thrusting it into your ass.'
 					
 					my_show_tip = rand(700, 1400)
-					if pcs_ass < 30 or (pcs_ass < 35 and extradildo = 1): pcs_ass += 1
-				!!Big dildos 15cm and 20cm
-				elseif (pcs_ass >= 15 and middildo = 1) or (pcs_ass >= 20 and largedildo = 1):
-					*clr
+					if pcs_ass < 40: pcs_ass += 1
+				!!Giant dildos 25cm and 30cm
+				elseif (pcs_ass >= 25 and bigdildo = 1) or (pcs_ass >= 30 and extradildo = 1):
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/biganal'+rand(1,3)+'.mp4" ></video></center>'		
 
 					'You then take your giant ' + iif(pcs_ass >= 30 and extradildo = 1, '30cm', '25cm') + ' dildo and begin rhythmically driving it into your ass.'
 			
 					my_show_tip = rand(500, 1000)
-					if pcs_ass < 35: pcs_ass += 1
-				!Average dildo 15cm
-				elseif pcs_ass >= 15 and middildo = 1:
+					if pcs_ass < 30 or (pcs_ass < 35 and extradildo = 1): pcs_ass += 1
+				!!Big dildos 15cm and 20cm
+				elseif (pcs_ass >= 15 and middildo = 1) or (pcs_ass >= 20 and largedildo = 1):
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/midanal'+rand(1,3)+'.mp4" ></video></center>'	
 					'You then take your big ' + iif(pcs_ass >= 20 and largedildo = 1, '20cm', '15cm') + ' dildo and begin rhythmically driving it into your ass.'
 					
 					my_show_tip = rand(300, 800)
 					if pcs_ass < 20 or (pcs_ass < 25 and largedildo = 1): pcs_ass += 1
 				!normal dildo 10cm
-				else:
+				else
 					'<center><video autoplay loop src="images/shared/accessories/computer/webcam/toys/anal'+rand(1,3)+'.mp4" ></video></center>'
 					'You then take your 10cm dildo and begin rhythmically driving it into your ass.'
 
@@ -439,7 +432,7 @@ $webcam_show = {
 !------------------------------!
 		!! Might be good to differentiate between different dildo sizes here. In particular, maybe there should
 		!! be different tip amounts for larger dildos like there are for the single dildo actions.
-		if agape < 3 and vgape < 3 and my_show_dp = 0 and ((pcs_ass >= 15 and pcs_vag >= 15 and dildo = 1 and middildo = 1) or (pcs_ass >= 20 and pcs_vag >= 20 and largedildo = 1 and (middildo = 1 or dildo = 1)) or (pcs_ass >= 25 and pcs_vag >= 25 and bigdildo = 1 and (largedildo = 1 or middildo = 1 or dildo = 1)) or (pcs_ass >= 30 and pcs_vag >= 30 and extradildo = 1 and (bigdildo = 1 or largedildo = 1 or middildo = 1 or dildo = 1)) or (pcs_ass >= 35 and pcs_vag >= 35 and superdildo = 1 and (extradildo = 1 or bigdildo = 1 or largedildo = 1 or middildo = 1 or dildo = 1)) or (pcs_ass >= 40 and pcs_vag >= 40 and maddildo = 1 and (superdildo = 1 or extradildo = 1 or bigdildo = 1 or largedildo = 1 or middildo = 1 or dildo = 1))):
+		if max(agape, vgape) < 3 and my_show_dp = 0 and iif(min(pcs_ass, pcs_vag) >= 10, dildo, 0) +  iif(min(pcs_ass, pcs_vag) >= 15, middildo, 0) + iif(min(pcs_ass, pcs_vag) >= 20, largedildo, 0) + iif(min(pcs_ass, pcs_vag) >= 25, bigdildo, 0) + iif(min(pcs_ass, pcs_vag) >= 30, extradildo, 0) + iif(min(pcs_ass, pcs_vag) >= 35, superdildo, 0) + iif(min(pcs_ass, pcs_vag) >= 40, maddildo, 0) >= 2:
 			act 'Dildo in ass and pussy':
 				gs'stat'
 				*clr