diff --git a/data/third_party_json/spells.py b/data/third_party_json/spells.py index 90e33f9..895a430 100644 --- a/data/third_party_json/spells.py +++ b/data/third_party_json/spells.py @@ -155,14 +155,15 @@ def do_spell_components(i,id,conn,ctypes): if k.capitalize() == j[1]: res = j[0] - inp = (res, id) + inp = (id, res) stmt = "INSERT INTO spells_spellcomponents (spells_id, spellcomponents_id) VALUES (?,?)" try: conn.execute(stmt, inp) - except: - print("Error inserting spell components") + except sqlite3.Error as e: + print("Error inserting spell components: {}".format(e)) + print("\tinp: {}".format(inp)) else: conn.commit() @@ -224,7 +225,7 @@ def do_spell_traits(i, id, conn, traits): # print(inp) # insert into sql - stmt = "INSERT OR REPLACE INTO spells_traits (spells_id, traits_id) VALUES (?,?)" + stmt = "INSERT OR REPLACE INTO spells_traits (spells_id, trait_id) VALUES (?,?)" try: conn.executemany(stmt, inp) except: diff --git a/gendb.sh b/gendb.sh index 5db9c45..66c4854 100755 --- a/gendb.sh +++ b/gendb.sh @@ -62,9 +62,9 @@ sqlite3 pf2.db < data/gear.sql echo '15' sqlite3 pf2.db < data/heritages.sql # Comment out the following three lines if you don't want to generate the spell data. -# cd data/third_party_json -# python3 spells.py -# cd ../.. +cd data/third_party_json +python3 spells.py +cd ../.. # TODO Eventually we will stop relying on the spells.py script and I will have # the actual .sql files for the spell data; I am waiting to see if the