Missed a few clothing images

Fix script to capture missed files

.gitignore

@@ -2,3 +2,4 @@ images
 *.qsp
 *.sav
 glife.txt
+music/

Get Image Paths.ahk

@@ -117,208 +117,219 @@ Loop, Parse, Source, `n, `r  			; Specifying `n prior to `r allows both Windows
 		}
 		Continue
 	}
-
 	
-	; -- Find Image File Path --
-	FoundPos := RegExMatch(A_LoopField, SearchRegEx, Match)						;; Search for image path
-	if (ErrorLevel)
+	FoundPos := 1
+	Haystack := A_LoopField
+
+	Loop, 200
 	{
-		MsgBox, 48, Get Image Paths, RegExMatch runtime error: %ErrorLevel%`n`nFound searching string: %A_LoopField%`n`nusing search: %SearchRegEx%
-		break
-	}
 	
-	if (FoundPos)																;; Found File
-	{	
-		Match1 := StrReplace(Match1, "/", "\")									;; Use correct Win path seperator
-		OutAll .= Match1 . "`n"
-		; -- Image Path Contains Code --
-		if inStr(Match1, "<<")													;; String contains expression
+		; -- Find Image File Path --
+		FoundPos := RegExMatch(Haystack, SearchRegEx, Match, FoundPos)			;; Search for image path
+		if (ErrorLevel)
 		{
-			
-			if inStr(Match1, "FUNC('$face_image'")								;; Hairstyle images Function
-			{
-				if GetImageFiles("images\body\hairstyles", "hcol*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\body\hairstyles\*\hcol*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\body\hairstyles\*\hcol*.jpg'`n"
-				}
-				
-			}
-			else if inStr(Match1, "FUNC('$clothing_image'")						;; Clothing images Function
+			MsgBox, 48, Get Image Paths, RegExMatch runtime error: %ErrorLevel%`n`nFound searching string: %Haystack%`n`nusing search: %SearchRegEx%
+			break
+		}
+		
+		if (FoundPos = 0)															;; Not Found exit loop
+		{
+			break
+		}
+		else
+		; if (FoundPos)																;; Found File
+		{	
+			FoundPos += 8 + StrLen(Match1)											;; Increment Search Position
+			Match1 := StrReplace(Match1, "/", "\")									;; Use correct Win path seperator
+			OutAll .= Match1 . "`n"
+			; -- Image Path Contains Code --
+			if inStr(Match1, "<<")													;; String contains expression
 			{
-				if GetImageFiles("images\clothes", "vatnik.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\vatnik.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\vatnik.jpg'`n"
-				}
-				; GetImageFiles("images\clothes\newclo", "131.jpg", OutUsed)	;; Dupe See below	
 				
-				if GetImageFiles("images\clothes", "jeans*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\jeans*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\jeans*.jpg'`n"
-				}
-
-				if GetImageFiles("images\clothes", "yoga*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\yoga*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\yoga*.jpg'`n"
-				}
-
-				if GetImageFiles("images\clothes", "sarafan*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\sarafan*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\sarafan*.jpg'`n"
-				}
-
-
-				if GetImageFiles("images\clothes", "short*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\short*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\short*.jpg'`n"
-				}
-
-				if GetImageFiles("images\clothes", "skirt*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\skirt*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\skirt*.jpg'`n"
-				}
-
-				if GetImageFiles("images\clothes", "dress*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\dress*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\dress*.jpg'`n"
-				}
-
-				if GetImageFiles("images\clothes", "profi*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\profi*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\profi*.jpg'`n"
+				if inStr(Match1, "FUNC(''$face_image''")								;; Hairstyle images Function
+				{
+					if GetImageFiles("images\body\hairstyles", "hcol*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\body\hairstyles\*\hcol*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\body\hairstyles\*\hcol*.jpg'`n"
+					}
+					
 				}
-
-				if GetImageFiles("images\clothes", "pants*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\pants*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\pants*.jpg'`n"
-				}
-
-				if GetImageFiles("images\clothes", "latex*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\latex*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\latex*.jpg'`n"
-				}
-
-				if GetImageFiles("images\clothes", "hooker*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\hooker*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\hooker*.jpg'`n"
-				}
-
-				if GetImageFiles("images\clothes", "k*.jpg", OutUsed)
-				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\k*.jpg'`n"
-				}
-				else
-				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\k*.jpg'`n"
+				else if inStr(Match1, "FUNC(''$clothing_image''")						;; Clothing images Function
+				{
+					if GetImageFiles("images\clothes", "vatnik.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\vatnik.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\vatnik.jpg'`n"
+					}
+					; GetImageFiles("images\clothes\newclo", "131.jpg", OutUsed)	;; Dupe See below	
+					
+					if GetImageFiles("images\clothes", "jeans*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\jeans*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\jeans*.jpg'`n"
+					}
+
+					if GetImageFiles("images\clothes", "yoga*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\yoga*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\yoga*.jpg'`n"
+					}
+
+					if GetImageFiles("images\clothes", "sarafan*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\sarafan*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\sarafan*.jpg'`n"
+					}
+
+					if GetImageFiles("images\clothes", "short*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\short*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\short*.jpg'`n"
+					}
+
+					if GetImageFiles("images\clothes", "skirt*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\skirt*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\skirt*.jpg'`n"
+					}
+
+					if GetImageFiles("images\clothes", "dress*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\dress*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\dress*.jpg'`n"
+					}
+
+					if GetImageFiles("images\clothes", "profi*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\profi*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\profi*.jpg'`n"
+					}
+
+					if GetImageFiles("images\clothes", "pants*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\pants*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\pants*.jpg'`n"
+					}
+
+					if GetImageFiles("images\clothes", "latex*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\latex*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\latex*.jpg'`n"
+					}
+
+					if GetImageFiles("images\clothes", "hooker*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\hooker*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\hooker*.jpg'`n"
+					}
+
+					if GetImageFiles("images\clothes", "k*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\k*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\k*.jpg'`n"
+					}
+
+					if GetImageFiles("images\clothes\newclo", "*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\newclo\*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\newclo\*.jpg'`n"
+					}
+
+					if GetImageFiles("images\img\dress", "ero*.jpg", OutUsed)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\img\dress\ero*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\img\dress\ero*.jpg'`n"
+					}
 				}
 
-				if GetImageFiles("images\clothes\newclo", "*.jpg", OutUsed)
+				else if inStr(Match1, "images\qwest\card")								;; Playingcard Images
 				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\newclo\*.jpg'`n"
+					if GetImageFiles("images\qwest\card", "*.jpg", Output)
+					{
+						OutAuto	.= Spacer(Match1) . "- Found 'images\qwest\card\*\*.jpg'`n"
+					}
+					else
+					{
+						OutMan	.= Spacer(Match1) . "- No files found in 'images\qwest\card\*\*.jpg'`n"
+					}				
 				}
-				else
+				
+				else if inStr(Match1, "FUNC")											;; Unknown Function - Manual
 				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\newclo\*.jpg'`n"
+					OutMan	.= Spacer(Match1) . "- Unknown Function`n"
 				}
-
-				if GetImageFiles("images\img\dress", "ero*.jpg", OutUsed)
+				
+				else if inStr(Match1, "$")												;; Uses String variable - Manual
 				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\img\dress\ero*.jpg'`n"
+					OutMan	.= Spacer(Match1) . "- Unknown Function`n"
 				}
-				else
+				
+				else if not GetImagefromPath(Match1, OutUsed)							;; Try to find images
 				{
-					OutMan	.= Spacer(Match1) . "- no files found in 'images\img\dress\ero*.jpg'`n"
+					OutMan	.= Spacer(Match1) . "- Files not found`n"
 				}
 			}
-
-			else if inStr(Match1, "images\qwest\card")								;; Playingcard Images
+			
+			; -- Image path is just a file name --
+			else
 			{
-				if GetImageFiles("images\qwest\card", "*.jpg", Output)
+				IfExist %Match1%
 				{
-					OutAuto	.= Spacer(Match1) . "- Found 'images\qwest\card\*\*.jpg'`n"
+					OutUsed	.= Match1 . "`n"											;; Normal file found
 				}
 				else
 				{
-					OutMan	.= Spacer(Match1) . "- No files found in 'images\qwest\card\*\*.jpg'`n"
-				}				
-			}
-			
-			else if inStr(Match1, "FUNC")											;; Unknown Function - Manual
-			{
-				OutMan	.= Spacer(Match1) . "- Unknown Function`n"
-			}
-			
-			else if inStr(Match1, "$")												;; Uses String variable - Manual
-			{
-				OutMan	.= Spacer(Match1) . "- Unknown Function`n"
-			}
-			
-			else if not GetImagefromPath(Match1, OutUsed)							;; Try to find images
-			{
-				OutMan	.= Spacer(Match1) . "- Files not found`n"
-			}
-		}
-		
-		; -- Image path is just a file name --
-		else
-		{
-			IfExist %Match1%
-			{
-				OutUsed	.= Match1 . "`n"											;; Normal file found
-			}
-			else
-			{
-				OutMan	.= Spacer(Match1) . "- File not found`n"					;; Normal file Not found
+					OutMan	.= Spacer(Match1) . "- File not found`n"					;; Normal file Not found
+				}
 			}
 		}
-	}	
+	}
 }
 
 

Images List - Dupes.txt

@@ -1,5 +1,5 @@
 DupeMerge 1.070
-                       
+                         
 'images\qwest\alter\artom\2.jpg' 67444
 'images\qwest\alter\npc2.jpg' 67444
 'images\qwest\alter\npc\2.jpg' 67444

locations/clothing

@@ -131,7 +131,7 @@ if $ARGS[0] = 'view_clothing_item':
 	!! ARGS 4 - price for shop
 
 	cla
-	'<center><img src="<<FUNC('$clothing_image', $ARGS[2], ARGS[3])>>"></center>'
+	'<center><img src="<<FUNC(''$clothing_image'',  $ARGS[2], ARGS[3])>>"></center>'
 	FUNC('$clothing_name', $ARGS[2], ARGS[3])
 
 	if $ARGS[1] ! 'shop' and $ARGS[2] ! 'vatnik' and $ARGS[2] ! 'sforma' and $ARGS[2] ! 'ero':

locations/gor_exh

@@ -8,7 +8,7 @@ if $ARGS[0] = 'pos1':
 	if cloth_vid = 1:
 		'<center><img src="images/etogame/cloth_bimbo.jpg"></center>'
 	else
-		'<center><img src="<<FUNC('$face_image')>>"></center>'
+		'<center><img src="<<FUNC(''$face_image'')>>"></center>'
 	end
 
 	if $clothingworntype = 'nude':

locations/gor_mirror

@@ -2,7 +2,7 @@
 if $ARGS[0] = 'start':
 	cla
 	clr
-	'<center><img src="<<FUNC('$face_image')>>"></center>'
+	'<center><img src="<<FUNC(''$face_image'')>>"></center>'
 	'<<$hair>> <<$mop>> <<$skin>> <<$vnesh>>'
 
 	if kosmetica > 0:'Cosmetics <<kosmetica>>'

locations/hairsalon

@@ -536,7 +536,7 @@ end
 
 if $ARGS[0] = 'mirror':
 	cls
-	'<center><img src="<<FUNC('$face_image')>>"></center>'
+	'<center><img src="<<FUNC(''$face_image'')>>"></center>'
 	'<center>You look at your new hairstyle in the mirror.</center>'
 	act 'Move away':gt 'hairsalon', 'start'
 end

locations/portmirror

@@ -2,7 +2,7 @@
 $portmirror = {
 	cla
 	*clr
-	'<center><img src="<<FUNC('$face_image')>>"></center>'
+	'<center><img src="<<FUNC(''$face_image'')>>"></center>'
 	'<<$hair>> <<$mop>> <<$skin>> <<$vnesh>>'
 	if daystart < 10 and StoryLine = 0:'In the mirror, you looked quite strange woman''s face which is exactly copied all your actions. You hardly get to accept the idea that it is now is you.'
 	if daystart >= 10 and daystart < 30 and StoryLine = 0:'From the mirror looks at you a woman''s face, to which you have become accustomed to, but sometimes, no, no and yes flash the idea that it is not your face.'