RC8.3

- fixed unix ffmpeg directory - fixed duplicated Candlekeep worldmap travel time - removed duplicated links
Gibberlings3 · Feb 1, 2017 · 1cbd094 · 1cbd094
1 parent 6eeb339
commit 1cbd094
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/EET/lib/EET_core.tp2 b/EET/lib/EET_core.tp2
@@ -150,7 +150,7 @@ END ELSE BEGIN //osx, unix
 		END
 	END
 	AT_NOW ~chmod +x EET/bin/%WEIDU_OS%/%arch_var%lua~ EXACT
-	AT_NOW ~chmod +x EET/bin/%WEIDU_OS%/%arch_var%ffmpeg~ EXACT
+	AT_NOW ~chmod +x EET/bin/%WEIDU_OS%/ffmpeg~ EXACT
 	AT_NOW ~chmod +x EET/bin/%WEIDU_OS%/%arch_var%tileconv~ EXACT
 	AT_NOW ~chmod +x EET/bin/%WEIDU_OS%/%arch_var%tile2ee~ EXACT
 END

diff --git a/EET/lib/macros.tph b/EET/lib/macros.tph
@@ -1024,7 +1024,7 @@ DEFINE_PATCH_FUNCTION dump_wmp
 						REPLACE_TEXTUALLY 2 S
 						REPLACE_TEXTUALLY 3 E
 					END
-					PATCH_IF (("%link_string%" STRING_CONTAINS_REGEXP "%area% %nesw% %target_are% %entry% %time% %flags% %enc1% %enc2% %enc3% %enc4% %enc5% %prob%")=0) BEGIN
+					PATCH_IF (("%link_string%" STRING_CONTAINS_REGEXP "%area% %nesw% %target_are% %entry% ")=0) BEGIN
 						PATCH_PRINT ~Skipping duplicated link: %area% %nesw% %target_are% %entry% %time% %flags% %enc1% %enc2% %enc3% %enc4% %enc5% %prob%~
 					END ELSE BEGIN
 						SPRINT link_string "%link_string%%area% %nesw% %target_are% %entry% %time% %flags% %enc1% %enc2% %enc3% %enc4% %enc5% %prob%%LNL%"
@@ -1053,7 +1053,7 @@ DEFINE_PATCH_FUNCTION dump_wmp
 							REPLACE_TEXTUALLY 2 S
 							REPLACE_TEXTUALLY 3 E
 						END
-						PATCH_IF (("%link_string%" STRING_CONTAINS_REGEXP "%MATCH1% %nesw% %source% %MATCH3% %MATCH4% %MATCH2% %MATCH6% %MATCH7% %MATCH8% %MATCH9% %MATCH10% %MATCH5%")=0) BEGIN
+						PATCH_IF (("%link_string%" STRING_CONTAINS_REGEXP "%MATCH1% %nesw% %source% %MATCH3%")=0) BEGIN
 							PATCH_PRINT ~Skipping duplicated link: %MATCH1% %nesw% %source% %MATCH3% %MATCH4% %MATCH2% %MATCH6% %MATCH7% %MATCH8% %MATCH9% %MATCH10% %MATCH5%~
 						END ELSE BEGIN
 							SPRINT link_string "%link_string%%MATCH1% %nesw% %source% %MATCH3% %MATCH4% %MATCH2% %MATCH6% %MATCH7% %MATCH8% %MATCH9% %MATCH10% %MATCH5%%LNL%"

diff --git a/EET/tbl/map_eet_areas.tbl b/EET/tbl/map_eet_areas.tbl
@@ -24,7 +24,7 @@ BG2100     BG2100     BG2100     2          39         602        1685       @BG
 BG2200     BG2200     BG2200     0          45         720        1688       @BG2200    @BG2200    N        //Cloakwood (Cloakwood 1)
 BG2300     BG2300     BG2300     3          46         935        1659       @BG2300    @BG2300    N        //Friendly Arm Inn
 BG2400     BG2400     BG2400     2          49         1148       1539       @BG2400    @BG2400    N        //Peldvale
-BG2600     BG2600     BG2600     0          50         639        1796       @BG2600    @BG2600    N        //Candlekeep [prologue]
+BG2600     BG2600     BG2600     0          50         639        1796       N          N          N        //Candlekeep [prologue]
 BG2626     BG2626     BG2626     15         50         639        1796       @BG2600    @BG2600    N        //Candlekeep [ch.6]
 BG2700     BG2700     BG2700     2          52         770        1788       @BG2700    @BG2700    N        //Lion's Way (Gorion's Rest)
 BG2800     BG2800     BG2800     2          47         893        1752       @BG2800    @BG2800    N        //Coast Way (Crossroads)

diff --git a/EET/tbl/map_mods_areas.tbl b/EET/tbl/map_mods_areas.tbl
@@ -25,7 +25,7 @@ BG2100     BG2100     BG2100     2          39         1412       2378       @BG
 BG2200     BG2200     BG2200     0          45         1562       2336       @BG2200    @BG2200    N        //Cloakwood Lodge (Cloakwood 1)
 BG2300     BG2300     BG2300     3          46         1800       2270       @BG2300    @BG2300    N        //Friendly Arm Inn
 BG2400     BG2400     BG2400     2          49         1990       2282       @BG2400    @BG2400    N        //Peldvale
-BG2600     BG2600     BG2600     0          50         1366       2464       @BG2600    @BG2600    N        //Candlekeep [prologue]
+BG2600     BG2600     BG2600     0          50         1366       2464       N          N          N        //Candlekeep [prologue]
 BG2626     BG2626     BG2626     15         50         1366       2464       @BG2600    @BG2600    N        //Candlekeep [ch.6]
 BG2700     BG2700     BG2700     2          52         1500       2450       @BG2700    @BG2700    N        //Lion's Way (Gorion's Rest)
 BG2800     BG2800     BG2800     2          47         1795       2392       @BG2800    @BG2800    N        //Coast Way (Crossroads)