merged feature/factionless

.pkgmeta

@@ -2,26 +2,18 @@ package-as: RaiderIO
 enable-nolib-creation: no
 
 move-folders:
-  RaiderIO/db/RaiderIO_DB_EU_A: RaiderIO_DB_EU_A
-  RaiderIO/db/RaiderIO_DB_EU_H: RaiderIO_DB_EU_H
-  RaiderIO/db/RaiderIO_DB_KR_A: RaiderIO_DB_KR_A
-  RaiderIO/db/RaiderIO_DB_KR_H: RaiderIO_DB_KR_H
-  RaiderIO/db/RaiderIO_DB_TW_A: RaiderIO_DB_TW_A
-  RaiderIO/db/RaiderIO_DB_TW_H: RaiderIO_DB_TW_H
-  RaiderIO/db/RaiderIO_DB_US_A: RaiderIO_DB_US_A
-  RaiderIO/db/RaiderIO_DB_US_H: RaiderIO_DB_US_H
-  RaiderIO/db/RaiderIO_DB_EU_A_R: RaiderIO_DB_EU_A_R
-  RaiderIO/db/RaiderIO_DB_EU_H_R: RaiderIO_DB_EU_H_R
-  RaiderIO/db/RaiderIO_DB_KR_A_R: RaiderIO_DB_KR_A_R
-  RaiderIO/db/RaiderIO_DB_KR_H_R: RaiderIO_DB_KR_H_R
-  RaiderIO/db/RaiderIO_DB_TW_A_R: RaiderIO_DB_TW_A_R
-  RaiderIO/db/RaiderIO_DB_TW_H_R: RaiderIO_DB_TW_H_R
-  RaiderIO/db/RaiderIO_DB_US_A_R: RaiderIO_DB_US_A_R
-  RaiderIO/db/RaiderIO_DB_US_H_R: RaiderIO_DB_US_H_R
   RaiderIO/db/RaiderIO_DB_EU_F: RaiderIO_DB_EU_F
+  RaiderIO/db/RaiderIO_DB_EU_M: RaiderIO_DB_EU_M
+  RaiderIO/db/RaiderIO_DB_EU_R: RaiderIO_DB_EU_R
   RaiderIO/db/RaiderIO_DB_KR_F: RaiderIO_DB_KR_F
+  RaiderIO/db/RaiderIO_DB_KR_M: RaiderIO_DB_KR_M
+  RaiderIO/db/RaiderIO_DB_KR_R: RaiderIO_DB_KR_R
   RaiderIO/db/RaiderIO_DB_TW_F: RaiderIO_DB_TW_F
+  RaiderIO/db/RaiderIO_DB_TW_M: RaiderIO_DB_TW_M
+  RaiderIO/db/RaiderIO_DB_TW_R: RaiderIO_DB_TW_R
   RaiderIO/db/RaiderIO_DB_US_F: RaiderIO_DB_US_F
+  RaiderIO/db/RaiderIO_DB_US_M: RaiderIO_DB_US_M
+  RaiderIO/db/RaiderIO_DB_US_R: RaiderIO_DB_US_R
 
 unaltered:
   - db/db_*.lua

RaiderIO.toc

@@ -2,7 +2,7 @@
 ## Title: Raider.IO Mythic Plus, Raiding, and Recruitment
 ## Notes: Shows Raider.IO Mythic+ Score, Raid Progress, and Recruitment status in-game. Make sure to load one or more region DB.
 ## Author: Vladinator (Vladinator-TarrenMill), Aspyr (Aspyrox-Skullcrusher) and Isak (Isak-Sargeras)
-## Version: 9.2.0 (@project-version@)
+## Version: 9.2.5 (@project-version@)
 ## SavedVariables: RaiderIO_Config, RaiderIO_LastCharacter, RaiderIO_MissingCharacters, RaiderIO_MissingServers, RaiderIO_CachedRuns, RaiderIO_RWF
 ## X-Website: https://raider.io
 ## X-AddonProvider: github

db/RaiderIO_DB.bat

@@ -1,25 +1,38 @@
 @echo off
 setlocal enabledelayedexpansion
+set cwd=%~dp0
 
+:TOC
 set toc_interface=90205
 set toc_author=Vladinator ^(Vladinator-TarrenMill^), Aspyr ^(Aspyrox-Skullcrusher^) and Isak ^(Isak-Sargeras^)
 set toc_addon=RaiderIO
 
-:KeystoneAndRaidingPerRegionAndFaction
+:DB
 for %%r in (
-	"US	Americas"
+
 	"EU	Europe"
 	"KR	Korea"
 	"TW	Taiwan"
+	"US	Americas"
+
 ) do (
+
 	set r=%%r
 	set r1=!r:~1,2!
 	set r2=!r:~4,-1!
 
+	set lr=!r1!
+	call :LoCase lr
+	call :UnScor lr
+
 	for %%t in (
-		"R	Raiding"
+
 		"M	Mythic Plus"
+		"R	Raiding"
+		"F	Recruitment"
+
 	) do (
+
 		set t=%%t
 		set t1=!t:~1,1!
 		set t2=!t:~3,-1!
@@ -28,123 +41,40 @@ for %%r in (
 		call :LoCase lt
 		call :UnScor lt
 
-		if !t1! neq M set t1=_!t1!
-		if !t1! equ M set t1=
-
-		if !lt! neq mythicplus set lt=_!lt!
-		if !lt! equ mythicplus set lt=
-
-		for %%f in (
-			"A	Alliance"
-			"H	Horde"
-		) do (
-			set f=%%f
-			set f1=!f:~1,1!
-			set f2=!f:~3,-1!
-
-			set d=.\RaiderIO_DB_!r1!_!f1!!t1!
-			set f=.\!d!\!d!.toc
-
-			set lr=!r1!
-			set lf=!f2!
-			call :LoCase lr
-			call :LoCase lf
-
-			echo !d! !f!
-
-			rmdir /s /q "!d!"
-			mkdir "!d!"
-
-			echo ## Interface: !toc_interface!>"!f!"
-			echo ## Title: Raider.IO ^|cffFFFFFF!t2!^|r ^(!r2! - !f2!^)>>"!f!"
-			echo ## Author: !toc_author!>>"!f!"
-			echo ## Dependencies: !toc_addon!>>"!f!"
-			echo ## DefaultState: enabled>>"!f!"
-			echo ## X-Type: !t2!>>"!f!"
-			echo ## X-Region: !r2!>>"!f!"
-			echo ## X-Faction: !f2!>>"!f!"
-			echo ## X-Website: https:^/^/raider.io>>"!f!"
-			if !t1! == _R (
-				echo ../!toc_addon!/db/db_raiding_!lr!_!lf!_characters.lua>>"!f!"
-				echo ../!toc_addon!/db/db_raiding_!lr!_!lf!_lookup.lua>>"!f!"
-			) else if !t1! == _F (
-				echo ../!toc_addon!/db/db_recruitment_!lr!_!lf!_characters.lua>>"!f!"
-				echo ../!toc_addon!/db/db_recruitment_!lr!_!lf!_lookup.lua>>"!f!"
-			) else (
-				echo ../!toc_addon!/db/db_!lr!_!lf!!lt!_characters.lua>>"!f!"
-				echo ../!toc_addon!/db/db_!lr!_!lf!!lt!_lookup.lua>>"!f!"
-			)
-		)
-	)
-)
+		set db1=db_!lt!_!lr!_characters.lua
+		set db2=db_!lt!_!lr!_lookup.lua
 
-:RecruitmentPerRegionForBothFactions
-for %%r in (
-	"US	Americas"
-	"EU	Europe"
-	"KR	Korea"
-	"TW	Taiwan"
-) do (
-	set r=%%r
-	set r1=!r:~1,2!
-	set r2=!r:~4,-1!
+		if exist "!cwd!\!db1!" (
 
-	for %%t in (
-		"F	Recruitment"
-	) do (
-		set t=%%t
-		set t1=!t:~1,1!
-		set t2=!t:~3,-1!
+			set d=RaiderIO_DB_!r1!_!t1!
+			set f=!d!\!d!.toc
 
-		set lt=!t2!
-		call :LoCase lt
-		call :UnScor lt
+			set ad="!cwd!\!d!"
+			set af="!cwd!\!f!"
+
+			rmdir /s /q !ad!
+			mkdir !ad!
+
+			echo ## Interface: !toc_interface!>!af!
+			echo ## Title: Raider.IO ^|cffFFFFFF!t2!^|r ^(!r2!^)>>!af!
+			echo ## Author: !toc_author!>>!af!
+			echo ## Dependencies: !toc_addon!>>!af!
+			echo ## DefaultState: enabled>>!af!
+			echo ## X-Type: !t2!>>!af!
+			echo ## X-Region: !r2!>>!af!
+			echo ## X-Faction: Both>>!af!
+			echo ## X-Website: https:^/^/raider.io>>!af!
+			echo ../!toc_addon!/db/!db1!>>!af!
+			echo ../!toc_addon!/db/!db2!>>!af!
 
-		if !t1! neq M set t1=_!t1!
-		if !t1! equ M set t1=
-
-		if !lt! neq mythicplus set lt=_!lt!
-		if !lt! equ mythicplus set lt=
-
-		for %%f in (
-			"_	Alliance and Horde"
-		) do (
-			set f=%%f
-			set f1=!f:~1,1!
-			set f2=!f:~3,-1!
-
-			set d=.\RaiderIO_DB_!r1!!t1!
-			set f=.\!d!\!d!.toc
-
-			set lr=!r1!
-			set lf=!f2!
-			call :LoCase lr
-			call :LoCase lf
-
-			echo !d! !f!
-
-			rmdir /s /q "!d!"
-			mkdir "!d!"
-
-			echo ## Interface: !toc_interface!>"!f!"
-			echo ## Title: Raider.IO ^|cffFFFFFF!t2!^|r ^(!r2! - !f2!^)>>"!f!"
-			echo ## Author: !toc_author!>>"!f!"
-			echo ## Dependencies: !toc_addon!>>"!f!"
-			echo ## DefaultState: enabled>>"!f!"
-			echo ## X-Type: !t2!>>"!f!"
-			echo ## X-Region: !r2!>>"!f!"
-			echo ## X-Faction: !f2!>>"!f!"
-			echo ## X-Website: https:^/^/raider.io>>"!f!"
-			echo ../!toc_addon!/db/db_recruitment_!lr!_alliance_characters.lua>>"!f!"
-			echo ../!toc_addon!/db/db_recruitment_!lr!_alliance_lookup.lua>>"!f!"
-			echo ../!toc_addon!/db/db_recruitment_!lr!_horde_characters.lua>>"!f!"
-			echo ../!toc_addon!/db/db_recruitment_!lr!_horde_lookup.lua>>"!f!"
 		)
+
 	)
+
 )
 
-:SkipToEndOfFile
-goto End
+:GoToEnd
+GOTO:End
 
 REM http://www.robvanderwoude.com/battech_convertcase.php
 :LoCase
@@ -160,4 +90,4 @@ FOR %%i IN (" =") DO CALL SET "%1=%%%1:%%~i%%"
 GOTO:EOF
 
 :End
-pause
+REM pause

db/RaiderIO_DB_EU_F/RaiderIO_DB_EU_F.toc

@@ -1,13 +1,11 @@
 ## Interface: 90205
-## Title: Raider.IO |cffFFFFFFRecruitment|r (Europe - Alliance and Horde)
+## Title: Raider.IO |cffFFFFFFRecruitment|r (Europe)
 ## Author: Vladinator (Vladinator-TarrenMill), Aspyr (Aspyrox-Skullcrusher) and Isak (Isak-Sargeras)
 ## Dependencies: RaiderIO
 ## DefaultState: enabled
 ## X-Type: Recruitment
 ## X-Region: Europe
-## X-Faction: Alliance and Horde
+## X-Faction: Both
 ## X-Website: https://raider.io
-../RaiderIO/db/db_recruitment_eu_alliance_characters.lua
-../RaiderIO/db/db_recruitment_eu_alliance_lookup.lua
-../RaiderIO/db/db_recruitment_eu_horde_characters.lua
-../RaiderIO/db/db_recruitment_eu_horde_lookup.lua
+../RaiderIO/db/db_recruitment_eu_characters.lua
+../RaiderIO/db/db_recruitment_eu_lookup.lua

db/RaiderIO_DB_EU_H/RaiderIO_DB_EU_H.toc → db/RaiderIO_DB_EU_M/RaiderIO_DB_EU_M.toc

@@ -1,11 +1,11 @@
 ## Interface: 90205
-## Title: Raider.IO |cffFFFFFFMythic Plus|r (Europe - Horde)
+## Title: Raider.IO |cffFFFFFFMythic Plus|r (Europe)
 ## Author: Vladinator (Vladinator-TarrenMill), Aspyr (Aspyrox-Skullcrusher) and Isak (Isak-Sargeras)
 ## Dependencies: RaiderIO
 ## DefaultState: enabled
 ## X-Type: Mythic Plus
 ## X-Region: Europe
-## X-Faction: Horde
+## X-Faction: Both
 ## X-Website: https://raider.io
-../RaiderIO/db/db_eu_horde_characters.lua
-../RaiderIO/db/db_eu_horde_lookup.lua
+../RaiderIO/db/db_mythicplus_eu_characters.lua
+../RaiderIO/db/db_mythicplus_eu_lookup.lua

db/RaiderIO_DB_EU_H_R/RaiderIO_DB_EU_H_R.toc → db/RaiderIO_DB_EU_R/RaiderIO_DB_EU_R.toc

@@ -1,11 +1,11 @@
 ## Interface: 90205
-## Title: Raider.IO |cffFFFFFFRaiding|r (Europe - Horde)
+## Title: Raider.IO |cffFFFFFFRaiding|r (Europe)
 ## Author: Vladinator (Vladinator-TarrenMill), Aspyr (Aspyrox-Skullcrusher) and Isak (Isak-Sargeras)
 ## Dependencies: RaiderIO
 ## DefaultState: enabled
 ## X-Type: Raiding
 ## X-Region: Europe
-## X-Faction: Horde
+## X-Faction: Both
 ## X-Website: https://raider.io
-../RaiderIO/db/db_raiding_eu_horde_characters.lua
-../RaiderIO/db/db_raiding_eu_horde_lookup.lua
+../RaiderIO/db/db_raiding_eu_characters.lua
+../RaiderIO/db/db_raiding_eu_lookup.lua

db/RaiderIO_DB_KR_F/RaiderIO_DB_KR_F.toc

@@ -1,13 +1,11 @@
 ## Interface: 90205
-## Title: Raider.IO |cffFFFFFFRecruitment|r (Korea - Alliance and Horde)
+## Title: Raider.IO |cffFFFFFFRecruitment|r (Korea)
 ## Author: Vladinator (Vladinator-TarrenMill), Aspyr (Aspyrox-Skullcrusher) and Isak (Isak-Sargeras)
 ## Dependencies: RaiderIO
 ## DefaultState: enabled
 ## X-Type: Recruitment
 ## X-Region: Korea
 ## X-Faction: Alliance and Horde
 ## X-Website: https://raider.io
-../RaiderIO/db/db_recruitment_kr_alliance_characters.lua
-../RaiderIO/db/db_recruitment_kr_alliance_lookup.lua
-../RaiderIO/db/db_recruitment_kr_horde_characters.lua
-../RaiderIO/db/db_recruitment_kr_horde_lookup.lua
+../RaiderIO/db/db_recruitment_kr_characters.lua
+../RaiderIO/db/db_recruitment_kr_lookup.lua

db/RaiderIO_DB_KR_H/RaiderIO_DB_KR_H.toc → db/RaiderIO_DB_KR_M/RaiderIO_DB_KR_M.toc

@@ -1,11 +1,11 @@
 ## Interface: 90205
-## Title: Raider.IO |cffFFFFFFMythic Plus|r (Korea - Horde)
+## Title: Raider.IO |cffFFFFFFMythic Plus|r (Korea)
 ## Author: Vladinator (Vladinator-TarrenMill), Aspyr (Aspyrox-Skullcrusher) and Isak (Isak-Sargeras)
 ## Dependencies: RaiderIO
 ## DefaultState: enabled
 ## X-Type: Mythic Plus
 ## X-Region: Korea
-## X-Faction: Horde
+## X-Faction: Both
 ## X-Website: https://raider.io
-../RaiderIO/db/db_kr_horde_characters.lua
-../RaiderIO/db/db_kr_horde_lookup.lua
+../RaiderIO/db/db_mythicplus_kr_characters.lua
+../RaiderIO/db/db_mythicplus_kr_lookup.lua

db/RaiderIO_DB_KR_H_R/RaiderIO_DB_KR_H_R.toc → db/RaiderIO_DB_KR_R/RaiderIO_DB_KR_R.toc

@@ -1,11 +1,11 @@
 ## Interface: 90205
-## Title: Raider.IO |cffFFFFFFRaiding|r (Korea - Horde)
+## Title: Raider.IO |cffFFFFFFRaiding|r (Korea)
 ## Author: Vladinator (Vladinator-TarrenMill), Aspyr (Aspyrox-Skullcrusher) and Isak (Isak-Sargeras)
 ## Dependencies: RaiderIO
 ## DefaultState: enabled
 ## X-Type: Raiding
 ## X-Region: Korea
-## X-Faction: Horde
+## X-Faction: Both
 ## X-Website: https://raider.io
-../RaiderIO/db/db_raiding_kr_horde_characters.lua
-../RaiderIO/db/db_raiding_kr_horde_lookup.lua
+../RaiderIO/db/db_raiding_kr_characters.lua
+../RaiderIO/db/db_raiding_kr_lookup.lua