Skip to content

Commit

Permalink
Version 1.0 Release Candidate 5
Browse files Browse the repository at this point in the history
- Fixed MAJOR regression regarding NPC SoA continuity system caused by
engine changes in patch 2.x
- Fixed problem with not working NPC Override scripts after SoD->SoA
transition (damn DisableAI command, wasted too much time before finding
the obvious cause)
- Fixed random tables item quirks (mod now uses old 2da files and the
same names as BGT)
- Added new function that can be used by modders to easily patch BG1
random tables dummy item names. Supported platforms: BG1, BG:EE, Tutu,
BGT, EET
- Fixed water layers via argent77's code (this time for sure)
- Day/Night movies no longer shows up in interiors
- Kicked NPCs won't try to initiate post dialogue after spawned again
- Fixed regression in EET_modConverter 'Chapter_patcher.tph', also added
support for commands written with whitespace between commas
- Fixed support for 'Story mode' (needs testing)
- Fixed vanilla BG:EE bug - duplicating Rasaad GAM entries
- Fixed problem with spawning Rasaad too early in Trademeet
- Changed vanilla code that for whatever reason sets Aerie's BeenInParty
flag even if she wasn't in party at all
- Implemented auto biography GUI feature depending on the chosen
campaign (workaround for the vanilla system that doesn't work when
engine_mode = 1)
- SoD GUI now supports High Level Abilities selection
- added scrollbar to SoD GUI kits selection menu
- Removed SCRL1V importation - Dimension Door scroll no longer exists in
vanilla BG:EE. EET now copies version of this file from patch 1.3 to
Override in case some mods still use it
- Updated 'EET_functions.tph' - also included in updated BG2:EE NPC
compatibility patches (no other changes)
- Resolved compatibility problem with mods that use Player initiated
dialogues system
- Resolved compatibility issue with Margarita NPC - please re-install
setup-EET_end finalise component if you have it installed
- All vanilla BG1 and BG2 areas added to console menu (if there is a
reference for BG:EE and BG2:EE areas than let me know)
- Added XP adjustment after spawning NPC in ToB
- Thieves Guild time limit disabled when you return to old areas
- EET no longer uses HANDLE_CHARSETS - all TRA files have been converted
to UTF-8 without boom to solve the issue with M_EET.LUA file (if the
game crashed on you with non-English language than this will fix it).
  • Loading branch information
K4thos committed Aug 12, 2016
1 parent 2961c27 commit d21bb67
Show file tree
Hide file tree
Showing 54 changed files with 2,992 additions and 875 deletions.
899 changes: 798 additions & 101 deletions EET/EET.tp2

Large diffs are not rendered by default.

Binary file modified EET/base/gui/BIGLOGO.BAM
Binary file not shown.
Binary file modified EET/base/gui/MOS3000.PVRZ
Binary file not shown.
Binary file modified EET/base/gui/MOS3001.PVRZ
Binary file not shown.
Binary file added EET/base/itm/SCRL1V_.ITM
Binary file not shown.
22 changes: 22 additions & 0 deletions EET/base/lua/M_EET.LUA
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--obviously theres some redundancy in this data but I dislike the idea of assuming what our frame/sequence will be.
startCampaignData = {
{name = 'EET_CMP_TITLE_BG1', description = 'EET_CMP_TEXT_BG1', title = 0, bigLogo = 0, icon = 0, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --bg1
{name = 'EET_CMP_TITLE_SOD', description = 'EET_CMP_TEXT_SOD', title = 1, bigLogo = 1, icon = 1, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --sod
{name = 'EET_CMP_TITLE_SOA', description = 'EET_CMP_TEXT_SOA', title = 2, bigLogo = 2, icon = 2, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --soa
{name = 'EET_CMP_TITLE_TOB', description = 'EET_CMP_TEXT_TOB', title = 3, bigLogo = 3, icon = 3, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --tob
{name = 'EET_CMP_TITLE_BP1', description = 'EET_CMP_TEXT_BP1', title = 4, bigLogo = 4, icon = 4, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --bp1
{name = 'EET_CMP_TITLE_BP2', description = 'EET_CMP_TEXT_BP2', title = 5, bigLogo = 5, icon = 5, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --bp2
{name = 'EET_CMP_TITLE_TUT', description = 'EET_CMP_TEXT_TUT', title = 6, bigLogo = 6, icon = 6, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --tut
}

--strings used by UI.MENU file
eetStrings = {
}

-- class, kit, clastxtBIO: BG1, SOD, SOA, TOB, BP1, BP2, TUT, (...)
bioClassData = {
}

-- race, racetextBIO: BG1, SOD, SOA, TOB, BP1, BP2, TUT, (...)
bioRaceData = {
}
93 changes: 63 additions & 30 deletions EET/base/lua/UI_BG2.MENU
Original file line number Diff line number Diff line change
Expand Up @@ -6721,13 +6721,13 @@ menu
{
area 158 32 354 46
text style "title"
text lua "t('EET_WARNING_TITLE')"
text lua "eetStrings.EET_WARNING_TITLE"
}
label
{
area 126 106 422 458
text style "normal"
text lua "t('EET_WARNING_TEXT')"
text lua "eetStrings.EET_WARNING_TEXT"
}
}

Expand Down Expand Up @@ -6766,7 +6766,7 @@ menu
label
{
area 0 0 -1 -1
text lua "t(startCampaignData[rowNumber].name)"
text lua "getEETTitle(rowNumber)"
text style "normal_parchment"
text align left center
}
Expand Down Expand Up @@ -6804,37 +6804,33 @@ menu
{
name "campaignBookDescription"
area 426 25 316 384
text lua "t(startCampaignData[highlightedCampaign].description)"
text lua "getEETDescription(highlightedCampaign)"
text style "normal_parchment"
scrollbar 'GUISCRP'
}
}

`
--obviously theres some redundancy in this data but I dislike the idea of assuming what our frame/sequence will be.
startCampaignData = {
{name = 'EET_CMP_TITLE_BG1', description = 'EET_CMP_TEXT_BG1', title = 0, bigLogo = 0, icon = 0, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --bg1
{name = 'EET_CMP_TITLE_SOD', description = 'EET_CMP_TEXT_SOD', title = 1, bigLogo = 1, icon = 1, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --sod
{name = 'EET_CMP_TITLE_SOA', description = 'EET_CMP_TEXT_SOA', title = 2, bigLogo = 2, icon = 2, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --soa
{name = 'EET_CMP_TITLE_TOB', description = 'EET_CMP_TEXT_TOB', title = 3, bigLogo = 3, icon = 3, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --tob
{name = 'EET_CMP_TITLE_BP1', description = 'EET_CMP_TEXT_BP1', title = 4, bigLogo = 4, icon = 4, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --bp1
{name = 'EET_CMP_TITLE_BP2', description = 'EET_CMP_TEXT_BP2', title = 5, bigLogo = 5, icon = 5, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --bp2
{name = 'EET_CMP_TITLE_TUT', description = 'EET_CMP_TEXT_TUT', title = 6, bigLogo = 6, icon = 6, background = 2, button = 2, sidebar = 2, importEnabled = true, tutorialEnabled = false}, --tut
}

function getTitle()
local campaign = Infinity_GetINIValue('Program Options','Active Campaign')
return startCampaignData[campaign].title
return startCampaignData[currentCampaign].title
end

function getBigLogo()
local campaign = Infinity_GetINIValue('Program Options','Active Campaign')
return startCampaignData[campaign].bigLogo
return startCampaignData[currentCampaign].bigLogo
end

function getCampaignButtonSequence()
local campaign = Infinity_GetINIValue('Program Options','Active Campaign')
return startCampaignData[campaign].button
return startCampaignData[currentCampaign].button
end

function getEETTitle(row)
local text = startCampaignData[row].name
return eetStrings[text]
end

function getEETDescription(row)
local text = startCampaignData[row].description
return eetStrings[text]
end

function onCampaignButton(buttonNum)
Expand Down Expand Up @@ -6863,22 +6859,20 @@ menu
startEngine:OnCampaignButtonClick('BG1',true)
Infinity_SetINIValue('Program Options','Active Campaign',const.START_CAMPAIGN_BG1)
end
currentCampaign = buttonNum
end

function getCampaignImportEnabled()
local campaign = Infinity_GetINIValue('Program Options','Active Campaign')
return startCampaignData[campaign].importEnabled
return startCampaignData[currentCampaign].importEnabled
end

function getTutorialEnabled()
--Tutorial and campaign import should never be enabled for the same campaign - the button uses the same space
local campaign = Infinity_GetINIValue('Program Options','Active Campaign')
return startCampaignData[campaign].tutorialEnabled
return startCampaignData[currentCampaign].tutorialEnabled
end

function getSidebarFrame()
local campaign = Infinity_GetINIValue('Program Options','Active Campaign')
return startCampaignData[campaign].sidebar
return startCampaignData[currentCampaign].sidebar
end

--usingSODStartMenu = 1
Expand All @@ -6894,9 +6888,12 @@ menu
Infinity_PushMenu('START_INSTALLATION_WARNING')
end
if (start_doOnce == nil) then
local campaign = Infinity_GetINIValue('Program Options','Active Campaign')
onCampaignButton(campaign)
highlightedCampaign = campaign
currentCampaign = Infinity_GetINIValue('Program Options','Active Campaign')
if (currentCampaign == 0) then
currentCampaign = 1
end
onCampaignButton(currentCampaign)
highlightedCampaign = currentCampaign
start_doOnce = 1
return
end
Expand Down Expand Up @@ -14223,12 +14220,48 @@ menu
}
`
createBioEdit = ""

function generateBioText()
bioClass = ""
bioRace = ""
MyRace = chargen.races[currentChargenRace].id
MyClass = chargen.class[currentChargenClass].id
MyKit = -1
MyKit = chargen.kit[currentChargenKit].id
colClass = 2 + Infinity_GetINIValue('Program Options','Active Campaign')
colRace = 1 + Infinity_GetINIValue('Program Options','Active Campaign')
-- Go through each row of bioClassData
for i=1,#bioClassData,1 do
-- Check chargen.class and chargen.kit to find a match against the current row
if MyClass == bioClassData[i][1] and MyKit == bioClassData[i][2] then
-- On match, set bioClass string equal to bioClassData text
bioClass = Infinity_FetchString(bioClassData[i][colClass])
end
end
-- Go through each row of bioRaceData
for i=1,#bioRaceData,1 do
-- Check chargen.race to find a match against the current row
if MyRace == bioRaceData[i][1] then
-- On match, set bioRace string equal to bioRaceData text
bioRace = Infinity_FetchString(bioRaceData[i][colRace])
end
end
end
`
menu
{
name 'CHARGEN_BIO'
align center center
ignoreesc
onopen
"
generateBioText()
if bioRace == '' then
createBioEdit = bioClass
else
createBioEdit = bioClass .. '\n\n' .. bioRace
end
"
label
{
area 0 154 1024 614
Expand Down
Loading

0 comments on commit d21bb67

Please sign in to comment.