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

Various updates #17

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Various updates #17

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 92 additions & 5 deletions src/game_starfield_en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,106 @@
<context>
<name>GameStarfield</name>
<message>
<location filename="gamestarfield.cpp" line="107"/>
<location filename="gamestarfield.cpp" line="113"/>
<source>Starfield Support Plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="117"/>
<location filename="gamestarfield.cpp" line="123"/>
<source>Adds support for the game Starfield.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="129"/>
<source>Turn on plugin management. As of Starfield 1.7.33 this REQUIRES fixing &apos;plugins.txt&apos; with a SFSE plugin. This will do nothing otherwise.</source>
<oldsource>Turn on plugin management. As of Starfield 1.7.33 this REQUIRES SPECIAL WORKAROUNDS.</oldsource>
<location filename="gamestarfield.cpp" line="136"/>
<source>Show a warning when ESP plugins are enabled in the load order.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="140"/>
<source>Show a warning when light plugins are enabled in the load order.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="143"/>
<source>Show a warning when overlay-flagged plugins ar enabled in the load order.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="147"/>
<source>Show a warning when plugins.txt management is invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="150"/>
<source>As of this release LOOT Starfield support is minimal to nonexistant. Toggle this to enable it anyway.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="444"/>
<source>You have active ESP plugins in Starfield</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="446"/>
<source>You have active ESL plugins in Starfield</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="448"/>
<source>You have active overlay plugins</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="450"/>
<source>sTestFile entries are present</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="452"/>
<source>Plugins.txt Enabler missing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="461"/>
<source>&lt;p&gt;ESP plugins are not ideal for Starfield. In addition to being unable to sort them alongside ESM or master-flagged plugins, certain record references are always kept loaded by the game. This consumes unnecessary resources and limits the game&apos;s ability to load what it needs.&lt;/p&gt;&lt;p&gt;Ideally, plugins should be saved as ESM files upon release. It can also be released as an ESL plugin, however there are additional concerns with the way light plugins are currently handled and should only be used when absolutely certain about what you&apos;re doing.&lt;/p&gt;&lt;p&gt;Notably, xEdit does not currently support saving ESP files.&lt;/p&gt;&lt;h4&gt;Current ESPs:&lt;/h4&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="476"/>
<source>&lt;p&gt;Light plugins work differently in Starfield. They use a different base form ID compared with standard plugin files.&lt;/p&gt;&lt;p&gt;What this means is that you can&apos;t just change a standard plugin to a light plugin at will, it can and will break any dependent plugin. If you do so, be absolutely certain no other plugins use that plugin as a master.&lt;/p&gt;&lt;p&gt;Notably, xEdit does not currently support saving or loading ESL files under these conditions.&lt;p&gt;&lt;h4&gt;Current ESLs:&lt;/h4&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="489"/>
<source>&lt;p&gt;Overlay-flagged plugins are not currently recommended. In theory, they should allow you to update existing records without utilizing additional load order slots. Unfortunately, it appears that the game still allocates the slots as if these were standard plugins. Therefore, at the moment there is no real use for this plugin flag.&lt;/p&gt;&lt;p&gt;Notably, xEdit does not currently support saving or loading overlay-flagged files under these conditions.&lt;/p&gt;&lt;h4&gt;Current Overlays:&lt;/h4&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="500"/>
<source>&lt;p&gt;You have plugin managment enabled but you still have sTestFile settings in your StarfieldCustom.ini. These must be removed or the game will not read the plugins.txt file. Management is still disabled.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gamestarfield.cpp" line="505"/>
<source>&lt;p&gt;You have plugin management turned on but do not have the Plugins.txt Enabler SFSE plugin installed. Plugin file management for Starfield will not work without this SFSE plugin.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StarfieldModDataContent</name>
<message>
<location filename="starfieldmoddatacontent.h" line="29"/>
<source>Materials</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="starfieldmoddatacontent.h" line="30"/>
<source>Geometries</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="starfieldmoddatacontent.h" line="31"/>
<source>Video</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
38 changes: 23 additions & 15 deletions src/gamestarfield.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ QString GameStarfield::description() const

MOBase::VersionInfo GameStarfield::version() const
{
return VersionInfo(1, 0, 0, VersionInfo::RELEASE_CANDIDATE);
return VersionInfo(1, 0, 0, VersionInfo::RELEASE_FINAL);
}

QList<PluginSetting> GameStarfield::settings() const
Expand All @@ -142,7 +142,14 @@ QList<PluginSetting> GameStarfield::settings() const
<< PluginSetting("enable_overlay_warning",
tr("Show a warning when overlay-flagged plugins ar enabled "
"in the load order."),
true);
true)
<< PluginSetting("enable_management_warnings",
tr("Show a warning when plugins.txt management is invalid."),
true)
<< PluginSetting("enable_loot_sorting",
tr("As of this release LOOT Starfield support is minimal to "
"nonexistant. Toggle this to enable it anyway."),
false);
}

MappingType GameStarfield::mappings() const
Expand Down Expand Up @@ -294,14 +301,15 @@ QStringList GameStarfield::CCPlugins() const

IPluginGame::SortMechanism GameStarfield::sortMechanism() const
{
if (testFilePlugins().isEmpty())
if (!testFilePresent() &&
m_Organizer->pluginSetting(name(), "enable_loot_sorting").toBool())
return IPluginGame::SortMechanism::LOOT;
return IPluginGame::SortMechanism::NONE;
}

IPluginGame::LoadOrderMechanism GameStarfield::loadOrderMechanism() const
{
if (testFilePlugins().isEmpty())
if (!testFilePresent() && pluginsTxtEnablerPresent())
return IPluginGame::LoadOrderMechanism::PluginsTxt;
return IPluginGame::LoadOrderMechanism::None;
}
Expand Down Expand Up @@ -330,10 +338,12 @@ std::vector<unsigned int> GameStarfield::activeProblems() const
if (m_Organizer->pluginSetting(name(), "enable_overlay_warning").toBool() &&
activeOverlay())
result.push_back(PROBLEM_OVERLAY);
if (testFilePresent())
result.push_back(PROBLEM_TEST_FILE);
else if (pluginsTxtEnabler())
result.push_back(PROBLEM_PLUGINS_TXT);
if (m_Organizer->pluginSetting(name(), "enable_management_warnings").toBool()) {
if (testFilePresent())
result.push_back(PROBLEM_TEST_FILE);
else if (!pluginsTxtEnablerPresent())
result.push_back(PROBLEM_PLUGINS_TXT);
}
}
return result;
}
Expand Down Expand Up @@ -419,14 +429,12 @@ bool GameStarfield::testFilePresent() const
return false;
}

bool GameStarfield::pluginsTxtEnabler() const
bool GameStarfield::pluginsTxtEnablerPresent() const
{
if (sortMechanism() != SortMechanism::NONE) {
auto files = m_Organizer->findFiles("sfse\\plugins", {"sfpluginstxtenabler.dll"});
if (files.isEmpty())
return true;
}
return false;
auto files = m_Organizer->findFiles("sfse\\plugins", {"sfpluginstxtenabler.dll"});
if (files.isEmpty())
return false;
return true;
}

QString GameStarfield::shortDescription(unsigned int key) const
Expand Down
2 changes: 1 addition & 1 deletion src/gamestarfield.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class GameStarfield : public GameGamebryo, public MOBase::IPluginDiagnose
bool activeESL() const;
bool activeOverlay() const;
bool testFilePresent() const;
bool pluginsTxtEnabler() const;
bool pluginsTxtEnablerPresent() const;

private:
static const unsigned int PROBLEM_ESP = 1;
Expand Down
4 changes: 2 additions & 2 deletions src/starfielddataarchives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ QStringList StarfieldDataArchives::archives(const MOBase::IProfile* profile) con
"sResourceStartUpArchiveList",
"sResourceEnglishVoiceList"};
for (auto setting : archiveSettings) {
auto archives = getArchivesFromKey(customIniFile, setting, 1023);
auto archives = getArchivesFromKey(customIniFile, setting, 4096);
if (archives.isEmpty())
archives = getArchivesFromKey(defaultIniFile, setting, 1023);
archives = getArchivesFromKey(defaultIniFile, setting, 4096);
result.append(archives);
}

Expand Down
8 changes: 4 additions & 4 deletions src/starfieldgameplugins.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ bool StarfieldGamePlugins::overridePluginsAreSupported()
void StarfieldGamePlugins::writePluginList(const IPluginList* pluginList,
const QString& filePath)
{
if (m_Organizer->managedGame()->sortMechanism() !=
MOBase::IPluginGame::SortMechanism::NONE) {
if (m_Organizer->managedGame()->loadOrderMechanism() ==
MOBase::IPluginGame::LoadOrderMechanism::PluginsTxt) {
CreationGamePlugins::writePluginList(pluginList, filePath);
}
}

QStringList StarfieldGamePlugins::readPluginList(MOBase::IPluginList* pluginList)
{
if (m_Organizer->managedGame()->sortMechanism() !=
MOBase::IPluginGame::SortMechanism::NONE) {
if (m_Organizer->managedGame()->loadOrderMechanism() ==
MOBase::IPluginGame::LoadOrderMechanism::PluginsTxt) {
return CreationGamePlugins::readPluginList(pluginList);
}
return {};
Expand Down
Loading