Skip to content

Address 3.20.1 export issues from #102 #104

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

Draft
zao wants to merge 3 commits into
base: dev
Choose a base branch
from
Draft

Address 3.20.1 export issues from #102 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d827740
Repopulate cosmetic_type and cosmetic_theme
zao Jan 13, 2023
cf2eaa7
Skip old region-specific watchstones
zao Jan 13, 2023
0da236c
Restore Lua exporter for quest rewards
zao Jan 18, 2023
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
84 changes: 71 additions & 13 deletions PyPoE/cli/exporter/wiki/parsers/item.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2448,6 +2448,67 @@ class ItemsParser(SkillParserShared):
'Metadata/Items/Weapons/OneHandWeapons/Daggers/EtherealBlade1',
'Metadata/Items/ItemEffects/SekhemasBanner',
'Metadata/Items/Armours/BodyArmours/BodyStrTemp',

#
# Old region watchstones
#
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgradeFinal',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade1_1',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade1_2',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade1_3',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade1_4',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade1_5',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade1_6',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade1_7',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade1_8',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade2_1',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade2_2',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade2_3',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade2_4',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade2_5',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade2_6',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade2_7',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade2_8',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade3_1',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade3_2',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade3_3',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade3_4',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade3_5',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade3_6',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade3_7',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade3_8',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade4_1',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade4_2',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade4_3',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade4_4',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade4_5',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade4_6',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade4_7',
'Metadata/Items/AtlasUpgrades/AtlasRegionUpgrade4_8',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_1',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_2',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_3',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_4',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_5',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_6',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_7',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable1_8',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_1',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_2',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_3',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_4',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_5',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_6',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_7',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable2_8',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_1',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_2',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_3',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_4',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_5',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_6',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_7',
'Metadata/Items/AtlasUpgrades/AtlasUpgradeCraftable3_8',
}

_attribute_map = OrderedDict((
Expand Down Expand Up @@ -2881,20 +2942,17 @@ def _currency_extra(self, infobox, base_item_type, currency):
)

_type_microtransaction = _type_factory(
data_file='BaseItemTypes.dat64',
data_file='CurrencyItems.dat64',
data_mapping=(
# This field was removed in 3.17.
# ('ItemShopType', {
# 'template': 'cosmetic_type',
# 'format': lambda v: v['Name'],
# 'condition': lambda v: v,
# }),
# This field was also removed in 3.17.
# ('ItemThemesKey', {
# 'template': 'cosmetic_theme',
# 'format': lambda v: v['Name'],
# 'condition': lambda v: v,
# }),
('CosmeticTypeName', {
'template': 'cosmetic_type',
'condition': lambda v: v,
}),
('ShopTagKey', {
'template': 'cosmetic_theme',
'format': lambda v: v['Name'],
'condition': lambda v: v,
}),
),
)

Expand Down
224 changes: 224 additions & 0 deletions PyPoE/cli/exporter/wiki/parsers/lua.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,16 @@ def __init__(self, sub_parser):
func=PantheonParser.main,
)

parser = lua_sub.add_parser(
'quest_rewards',
help='Extract quest rewards into lua.'
)
self.add_default_parsers(
parser=parser,
cls=QuestRewardReader,
func=QuestRewardReader.read_quest_rewards,
)

parser = lua_sub.add_parser(
'synthesis',
help='Extract synthesis information',
Expand Down Expand Up @@ -1079,6 +1089,220 @@ def main(self, parsed_args):
return r


class QuestRewardReader(BaseParser):
# Load the files we need
_files = [
'BaseItemTypes.dat64',
'Characters.dat64',
'NPCs.dat64',
'Quest.dat64',
'QuestStates.dat64',
'QuestRewards.dat64',
'MapSeries.dat64'
]

# TODO find a better way
# TODO Break with updates
_ITEM_MAP = {
'English': {
# A2: Though Scared Ground
423: "Survival Instincts", # Veridian
424: "Survival Skills", # Crimson
425: "Survival Secrets", # Cobalt
# A5: The King's Feast
454: "Poacher's Aim", # Verdian
455: "Warlord's Reach ", # Crimson
456: "Assassin's Haste", # Cobalt
#
457: "Conqueror's Efficiency", # crimson
458: "Conqueror's Potency", # cobalt
459: "Conqueror's Longevity", #viridian
# A5: Death to Puirty
560: "Rapid Expansion",
780: "Wildfire",
777: "Overwhelming Odds",

775: "Collateral Damage",
779: "Omen on the Winds",
781: "Fight for Survival",
784: "Ring of Blades",

778: "First Snow",
783: "Frozen Trail",
786: "Inevitability",
788: "Spreading Rot",
789: "Violent Dead",
790: "Hazardous Research",
},
'Russian': {
# A2: По святой земле
423: "Инстинкты выживания", # Бирюзовый
424: "Навыки выживания", # Багровый
425: "Секреты выживания", # Кобальтовый
# A5: Пир вождя
454: "Браконьерство", # Бирюзовый
455: "Длинные руки ", # Багровый
456: "Бойкий убийца", # Кобальтовый
#
457: "Смекалка победителя", # Багровый
458: "Могущество победителя", # Кобальтовый
459: "Живучесть победителя", #Бирюзовый
# A5: Смерть Чистоте
560: "Быстрое расширение",
780: "Степной пожар",
777: "Подавляющее превосходство",

775: "Сопутствующий риск",
779: "Знамение ветров",
781: "Борьба за жизнь",
784: "Кольцо клинков",

778: "Первый снег",
783: "Мерзлый путь",
786: "Неизбежность",
788: "Гангрена",
789: "Ярость мертвецов",
790: "Опасная наука",
},
}

_TWO_STONE_MAP = {
'English': {
'Metadata/Items/Rings/Ring12': "Two-Stone Ring (ruby and topaz)",
'Metadata/Items/Rings/Ring13': "Two-Stone Ring (sapphire and topaz)",
'Metadata/Items/Rings/Ring14': "Two-Stone Ring (ruby and sapphire)",
},
'Russian': {
'Metadata/Items/Rings/Ring12':
"Кольцо с двумя камнями (рубин и топаз)",
'Metadata/Items/Rings/Ring13':
"Кольцо с двумя камнями (сапфир и топаз)",
'Metadata/Items/Rings/Ring14':
"Кольцо с двумя камнями (рубин и сапфир)",
},
'German': {
'Metadata/Items/Rings/Ring12': "Zweisteinring (Rubin und Topas)",
'Metadata/Items/Rings/Ring13': "Zweisteinring (Saphir und Topas)",
'Metadata/Items/Rings/Ring14': "Zweisteinring (Rubin und Saphir)",
}
}

_UNIT_SEP = '\u001F'

def _write_lua(self, outdata, data_type):
# Pre-sort
outdata.sort(key=lambda x: x['reward'])
outdata.sort(key=lambda x: x['quest_id'])
outdata.sort(key=lambda x: x['act'])

r = ExporterResult()
r.add_result(
text=LuaFormatter.format_module(outdata),
out_file='%s_rewards.txt' % data_type,
wiki_page=[{
'page': 'Module:Quest reward/data/%s_rewards' % data_type,
'condition': None,
}]
)

return r

def read_quest_rewards(self, args):
compress = {}
for row in self.rr['QuestRewards.dat64']:
# Find the corresponding keys
item = row['BaseItemTypesKey']

# TODO: Skipping random map reward with zana mod here
if item is None:
continue
quest = row['QuestRewardOffersKey']['QuestKey']
character = row['CharactersKey']


itemcls = item['ItemClassesKey']['Id']

# Format the data
data = OrderedDict()

data['quest'] = quest['Name']
data['quest_id'] = quest['Id']
# Quest not implemented or buggy or master stuff
if not data['quest']:
continue
data['act'] = quest['Act']

DIFFICULTIES = ['any', 'normal', 'hard']
data['difficulty'] = DIFFICULTIES[row['Difficulty']]

if character is not None and len(character):
data['classes'] = self._UNIT_SEP.join([c['Name'] for c in character])

if row['RarityKey'] is not None:
rarity = self.rr['ClientStrings.dat64'].index['Id'][
'ItemDisplayString' + row['RarityKey']['Id']]['Text']

sockets = row['SocketGems']
if sockets:
data['sockets'] = sockets

name = item['Name']

# Some of unique items follow special rules
if itemcls == 'QuestItem' and 'Book' in item['Id']:
name = '%s (%s)' % (name, data['quest'])
elif itemcls == 'Map':
name = '%s (%s)' % (
name, self.rr['MapSeries.dat64'].index['Id']['MapWorlds'][
'Name']
)
# Non non quest items or skill gems have their rarity added
if itemcls not in {'Active Skill Gem', 'Support Skill Gem',
'QuestItem', 'StackableCurrency'}:
data['item_level'] = row['ItemLevel']
data['rarity'] = rarity
# Unique and not a quest item or gem
if row['RarityKey'] == RARITY.ANY:
uid = row['Key0']
item_map = self._ITEM_MAP.get(config.get_option('language'))
if item_map is None:
warnings.warn(
'No unique item mapping defined for the current '
'language'
)
elif uid in item_map:
name = item_map[uid]
data['rarity'] = self.rr['ClientStrings.dat64'].index[
'Id']['ItemDisplayStringUnique']['Text']
else:
warnings.warn(
'Uncaptured unique item. %s %s %s' % (
uid, data['quest'], name)
)

# Two stone rings
two_stone_map = self._TWO_STONE_MAP.get(
config.get_option('language'))
if two_stone_map is None:
warnings.warn(
'No two stone ring mapping for the current language')
elif item['Id'] in two_stone_map:
name = two_stone_map[item['Id']]
data['reward'] = name

# Add to formatting list
# TODO(LV): What did Key0 represent in the past?
# Old suffix: str(row['Key0'])
key = f"{quest['Id']} {item['Id']} {row['Difficulty']}"
if key in compress:
compress[key]['classes'] += self._UNIT_SEP + self._UNIT_SEP.join([c['Name'] for c in character])
else:
compress[key] = data

outdata = [data for data in compress.values()]
return self._write_lua(outdata, 'quest')


class SynthesisParser(GenericLuaParser):

_DATA = (
Expand Down
Loading