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.

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

Updated store revision component to add scrolls for new SR spells for BGEE and EET-BG1 #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions item_rev/components/store_revisions.tpa
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
INCLUDE ~item_rev/lib/compatibility.tpa~
INCLUDE ~item_rev/lib/identify_item.tpa~
INCLUDE ~item_rev/lib/store_rev_macros.tpa~

///////////////////////////////////////////////////////////////////

// use this detection check - 'FILE_EXISTS_IN_GAME ag#store_revisions.mrk'
Expand Down
8 changes: 8 additions & 0 deletions item_rev/components/store_revisions_bg1.tpa
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Added by mercurier
// Patch BG1 stores to include new spells from SR
ACTION_IF comp_sr BEGIN
COPY_EXISTING ~sto0703.sto~ ~override~ // Sorcerous Sundries
ADD_STORE_ITEM ~SCRL6Y~ LAST #1 #0 #0 IDENTIFIED #1 // Vitriolic Sphere
BUT_ONLY
END

34 changes: 24 additions & 10 deletions item_rev/item_rev.tp2
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,36 @@ DESIGNATED 1030
REQUIRE_PREDICATE (GAME_IS ~soa tob bgt bgee bg2ee eet~) @9002

// a bit rough for now... will fine-tune once BG1 revision is complete
ACTION_IF (GAME_IS ~tob bgt bg2ee eet~) BEGIN
ACTION_IF (GAME_IS ~bgt eet~) BEGIN
LOAD_TRA ~item_rev/languages/english/store_revisions.tra~
LOAD_TRA ~item_rev/languages/%LANGUAGE%/store_revisions.tra~
INCLUDE ~item_rev/lib/compatibility.tpa~
INCLUDE ~item_rev/components/store_revisions.tpa~
INCLUDE ~item_rev/components/store_revisions_bg1.tpa~
INCLUDE ~item_rev/components/item_reallocation.tpa~
COPY_EXISTING_REGEXP GLOB ~.*\.sto~ override
LPF items_to_order END
BUT_ONLY
END ELSE BEGIN
INCLUDE ~item_rev/lib/identify_item.tpa~
INCLUDE ~item_rev/lib/store_rev_macros.tpa~
COPY_EXISTING_REGEXP GLOB ~.*\.sto~ override
LPF items_to_order END
BUT_ONLY
END ELSE BEGIN
ACTION_IF (GAME_IS ~tob bg2ee~) BEGIN
LOAD_TRA ~item_rev/languages/english/store_revisions.tra~
LOAD_TRA ~item_rev/languages/%LANGUAGE%/store_revisions.tra~
INCLUDE ~item_rev/lib/compatibility.tpa~
INCLUDE ~item_rev/components/store_revisions.tpa~
INCLUDE ~item_rev/components/item_reallocation.tpa~
END ELSE BEGIN
ACTION_IF (GAME_IS ~bg1 bgee~) BEGIN
LOAD_TRA ~item_rev/languages/english/store_revisions.tra~
LOAD_TRA ~item_rev/languages/%LANGUAGE%/store_revisions.tra~
INCLUDE ~item_rev/lib/compatibility.tpa~
INCLUDE ~item_rev/components/store_revisions_bg1.tpa~
END
END
END

INCLUDE ~item_rev/lib/identify_item.tpa~
INCLUDE ~item_rev/lib/store_rev_macros.tpa~
COPY_EXISTING_REGEXP GLOB ~.*\.sto~ override
LPF items_to_order END
BUT_ONLY

ACTION_IF install_masterwork_weapons BEGIN
LOAD_TRA ~item_rev/languages/english/masterwork.tra~
LOAD_TRA ~item_rev/languages/%LANGUAGE%/masterwork.tra~
Expand Down