2022/7/28 アンソロジー実装で動かなくなったのを改修

poslogithub · Jul 27, 2022 · 701c31b · 701c31b
1 parent 2130848
commit 701c31b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/script/generate_set_map.py b/script/generate_set_map.py
@@ -97,7 +97,7 @@ def generate_set_map(loc, cards, enums, set_name):
  else:
  set_number = int(card["collectorNumber"])
 
- grp_id = card["grpid"]
+ grp_id = card["grpId"]
  abilities = []
 
  abilities_raw = card["abilities"]
@@ -133,7 +133,7 @@ def generate_set_map(loc, cards, enums, set_name):
  output_lines.append(new_card_str)
 
  except Exception:
- print("hit an error on {} / {} / {}".format(card["grpid"], loc_map[card["titleId"]], card["collectorNumber"]))
+ print("hit an error on {} / {} / {}".format(card["grpId"], loc_map[card["titleId"]], card["collectorNumber"]))
  raise
  header = """
 import sys

diff --git a/source/mtga/set_data/dynamic.py b/source/mtga/set_data/dynamic.py
@@ -171,9 +171,9 @@ def del_ruby(s):
  else:
  set_number = int(card["collectorNumber"])
  except ValueError:
- set_number = card["grpid"]
+ set_number = card["grpId"]
 
- grp_id = card["grpid"]
+ grp_id = card["grpId"]
  abilities = []
 
  try:
@@ -194,10 +194,10 @@ def del_ruby(s):
  try:
  abilities_raw = card["abilities"]
  except KeyError:
- abilities_raw = []
- for ability in abilities_raw:
- aid = ability["Id"]
- textid = ability.get("TextId")
+ abilities_raw = ""
+ for ability in abilities_raw.split(","):
+ aid = ability.split(":")[0]
+ textid = ability.split(":")[1] if len(ability.split(":")) >= 2 else None
  text = ""
  try:
  if textid:
@@ -212,10 +212,10 @@ def del_ruby(s):
  try:
  hidden_abilities_raw = card["hiddenAbilities"]
  except KeyError:
- hidden_abilities_raw = []
- for ability in hidden_abilities_raw:
- aid = ability["Id"]
- textid = ability.get("TextId")
+ hidden_abilities_raw = ""
+ for ability in hidden_abilities_raw.split(","):
+ aid = ability.split(":")[0]
+ textid = ability.split(":")[1] if len(ability.split(":")) >= 2 else None
  text = ""
  try:
  if textid:
@@ -235,7 +235,7 @@ def del_ruby(s):
  set_card_objs.append(new_card_obj)
 
  except Exception:
- print("hit an error on {} / {} / {}".format(card["grpid"], loc_map[card["titleId"]],
+ print("hit an error on {} / {} / {}".format(card["grpId"], loc_map[card["titleId"]],
  card["collectorNumber"]))
  raise
  card_set_obj = Set(set_name_class_cased, cards=set_card_objs)