Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Dorn vs. Shar-Teel conflict. #75

Merged
merged 1 commit into from
Jan 24, 2023
Merged

Fix Dorn vs. Shar-Teel conflict. #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions EET/EET.tp2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1555,6 +1555,27 @@ BUT_ONLY
COMPILE ~%patch_dir%/d~
~%MOD_FOLDER%/compile/d~

///// \\\\\
///// workaround for engine differences \\\\\
///// \\\\\

//local scripts are not processing after MakeUnselectable is used
//including this in cleanBG1.d fails on newline pattern matching
COPY_EXISTING ~SHARTJ.DLG~ ~override~
DECOMPILE_AND_PATCH BEGIN
SPRINT textToReplace ~ActionOverride("DORN",MakeUnselectable(1000))
MakeUnselectable(1000)~
COUNT_REGEXP_INSTANCES ~%textToReplace%~ num_matches
PATCH_IF (num_matches > 0) BEGIN
REPLACE_TEXTUALLY ~%textToReplace%~ ~ReallyForceSpellRES("K#UNSELE","SHARTEEL")
ReallyForceSpellRES("K#UNSELE","DORN")~
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%~
END
END
BUT_ONLY

///// \\\\\
///// EFF \\\\\
///// \\\\\
Expand Down
8 changes: 0 additions & 8 deletions EET/compile/d/cleanBG1.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,3 @@ ADD_STATE_TRIGGER RBEREG 6 ~GlobalLT("Chapter","GLOBAL",8)~ 15 18 19

REPLACE_STATE_TRIGGER RFRIEN 1 ~Global("Chapter","GLOBAL",7)~
REPLACE_STATE_TRIGGER RFRIEN 3 ~GlobalLT("Chapter","GLOBAL",8)~ 4 5 6

///// \\\\\
///// workaround for engine differences \\\\\
///// \\\\\

//local scripts are not processing after MakeUnselectable is used
REPLACE_TRIGGER_TEXT SHARTJ ~ActionOverride("DORN",MakeUnselectable(1000))[%newline%]*MakeUnselectable(1000)~ ~ReallyForceSpellRES("K#UNSELE","SHARTEEL")
ReallyForceSpellRES("K#UNSELE","DORN")~