Merge pull request #169 from CamDawg/master

fix: EEFP compatibility, modernized readmes

Author: K4thos

EET/EET.tp2

@@ -1,6 +1,6 @@
 BACKUP ~EET/backup~
 AUTHOR ~K4thos (swit)~
-VERSION ~V13.4~
+VERSION ~v14.0~
 README ~EET/lang/%LANGUAGE%/readme-EET.html~ ~EET/readme-EET.html~
 
 LANGUAGE ~English~
@@ -219,8 +219,10 @@ END
 ///// Detect mods installed on BG:EE                   \\\\\
 /////                                                  \\\\\
 
+OUTER_SET cd_eefp_bgee = 0
 ACTION_IF FILE_EXISTS ~%bgee_dir%/WeiDU.log~ BEGIN
 	COPY + ~%bgee_dir%/WeiDU.log~ ~%MOD_FOLDER%/temp~
+    COUNT_REGEXP_INSTANCES "^~EEFIXPACK/SETUP-EEFIXPACK\.TP2~ #[0-9]+ #0" cd_eefp_bgee
 		REPLACE_TEXTUALLY ~^//.*~ ~~ //removes "Recently uninstalled" lines
 		COUNT_REGEXP_INSTANCES "^~SOA/SETUP-SOA\.TP2~ #[0-9]+ #1 " num_matches
 		PATCH_IF (num_matches > 0) BEGIN

EET/docs/Modder's Notes.html

@@ -1346,7 +1346,10 @@ COPY_EXISTING ~BD6100.BCS~ ~override~
 			REPLACE_TEXTUALLY ~%textToReplace%~ ~~
 			PATCH_PRINT ~Patching: %num_matches% matches found in %SOURCE_FILESPEC% for REPLACE_TEXTUALLY: %textToReplace%~
 		END ELSE BEGIN
-			PATCH_WARN ~WARNING: could not find %textToReplace% in %SOURCE_FILESPEC%~
+      // camdawg: OK if not a match since we don't want it here (EEFP removes it anyway)
+      PATCH_IF !cd_eefp_bgee BEGIN 
+			  PATCH_WARN ~WARNING: could not find %textToReplace% in %SOURCE_FILESPEC%~
+      END   
 		END
 		SPRINT textToReplace ~\(ApplySpellRES("bdremove",Player1)\)~
 		COUNT_REGEXP_INSTANCES ~%textToReplace%~ num_matches
@@ -1391,7 +1394,8 @@ EXTEND_TOP ~BD6100.BCS~ ~.../BD6100-et.baf~
 //BD6200.BCS
 COPY_EXISTING ~BD6200.BCS~ ~override~
 	DECOMPILE_AND_PATCH BEGIN
-		SPRINT textToReplace ~CreateCreature("bdimoen",\[775\.705\],E)[%newline%]*ActionOverride("bdimoen",MakeGlobalOverride())~
+    // camdawg: matching bdimoen (bgee 2.6 and incorrect) and imoen (eefp and correct) -- imoen converted to imoen2 by earlier work
+		SPRINT textToReplace ~CreateCreature("bdimoen",\[775\.705\],E)[%newline%]*ActionOverride("\(bdimoen\|imoen2\)",MakeGlobalOverride())~
 		COUNT_REGEXP_INSTANCES ~%textToReplace%~ num_matches
 		PATCH_IF (num_matches > 0) BEGIN
 			REPLACE_TEXTUALLY ~%textToReplace%~ ~ActionOverride("IMOEN2",SetGlobal("K#PartySoD","LOCALS",1))

EET/docs/images/EET_worldmap_thumb.jpg

@@ -48,6 +48,8 @@ COPY_EXISTING ~PRINCESS.ITM~ ~override~
 	LPF EET_PCU_core END
 BUT_ONLY
 
+ACTION_IF !cd_eefp_bgee BEGIN // if eefp was installed on bgee prior to merge, none of this should be necessary
+
 //http://gibberlings3.net/forums/index.php?showtopic=28161&page=19#entry246196
 COPY_EXISTING ~BDPETR01.CRE~ ~override~
 	~BDPETR02.CRE~ ~override~
@@ -58,7 +60,7 @@ COPY_EXISTING ~BDPETR01.CRE~ ~override~
 	PATCH_IF (~%default%~ STR_EQ ~DPLAYER3~) BEGIN
 		WRITE_ASCII 0x268 ~~ #8
 	END ELSE BEGIN
-		PATCH_WARN ~WARNING: %BASH_FOR_FILE% no longer needs fixing~
+		PATCH_WARN ~WARNING: %SOURCE_FILE% no longer needs fixing~
 	END
 BUT_ONLY
 
@@ -286,7 +288,9 @@ BUT_ONLY
 	LPF REPLACE_AREA_ITEM STR_VAR old_item = SLNG03 new_item = SLNG05 END
 BUT_ONLY*/
 
+END // eefp check
+
 COPY_EXISTING ~IMPORT02.2DA~ ~override~
 	PRETTY_PRINT_2DA
 	REPLACE_TEXTUALLY ~ SLNG03$~ ~ SLNG05~
-BUT_ONLY
+BUT_ONLY