Skip to content

Supporting Mod Families (and More Spec Updates) #93

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

Open
angelic-knight wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Supporting Mod Families (and More Spec Updates) #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a5481d
Updating spec for Mods
angelic-knight Sep 2, 2022
c8a114c
Spec updates for crafting bench related things
angelic-knight Sep 17, 2022
4732aea
Save mod_groups to wiki and preserve existing mod_group field
angelic-knight Dec 6, 2022
178ece9
Merge remote-tracking branch 'my_fork/3.19_spec_updates' into 3.19_sp…
angelic-knight Dec 6, 2022
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
6 changes: 5 additions & 1 deletion PyPoE/cli/exporter/wiki/parsers/mods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class OutOfBoundsWarning(UserWarning):
class ModWikiCondition(WikiCondition):
COPY_KEYS = (
'tier_text',
'mod_group',
)

NAME = 'Mod'
Expand Down Expand Up @@ -220,7 +221,7 @@ def _export(self, parsed_args, mods):

for k in (
('Id', 'id'),
('CorrectGroup', 'mod_group'),
#('ModGroups', 'mod_groups'),
('Domain', 'domain'),
('GenerationType', 'generation_type'),
('Level', 'required_level'),
Expand All @@ -237,6 +238,9 @@ def handler(hstr, parameter):

data['name'] = root.handle_tags({'if': handler, 'elif': handler})

if mod['ModGroups']:
data['mod_groups'] = ', '.join([mod_fam['Id'] for mod_fam in mod['ModGroups']])

# TODO: need to look into this before completely removing it.

# print('yep', mod)
Expand Down
88 changes: 53 additions & 35 deletions PyPoE/poe/file/specification/data/stable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6267,7 +6267,7 @@
type='int',
),
Field(
name='EndlessDelveMonsterLevel', #This is pobably endless delve mosnter level scaling.
name='EndlessDelveMonsterLevel', #This is pobably endless delve monster level scaling.
type='int',
),
),
Expand Down Expand Up @@ -7074,19 +7074,15 @@
),
Field(
name='Unknown0',
type='int',
type='ulong',
),
Field(
name='Unknown1',
type='int',
),
Field(
name='Unknown2',
type='int',
type='ulong',
),
Field(
name='Unknown3',
type='int',
name='List',
type='ref|list|ulong',
),
Field(
name='EnvironmentTransitionsKey',
Expand Down Expand Up @@ -11671,18 +11667,6 @@
name='IsNonMasterDoodad',
type='bool',
),
Field(
name='Unknown0',
type='int',
),
Field(
name='Unknown1',
type='int',
),
Field(
name='Unknown2',
type='int',
),
Field(
name='InheritsFrom',
type='ref|string',
Expand Down Expand Up @@ -11715,6 +11699,18 @@
type='ulong',
#key='HideoutDoodadCategory.dat',
),
Field(
name='Unknown0',
type='int'
),
Field(
name='Flag2',
type='bool',
),
Field(
name='Key1',
type='ulong',
),
),
),
'HideoutNPCs.dat': File(
Expand All @@ -11739,31 +11735,31 @@
type='int',
),
Field(
name='Unknown0',
type='int',
name='Key0',
type='ulong',
),
Field(
name='Unknown1',
type='int',
name='Key1',
type='ulong',
),
Field(
name='Unknown2',
name='Unknown1',
type='int',
),
Field(
name='Key0',
name='Key2',
type='ulong',
),
Field(
name='Unknown3',
name='Unknown2',
type='int',
),
Field(
name='Flag0',
type='bool',
),
Field(
name='Key1',
name='Key3',
type='ulong',
),
),
Expand Down Expand Up @@ -15687,6 +15683,15 @@
),
),
),
'ModFamily.dat': File(
fields=(
Field(
name='Id',
type='ref|string',
unique=True,
),
),
),
'ModSellPriceTypes.dat': File(
fields=(
Field(
Expand Down Expand Up @@ -15788,8 +15793,9 @@
enum='MOD_GENERATION_TYPE',
),
Field(
name='Keys0',
name='ModGroups',
type='ref|list|ulong',
key='ModFamily.dat'
),
Field(
name='Stat1Min',
Expand Down Expand Up @@ -17477,6 +17483,10 @@
name='Unknown38',
type='int',
),
Field(
name='Unknown39',
type='int',
),
),
),
'MoveDaemon.dat': File(
Expand Down Expand Up @@ -17801,6 +17811,14 @@
name='Unknown3',
type='int',
),
Field(
name='Unknown4',
type='int',
),
Field(
name='Unknown5',
type='int',
),
),
),
'NPCConversations.dat': File(
Expand Down Expand Up @@ -18369,8 +18387,8 @@
file_ext='.ot, .otc',
),
Field(
name='Unknown0',
type='int',
name='Key0',
type='ulong',
),
Field(
name='NPCMasterKey',
Expand Down Expand Up @@ -23528,7 +23546,7 @@
),
Field(
name='Unknown2',
type='int',
type='ulong',
),
Field(
name='Data0',
Expand All @@ -23554,11 +23572,11 @@
),
Field(
name='Unknown5',
type='int',
type='ulong',
),
Field(
name='Unknown6',
type='int',
type='ulong',
),
Field(
name='Bosses_MonsterVarietiesKeys',
Expand Down