bda/mhapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add components to armor/decorations, refactor

Browse Source 
- model: add base ItemCraftable
- db: use instance option to control fetching of components,
  instead of per-method arg
This commit is contained in:
Bryce Allen
2015-08-12 01:48:19 -05:00
parent 5af2a2e04e
commit a2008a0461
3 changed files with 128 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/mkjsonapi.py
View File

@@ -170,7 +170,7 @@ def skilltree_json(db, path):
def weapon_json(db, path):
weapons = db.get_weapons(get_components=True)
weapons = db.get_weapons()
mkdirs_p(path)
write_list_file(path, weapons)
@@ -235,7 +235,7 @@ def horn_melody_json(db, path):
def main():
db = MHDB(_pathfix.db_path)
db = MHDB(include_item_components=True)
args = parse_args()

172
mhapi/db.py
View File

@@ -35,8 +35,30 @@ class MHDB(object):
- get_ENTITY_NAME_names will return a list of all names of the
entities in the db, possibly with a type param.
"""
# buy and sell are empty, uses weapon.create_cost and upgrade_cost
_weapon_select = """
SELECT items._id, items.type, items.name, items.rarity, weapons.*
FROM weapons
LEFT JOIN items ON weapons._id = items._id
"""
def __init__(self, path=None, use_cache=False):
# sell has the a value, but not used at the moment
_decoration_select = """
SELECT items._id, items.type, items.name, items.rarity, decorations.*
FROM decorations
LEFT JOIN items ON decorations._id = items._id
"""
# buy has the armor cost, sell is empty
_armor_select = """
SELECT items._id, items.type, items.name, items.rarity, items.buy,
armor.*
FROM armor
LEFT JOIN items ON armor._id = items._id
"""
def __init__(self, path=None, use_cache=False,
include_item_components=False):
"""
If use_cache=True, a lot of memory could be used. No attempt is
made to de-dupe data between keys, e.g. if you access an item
@@ -50,6 +72,7 @@ class MHDB(object):
self.conn = sqlite3.connect(path)
self.conn.row_factory = sqlite3.Row
self.use_cache = use_cache
self.include_item_components = include_item_components
self.cache = {}
def _query_one(self, key, query, args=(), model_cls=None,
@@ -71,6 +94,7 @@ class MHDB(object):
return v
else:
self.cache[key] = {}
#print "query", query
cursor = self.conn.execute(query, args)
rows = cursor.fetchall()
if model_cls:
@@ -79,6 +103,7 @@ class MHDB(object):
rows = collection_cls(rows)
if self.use_cache and not no_cache:
self.cache[key][args] = rows
self._add_components(key, rows)
return rows
def cursor(self):
@@ -284,75 +309,66 @@ class MHDB(object):
WHERE monster_id=?
""", (monster_id,), collection_cls=model.MonsterDamage)
def get_weapons(self, get_components=False):
results = self._query_all("weapons", """
SELECT * FROM weapons
LEFT JOIN items ON weapons._id = items._id
""", model_cls=model.Weapon)
if results and get_components:
for r in results:
self._add_components(r)
def get_weapons(self):
return self._query_all("weapons", MHDB._weapon_select,
model_cls=model.Weapon)
def get_weapons_by_query(self, wtype=None, element=None,
final=None):
"""
@element can have the special value 'Raw' to search for weapons
with no element. Otherwise @element is searched for in both
awaken and native, and can be a status or an element.
@final should be string '1' or '0'
"""
q = MHDB._weapon_select
where = []
args = []
if wtype is not None:
where.append("wtype = ?")
args.append(wtype)
if element is not None:
if element == "Raw":
where.append("(element = '' AND awaken = '')")
else:
where.append("(element = ? OR element_2 = ? OR awaken = ?)")
args.extend([element] * 3)
if final is not None:
where.append("final = ?")
args.append(final)
if where:
q += "WHERE " + "\nAND ".join(where)
results = self._query_all("weapons", q, tuple(args),
model_cls=model.Weapon)
return results
def _add_components(self, item_data):
ccomps = self.get_item_components(item_data.id, "Create")
ucomps = self.get_item_components(item_data.id, "Improve")
item_data.set_components(ccomps, ucomps)
def get_weapon(self, weapon_id, get_components=False):
weapon = self._query_one("weapon", """
SELECT items._id, items.name, items.buy, weapons.*
FROM weapons
LEFT JOIN items ON weapons._id = items._id
def get_weapon(self, weapon_id):
return self._query_one("weapon", MHDB._weapon_select + """
WHERE weapons._id=?
""", (weapon_id,), model_cls=model.Weapon)
if weapon and get_components:
self._add_components(weapon)
return weapon
def get_weapon_by_name(self, name, get_components=False):
weapon = self._query_one("weapon", """
SELECT items._id, items.name, items.buy, weapons.*
FROM weapons
LEFT JOIN items ON weapons._id = items._id
def get_weapon_by_name(self, name):
return self._query_one("weapon", MHDB._weapon_select + """
WHERE items.name=?
""", (name,), model_cls=model.Weapon)
if weapon and get_components:
self._add_components(weapon)
return weapon
def get_weapons_by_parent(self, parent_id, get_components=False):
weapons = self._query_all("weapon_by_parent", """
SELECT items._id, items.name, items.buy, weapons.*
FROM weapons
LEFT JOIN items ON weapons._id = items._id
def get_weapons_by_parent(self, parent_id):
return self._query_all("weapon_by_parent", MHDB._weapon_select + """
WHERE weapons.parent_id=?
""", (parent_id,), model_cls=model.Weapon)
if get_components:
for weapon in weapons:
self._add_components(weapon)
return weapons
def get_armors(self):
return self._query_all("armors", """
SELECT items._id, items.name, items.buy, armor.*
FROM armor
LEFT JOIN items ON armor._id = items._id
""", model_cls=model.Armor)
return self._query_all("armors", MHDB._armor_select,
model_cls=model.Armor)
def get_armor(self, armor_id):
return self._query_one("armor", """
SELECT items._id, items.name, items.buy, armor.*
FROM armor
LEFT JOIN items ON armor._id = items._id
return self._query_one("armor", MHDB._armor_select + """
WHERE armor._id=?
""", (armor_id,), model_cls=model.Armor)
def get_armor_by_name(self, name):
return self._query_one("armor", """
SELECT items._id, items.name, items.buy, armor.*
FROM armor
LEFT JOIN items ON armor._id = items._id
return self._query_one("armor", MHDB._armor_select + """
WHERE items.name=?
""", (name,), model_cls=model.Armor)
@@ -366,28 +382,16 @@ class MHDB(object):
""", (item_id,), model_cls=model.ItemSkill)
def get_decorations(self):
return self._query_all("decorations", """
SELECT items._id, items.name, items.buy, decorations.*
FROM decorations
INNER JOIN items
ON items._id = decorations._id
""", model_cls=model.Decoration)
return self._query_all("decorations", MHDB._decoration_select,
model_cls=model.Decoration)
def get_decoration(self, decoration_id):
return self._query_one("decoration", """
SELECT items._id, items.name, items.buy, decorations.*
FROM decorations
INNER JOIN items
ON items._id = decorations._id
return self._query_one("decoration", MHDB._decoration_select + """
WHERE decorations._id = ?
""", (decoration_id,), model_cls=model.Decoration)
def get_decoration_by_name(self, name):
return self._query_all("decoration", """
SELECT items._id, items.name, items.buy, decorations.*
FROM decorations
INNER JOIN items
ON items._id = decorations._id
return self._query_all("decoration", MHDB._decoration_select + """
WHERE items.name = ?
""", (name,), model_cls=model.Decoration)
@@ -416,7 +420,8 @@ class MHDB(object):
args = sorted(skill_tree_ids)
placeholders = ", ".join(["?"] * len(skill_tree_ids))
return self._query_all("decorations", """
SELECT items._id, items.name, items.buy, decorations.*
SELECT items._id, items.type, items.name, items.rarity,
decorations.*
FROM item_to_skill_tree
LEFT JOIN items
ON items._id = item_to_skill_tree.item_id
@@ -433,7 +438,8 @@ class MHDB(object):
placeholders = ", ".join(["?"] * len(skill_tree_ids))
args += [hunter_type]
return self._query_all("decorations", """
SELECT items._id, items.name, items.buy, armor.*
SELECT items._id, item.type, items.name, item.rariry, items.buy,
armor.*
FROM item_to_skill_tree
LEFT JOIN items
ON items._id = item_to_skill_tree.item_id
@@ -485,3 +491,29 @@ class MHDB(object):
FROM horn_melodies
WHERE notes=?
""", (notes,), model_cls=model.HornMelody)
def _add_components(self, key, item_results):
"""
Add component data to item results from _query_one or _query_all,
if include_item_components is set. Uses the cache key to determine
if it's one of the item types we care about having components for.
TODO: use batches or single query to make this more efficient for
large result sets.
"""
if not self.include_item_components:
return
if key.rstrip("s") not in "weapon armor decoration".split():
return
if item_results is None:
return
if not isinstance(item_results, list):
item_results = [item_results]
for item_data in item_results:
ccomps = self.get_item_components(item_data.id, "Create")
if item_data["type"] == "Weapon":
# only weapons have upgrade components
ucomps = self.get_item_components(item_data.id, "Improve")
else:
ucomps = None
item_data.set_components(ccomps, ucomps)

47
mhapi/model.py
View File

@@ -1,7 +1,6 @@
import string
import json
import urllib
from collections import defaultdict
import re
import difflib
@@ -197,7 +196,28 @@ class WeaponSharpness(ModelBase):
return self.value_list
class ItemWithSkills(RowModel):
class ItemCraftable(RowModel):
def __init__(self, item_row):
super(ItemCraftable, self).__init__(item_row)
self.create_components = None
self.upgrade_components = None
def set_components(self, create_components, upgrade_components):
self.create_components = create_components
self.upgrade_components = upgrade_components
def as_data(self):
data = super(ItemCraftable, self).as_data()
if self.create_components is not None:
data["create_components"] = dict((item.name, item.quantity)
for item in self.create_components)
if self.upgrade_components is not None:
data["upgrade_components"] = dict((item.name, item.quantity)
for item in self.upgrade_components)
return data
class ItemWithSkills(ItemCraftable):
def __init__(self, item_row):
super(ItemWithSkills, self).__init__(item_row)
self.skills = None
@@ -308,8 +328,7 @@ class Skill(RowModel):
["id", "required_skill_tree_points", "name", "description"] }
class Weapon(RowModel):
class Weapon(ItemCraftable):
_list_fields = ["id", "wtype", "name"]
_indexes = { "name": "id",
"wtype": ["id", "name"],
@@ -320,14 +339,7 @@ class Weapon(RowModel):
def __init__(self, weapon_item_row):
super(Weapon, self).__init__(weapon_item_row)
self._parse_sharpness()
self.create_components = []
self.upgrade_components = []
def set_components(self, create_components, upgrade_components):
self.create_components = create_components
self.upgrade_components = upgrade_components
def _parse_sharpness(self):
"""
@@ -345,17 +357,6 @@ class Weapon(RowModel):
self._data["sharpness"] = WeaponSharpness(normal)
self._data["sharpness_plus"] = WeaponSharpness(plus)
def as_data(self):
data = super(Weapon, self).as_data()
if self.create_components is not None:
data["create_components"] = dict((item.name, item.quantity)
for item in self.create_components)
if self.upgrade_components is not None:
data["upgrade_components"] = dict((item.name, item.quantity)
for item in self.upgrade_components)
return data
class Monster(RowModel):
_list_fields = ["id", "class", "name"]
@@ -556,7 +557,7 @@ def get_costs(db, weapon):
cost_display = urllib.quote(weapon.upgrade_cost)
print "WARN: bad upgrade cost for '%s' (%s): '%s'" \
% (weapon.name, weapon.id, cost_display)
parent_weapon = db.get_weapon(weapon.parent_id, True)
parent_weapon = db.get_weapon(weapon.parent_id)
costs = get_costs(db, parent_weapon)
for cost in costs:
cost["zenny"] += upgrade_cost