Commit d5412981 authored by Loïc Petit's avatar Loïc Petit

Falke update + Vtrigger activation flag

parent b0b04fca
......@@ -13,6 +13,8 @@ char_path = "D:/Steam/SteamApps/common/StreetFighterV/StreetFighterV/Content/Pak
chars = sorted(a for a in os.listdir(char_path) if a != "NDK")
versions = {re.sub("s([0-9\.]*)-.*","\\1", version): {line[:3]: line[4:] for line in open("../sfv-simulator/versions/"+version).read().strip().split("\n")} for version in os.listdir("../sfv-simulator/versions") if version[-3:] == "txt"}
for c in chars:
# if c not in {"ZGF"}:
# continue
print(c)
previous = None
previous_data = None
......@@ -22,7 +24,7 @@ for c in chars:
continue
current_data = load_char(char_path, c, current)
path_diff = output_path+"diffs/%s_%s_%s.bin" % (c, previous, current)
if previous_data is not None: #: and not os.path.exists(path_diff):
if previous_data is not None and not os.path.exists(path_diff):
diff = DeepDiff(previous_data, current_data, exclude_paths=["root['version']"])
diff = transform_diff(clean_diff(diff, previous_data, current_data))
if len(diff):
......
......@@ -11,8 +11,8 @@ def transform_bch(data):
res = {
"Stun": data["StunGauge"],
"Life": data["VitalGauge"],
"VGauge": data.get("VGauge", data.get("VGauge0")),
"VTrigger": data.get("VT_Time0", data.get("VT1_Time")),
"VGauge": data.get("VGauge0", data.get("VGauge")),
"VTrigger": data.get("VT_Time0", data.get("VT1_Time", data.get("VT_Time1"))),
"VGauge2": data.get("VGauge1"),
"VTrigger2": data.get("VT_Time1"),
}
......
......@@ -97,7 +97,8 @@ def transform_move(data, max_uk8):
"VMeterConsumes": data["VtriggerUsed"] if data["VtriggerUsed"] != 0 else None,
"EXRequires": data["MeterRequirement"] if data["MeterRequirement"] != 0 else None,
"EXConsumes": data["MeterUsed"] if data["MeterUsed"] != 0 else None,
"VTriggerConsumes": data["Unknown16"] >> 16 if data["Unknown16"] & 0xFFFF else None,
"VTriggerConsumes": data["Unknown16"] >> 16,
"VTriggerActivated": data["Unknown16"] & 0xFFFF if data["Unknown16"] & 0xFFFF else None,
"VTriggerRequired": (projectile_limit[2] + 1) if projectile_limit[3] else None,
}
res = {k: v for k, v in res.items() if v is not None}
......
......@@ -13,6 +13,7 @@ char_alias = {
"Z25": "ZKU",
"Z26": "SKR",
"Z27": "BLK",
"Z28": "FLK"
}
......
......@@ -193,6 +193,10 @@ with ZipFile("result/dump.zip", "w", compression=ZIP_DEFLATED) as zf:
# print(version)
# write_version(basepath, version_map, "SKR", "000")
for char, versions in sorted(version_map.items()):
# if char not in {"LAR", "ABG", "FLK", "ZGF"}:
# continue
for version, version_content in sorted(versions.items()):
# if version_content[0] != "3.040":
# continue
print(char, version, version_content)
write_version(basepath, version_map, char, version, zf)
......@@ -16,6 +16,7 @@ char_label = {
"DSM": "Dhalsim",
"EDO": "Ed",
"FAN": "F.A.N.G.",
"FLK": "Falke",
"GOK": "Akuma",
"GUL": "Guile",
"IBK": "Ibuki",
......
......@@ -29,6 +29,7 @@
{%- call(v) dd_dt_diff(move, "EXRequires", "Requires EX") %}{{ v }}{%- endcall %}
{%- call(v) dd_dt_diff(move, "EXConsumes", "Consumes EX") %}{{ v }}{%- endcall %}
{%- call(v) dd_dt_diff(move, "VTriggerConsumes", "Consumes V-Trigger") %}{{ v }}{%- endcall %}
{%- call(v) dd_dt_diff(move, "VTriggerActivated", "V-Trigger Activated") %}Yes{%- endcall %}
{%- call(v) dd_dt_diff(move, "VTriggerRequired", "V-Trigger Required") %}{{ v }}{%- endcall %}
{%- call(v) dd_dt_diff(move, "BloodyGarden", "Blood Garden Only") %}{{ v }}{%- endcall %}
</dl>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment