Skip to content

Commit

Permalink
Merge pull request #4 from arthurb123/er-dlc-update
Browse files Browse the repository at this point in the history 
Add support for the Shadow of the Erdtree DLC
  • Loading branch information
@arthurb123
arthurb123 authored Sep 14, 2024
2 parents a3cd569 + cb1b0f5 commit 91df010
Show file tree
Hide file tree
Showing 960 changed files with 199,378 additions and 1,162 deletions.
8 changes: 4 additions & 4 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "SoulsFormats"]
path = SoulsFormats
url = https://github.com/JKAnderson/SoulsFormats/
branch = er
[submodule "SoulsFormatsNEXT"]
path = SoulsFormatsNEXT
url = https://github.com/soulsmods/SoulsFormatsNEXT/
branch = master
18 changes: 9 additions & 9 deletions ERregulator.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ERregulator", "ERregulator\ERregulator.csproj", "{9AFD144B-9E2A-42BB-936D-2B2401CBD495}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoulsFormats", "SoulsFormats\SoulsFormats\SoulsFormats.csproj", "{298EA026-E167-4BA9-A77C-E989CD45D535}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoulsFormats", "SoulsFormatsNEXT\SoulsFormats\SoulsFormats.csproj", "{FAD7BE81-7817-4ACD-8DA4-631596C7F930}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -23,14 +23,14 @@ Global
{9AFD144B-9E2A-42BB-936D-2B2401CBD495}.Release|Any CPU.Build.0 = Release|Any CPU
{9AFD144B-9E2A-42BB-936D-2B2401CBD495}.Release|x64.ActiveCfg = Release|Any CPU
{9AFD144B-9E2A-42BB-936D-2B2401CBD495}.Release|x64.Build.0 = Release|Any CPU
{298EA026-E167-4BA9-A77C-E989CD45D535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{298EA026-E167-4BA9-A77C-E989CD45D535}.Debug|Any CPU.Build.0 = Debug|Any CPU
{298EA026-E167-4BA9-A77C-E989CD45D535}.Debug|x64.ActiveCfg = Debug|Any CPU
{298EA026-E167-4BA9-A77C-E989CD45D535}.Debug|x64.Build.0 = Debug|Any CPU
{298EA026-E167-4BA9-A77C-E989CD45D535}.Release|Any CPU.ActiveCfg = Release|Any CPU
{298EA026-E167-4BA9-A77C-E989CD45D535}.Release|Any CPU.Build.0 = Release|Any CPU
{298EA026-E167-4BA9-A77C-E989CD45D535}.Release|x64.ActiveCfg = Release|Any CPU
{298EA026-E167-4BA9-A77C-E989CD45D535}.Release|x64.Build.0 = Release|Any CPU
{FAD7BE81-7817-4ACD-8DA4-631596C7F930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FAD7BE81-7817-4ACD-8DA4-631596C7F930}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FAD7BE81-7817-4ACD-8DA4-631596C7F930}.Debug|x64.ActiveCfg = Debug|Any CPU
{FAD7BE81-7817-4ACD-8DA4-631596C7F930}.Debug|x64.Build.0 = Debug|Any CPU
{FAD7BE81-7817-4ACD-8DA4-631596C7F930}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FAD7BE81-7817-4ACD-8DA4-631596C7F930}.Release|Any CPU.Build.0 = Release|Any CPU
{FAD7BE81-7817-4ACD-8DA4-631596C7F930}.Release|x64.ActiveCfg = Release|Any CPU
{FAD7BE81-7817-4ACD-8DA4-631596C7F930}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
12 changes: 6 additions & 6 deletions ERregulator/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="ERregulator.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="ERregulator.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<userSettings>
<ERregulator.Properties.Settings>
Expand All @@ -26,7 +26,7 @@
<value>C:\Program Files (x86)\Steam\steamapps\common\ELDEN RING\Game</value>
</setting>
<setting name="Seed" serializeAs="String">
<value />
<value/>
</setting>
<setting name="DoArmor" serializeAs="String">
<value>True</value>
Expand Down Expand Up @@ -81,4 +81,4 @@
</setting>
</ERregulator.Properties.Settings>
</userSettings>
</configuration>
</configuration>
18 changes: 10 additions & 8 deletions ERregulator/ERregulator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,10 @@ bool doOthers
int ceruleanFlaskEnd = 1075;
int wondrousFlaskStart = 250;
int wondrousFlaskEnd = 251;
int spectralSteedWhistle = 130;
int spiritCallingBell = 8158;
// There exist two entries for the spectral steed
// whistle, let's just exclude both of them
int[] spectralSteedWhistles = new int[] { 130, 181 };
var usable = param.Rows.Where(
row =>
!(row.ID >= ceruleanFlaskStart
Expand All @@ -88,7 +90,7 @@ bool doOthers
&& !(row.ID >= wondrousFlaskStart
&& row.ID <= wondrousFlaskEnd)

&& row.ID != spectralSteedWhistle
&& !spectralSteedWhistles.Any((id) => id == row.ID)
&& row.ID != spiritCallingBell
);

Expand All @@ -108,7 +110,7 @@ bool doOthers
if (doArmor)
{
PARAM param = paramDict["EquipParamProtector"];
var valid = param.Rows.Where(row => row.ID >= 1000000);
var valid = param.Rows.Where(row => row.ID >= 40000);
RandomizeSome(valid, false,
"residentSpEffectId",
"residentSpEffectId2",
Expand Down Expand Up @@ -160,11 +162,11 @@ bool doOthers
// Get the melee (including shields), ranged and magic weapons seperately;
// Also skip the unarmed weapon.
PARAM param = paramDict["EquipParamWeapon"];
IEnumerable<PARAM.Row> weaponsExceptUnarmed = param.Rows.Where(row => row.ID > 110000);
IEnumerable<PARAM.Row> meleeWeapons = param.Rows.Where(row => row.ID > 110000 && row.ID <= 24070000);
IEnumerable<PARAM.Row> shieldMeleeWeapons = param.Rows.Where(row => row.ID >= 30000000 && row.ID <= 32301200);
IEnumerable<PARAM.Row> magicWeapons = param.Rows.Where(row => row.ID > 32301200 && row.ID <= 34090000);
IEnumerable<PARAM.Row> rangedWeapons = param.Rows.Where(row => row.ID > 34090000);
IEnumerable<PARAM.Row> weaponsExceptUnarmed = param.Rows.Where(row => row.ID > 110000);
IEnumerable<PARAM.Row> meleeWeapons = param.Rows.Where(row => row.ID > 110000 && row.ID <= 24510000);
IEnumerable<PARAM.Row> shieldMeleeWeapons = param.Rows.Where(row => row.ID >= 30000000 && row.ID <= 32520000);
IEnumerable<PARAM.Row> magicWeapons = param.Rows.Where(row => row.ID >= 33000000 && row.ID <= 34520000);
IEnumerable<PARAM.Row> rangedWeapons = param.Rows.Where(row => row.ID >= 40000000);
RandomizeSome(param.Rows, false,
"correctStrength",
"correctAgility",
Expand Down
Loading

0 comments on commit 91df010

Please sign in to comment.