1
0
Переглянути джерело

Tweaked Image script to be less greedy auto grabbing file names

Rename files to fix script errors

images/clothes/jeans226.png to jeans226.jpg
images/clothes/pants248.png to pants248.jpg
images/clothes/pants279.png to pants279.jpg
images/clothes/pants284.png to pants284.jpg
images/clothes/pants309.png to pants309.jpg

images/etogame/ghFinger.jpg to ghFinger5.jpg

Remove some dupes between 'images/etogame' and 'images/pic'
Wonder Dog 9 роки тому
батько
коміт
96ce8c556b

+ 95 - 60
Get Image Paths.ahk

@@ -30,9 +30,9 @@ OutMissFile		= Image List - Missing.txt
 OutAutoFile		= Image Paths - Auto List.txt
 OutManFile		= Image Paths - Manual List.txt
 SearchRegEx		= i)<img\s+src\s*=\s*"(.*?)"
-Search2RegEx	= i)view\s*'+(.*?)'+
+Search2RegEx	= i)\bview\s*'+(.*?)'+
 CommentRegEx 	= ^\s*!
-MarkMissRegEx	= i)!\s*WD:\s+IMAGE NEEDED\s*~\s*.*?<img\s+src\s*=\s*"(.*?)"
+MarkMissRegEx	= i)!.*?:\s+IMAGE NEEDED\s*~\s*.*?<img\s+src\s*=\s*"(.*?)"
 
 FileEncoding, UTF-16
 
@@ -88,6 +88,8 @@ VarSetCapacity(OutMan, 1048576)				;; 1mb
 ; -- Parse data one line at a time --
 Loop, Parse, Source, `n, `r  			; Specifying `n prior to `r allows both Windows and Unix files to be parsed.
 {
+	if trim(A_LoopField) = ""													;; Skip blank line
+		continue
 	
 	; -- Check is Comment line --
 	FoundCmntPos := RegExMatch(A_LoopField, CommentRegEx)
@@ -96,6 +98,7 @@ Loop, Parse, Source, `n, `r  			; Specifying `n prior to `r allows both Windows
 		MsgBox, 48, Get Image Paths, RegExMatch runtime error: %ErrorLevel%`n`nFound searching string: %A_LoopField%`n`nusing search: %CommentRegEx%
 		break
 	}
+	
 	if (FoundCmntPos)															;; comment found
 	{
 		FoundPos := RegExMatch(A_LoopField, MarkMissRegEx, Match)				;; Check for known missing file
@@ -119,6 +122,8 @@ Loop, Parse, Source, `n, `r  			; Specifying `n prior to `r allows both Windows
 		Continue
 	}
 	
+	LineNo := A_index															;; Save line no
+	
 	; -- HTML  images --
 	FoundPos := 1
 	Haystack := A_LoopField
@@ -127,7 +132,7 @@ Loop, Parse, Source, `n, `r  			; Specifying `n prior to `r allows both Windows
 	{
 	
 		; -- Find Image File Path --
-		FoundPos := RegExMatch(Haystack, SearchRegEx, Match, FoundPos)			;; Search for image path in html
+		FoundPos := RegExMatch(Haystack, SearchRegEx, Match, FoundPos)				;; Search for image path in html
 		if (ErrorLevel)
 		{
 			MsgBox, 48, Get Image Paths, RegExMatch runtime error: %ErrorLevel%`n`nFound searching string: %Haystack%`n`nusing search: %SearchRegEx%
@@ -141,26 +146,26 @@ Loop, Parse, Source, `n, `r  			; Specifying `n prior to `r allows both Windows
 		else
 		; if (FoundPos)																;; Found File
 		{	
-			FoundPos += 8 + StrLen(Match1)											;; Increment Search Position
+			IdxTxt := " (L:" . LineNo . ", P:" . FoundPos . ")" 
 			Match1 := StrReplace(Match1, "/", "\")									;; Use correct Win path seperator
 			OutAll .= Match1 . "`n"
 			; -- Image Path Contains Code --
 			if inStr(Match1, "<<")													;; String contains expression
 			{
 				
-				if inStr(Match1, "FUNC(''$face_image''")								;; Hairstyle images Function
+				if inStr(Match1, "FUNC(''$face_image''")							;; Hairstyle images Function - only use JPG files
 				{
-					if GetImageFiles("images\body\hairstyles", "hcol*.jpg", OutUsed)
+					if GetImageFiles("images\body\hairstyles", "hcol*.jpg", OutUsed, "", "FR")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\body\hairstyles\*\hcol*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\body\hairstyles\*\hcol*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\body\hairstyles\*\hcol*.jpg' " . IdxTxt . "`n"
 					}
 					
 				}
-				else if inStr(Match1, "FUNC(''$clothing_image''")						;; Clothing images Function
+				else if inStr(Match1, "FUNC(''$clothing_image''")					;; Clothing images Function - only use JPG files
 				{
 					if GetImageFiles("images\clothes", "vatnik.jpg", OutUsed)
 					{
@@ -168,168 +173,172 @@ Loop, Parse, Source, `n, `r  			; Specifying `n prior to `r allows both Windows
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\vatnik.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\vatnik.jpg' " . IdxTxt . "`n"
 					}
 					; GetImageFiles("images\clothes\newclo", "131.jpg", OutUsed)	;; Dupe See below	
 					
-					if GetImageFiles("images\clothes", "jeans*.jpg", OutUsed)
+					if GetImageFiles("images\clothes", "jeans*.jpg", OutUsed,  "i)jeans\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\jeans*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\jeans*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\jeans*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\clothes", "yoga*.jpg", OutUsed)
+					if GetImageFiles("images\clothes", "yoga*.jpg", OutUsed, "i)yoga\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\yoga*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\yoga*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\yoga*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\clothes", "sarafan*.jpg", OutUsed)
+					if GetImageFiles("images\clothes", "sarafan*.jpg", OutUsed, "i)sarafan\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\sarafan*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\sarafan*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\sarafan*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\clothes", "short*.jpg", OutUsed)
+					if GetImageFiles("images\clothes", "short*.jpg", OutUsed, "i)short\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\short*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\short*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\short*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\clothes", "skirt*.jpg", OutUsed)
+					if GetImageFiles("images\clothes", "skirt*.jpg", OutUsed, "i)skirt\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\skirt*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\skirt*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\skirt*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\clothes", "dress*.jpg", OutUsed)
+					if GetImageFiles("images\clothes", "dress*.jpg", OutUsed, "i)dress\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\dress*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\dress*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\dress*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\clothes", "profi*.jpg", OutUsed)
+					if GetImageFiles("images\clothes", "profi*.jpg", OutUsed, "i)profi\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\profi*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\profi*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\profi*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\clothes", "pants*.jpg", OutUsed)
+					if GetImageFiles("images\clothes", "pants*.jpg", OutUsed "i)pants\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\pants*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\pants*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\pants*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\clothes", "latex*.jpg", OutUsed)
+					if GetImageFiles("images\clothes", "latex*.jpg", OutUsed, "i)latex\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\latex*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\latex*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\latex*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\clothes", "hooker*.jpg", OutUsed)
+					if GetImageFiles("images\clothes", "hooker*.jpg", OutUsed, "i)hooker\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\hooker*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\hooker*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\hooker*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\clothes", "k*.jpg", OutUsed)
+					if GetImageFiles("images\clothes", "k*.jpg", OutUsed, "i)k\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\k*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\k*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\k*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\clothes\newclo", "*.jpg", OutUsed)
+					if GetImageFiles("images\clothes\newclo", "*.jpg", OutUsed, "i)\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\clothes\newclo\*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\newclo\*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\clothes\newclo\*.jpg' " . IdxTxt . "`n"
 					}
 
-					if GetImageFiles("images\img\dress", "ero*.jpg", OutUsed)
+					if GetImageFiles("images\img\dress", "ero*.jpg", OutUsed, "i)ero\d+\.jpg")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\img\dress\ero*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- no files found in 'images\img\dress\ero*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- no files found in 'images\img\dress\ero*.jpg' " . IdxTxt . "`n"
 					}
 				}
 
-				else if inStr(Match1, "images\qwest\card")								;; Playingcard Images
+				else if inStr(Match1, "images\qwest\card")							;; Playingcard Images  - only use JPG files
 				{
-					if GetImageFiles("images\qwest\card", "*.jpg", Output)
+					if GetImageFiles("images\qwest\card", "*.jpg", OutUsed, "", "FR")
 					{
 						OutAuto	.= Spacer(Match1) . "- Found 'images\qwest\card\*\*.jpg'`n"
 					}
 					else
 					{
-						OutMan	.= Spacer(Match1) . "- No files found in 'images\qwest\card\*\*.jpg'`n"
+						OutMan	.= Spacer(Match1) . "- No files found in 'images\qwest\card\*\*.jpg' " . IdxTxt . "`n"
 					}				
 				}
 				
-				else if inStr(Match1, "FUNC")											;; Unknown Function - Manual
+				else if inStr(Match1, "FUNC")										;; Unknown Function - Manual
 				{
-					OutMan	.= Spacer(Match1) . "- Unknown Function`n"
+					OutMan	.= Spacer(Match1) . "- Unknown Function " . IdxTxt . "`n"
 				}
 				
-				else if inStr(Match1, "$")												;; Uses String variable - Manual
+				else if inStr(Match1, "$")											;; Uses String variable - Manual
 				{
-					OutMan	.= Spacer(Match1) . "- Unknown Function`n"
+					OutMan	.= Spacer(Match1) . "- Used String Variable " . IdxTxt . "`n"
 				}
 				
-				else if not GetImagefromPath(Match1, OutUsed)							;; Try to find images
+				else if GetImagefromPath(Match1, OutUsed)							;; Try to find images
+				{
+					OutAuto	.= Spacer(Match1) . "- Found image files`n"
+				}
+				else
 				{
-					OutMan	.= Spacer(Match1) . "- Files not found`n"
+					OutMan	.= Spacer(Match1) . "- Files not found " . IdxTxt . "`n"
 				}
 			}
-			
 			; -- Image path is just a file name --
 			else
 			{
 				IfExist %Match1%
 				{
-					OutUsed	.= Match1 . "`n"											;; Normal file found
+					OutUsed	.= Match1 . "`n"										;; Normal file found
 				}
 				else
 				{
-					OutMan	.= Spacer(Match1) . "- File not found`n"					;; Normal file Not found
+					OutMan	.= Spacer(Match1) . "- File not found " . IdxTxt . "`n"
 				}
-			}
+			}	
+			FoundPos += 8 + StrLen(Match1)											;; Increment Search Position
 		}
 	}
 	
@@ -356,7 +365,7 @@ Loop, Parse, Source, `n, `r  			; Specifying `n prior to `r allows both Windows
 		else
 		; if (FoundPos)																;; Found File
 		{	
-			FoundPos += 5 + StrLen(Match1)											;; Increment Search Position
+			IdxTxt := " (L:" . LineNo . ", P:" . FoundPos . ")" 
 			Match1 := StrReplace(Match1, "/", "\")									;; Use correct Win path seperator
 			OutAll .= Match1 . "`n"
 			; -- Image Path Contains Code --
@@ -364,17 +373,21 @@ Loop, Parse, Source, `n, `r  			; Specifying `n prior to `r allows both Windows
 			{
 				if inStr(Match1, "FUNC")											;; Unknown Function - Manual
 				{
-					OutMan	.= Spacer(Match1) . "- Unknown Function`n"
+					OutMan	.= Spacer(Match1) . "- Unknown Function " . IdxTxt . "`n"
 				}
 				
 				else if inStr(Match1, "$")											;; Uses String variable - Manual
 				{
-					OutMan	.= Spacer(Match1) . "- Unknown Function`n"
+					OutMan	.= Spacer(Match1) . "- Used String Variable " . IdxTxt . "`n"
 				}
 				
-				else if not GetImagefromPath(Match1, OutUsed)						;; Try to find images
+				else if GetImagefromPath(Match1, OutUsed)							;; Try to find images
+				{
+					OutAuto	.= Spacer(Match1) . "- Found image files`n"
+				}
+				else
 				{
-					OutMan	.= Spacer(Match1) . "- Files not found`n"
+					OutMan	.= Spacer(Match1) . "- Files not found " . IdxTxt . "`n"
 				}
 			}
 			
@@ -387,9 +400,10 @@ Loop, Parse, Source, `n, `r  			; Specifying `n prior to `r allows both Windows
 				}
 				else
 				{
-					OutMan	.= Spacer(Match1) . "- File not found`n"				;; Normal file Not found
+					OutMan	.= Spacer(Match1) . "- File not found " . IdxTxt . "`n"
 				}
 			}
+			FoundPos += 5 + StrLen(Match1)											;; Increment Search Position
 		}
 	}
 }
@@ -432,9 +446,11 @@ Spacer(TxtStr = "")
 	
 }
 
-GetImageFiles(FilePath, FileName, ByRef Output)
+GetImageFiles(FilePath, FileName, ByRef Output, FileNameRegEx := "", FileLoopMode := "F")
 {	;; Get image paths in filepath using filepattern FileName
 	
+	;~ msgbox 	GetImageFiles()`nFilePath := %FilePath%`nFileName := %FileName%`nFileNameRegEx := %FileNameRegEx%`nFileLoopMode := %FileLoopMode%
+	
 	IfNotExist, %FilePath%
 	{
 		MsgBox, 48, Get Image Paths, Error in GetImageFiles()`n`nUnable to locate "%FilePath%" folder, Filename '%FileName%'.`n`nCurrent working dir is "%A_WorkingDir%"
@@ -445,12 +461,28 @@ GetImageFiles(FilePath, FileName, ByRef Output)
 	Setworkingdir, %FilePath%
 	
 	found := false
-	Loop, Files, %FileName%, FR						;; Find files in FilePath  using Filepattern FileName
+	
+	; -- Loop with or Without recursion --
+	Loop, Files, %FileName%, %FileLoopMode%										;; Find files in FilePath using Filepattern FileName
 	{
-		fp := FilePath  . "\" . A_LoopFileFullPath
-		Output .= fp . "`n"
-		found := true
+		if(FileNameRegEx)														;; Can we test file name
+		{
+			FoundPos := RegExMatch(A_LoopFileName, FileNameRegEx)				;; File Found matches
+			if (ErrorLevel)
+			{
+				MsgBox, 48, Get Image Paths, RegExMatch Error in function GetImageFiles()`n`nruntime error: %ErrorLevel%`n`nFound searching string: %A_LoopFileName%`n`nusing search: %FileNameRegEx%
+				break
+			}
+			if (not FoundPos)													;; Filename not matches skip
+			{
+				continue
+			}
+		}
+	fp := FilePath  . "\" . A_LoopFileFullPath
+	Output .= fp . "`n"
+	found := true
 	}
+
 	
 	Setworkingdir, %SaveWorkDir%
 	return found
@@ -474,6 +506,9 @@ GetImagefromPath(FilePath, ByRef Output)
 		; MsgBox, 64, Get Image Path, GetImageFromPath() error: Path contains wildcard`n `nPath : '%fp%'`nDir :  '%Dir%'
 		return false
 	}
+
+	FileNameRegEx := StrReplace(FileName, "*", "\d+") 					; set up test for filename wildcard to be numbers only
+	FileNameRegEx := "i)" . StrReplace(FileNameRegEx, ".", "\.") 
 	
-	return GetImageFiles(Dir, FileName, Output)
+	return GetImageFiles(Dir, FileName, Output, FileNameRegEx)
 }

BIN
Image List - Missing.txt


BIN
Image List - Used.txt


+ 42 - 71
Images List - Dupes.txt

@@ -1,47 +1,26 @@
 DupeMerge 1.070
-                          
-'images\qwest\alter\artom\2.jpg' 67444
-'images\qwest\alter\npc2.jpg' 67444
-'images\qwest\alter\npc\2.jpg' 67444
-
-'images\etogame\frotsp.jpg' 13775
-'images\pic\frotsp.jpg' 13775
-
-'images\etogame\facesp.jpg' 15258
-'images\pic\facesp.jpg' 15258
 
+                        
 'images\klof\klof 11.jpg' 15612
 'images\klof\klof 7.jpg' 15612
 
-'images\etogame\park1.jpg' 22796
-'images\pic\park1.jpg' 22796
-
-'images\etogame\analplug.jpg' 23298
-'images\pic\analplug.jpg' 23298
+'images\body\t0.jpg' 21510
+'images\picb\t0.jpg' 21510
 
 'images\klof\klof 10.jpg' 23755
 'images\klof\klof31.jpg' 23755
 
-'images\qwest\alter\npc11.jpg' 23757
-'images\qwest\alter\npc\11.jpg' 23757
+'images\body\t1.jpg' 24271
+'images\picb\t1.jpg' 24271
 
-'images\qwest\alter\npc9.jpg' 27696
-'images\qwest\alter\npc\9.jpg' 27696
-
-'images\qwest\alter\npc5.jpg' 27878
-'images\qwest\alter\npc\5.jpg' 27878
-
-'images\pics\vagcow.jpg' 28104
-'images\pics\vagcow1.jpg' 28104
-
-'images\etogame\parkbeg.jpg' 28184
-'images\pic\parkbeg.jpg' 28184
+'images\body\fat2.jpg' 28010
+'images\picb\fat2.jpg' 28010
 
 'images\picBJ\parkBJ.jpg' 30233
 'images\pics2\ara.jpg' 30233
 
-'images\pics\vagdog.jpg' 30540
-'images\pics\vagdog1.jpg' 30540
+'images\body\fit6.jpg' 32322
+'images\picb\fit6.jpg' 32322
 
 'images\picKav\cum9.jpg' 33896
 'images\qwest\alter\Ev\kotovBJcum5.jpg' 33896
@@ -49,6 +28,9 @@ DupeMerge 1.070
 'images\etogame\dance.jpg' 34659
 'images\qwest\sosed\dance.jpg' 34659
 
+'images\body\t2.jpg' 36028
+'images\picb\t2.jpg' 36028
+
 'images\qwest\alter\Ev\kotovHJ2.jpg' 36729
 'images\qwest\sosed\bossBJcum.jpg' 36729
 
@@ -61,53 +43,44 @@ DupeMerge 1.070
 'images\etogame\dur.jpg' 39891
 'images\pic\dur.jpg' 39891
 
+'images\body\fit2.jpg' 40784
+'images\picb\fit2.jpg' 40784
+
 'images\picBJ\fa6.jpg' 41165
 'images\qwest\alexey\bjcum6.jpg' 41165
 
-'images\qwest\alter\npc7.jpg' 42016
-'images\qwest\alter\npc\7.jpg' 42016
+'images\body\fat3.jpg' 41628
+'images\picb\fat3.jpg' 41628
 
-'images\etogame\electri.jpg' 47455
-'images\pic\electri.jpg' 47455
+'images\body\fat6.jpg' 45079
+'images\picb\fat6.jpg' 45079
 
-'images\qwest\alter\npc10.jpg' 48051
-'images\qwest\alter\npc\10.jpg' 48051
+'images\body\fat4.jpg' 48546
+'images\picb\fat4.jpg' 48546
 
 'images\img\sexdvanadva\anal12.jpg' 49301
 'images\img\sexdvanadva\uanal12.jpg' 49301
 
-'images\etogame\stir.jpg' 49623
-'images\pic\stir.jpg' 49623
+'images\body\fat5.jpg' 49369
+'images\picb\fat5.jpg' 49369
 
-'images\pics\vagmis.jpg' 53136
-'images\pics\vagmis1.jpg' 53136
+'images\body\fit1.jpg' 50648
+'images\picb\fit1.jpg' 50648
 
 'images\img\sexdvanadva\uvag12.jpg' 56393
 'images\img\sexdvanadva\vag12.jpg' 56393
 
+'images\body\fit7.jpg' 57487
+'images\picb\fit7.jpg' 57487
+
 'images\qwest\alter\placer\miss.jpg' 58863
 'images\qwest\gadukino\mitka.jpg' 58863
 
-'images\qwest\alter\npc1.jpg' 59883
-'images\qwest\alter\npc\1.jpg' 59883
-
-'images\qwest\alter\npc25.jpg' 61073
-'images\qwest\alter\npc\25.jpg' 61073
-
-'images\etogame\PublicToilet.jpg' 63023
-'images\pic\PublicToilet.jpg' 63023
-
-'images\etogame\stripdance.jpg' 63669
-'images\pic\stripdance.jpg' 63669
-
-'images\etogame\kassa.jpg' 64494
-'images\pic\kassa.jpg' 64494
+'images\body\fat7.jpg' 61663
+'images\picb\fat7.jpg' 61663
 
-'images\qwest\alter\npc4.jpg' 65999
-'images\qwest\alter\npc\4.jpg' 65999
-
-'images\etogame\mop.jpg' 10321
-'images\pic\mop.jpg' 10321
+'images\qwest\alter\artom\2.jpg' 67444
+'images\qwest\alter\npc\2.jpg' 67444
 
 'images\img\masha\r62.jpg' 72485
 'images\img\masha\r63.jpg' 72485
@@ -118,24 +91,22 @@ DupeMerge 1.070
 'images\etogame\bukli_stol.jpg' 73807
 'images\etogame\ptu_stolovaya.jpg' 73807
 
+'images\body\fit4.jpg' 73920
+'images\picb\fit4.jpg' 73920
+
+'images\body\fit5.jpg' 75892
+'images\picb\fit5.jpg' 75892
+
 'images\qwest\alter\sister.jpg' 75962
 'images\qwest\alter\sister\sister.jpg' 75962
 
-'images\qwest\alter\npc8.jpg' 78212
-'images\qwest\alter\npc\8.jpg' 78212
+'images\body\fat1.jpg' 78480
+'images\picb\fat1.jpg' 78480
 
-'images\body\0.jpg' 78944
-'images\picb\0.jpg' 78944
+'images\body\fit3.jpg' 138223
+'images\picb\fit3.jpg' 138223
 
-'images\body\1.jpg' 80274
-'images\picb\1.jpg' 80274
 
-'images\body\2.jpg' 87361
-'images\picb\2.jpg' 87361
 
-'images\qwest\alter\npc6.jpg' 149677
-'images\qwest\alter\npc\6.jpg' 149677
 
-'images\qwest\alter\npc3.jpg' 190860
-'images\qwest\alter\npc\3.jpg' 190860
 


+ 2 - 1
locations/FedorEv

@@ -2,7 +2,8 @@
 numnpc = 5
 gs 'stat'
 '<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 
 if GorSlut = 0:
 	if kotovLoveQW > 0 and week < 5 and kotovVSkozlov = 0:

+ 4 - 2
locations/Gadbana

@@ -95,7 +95,8 @@ if mop ! 1:
 		cumface = 0
 		minut += 15
 		gs 'stat'
-		'<center><img src="images/pic/facesp.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/pic/facesp.jpg"></center>'
+		'<center><img src="images/etogame/facesp.jpg"></center>'
 		'You washed off your makeup.'
 
 		act 'Finish':gt $curloc
@@ -110,7 +111,8 @@ if cumfrot > 0:
 		cumfrot = 0
 		minut += 10
 		gs 'stat'
-		'<center><img src="images/pic/frotsp.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/pic/frotsp.jpg"></center>'
+		'<center><img src="images/etogame/frotsp.jpg"></center>'
 		'You remove traces of cum from your clothes.'
 
 		act 'Finish':gt $curloc

+ 2 - 1
locations/IgorEv

@@ -1,7 +1,8 @@
 # IgorEv
 gs 'stat'
 '<center><b><font color="maroon"><<$npcName[4]>> <<$npcSurName[4]>></font></b></center>'
-'<center><img src="images/qwest/alter/npc4.jpg"></center>'
+! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc4.jpg"></center>'
+'<center><img src="images/qwest/alter/npc/4.jpg"></center>'
 
 if fedorKozlovQW >= 10 and $loc = 'gdkin':
 	'To you and Igor suitable Fedor. "Gosh, you do not confused? <<$name>> my girl." Igor blushed "Well Fed, you know, I did not know. But if you insist, then okay, I''m just a joke." Fyodor nodded, "Well, go wherever you go, a practical joker."'

+ 2 - 1
locations/IvanEv

@@ -2,7 +2,8 @@
 ivansportday = day
 gs 'stat'
 '<center><b><font color="maroon"><<$npcName[3]>> <<$npcSurName[3]>></font></b></center>'
-'<center><img src="images/qwest/alter/npc3.jpg"></center>'
+! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc3.jpg"></center>'
+'<center><img src="images/qwest/alter/npc/3.jpg"></center>'
 
 if $loc = 'gdksport':
 	'Ivan grinned seeing you "Hello <<$name>>, you''re here too zanimaeshsya sports?" You confirmed his words. Ivan nodded. "I''ve been training for boxing go. Soon the competition."'

+ 12 - 3
locations/ParkKafe

@@ -219,14 +219,23 @@ if $ARGS[0] = 'man':
 				!!oral += 1
 				cumlip += 1
 				cumass += 1
-				horny = 0
+				! WD: breaks horny test below ~ 
+				!horny = 0
 				vnesh += 1
 				vagina += 1
 				'<center><img src="images/pics2/sauna.jpg"></center>'
 				'In the sauna you two completely naked, have fun and enjoying yourself, gradually turns into a very passionate sex'
 
-				if horny > 75:horny = 0 & orgasm += 1 & 'You covered orgasm'
-				if horny <= 75:horny += 10 & 'You were not satisfied'
+				! WD: fix horny test logic stop both trigger
+				if horny > 75:
+					horny = 0
+					orgasm += 1 
+					'You covered orgasm'
+				! if horny <= 75:
+				else
+					horny += 10
+					'You were not satisfied'
+				end
 
 				act 'Leave':gt 'street'
 			end

+ 10 - 5
locations/Snpc

@@ -11,7 +11,8 @@ grupTipe[numnpc]
 gs 'dinnpc'
 gs 'stat'
 '<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 '<<$npcText[numnpc]>>'
 
 if grupTipe[numnpc] = -1:'<<$npcName[numnpc]>> refers to a group of outcasts.'
@@ -110,7 +111,8 @@ act 'Chat':
 
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-	'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+	! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+	'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 
 	if numnpc = 1 and grupNPC[numnpc] = 0:
 		'Dimka sniffed. "Get off me pimply pig."'
@@ -145,7 +147,8 @@ if numnpc = 2:
 
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-			'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+			'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 
 			if GorSlut < 3:'You came to Artem and asked him to help you to learn. Artem was a bit surprised and said to you "Okay. Come after school to my home, work."'
 			if GorSlut >= 3:'You came to Artem and asked him to help you to learn. Artem outraged "Bah, I''ll spend my time on this as you are, of course, and no more can not fit me."'
@@ -193,7 +196,8 @@ if numnpc = 14 and meynoldQW = 1:
 		meynoldQW = 2
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-		'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 		'You came to Katja and thanked her for what she stole you from the disco home when you have touched. Katja smiled at you. "Not at all, only you do not get drunk. Drunkenness could end badly."'
 
 		if $loc ! 'gdkin':dynamic $din_sekondparturok
@@ -212,7 +216,8 @@ if numnpc = 14 and meynoldQW > 1 and mop <= 1:
 
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-		'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 		'Katia quickly straightened your hair and asked. "You what? Little tint, usually distribute or shovel?"'
 
 		act 'Light makeup':

+ 2 - 1
locations/albinaEv

@@ -23,7 +23,8 @@ if albinaCar = 0:
 		gs 'stat'
 
 		'<center><b><font color="maroon"><<$npcName[23]>> <<$npcSurName[23]>></font></b></center>'
-		'<center><img src="images/qwest/alter/npc23.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc23.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/23.jpg"></center>'
 		'You asked Albina "Is this your car?" Albina squirmed grimassy contemptuous "What? Of course not, this is the machine my father, I would never have bought it. Generally X5 is a machine for cattle suddenly grown rich and not for decent people." You shake your head, "You what? Rights have?" Albina laughed "Rights? Why should I, right? Do you know who my father is? He police chief of our town, though retired, but the connection remained. Never stopped me in his car." Albina second thought about something and said, "go for a drive."'
 
 		act 'Go with Albina':

+ 2 - 1
locations/albinahome

@@ -141,7 +141,8 @@ if hour < 20:
 					manna -= 8
 					sweat += 3
 					gs 'stat'
-					'<center><img src="images/pic/stripdance.jpg"></center>'
+					! WD: Remove Dupe Images ~ '<center><img src="images/pic/stripdance.jpg"></center>'
+					'<center><img src="images/etogame/stripdance.jpg"></center>'
 
 					if dance >= 100:
 						stripdance += rand(2, 10)

+ 4 - 2
locations/artemEv

@@ -79,7 +79,8 @@ $din_artem_lern = {
 		lern += rand(3, 6)
 		intel += rand(1, 2)
 		gs 'stat'
-		'<center><img src="images/qwest/alter/npc<<2>>.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc2.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/2.jpg"></center>'
 		'Did you do with Artem within an hour, during which time he helped you with homework and explained something of the studied material.'
 
 		if grupNPC[2] >= 90:
@@ -167,7 +168,8 @@ $din_artem_lern = {
 
 gs 'stat'
 '<center><b><font color="maroon"><<$npcName[2]>> <<$npcSurName[2]>></font></b></center>'
-'<center><img src="images/qwest/alter/npc2.jpg"></center>'
+! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc2.jpg"></center>'
+'<center><img src="images/qwest/alter/npc/2.jpg"></center>'
 if kotovLoveQW > 0 and artemVitokQW = 0:
 	'You are out of school and went to Artem. Artem asked, "Well, shall we go?" You nodded his head. Once you have gathered with Artem leave the school yard when suddenly came up to meet you Witek Kotov. He walked up to you and smeryav disdainful look Artem said "Where are you going to go with this four-eyed jerk?" You answered Vit''ka that you went to teach lessons, Artem helps you tighten school. Witek frowned, "I do not trust this freak. He has written on his face, that he laid eyes on you." Artem much frightened, and began to mumble. "Witek, but you what, I would never. We just teach lessons." Have you noticed how tense nodules in Vic.'
 

+ 2 - 1
locations/artemhome2

@@ -74,7 +74,8 @@ act '':
 	cls
 	minut += 5
 	gs 'stat'
-	'<center><img src="images/qwest/alter/artom/2.jpg"></center>'
+	! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/artom/2.jpg"></center>'
+	'<center><img src="images/qwest/alter/npc/2.jpg"></center>'
 	''
 
 	act '':

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
locations/budgetclothes


+ 2 - 1
locations/dimaRudeEv

@@ -2,7 +2,8 @@
 dimarudeday = day
 gs 'stat'
 '<center><b><font color="maroon"><<$npcName[1]>> <<$npcSurName[1]>></font></b></center>'
-'<center><img src="images/qwest/alter/npc1.jpg"></center>'
+! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc1.jpg"></center>'
+'<center><img src="images/qwest/alter/npc/1.jpg"></center>'
 
 if dimarudorient = 0:
 	'Dimka seeing you turned and said quietly, "Well, come to me, have fun."'

+ 14 - 7
locations/dinnpc

@@ -6,7 +6,8 @@ $din_predlog_dima_bj = {
 		sub += 1
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-		'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 		'Embarrassed and blushing you squatted in front of Dimka, who got dick and put it in your face.'
 
 		act 'Take by mouth':
@@ -65,7 +66,8 @@ $din_dima_predlog = {
 		grupNPC[numnpc] = 0
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-		'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 		'You cracked the face Dimka and he clutched his cheek. "Well, get out a fool. And do not come near me."'
 
 		act 'Leave':gt $loc, $metka
@@ -75,7 +77,8 @@ $din_dima_predlog = {
 		cls
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-		'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 		'You have eyes widened and you flushed with such a proposal. Dimka unbuttoned his pants. "Come on, brave, I can not stand here all night."'
 
 		act 'Slap him':
@@ -84,7 +87,8 @@ $din_dima_predlog = {
 			grupNPC[numnpc] = 0
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-			'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+			'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 			'You cracked the face Dimka and he clutched his cheek. "Well, get out a fool. And do not come near me."'
 
 			act 'Leave':gt $loc, $metka
@@ -144,7 +148,8 @@ $din_igor__disco = {
 	act 'Go to the street':
 		cls
 		gs 'stat'
-		'<center><img src="images/qwest/alter/npc4.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc4.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/4.jpg"></center>'
 		'You went out with Igor. Igor passionately took you by the hand and began to say "<<$name>>, you''re such a pretty girl when I see you, I have immediately podnimaetsya mood. I like you very nravishsya. I''d really like to start a relationship with you."'
 
 		act 'Refuse':gt $loc, $metka
@@ -153,7 +158,8 @@ $din_igor__disco = {
 			cls
 			IgorLoverQW = 1
 			gs 'stat'
-			'<center><img src="images/qwest/alter/npc4.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc4.jpg"></center>'
+			'<center><img src="images/qwest/alter/npc/4.jpg"></center>'
 			'You agreed to meet with Igor and he blossomed smile "<<$name>>, you can get a kiss?"'
 
 			if dom > 0:
@@ -162,7 +168,8 @@ $din_igor__disco = {
 					dom += 5
 					IgorDominaQW = 1
 					gs 'stat'
-					'<center><img src="images/qwest/alter/npc4.jpg"></center>'
+					! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc4.jpg"></center>'
+					'<center><img src="images/qwest/alter/npc/4.jpg"></center>'
 					'You grin skazale Igor that he would kill. Igor blushed and knelt "<<$name>>, I beg you as a slave, on his knees, just one kiss!"'
 
 					if dom >= 10:

+ 2 - 1
locations/dom_gor

@@ -36,7 +36,8 @@ if cloth_vid = 2 and teachlevel > 20 and parkrunday ! day and hour < 21 and hour
 		fat -= 8
 		speed += 1
 		sweat += 3
-		'<center><img src="images/pic/parkbeg.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/pic/parkbeg.jpg"></center>'
+		'<center><img src="images/etogame/parkbeg.jpg"></center>'
 		'You did a few laps around the park. Out of breath, sweaty and tired.'
 		parkrand = rand (0, 10)
 

+ 8 - 4
locations/etoexhib

@@ -1316,7 +1316,8 @@ if $ARGS[0] = 'pos41':
 			poroshok -= 1
 			dirtbelo = 0
 			manna = manna - 10
-			'<center><img src="images/pic/stir.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/pic/stir.jpg"></center>'
+			'<center><img src="images/etogame/stir.jpg"></center>'
 			'You soaked clothes in the basin and poured the powder there, then you become a wash clothes, until it finally became clear.'
 
 			act 'Finish':gt 'etoexhib', 'pos41'
@@ -1390,7 +1391,8 @@ if $ARGS[0] = 'pos41':
 			cumface = 0
 			minut += 15
 			gs 'stat'
-			'<center><img src="images/pic/facesp.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/pic/facesp.jpg"></center>'
+			'<center><img src="images/etogame/facesp.jpg"></center>'
 			'You washed off your makeup.'
 
 			act 'Finish':gt 'etoexhib', 'pos41'
@@ -1502,7 +1504,8 @@ if $ARGS[0] = 'pos49':
 			poroshok -= 1
 			dirtbelo = 0
 			manna -= 10
-			'<center><img src="images/pic/stir.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/pic/stir.jpg"></center>'
+			'<center><img src="images/etogame/stir.jpg"></center>'
 			'You soaked clothes in the basin and poured the powder there, then you become a wash clothes, until it finally became clear.'
 
 			act 'Finish':gt 'etoexhib', 'pos41'
@@ -1576,7 +1579,8 @@ if $ARGS[0] = 'pos49':
 			cumface = 0
 			minut += 15
 			gs 'stat'
-			'<center><img src="images/pic/facesp.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/pic/facesp.jpg"></center>'
+			'<center><img src="images/etogame/facesp.jpg"></center>'
 			'You washed off your makeup.'
 
 			act 'Finish':gt 'etoexhib', 'pos41'

+ 2 - 1
locations/gaptek

@@ -688,7 +688,8 @@ if StoryLine = 1:
 				minut += 10
 				money -= 1500
 				Kandidoz = 0
-				'<center><img src="images/pic/kassa.jpg"></center>'
+				! WD: Remove Dupe Images ~ '<center><img src="images/pic/kassa.jpg"></center>'
+				'<center><img src="images/etogame/kassa.jpg"></center>'
 				'You bought tablets and paid the money to the cashier.'
 				'Immediately about cash you swallow the tablet.'
 

+ 2 - 1
locations/gdkin

@@ -4,7 +4,8 @@ $din_kotov_love = {
 		cls
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npcName[9]>> <<$npcSurName[9]>></font></b></center>'
-		'<center><img src="images/qwest/alter/npc9.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc9.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/9.jpg"></center>'
 		'To you and the guy fits Witek. "Che garbage? Who''s that bloke?" Witek takes for male breast and angrily said, "Well, ka sebal horrified by my heifer, and now the mug smashed into smithereens. Understood?"'
 
 		if DPgrup = 1:

+ 18 - 9
locations/gdksport

@@ -97,7 +97,8 @@ if grupNPC[5] >= 80 and fedorKozlovQW = 0 and GorSlut = 0 and UNSTARTER = 1:
 	numnpc = 5
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-	'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+	! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+	'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 	'The club you unexpectedly met Fedor Kozlov in your class. He smiled affably you "Hello <<$name>>. Hmm ... Here is the deal ... I have an extra ticket to the movies. Let''s go together."'
 
 	act 'Refuse':
@@ -105,7 +106,8 @@ if grupNPC[5] >= 80 and fedorKozlovQW = 0 and GorSlut = 0 and UNSTARTER = 1:
 		grupNPC[5] = 40
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-		'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 		'You refused to Fedor referring to employment. Fedor frowned. "Okay. Whereas some other time."'
 
 		act 'Leave':gt 'gdksport'
@@ -118,7 +120,8 @@ if grupNPC[5] >= 80 and fedorKozlovQW = 0 and GorSlut = 0 and UNSTARTER = 1:
 		minut += 15
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-		'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 		'You agreed and delighted Fedor took you to a movie theater located in the park.'
 
 		act 'Watch a movie':
@@ -127,7 +130,8 @@ if grupNPC[5] >= 80 and fedorKozlovQW = 0 and GorSlut = 0 and UNSTARTER = 1:
 			manna += 100
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-			'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+			'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 			'Fedor gave tickets at the entrance and you went into the hall. Soon the lights went out and started the movie. Fedor sat motionless and only occasionally glancing at you. Movie was quite interesting and you watched it with pleasure. When the movie ended, the hall lights were turned on and Fedor became accompany you. "<<$name>>. I like you. Maybe we could meet?"'
 
 			act 'Refuse':
@@ -137,7 +141,8 @@ if grupNPC[5] >= 80 and fedorKozlovQW = 0 and GorSlut = 0 and UNSTARTER = 1:
 				minut += 15
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-				'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+				! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+				'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 				'You refused to meet with him to Fedor and was invited to stay friends. Fedor visibly upand silently carried you home.'
 
 				act 'Leave':gt 'gorodok'
@@ -148,7 +153,8 @@ if grupNPC[5] >= 80 and fedorKozlovQW = 0 and GorSlut = 0 and UNSTARTER = 1:
 				minut += 15
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-				'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+				! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+				'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 				'You have agreed to meet with Fedor. Fedor was visibly delighted and escort you to the house on the way you viewed fun discussing movies.'
 
 				act 'Leave':gt 'gorodok'
@@ -480,7 +486,8 @@ if gsAboDance > 0 and sport = 1:
 					numnpc = 23
 					gs 'stat'
 					'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-					'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+					! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+					'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 					'You are greeted with Albina. She raised an eyebrow haughtily. "And it''s you.''s Your name there? Oh yeah <<$name>>. Did you? Zanimaeshsya Dancing?" You nodded confirming the obvious. Albina dismissive laugh. "Well, how''s it going?" You said coldly Albina "Not bad." Albina gave you look arrogant "Not bad? Well, maybe in comparison with other local bowlegged and not bad. But I doubt that you can dance on a more or less professional level."'
 
 					act 'I do not care':
@@ -490,7 +497,8 @@ if gsAboDance > 0 and sport = 1:
 						grupNPC[numnpc] -= 5
 						gs 'stat'
 						'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-						'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+						! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+						'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 						'You said scornfully as possible that you do not care and turned away from Albina. She said with a giggle. "Girls. Let''s train."'
 
 						act 'Leave':gt 'gdksport'
@@ -503,7 +511,8 @@ if gsAboDance > 0 and sport = 1:
 						!!grupNPC[numnpc] -= 5
 						gs 'stat'
 						'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-						'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+						! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+						'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 						'Albina you already began to annoy his arrogance. And you told her firmly that you know how to dance. Albina turned to the girls who came to her and said. "Girls. Let''s train." Then she turned to you and said with a slight grin. "You can sit and watch as the dance pros. Itself will understand everything"'
 
 						act 'Leave':gt 'gdksport'

+ 3 - 1
locations/gskver

@@ -52,7 +52,9 @@ if sport > 0 and hour > 5 and hour < 22 and daybegskver ! daystart:
 		daybegskver = daystart
 		gs 'stat'
 
-		'<center><img src="images/pic/parkbeg.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/pic/parkbeg.jpg"></center>'
+
+		'<center><img src="images/etogame/parkbeg.jpg"></center>'
 		'You are within an hour running through the square'
 
 		act 'Further':place = 1 & Frend_num = 0 & gt 'placer'

+ 2 - 1
locations/kafedinamic

@@ -98,7 +98,8 @@ $kafetualet = {
 			*clr
 			cumfrot = 0
 			minut += 10
-			'<center><img src="images/pic/frotsp.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/pic/frotsp.jpg"></center>'
+			'<center><img src="images/etogame/frotsp.jpg"></center>'
 			'You remove traces of cum from your clothes.'
 
 			act 'Finish':dynamic $kafetualet

+ 18 - 9
locations/katjaEv

@@ -114,7 +114,8 @@ $din_katja_kiss = {
 						KatjaHorny -= 10
 						KatjaLust += 1
 						gs 'stat'
-						'<center><img src="images/qwest/alter/npc14.jpg"></center>'
+						! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc14.jpg"></center>'
+						'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 						'You removed her hands and smiled Katja fun.'
 
 						act 'Further':gt 'KatjaHomeTalk'
@@ -134,7 +135,8 @@ gs 'stat'
 gs 'KatjaHomeDin'
 gs 'katjaEvDin'
 '<center><b><font color="maroon"><<$npcName[14]>> <<$npcSurName[14]>></font></b></center>'
-'<center><img src="images/qwest/alter/npc14.jpg"></center>'
+! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc14.jpg"></center>'
+'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 'Katja looks at you smiling. "<<$name>>, come to me, with the lessons learned."'
 
 if fedorKozlovQW >= 10:'To you and Katja suitable Fedor. "Hi girls, that up to?" Katja said embarrassed "Here we want to go teach lessons together." Fedor much thought and said "Okay. Then before the meeting." Then turned and walked away.'
@@ -147,7 +149,8 @@ act 'Go with Katja':
 	manna += 100
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npcName[14]>> <<$npcSurName[14]>></font></b></center>'
-	'<center><img src="images/qwest/alter/npc14.jpg"></center>'
+	! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc14.jpg"></center>'
+	'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 	'You walk down the streets of the town, along with Katja to her house. You are chatting together about all sorts of trivia and fun.'
 
 	if albinaQWdance > 0 and AlbinaBlokDance = 0:'Katja keen interest how are you doing with Zvezdushkami. In her opinion it is a very private team in a variety of rumors roam about Albina team.'
@@ -167,7 +170,8 @@ act 'Go with Katja':
 		manna += 100
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npcName[14]>> <<$npcSurName[14]>></font></b></center>'
-		'<center><img src="images/qwest/alter/npc14.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc14.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 		'The room Katja did not quite clean and circle are her things. Katja throws her to the floor and ryukzachek lacking textbooks and notebooks.'
 
 		act 'Engage with Katja':
@@ -179,7 +183,8 @@ act 'Go with Katja':
 			intel += rand(0, 1)
 			katjaLernTimes += 1
 			gs 'stat'
-			'<center><img src="images/qwest/alter/npc14.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc14.jpg"></center>'
+			'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 			'For half an hour that you do with Katja you fully learned the lessons and pretty well understood the materials.'
 
 			if katjaLernTimes >= 10:
@@ -198,7 +203,8 @@ act 'Go with Katja':
 					act 'Yes':
 						cls
 						gs 'stat'
-						'<center><img src="images/qwest/alter/npc14.jpg"></center>'
+						! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc14.jpg"></center>'
+						'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 						'You smiled at Katja and said that of course you kissing boys. Katja shy even more. "You see the <<$name>>, I like this guy, he''s older than me, and I am afraid that when we start to kiss, I''ll do something wrong. Could you teach me how to kiss?"'
 						dynamic $din_katja_kiss
 
@@ -207,7 +213,8 @@ act 'Go with Katja':
 							katjaLernQW = 0
 							katjaLernTimes = 1
 							gs 'stat'
-							'<center><img src="images/qwest/alter/npc14.jpg"></center>'
+							! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc14.jpg"></center>'
+							'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 							'You refused to kiss with Katja and she was mad at you.'
 
 							act 'Say goodbye and go home':minut += 15 & gt 'gorodok'
@@ -217,7 +224,8 @@ act 'Go with Katja':
 					act 'No':
 						cls
 						gs 'stat'
-						'<center><img src="images/qwest/alter/npc14.jpg"></center>'
+						! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc14.jpg"></center>'
+						'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 						'You shook their heads and said they did not kiss. Katja shy even more. "You see the <<$name>>, I like this guy, he''s older than me, and I am afraid that when we start to kiss, I''ll do something wrong. Maybe we could try to kiss, what to learn?"'
 						dynamic $din_katja_kiss
 
@@ -226,7 +234,8 @@ act 'Go with Katja':
 							katjaLernQW = 0
 							katjaLernTimes = 1
 							gs 'stat'
-							'<center><img src="images/qwest/alter/npc14.jpg"></center>'
+							! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc14.jpg"></center>'
+							'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 							'You refused to kiss with Katja and she was mad at you.'
 							act 'Say goodbye and go home':minut += 15 & gt 'gorodok'
 						end

+ 12 - 6
locations/kotovEv

@@ -1,7 +1,8 @@
 # kotovEv
 gs 'stat'
 '<center><b><font color="maroon"><<$npcName[9]>> <<$npcSurName[9]>></font></b></center>'
-'<center><img src="images/qwest/alter/npc9.jpg"></center>'
+! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc9.jpg"></center>'
+'<center><img src="images/qwest/alter/npc/9.jpg"></center>'
 
 if kotovLoveQW > 0 and GorSlut > 0:
 	'Witek scowled and tells you "Slysh <<$name>>, Th for garbage? We''re mutim, and then you tell me about you <<$gnikname>>. Whole town already know the boys with me neigh district. Ohuevshaya You bitch!"'
@@ -39,7 +40,8 @@ if $loc = 'gdksport':
 			cls
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npcName[9]>> <<$npcSurName[9]>></font></b></center>'
-			'<center><img src="images/qwest/alter/npc9.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc9.jpg"></center>'
+			'<center><img src="images/qwest/alter/npc/9.jpg"></center>'
 			'You asked Vic what he was doing. Witek snickered "You cho? Since I''ve been boxing for 11 years doing. Candidate Master of Sports is the second place in the championship held in the region."'
 
 			act 'You drink, and even smoke!':
@@ -47,7 +49,8 @@ if $loc = 'gdksport':
 				kotovKnowSport = 1
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npcName[9]>> <<$npcSurName[9]>></font></b></center>'
-				'<center><img src="images/qwest/alter/npc9.jpg"></center>'
+				! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc9.jpg"></center>'
+				'<center><img src="images/qwest/alter/npc/9.jpg"></center>'
 				'Were you surprised Witek every day thumps and smokes as he combines with sports. Witek chuckled, "Ha. Coach says I have a talent. Kick like a cannon, and the reaction is great. It''s in my dad, who was a drunkard goner. 6t walker on the area and died of cirrhosis, but move into the jug could always so that flew from sneakers. course bluing slightly hampered, but what the fuck? tossed and I would drink and smoke, but in boxing, no dating and money, CCM is the ceiling. though I can wriggle inside, but the master of sports will not. I''ve on the region, took 2nd place, I beat the champion in the shit, he twice knocked down lying. And gave him the victory. So for me right now is boxing, so they do out of habit, but that would be in the form behave. "'
 
 				act 'Move away':gt $loc, $metka
@@ -67,7 +70,8 @@ elseif $loc = 'gskver':
 		cls
 		minut += 5
 		gs 'stat'
-		'<center><img src="images/qwest/alter/npc9.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc9.jpg"></center>'
+		'<center><img src="images/qwest/alter/npc/9.jpg"></center>'
 		'Witek pours beer into a plastic cup. "In short, <<$name>>, let''s have a cup pivasom."'
 
 		act 'Drink beer':
@@ -83,7 +87,8 @@ elseif $loc = 'gskver':
 			act 'Okay, I gotta go.':
 				cls
 				gs 'stat'
-				'<center><img src="images/qwest/alter/npc9.jpg"></center>'
+				! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc9.jpg"></center>'
+				'<center><img src="images/qwest/alter/npc/9.jpg"></center>'
 				'Vitek came up to you and hugged, kissed her on the lips. "Slysh <<$name>>, come to me."'
 
 				if dom > 0:act 'Sorry, I''m in a hurry.':sub += 1 & gt $loc, $metka
@@ -92,7 +97,8 @@ elseif $loc = 'gskver':
 					cls
 					minut += 15
 					gs 'stat'
-					'<center><img src="images/qwest/alter/npc9.jpg"></center>'
+					! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc9.jpg"></center>'
+					'<center><img src="images/qwest/alter/npc/9.jpg"></center>'
 					'You went through the square to the side where he lives Witek. Soon you with Vic came to a dilapidated house he opened the door and led you to the poor and not well-kept apartment in a room where clothes lying crumpled heaps on the floor was littered with empty bottles.'
 
 					act 'Next':gt 'kotovSex'

+ 2 - 1
locations/kotovSex

@@ -163,7 +163,8 @@ $boy = 'Witek'
 minut += 15
 gs 'stat'
 '<center><b><font color="maroon"><<$npcName[9]>> <<$npcSurName[9]>></font></b></center>'
-'<center><img src="images/qwest/alter/npc9.jpg"></center>'
+! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc9.jpg"></center>'
+'<center><img src="images/qwest/alter/npc/9.jpg"></center>'
 'Vitek began groping and kissing you. "In short <<$name>> off your clothes."'
 
 if vagina = 0 and sex = 0:

+ 6 - 3
locations/kotovtalker

@@ -50,7 +50,8 @@ if numnpc = 9 and grupNPC[numnpc] >= 80 and GorSlut = 0 and kotovLoveQW >= 0:
 							grupNPC[numnpc] = 0
 							gs 'stat'
 							'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-							'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+							! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+							'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 							'You refused and Witek looks completely confused, but he was immediately covered anger. "Well, then Wali on dick fucking whore!"'
 
 							act 'Move away':gt $loc, $metka
@@ -61,7 +62,8 @@ if numnpc = 9 and grupNPC[numnpc] >= 80 and GorSlut = 0 and kotovLoveQW >= 0:
 							kotovLoveQW = 1
 							gs 'stat'
 							'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-							'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+							! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+							'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 							'You and Witek delighted "ohuet. I myself do not believe that you agreed with me muddy."'
 
 							act 'Move away':gt $loc, $metka
@@ -77,7 +79,8 @@ if numnpc = 9 and grupNPC[numnpc] >= 80 and GorSlut = 0 and kotovLoveQW >= 0:
 						cls
 						minut += 15
 						gs 'stat'
-						'<center><img src="images/qwest/alter/npc9.jpg"></center>'
+						! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc9.jpg"></center>'
+						'<center><img src="images/qwest/alter/npc/9.jpg"></center>'
 						'You came out of discos and went in the direction where he lives Witek with him while holding his arm. Soon you with Victor approached the dilapidated house he opened the door and led you to the poor and not well-kept apartment in a room where clothes lying crumpled heaps on the floor was littered with empty bottles.'
 
 						act 'Further.':gt 'kotovSex'

+ 6 - 3
locations/krutishi

@@ -96,14 +96,16 @@ if grupTipe[numnpc] = 3:
 							cls
 							gs 'stat'
 							'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-							'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+							! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+							'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 							'You replied in the negative and Dimka grinned. "Do not be shy, of course you want. Otherwise, why do you always come to me."'
 
 							act 'Well, maybe a little':
 								cls
 								gs 'stat'
 								'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-								'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+								! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+								'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 								'You were embarrassed and said that you do not know, but maybe. Dimka smiled and hugged you. "Of course. I knew it from the start. Know, I do not need some sort of a nun, I need a girl without complexes. Overall so we will meet with you, if you are right now otsosesh me."'
 								dynamic $din_dima_predlog
 							end
@@ -115,7 +117,8 @@ if grupTipe[numnpc] = 3:
 							cls
 							gs 'stat'
 							'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
-							'<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+							! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
+							'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
 							'You were confused by the question and confirmed directness. Dimka grinned. "Of course. I knew it from the start. Know, I do not need some sort of a nun, I need a girl without complexes. Overall so we will meet with you, if you are right now otsosesh me."'
 							dynamic $din_dima_predlog
 						end

+ 2 - 1
locations/laketoilet

@@ -87,7 +87,8 @@ if $ARGS[0] = 'main':
 				*clr
 				cumfrot = 0
 				minut += 10
-				'<center><img src="images/pic/frotsp.jpg"></center>'
+				! WD: Remove Dupe Images ~ '<center><img src="images/pic/frotsp.jpg"></center>'
+				'<center><img src="images/etogame/frotsp.jpg"></center>'
 				'You remove traces of cum from your clothes.'
 
 				act 'Finish':dynamic $kafetualet

+ 2 - 1
locations/park

@@ -413,7 +413,8 @@ if $ARGS[0] = 'whore':
 		'<center><img src="images/etogame/glpark.jpg"></center>'
 		'Cars passing on the road past the park and there is not seen nothing interesting.'
 	else
-		'<center><img src="images/pic/park1.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/pic/park1.jpg"></center>'
+		'<center><img src="images/etogame/park1.jpg"></center>'
 		'Cars drive on the road past the park and then not see anything interesting.'
 	end
 

+ 4 - 2
locations/poli

@@ -353,7 +353,8 @@ if $ARGS[0] = 'start':
 			if analplugIN ! 0:analplugIN = 0
 
 			gs 'stat'
-			'<center><img src="images/body/<<anpic>>.jpg"></center>'
+			! WD: Remove Dupe Images ~ use 'images/picb/' not 'images/body/' as in '# body'
+			'<center><img src="images/picb/<<anpic>>.jpg"></center>'
 			'You''ve come to the office to the proctologist. He immediately asked you to undress from the waist down and tilt.'
 
 			if anus <= 15:
@@ -374,7 +375,8 @@ if $ARGS[0] = 'start':
 					proktologday = day
 					anus -= 5
 					gs 'stat'
-					'<center><img src="images/body/<<anpic>>.jpg"></center>'
+					! WD: Remove Dupe Images ~ use 'images/picb/' not 'images/body/' as in '# body'
+					'<center><img src="images/picb/<<anpic>>.jpg"></center>'
 					'You paid for the procedure and the doctor an hour tinkering in your ass causing her to order.'
 
 					act 'Get away from the clinic':gt 'street'

+ 1 - 0
locations/sexshop

@@ -520,6 +520,7 @@ if $ARGS[0] = 'pip':
 					ghnow += 1
 					money += 300
 					fingerRand = rand(1, 5)
+					! WD: Rename missing Image ~  'ghFinger.jpg' to 'ghFinger5.jpg'
 					'<center><img src="images/etogame/ghFinger<<fingerRand>>.jpg"></center>'
 					'You poke your finger in the hole showing that you are ready to serve the stranger.'
 					'The stranger slipped 300 rubles into the hole, and then his cock stuck out of the hole.'

+ 8 - 8
locations/univer

@@ -173,8 +173,8 @@ if $ARGS[0] = 'dekanat':
 					cla
 					*clr
 					zanpicrand = rand(1, 3)
-					! Missing Images
-					! '<center><img src="images/img/oldtown/zan<<zanpicrand>>.jpg"></center>'
+					$ImageNeededPlacholder
+					! WD: IMAGE NEEDED ~ '<center><img src="images/img/oldtown/zan<<zanpicrand>>.jpg"></center>'
 					'After the class lecturer explains to you for an hour thing.'
 
 					act 'Leave':gt 'univer', 'dekanat'
@@ -187,8 +187,8 @@ if $ARGS[0] = 'dekanat':
 						if zanpicrand = 2:picrand = 45
 						if zanpicrand = 3:picrand = 46
 
-						! Missing Images
-						! '<center><img src="images/img/oldtown/zan1<<zanpicrand>>.jpg"></center>'
+						$ImageNeededPlacholder
+						! WD: IMAGE NEEDED ~ '<center><img src="images/img/oldtown/zan1<<zanpicrand>>.jpg"></center>'
 						'You grab his penis, he reflexively pulls away, but then relaxes and allows you to continue.'
 
 						act 'Blow job':gt 'sex', 'minet'
@@ -203,8 +203,8 @@ if $ARGS[0] = 'dekanat':
 					cla
 					*clr
 					zanpicrand = rand(4, 6)
-					! Missing Images
-					! '<center><img src="images/img/oldtown/zan<<zanpicrand>>.jpg"></center>'
+					$ImageNeededPlacholder
+					! WD: IMAGE NEEDED ~ '<center><img src="images/img/oldtown/zan<<zanpicrand>>.jpg"></center>'
 					'After exercising for an hour lecturer explains to you another girl the importance of its subject.'
 
 					act 'Leave':gt 'univer', 'dekanat'
@@ -217,8 +217,8 @@ if $ARGS[0] = 'dekanat':
 						if zanpicrand = 5:picrand = 21
 						if zanpicrand = 6:picrand = 22
 
-						! Missing Images
-						! '<center><img src="images/img/oldtown/zan1<<zanpicrand>>.jpg"></center>'
+						$ImageNeededPlacholder
+						! WD: IMAGE NEEDED ~ '<center><img src="images/img/oldtown/zan1<<zanpicrand>>.jpg"></center>'
 						'You go down on your knees and grab his penis, the other girl looks at you with round eyes, but then also starts to stick to the teacher to design, he resists a little at first, but then completely given into your hand.'
 
 						act 'Blow job':gt 'podrsex', 'var'

+ 3 - 1
locations/vanrPar

@@ -209,7 +209,9 @@ elseif analplug = 1 and analplugin = 0 and klismaday1= 1 and plugday ! daystart:
 		if anus >= 10 and anus < 20:anus += rand(1, 2)
 		if anus >= 20 and anus < 30:anus += rand(0, 1)
 
-		'<center><img src="images/pic/analplug.jpg"></center>'
+		! WD: Remove Dupe Images ~ '<center><img src="images/pic/analplug.jpg"></center>'
+
+		'<center><img src="images/etogame/analplug.jpg"></center>'
 
 		if butpluguse > 0:'You bent over and inserted the butt plug.'
 		if butpluguse = 0:butpluguse = 1 & '"If I don''t use it then why did I buy it!" you thought. You decided to take a closer look while thinking, "It is necessary to start developing my ass so I could have great adventures someday, you could even say a huge and thick adventures with crimson heads, uh, now I got carried away." You scratched your head. Then you directed it in your ass, it was a bit painful at first, but as soon as the widest part was plunged into the murky depths of your anus it became easier to push it all the way.'

+ 18 - 9
locations/vokdin

@@ -13,7 +13,8 @@ $din_vokzalg_kassi = {
 			money -= 200
 			minut += 15
 			gs 'stat'
-			'<center><img src="images/pic/electri.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/pic/electri.jpg"></center>'
+			'<center><img src="images/etogame/electri.jpg"></center>'
 			'You paid for the ticket and boarded the train going in the town.'
 			'After 15 minutes the train stopped at the station.'
 
@@ -21,21 +22,24 @@ $din_vokzalg_kassi = {
 				cls
 				minut += 15
 				gs 'stat'
-				'<center><img src="images/pic/electri.jpg"></center>'
+				! WD: Remove Dupe Images ~ '<center><img src="images/pic/electri.jpg"></center>'
+				'<center><img src="images/etogame/electri.jpg"></center>'
 				'After 15 minutes the train stopped at the station.'
 
 				act 'To go further':
 					cls
 					minut += 15
 					gs 'stat'
-					'<center><img src="images/pic/electri.jpg"></center>'
+					! WD: Remove Dupe Images ~ '<center><img src="images/pic/electri.jpg"></center>'
+					'<center><img src="images/etogame/electri.jpg"></center>'
 					'After 15 minutes the train stopped at the station.'
 
 					act 'To go further':
 						cls
 						minut += 15
 						gs 'stat'
-						'<center><img src="images/pic/electri.jpg"></center>'
+						! WD: Remove Dupe Images ~ '<center><img src="images/pic/electri.jpg"></center>'
+						'<center><img src="images/etogame/electri.jpg"></center>'
 						'After 15 minutes the train stopped at the Centre.'
 
 						act 'Leave':minut += 5 & nroad = 0 & gt 'Vokzal'
@@ -100,7 +104,8 @@ $din_vokzalg_toilet_deyst = {
 		act 'Apply makeup':
 			cla
 			*clr
-			'<center><img src="images/pic/mop.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/pic/mop.jpg"></center>'
+			'<center><img src="images/etogame/mop.jpg"></center>'
 
 			act 'Light makeup (0:03)':
 				cla
@@ -178,7 +183,8 @@ $din_vokzalg_toilet_deyst = {
 			cumface = 0
 			sweat -= 1
 			minut += 5
-			'<center><img src="images/pic/facesp.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/pic/facesp.jpg"></center>'
+			'<center><img src="images/etogame/facesp.jpg"></center>'
 			'You clean your face and got rid of any trace of cum.'
 
 			if vokzalToilet = 1:act 'Finish':dynamic $din_vokzalg_toilet_f
@@ -192,7 +198,8 @@ $din_vokzalg_toilet_deyst = {
 			*clr
 			cumfrot = 0
 			minut += 10
-			'<center><img src="images/pic/frotsp.jpg"></center>'
+			! WD: Remove Dupe Images ~ '<center><img src="images/pic/frotsp.jpg"></center>'
+			'<center><img src="images/etogame/frotsp.jpg"></center>'
 			'You remove traces of cum from your clothes.'
 
 			if vokzalToilet = 1:act 'Finish':dynamic $din_vokzalg_toilet_f
@@ -240,7 +247,8 @@ $din_vokzalg_toilet_f = {
 	vokzalToilet = 1
 	gs 'stat'
 	'<center><h4>The ladies'' room</h4></center>'
-	'<center><img src="images/pic/PublicToilet.jpg"></center>'
+	! WD: Remove Dupe Images ~ '<center><img src="images/pic/PublicToilet.jpg"></center>'
+	'<center><img src="images/etogame/PublicToilet.jpg"></center>'
 	'You opened the door to the ladies'' room and went in.'
 
 	act 'Leave':minut += 1 & dynamic $din_vokzalg_toilet
@@ -253,7 +261,8 @@ $din_vokzalg_toilet_m = {
 	vokzalToilet = 2
 	gs 'stat'
 	'<center><h4>The men''s room</h4></center>'
-	'<center><img src="images/pic/PublicToilet.jpg"></center>'
+	! WD: Remove Dupe Images ~ '<center><img src="images/pic/PublicToilet.jpg"></center>'
+	'<center><img src="images/etogame/PublicToilet.jpg"></center>'
 	'You opened the door to the men''s room and went in.'
 
 	if cloth_vid = 1:

+ 8 - 8
locations/young_shop

@@ -118,8 +118,8 @@ if hour = 15 and young_shop_work = 1 and week < 6:
 						if intel >= 50:
 							cla
 							*clr
-							! Missing Images / invalid path
-							! '<center><img src="images/pictures/characters/photo_dressed_[$vika]_13.src="></center>'
+							$ImageNeededPlacholder
+							! WD: IMAGE NEEDED ~ '<center><img src="images/pictures/characters/photo_dressed_[$vika]_13.src="></center>'
 							'Fortunately Kira very trusting girl, and my leadership qualities are not pumped. I managed to convince her that absolutely should not be embarrassed and that the mother wants for her nothing but good.'
 							'Vick slowly puts his hands under her skirt and pulls off her panties.'
 							'- You feel like a breeze blowing from the bottom? Imagine how nice it would be to go walking on the street.'
@@ -137,8 +137,8 @@ if hour = 15 and young_shop_work = 1 and week < 6:
 							act 'Remove her panties':
 								cla
 								*clr
-								! Missing Images
-								! '<center><img src="images/pictures/characters/photo_dressed_[$vika]_13.png"></center>'
+								$ImageNeededPlacholder
+								! WD: IMAGE NEEDED ~ '<center><img src="images/pictures/characters/photo_dressed_[$vika]_13.png"></center>'
 								'- Well, - I bend over and thrust his hands under her skirt Kira. The girl could not even imagine that it''s possible.'
 								'I lift my mini skirt and slowly Cyrus pulls off her panties. Bares her pussy is right before my eyes at a distance of 10 centimeters. I notice that the girl is very excited because of this situation and her panties a little wet. Delicate aroma hit my nose and I smiled.'
 								'Kira took off her panties, I show her wet spot, and then hide behind panties and get out of the booth.'
@@ -165,16 +165,16 @@ if hour = 15 and young_shop_work = 1 and week < 6:
 					'This can not be so leave! I resolve to do everything in my power to convince strange mother.'
 
 					if intel >= 60:
-						! Missing Images
-						! '<center><img src="images/pictures/characters/photo_dressed_[$vika]_13.png"></center>'
+						$ImageNeededPlacholder
+						! WD: IMAGE NEEDED ~ '<center><img src="images/pictures/characters/photo_dressed_[$vika]_13.png"></center>'
 						'- You seriously think so, but I do ..? - Glamorous lady ponders my words their meager umishkom and decides to eat them meaning. - Okay, let''s go to a regular store.'
 						'Before leaving Cyrus smiles at me and says:'
 						'- Thank you .. bye! - Girl waving me handle and runs after her mother.'
 
 						act 'Finish the job':dynamic $endwork
 					else
-						! Missing Images
-						! '<center><img src="images/pictures/characters/photo_dressed_[$vika]_13.png"></center>'
+						$ImageNeededPlacholder
+						! WD: IMAGE NEEDED ~ '<center><img src="images/pictures/characters/photo_dressed_[$vika]_13.png"></center>'
 						'- What are you saying? And on TV, so wrong show? What I''m talking to you all! - Glamorous lady could not understand the meaning of my words. - All Kira, we go to another store.'
 						'Before leaving, the girl thanked me for trying to save her and runs away after mama.'
 

Деякі файли не було показано, через те що забагато файлів було змінено