Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8152c1da0a | ||
|
|
40f068abe5 | ||
|
|
ef14ecaaa5 | ||
|
|
6467ce86a7 | ||
|
|
a9836c3191 |
@@ -88,3 +88,20 @@ presets:
|
|||||||
route_thresholds: [5, 10, 20, 30]
|
route_thresholds: [5, 10, 20, 30]
|
||||||
|
|
||||||
rare_goals: [Blue, Black, Blue or Black]
|
rare_goals: [Blue, Black, Blue or Black]
|
||||||
|
|
||||||
|
# "Show the paths of all riders" on the valley map (site/atlas/explorer.js): one layer per source that records a
|
||||||
|
# route, and two layers of deaths. Unlike everything above, the layers use every source of runs_clean.csv. A layer
|
||||||
|
# takes runs by source (and, for the spreadsheet, by its row label `entry`); the death layers take every death from
|
||||||
|
# the route-recording sources: "deliberate" = burned at an encounter the rider did not genuinely attempt (the route
|
||||||
|
# model's rule), "failed" = every other death. Discord has no runs yet: its layer is ready for when it is imported.
|
||||||
|
path_layers:
|
||||||
|
- { key: form, label: "Google Sheet: form posts", sources: [reddit spreadsheet], entry: [Form] }
|
||||||
|
- { key: bulk, label: "Google Sheet: bulk logs", sources: [reddit spreadsheet], entry_not: [Form] }
|
||||||
|
- { key: reported, label: "Reported on the Atlas", sources: [reported] }
|
||||||
|
- { key: reddit, label: "Reddit megathread comments", sources: [reddit comment] }
|
||||||
|
- { key: bot, label: "DragonKind bot", sources: [bot] }
|
||||||
|
- { key: discord, label: "Discord", sources: [discord] }
|
||||||
|
- { key: died_deliberate, label: "Deaths: chose to die", death: deliberate }
|
||||||
|
- { key: died_failed, label: "Deaths: failed runs", death: failed }
|
||||||
|
# sources that record which dragon bonded but not the route: counted on the map, not drawn
|
||||||
|
path_unrouted: [reddit thread, register]
|
||||||
|
|||||||
@@ -399,7 +399,7 @@ def place_path(r):
|
|||||||
s.append("bully")
|
s.append("bully")
|
||||||
if "res:" + r["resolution"] in L:
|
if "res:" + r["resolution"] in L:
|
||||||
s.append("res:" + r["resolution"])
|
s.append("res:" + r["resolution"])
|
||||||
if r["resolution"].startswith("DIED"):
|
if (r.get("resolution") or "").startswith("DIED"):
|
||||||
return s
|
return s
|
||||||
if r.get("post_path") in ("Forest", "West", "East"):
|
if r.get("post_path") in ("Forest", "West", "East"):
|
||||||
s.append("fork:" + r["post_path"])
|
s.append("fork:" + r["post_path"])
|
||||||
@@ -452,17 +452,54 @@ def valley(runs):
|
|||||||
return {"counts": counts, "edges": [[*k.split(">"), n] for k, n in sorted(edges.items(), key=lambda kv: -kv[1])]}
|
return {"counts": counts, "edges": [[*k.split(">"), n] for k, n in sorted(edges.items(), key=lambda kv: -kv[1])]}
|
||||||
|
|
||||||
|
|
||||||
|
DEATHS = ("Incinerated", "Died before the hour")
|
||||||
|
|
||||||
|
|
||||||
|
def deliberate(r):
|
||||||
|
"""A deliberate death: burned at a bonding encounter the rider did not genuinely attempt (chasing another colour,
|
||||||
|
choosing to die and try again). The route model's own rule."""
|
||||||
|
if r["outcome"] != "Incinerated":
|
||||||
|
return False
|
||||||
|
try:
|
||||||
|
v = model.prepare_run(r)
|
||||||
|
return bool(v.get("encCtx")) and not model.genuine_attempt(r, v["encCtx"])
|
||||||
|
except (KeyError, TypeError, ValueError): # a source coded from other questions (e.g. the bot): not known
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def path_layers(runs):
|
||||||
|
"""'Show the paths of all riders' on the valley map: for every layer in measures.yaml path_layers, how many runs
|
||||||
|
went from each place to the next (like valley()), plus where the death layers' runs ended. Every source is used
|
||||||
|
here, not only the statistics' sources. Sources that record no route are counted only (path_unrouted)."""
|
||||||
|
cfg = M["path_layers"]
|
||||||
|
routed = sorted({s for layer in cfg for s in layer.get("sources", [])})
|
||||||
|
out = []
|
||||||
|
for layer in cfg:
|
||||||
|
if "death" in layer:
|
||||||
|
sel = [r for r in runs if r["source"] in routed and r["outcome"] in DEATHS
|
||||||
|
and deliberate(r) == (layer["death"] == "deliberate")]
|
||||||
|
else:
|
||||||
|
sel = [r for r in runs if r["source"] in layer["sources"]
|
||||||
|
and (not layer.get("entry") or r.get("entry") in layer["entry"])
|
||||||
|
and (not layer.get("entry_not") or r.get("entry") not in layer["entry_not"])]
|
||||||
|
v = valley(sel)
|
||||||
|
item = {"key": layer["key"], "label": layer["label"], "runs": len(sel), "edges": v["edges"]}
|
||||||
|
if "death" in layer:
|
||||||
|
ends = {}
|
||||||
|
for r in sel:
|
||||||
|
seq = place_path(r)
|
||||||
|
if seq:
|
||||||
|
ends[seq[-1]] = ends.get(seq[-1], 0) + 1
|
||||||
|
item["ends"] = dict(sorted(ends.items(), key=lambda kv: -kv[1]))
|
||||||
|
out.append(item)
|
||||||
|
unrouted = {s: sum(1 for r in runs if r["source"] == s) for s in M.get("path_unrouted", [])}
|
||||||
|
return {"layers": out, "unrouted": unrouted}
|
||||||
|
|
||||||
|
|
||||||
def overview(runs):
|
def overview(runs):
|
||||||
"""The Odds' summary cards: cadets who went in and either bonded or died. Deliberate deaths (burned at an
|
"""The Odds' summary cards: cadets who went in and either bonded or died. Deliberate deaths (burned at an
|
||||||
encounter the rider did not genuinely attempt) and runs with no recorded outcome are left out."""
|
encounter the rider did not genuinely attempt) and runs with no recorded outcome are left out."""
|
||||||
ended = [r for r in runs if r["outcome"] in ("Bonded", "Incinerated", "Died before the hour")]
|
ended = [r for r in runs if r["outcome"] in ("Bonded", "Incinerated", "Died before the hour")]
|
||||||
|
|
||||||
def deliberate(r):
|
|
||||||
if r["outcome"] != "Incinerated":
|
|
||||||
return False
|
|
||||||
v = model.prepare_run(r)
|
|
||||||
return bool(v.get("encCtx")) and not model.genuine_attempt(r, v["encCtx"])
|
|
||||||
|
|
||||||
cadets = [r for r in ended if not deliberate(r)]
|
cadets = [r for r in ended if not deliberate(r)]
|
||||||
bonded = sum(1 for r in cadets if r["outcome"] == "Bonded")
|
bonded = sum(1 for r in cadets if r["outcome"] == "Bonded")
|
||||||
return {"cadets": len(cadets), "bonded": bonded, "dead": len(cadets) - bonded, "deliberate": len(ended) - len(cadets),
|
return {"cadets": len(cadets), "bonded": bonded, "dead": len(cadets) - bonded, "deliberate": len(ended) - len(cadets),
|
||||||
@@ -483,7 +520,7 @@ def clean(o):
|
|||||||
return o
|
return o
|
||||||
|
|
||||||
|
|
||||||
def build(runs, rows, exported=None):
|
def build(runs, rows, exported=None, every_run=None):
|
||||||
global PLACES
|
global PLACES
|
||||||
PLACES = place_ids()
|
PLACES = place_ids()
|
||||||
th = M["route_thresholds"]
|
th = M["route_thresholds"]
|
||||||
@@ -506,6 +543,8 @@ def build(runs, rows, exported=None):
|
|||||||
"routes": {t: rank_routes(sub, t, th) for t in TARGETS},
|
"routes": {t: rank_routes(sub, t, th) for t in TARGETS},
|
||||||
"map": route_map(sub), "valley": valley(sub), "overview": overview(sub),
|
"map": route_map(sub), "valley": valley(sub), "overview": overview(sub),
|
||||||
}
|
}
|
||||||
|
if every_run is not None:
|
||||||
|
out["paths"] = path_layers(every_run)
|
||||||
return clean(out)
|
return clean(out)
|
||||||
|
|
||||||
|
|
||||||
@@ -515,7 +554,7 @@ def main(argv=None):
|
|||||||
ap.add_argument("--out", default=str(ROOT / "data/public/stats.json"))
|
ap.add_argument("--out", default=str(ROOT / "data/public/stats.json"))
|
||||||
a = ap.parse_args(argv)
|
a = ap.parse_args(argv)
|
||||||
runs = runs_io.read(a.data, sources=M["sources"])
|
runs = runs_io.read(a.data, sources=M["sources"])
|
||||||
out = build(runs, len(runs), exported())
|
out = build(runs, len(runs), exported(), every_run=runs_io.read(a.data))
|
||||||
Path(a.out).write_text(json.dumps(out, separators=(",", ":"), ensure_ascii=False), encoding="utf-8")
|
Path(a.out).write_text(json.dumps(out, separators=(",", ":"), ensure_ascii=False), encoding="utf-8")
|
||||||
print(f"{a.out}: {len(runs)} runs, {len(out['presets'])} presets, {Path(a.out).stat().st_size / 1e6:.1f} MB")
|
print(f"{a.out}: {len(runs)} runs, {len(out['presets'])} presets, {Path(a.out).stat().st_size / 1e6:.1f} MB")
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ it exactly.
|
|||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| reddit spreadsheet | `reddit_spreadsheet`: u/ClumsyBadger's Threshing Routes form and spreadsheet, linked from the megathreads | the sheet's .xlsx export | `data/public/form_responses.json` (emails redacted), coded by `core/spec/form.yaml` |
|
| reddit spreadsheet | `reddit_spreadsheet`: u/ClumsyBadger's Threshing Routes form and spreadsheet, linked from the megathreads | the sheet's .xlsx export | `data/public/form_responses.json` (emails redacted), coded by `core/spec/form.yaml` |
|
||||||
| reddit thread | `reddit_thread`: dragonkind.com result pages posted in the r/fourthwing megathreads | the threads, through the official Reddit API (needs `REDDIT_CLIENT_ID` / `REDDIT_CLIENT_SECRET`) | `manual/reddit_results.yaml`, checked by hand; the extract lists result links not in it yet |
|
| reddit thread | `reddit_thread`: dragonkind.com result pages posted in the r/fourthwing megathreads | the threads, through the official Reddit API (needs `REDDIT_CLIENT_ID` / `REDDIT_CLIENT_SECRET`) | `manual/reddit_results.yaml`, checked by hand; the extract lists result links not in it yet |
|
||||||
| reddit comment | `reddit_comments`: runs riders describe in the megathread comments | not extracted here: the [threshing-reddit](https://git.kenschiano.net/DragonKind/threshing-reddit) scraper reads the threads every 6 hours and opens (or updates) a pull request that changes the public file | `data/public/reddit_comments.json`: each comment read into the "Report a run" answers, no usernames or text; corrections by hand in `manual/reddit_comments.yaml` |
|
|
||||||
| reported | `reported`: the Atlas's "Report a run" form (a GitHub issue form, `specs/report_form.yaml`) | issues labelled `run report`, through the GitHub API | `data/public/reports.json` (answers only, no usernames) |
|
| reported | `reported`: the Atlas's "Report a run" form (a GitHub issue form, `specs/report_form.yaml`) | issues labelled `run report`, through the GitHub API | `data/public/reports.json` (answers only, no usernames) |
|
||||||
| bot | `bot`: Ken's DragonKind bot | a local copy of the bot's private repo (`DRAGONKIND_BOT_DIR`) | `data/bot/scenes.json`, `data/bot/trajectories-<date>.jsonl` (no prose, accounts hashed with `DK_ACCOUNT_SALT`; `specs/bot.yaml`) |
|
| bot | `bot`: Ken's DragonKind bot | a local copy of the bot's private repo (`DRAGONKIND_BOT_DIR`) | `data/bot/scenes.json`, `data/bot/trajectories-<date>.jsonl` (no prose, accounts hashed with `DK_ACCOUNT_SALT`; `specs/bot.yaml`) |
|
||||||
| reddit pdf | `reddit_pdf`: the community route PDF | the PDF | `data/derived/pdf_fingerprint.json` only: hashes, never the text |
|
| reddit pdf | `reddit_pdf`: the community route PDF | the PDF | `data/derived/pdf_fingerprint.json` only: hashes, never the text |
|
||||||
|
|||||||
@@ -64,11 +64,6 @@ def reddit(spec, env):
|
|||||||
return json.dumps(threads, ensure_ascii=False, sort_keys=True).encode("utf-8")
|
return json.dumps(threads, ensure_ascii=False, sort_keys=True).encode("utf-8")
|
||||||
|
|
||||||
|
|
||||||
def delivered(spec, env):
|
|
||||||
"""A source another repository delivers by pull request (it changes the public file itself): nothing to fetch."""
|
|
||||||
raise Skip(f"delivered by pull request from {spec.get('by') or 'another repository'}")
|
|
||||||
|
|
||||||
|
|
||||||
def forge_issues(spec, env):
|
def forge_issues(spec, env):
|
||||||
"""Every issue with the label (open and closed), from the repository's host (forge.yaml: Gitea or GitHub)."""
|
"""Every issue with the label (open and closed), from the repository's host (forge.yaml: Gitea or GitHub)."""
|
||||||
from . import forge
|
from . import forge
|
||||||
@@ -112,7 +107,7 @@ def pack_local(spec, src):
|
|||||||
return json.dumps(files, ensure_ascii=False, sort_keys=True).encode("utf-8")
|
return json.dumps(files, ensure_ascii=False, sort_keys=True).encode("utf-8")
|
||||||
|
|
||||||
|
|
||||||
EXTRACTORS = {"http": http, "reddit": reddit, "forge_issues": forge_issues, "local_dir": local_dir, "delivered": delivered}
|
EXTRACTORS = {"http": http, "reddit": reddit, "forge_issues": forge_issues, "local_dir": local_dir}
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------- the raw store
|
# ---------------------------------------------------------------- the raw store
|
||||||
|
|||||||
+9
-108
@@ -4,7 +4,6 @@ One coder per source (pipeline.yaml `runs:`). Every coder returns rows keyed by
|
|||||||
missing answers get the same "not known" values the community form's coding uses, so every source can be filtered
|
missing answers get the same "not known" values the community form's coding uses, so every source can be filtered
|
||||||
the same way. The `source` column says where a run came from; `entry` keeps the spreadsheet's own row label.
|
the same way. The `source` column says where a run came from; `entry` keeps the spreadsheet's own row label.
|
||||||
"""
|
"""
|
||||||
import functools
|
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
@@ -68,13 +67,8 @@ def spreadsheet(name, spec):
|
|||||||
|
|
||||||
def reddit_results(name, spec):
|
def reddit_results(name, spec):
|
||||||
"""Dragons read from result pages linked in the megathreads: bonded, colour and tail known, route unknown."""
|
"""Dragons read from result pages linked in the megathreads: bonded, colour and tail known, route unknown."""
|
||||||
from .common import pipeline
|
|
||||||
comments = pipeline()["sources"].get("reddit_comments")
|
|
||||||
told = {r.get("result") for r in _comment_runs(comments)} if comments else set()
|
|
||||||
rows = []
|
rows = []
|
||||||
for r in read_yaml(spec["transform"]["manual"])["results"]:
|
for r in read_yaml(spec["transform"]["manual"])["results"]:
|
||||||
if r["id"] in told:
|
|
||||||
continue # the same run, with its route, is a "reddit comment" row
|
|
||||||
row = blank_row(run_id=f"thread-{r['id']}", source=spec["run_source"], outcome="Bonded",
|
row = blank_row(run_id=f"thread-{r['id']}", source=spec["run_source"], outcome="Bonded",
|
||||||
outcome_color=r["colour"], tail=r["tail"])
|
outcome_color=r["colour"], tail=r["tail"])
|
||||||
encounter_columns(row)
|
encounter_columns(row)
|
||||||
@@ -116,55 +110,14 @@ def register(name, spec):
|
|||||||
|
|
||||||
def reports(name, spec):
|
def reports(name, spec):
|
||||||
"""Runs reported through the "Report a run" issue form (collection/specs/report_form.yaml)."""
|
"""Runs reported through the "Report a run" issue form (collection/specs/report_form.yaml)."""
|
||||||
|
form = report_form.spec()
|
||||||
|
fields = {f["id"]: f for f in form["fields"]}
|
||||||
p = path(spec["load"])
|
p = path(spec["load"])
|
||||||
data = json.loads(p.read_text(encoding="utf-8")) if p.exists() else {"reports": []}
|
data = json.loads(p.read_text(encoding="utf-8")) if p.exists() else {"reports": []}
|
||||||
return [answers_row(f"reported-{rep['number']}", spec["run_source"], rep.get("opened"), rep["answers"])
|
|
||||||
for rep in data["reports"]]
|
|
||||||
|
|
||||||
|
|
||||||
def _comment_runs(spec):
|
|
||||||
"""data/public/reddit_comments.json with the hand corrections of collection/manual/reddit_comments.yaml:
|
|
||||||
`reject` (comment ids), `fix` (id -> answers that replace the read ones; null removes one) and `add` (runs the
|
|
||||||
reader missed: {id, thread, posted, answers})."""
|
|
||||||
p = path(spec["load"])
|
|
||||||
data = json.loads(p.read_text(encoding="utf-8")) if p.exists() else {"runs": []}
|
|
||||||
manual = read_yaml(spec["manual"]) if spec.get("manual") and path(spec["manual"]).exists() else {}
|
|
||||||
reject = {str(x) for x in manual.get("reject") or []}
|
|
||||||
fix = {str(k): v for k, v in (manual.get("fix") or {}).items()}
|
|
||||||
out = []
|
|
||||||
for run in list(data["runs"]) + list(manual.get("add") or []):
|
|
||||||
if str(run["id"]) in reject or str(run["id"]).split("-")[0] in reject:
|
|
||||||
continue
|
|
||||||
answers = dict(run["answers"])
|
|
||||||
for k, v in (fix.get(str(run["id"])) or {}).items():
|
|
||||||
if v is None:
|
|
||||||
answers.pop(k, None)
|
|
||||||
else:
|
|
||||||
answers[k] = str(v)
|
|
||||||
out.append({**run, "answers": answers, "checked": str(run["id"]) in fix or run in (manual.get("add") or [])})
|
|
||||||
return out
|
|
||||||
|
|
||||||
|
|
||||||
def reddit_comments(name, spec):
|
|
||||||
"""Runs riders described in the megathread comments, read into the "Report a run" answers (automatic: every
|
|
||||||
row is flagged, and those not checked by hand say so)."""
|
|
||||||
rows = []
|
rows = []
|
||||||
for run in _comment_runs(spec):
|
for rep in data["reports"]:
|
||||||
rows.append(answers_row(f"comment-{run['id']}", spec["run_source"], run.get("posted"), run["answers"],
|
vals, flags = {}, []
|
||||||
["read from a Reddit comment" + ("" if run["checked"] else " automatically, not checked by hand")]))
|
for fid, answer in rep["answers"].items():
|
||||||
return rows
|
|
||||||
|
|
||||||
|
|
||||||
@functools.lru_cache(maxsize=1)
|
|
||||||
def _form_fields():
|
|
||||||
return {f["id"]: f for f in report_form.spec()["fields"]}
|
|
||||||
|
|
||||||
|
|
||||||
def answers_row(run_id, source, date, answers, flags=None):
|
|
||||||
"""One run from the "Report a run" answers (option labels) -> a coded row."""
|
|
||||||
fields = _form_fields()
|
|
||||||
vals, flags = {}, list(flags or [])
|
|
||||||
for fid, answer in answers.items():
|
|
||||||
f = fields.get(fid)
|
f = fields.get(fid)
|
||||||
if not f:
|
if not f:
|
||||||
continue
|
continue
|
||||||
@@ -175,7 +128,7 @@ def answers_row(run_id, source, date, answers, flags=None):
|
|||||||
vals[f["column"]] = f["options"][answer]
|
vals[f["column"]] = f["options"][answer]
|
||||||
else:
|
else:
|
||||||
flags.append(f"unrecognised answer to {fid}")
|
flags.append(f"unrecognised answer to {fid}")
|
||||||
row = blank_row(run_id=run_id, source=source, date=date, **vals)
|
row = blank_row(run_id=f"reported-{rep['number']}", source=spec["run_source"], date=rep.get("opened"), **vals)
|
||||||
row["attempt_group"] = attempt_group(row["attempt"])
|
row["attempt_group"] = attempt_group(row["attempt"])
|
||||||
if row["outcome"] == "Died before the hour" and row["hour"] == "Unknown":
|
if row["outcome"] == "Died before the hour" and row["hour"] == "Unknown":
|
||||||
row["hour"] = "DIED before the hour"
|
row["hour"] = "DIED before the hour"
|
||||||
@@ -191,61 +144,10 @@ def answers_row(run_id, source, date, answers, flags=None):
|
|||||||
row["saw_blue_meadow"] = True
|
row["saw_blue_meadow"] = True
|
||||||
if row["outcome"] == "Bonded" and not row["outcome_color"]:
|
if row["outcome"] == "Bonded" and not row["outcome_color"]:
|
||||||
flags.append("bonded, colour not given")
|
flags.append("bonded, colour not given")
|
||||||
flags += rule_flags(row)
|
|
||||||
encounter_columns(row)
|
encounter_columns(row)
|
||||||
row["data_flags"] = "; ".join(flags)
|
row["data_flags"] = "; ".join(flags)
|
||||||
return row
|
rows.append(row)
|
||||||
|
return rows
|
||||||
|
|
||||||
# the scream answer each cadet outcome follows (a run cannot end the encounter on another path)
|
|
||||||
CADET_PATH = {
|
|
||||||
"Killed the bullies yourself": "Investigate & help", "Squadmate's revenge": "Investigate & help",
|
|
||||||
"Left bullies to the dragons": "Investigate & help", "DIED in combat": "Investigate & help",
|
|
||||||
"Tourniquet": "Ignore the scream", "Left injured cadet": "Ignore the scream", "Took their weapons": "Ignore the scream",
|
|
||||||
"Left them to it": "Investigate & leave",
|
|
||||||
}
|
|
||||||
REACHED = ("Tree", "Valley")
|
|
||||||
|
|
||||||
|
|
||||||
@functools.lru_cache(maxsize=1)
|
|
||||||
def _form_rules():
|
|
||||||
from atlas import spec as atlas_spec
|
|
||||||
f = atlas_spec.form()
|
|
||||||
return f["sighting_pool"], {k: set(v) for k, v in f["encounter_colours"].items()}
|
|
||||||
|
|
||||||
|
|
||||||
def rule_flags(row):
|
|
||||||
"""The game's own rules, for runs answered through "Report a run": the checks core/atlas/coding.py makes on
|
|
||||||
the community form (first-dragon pools, Greens in the valley) plus the encounter's dragons and the cadet path.
|
|
||||||
Each broken rule is a flag; the run is kept."""
|
|
||||||
pools, enc_colours = _form_rules()
|
|
||||||
flags = []
|
|
||||||
company, direction, first = row["company"], row["direction"], row["first_sighting"]
|
|
||||||
if company in pools and direction in pools[company] and first in COLOURS:
|
|
||||||
pool = list(pools[company][direction]) + (list(pools["Alone"][direction]) if row["left_squadmates"] is True else [])
|
|
||||||
if first not in pool:
|
|
||||||
flags.append(f"first sighting {first} not in documented pool for {company}/{direction}")
|
|
||||||
colour, branch = row["outcome_color"], row["branch"]
|
|
||||||
if row["outcome"] in ("Bonded", "Incinerated") and colour:
|
|
||||||
if branch in enc_colours and colour not in enc_colours[branch]:
|
|
||||||
flags.append(f"{colour} at the {branch} encounter, which has only {'/'.join(sorted(enc_colours[branch]))}")
|
|
||||||
if row["hour"] == "Valley" and colour == "Green":
|
|
||||||
flags.append("Green recorded on a Valley run (no Greens in the valley)")
|
|
||||||
scream, res = row["scream"], row["resolution"]
|
|
||||||
if scream in ("Investigate & help", "Ignore the scream", "Investigate & leave"):
|
|
||||||
if res in CADET_PATH and CADET_PATH[res] != scream:
|
|
||||||
flags.append(f"cadet outcome {res!r} does not follow {scream!r}")
|
|
||||||
if scream != "Investigate & help" and (row["combat_first"] not in (None, "(not recorded)")
|
|
||||||
or row["combat_second"] not in (None, "(not recorded)")):
|
|
||||||
flags.append("fight answers on a run that did not help")
|
|
||||||
if scream != "Investigate & help" and row["post_path"] in ("Forest", "West", "East"):
|
|
||||||
flags.append("a path after the fight on a run without a fight")
|
|
||||||
if row["combat_second"] not in (None, "(not recorded)") and row["combat_first"] != "Assess the situation":
|
|
||||||
flags.append("a second fight move without pausing to assess")
|
|
||||||
died_early = (scream or "").startswith("DIED") or (res or "").startswith("DIED")
|
|
||||||
if died_early and (row["hour"] in REACHED or row["outcome"] in ("Bonded", "Incinerated")):
|
|
||||||
flags.append("died before the hour, yet reached the tree, the valley or a bonding encounter")
|
|
||||||
return flags
|
|
||||||
|
|
||||||
|
|
||||||
def _norm(text):
|
def _norm(text):
|
||||||
@@ -360,8 +262,7 @@ def bot(name, spec):
|
|||||||
return rows
|
return rows
|
||||||
|
|
||||||
|
|
||||||
CODERS = {"spreadsheet": spreadsheet, "reddit_results": reddit_results, "reddit_comments": reddit_comments,
|
CODERS = {"spreadsheet": spreadsheet, "reddit_results": reddit_results, "reports": reports, "bot": bot, "register": register}
|
||||||
"reports": reports, "bot": bot, "register": register}
|
|
||||||
|
|
||||||
|
|
||||||
def build_runs(pipe):
|
def build_runs(pipe):
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
# Hand corrections to the runs read from the r/fourthwing megathread comments (data/public/reddit_comments.json).
|
|
||||||
# The threshing-reddit scraper reads them automatically; every new run it finds is listed, with a link to its
|
|
||||||
# comment, in the pull request that brings it in. Check them there and correct them here. Applied when the
|
|
||||||
# runs are built (`python -m collection build`), so a correction never waits for the threads to change.
|
|
||||||
#
|
|
||||||
# reject: comment ids whose "run" is not a run (a joke, a friend's run, two runs told as one). An id without
|
|
||||||
# its "-n" suffix rejects every run read from that comment.
|
|
||||||
# fix: comment id -> answers that replace the ones read (form option labels from
|
|
||||||
# collection/specs/report_form.yaml; null removes an answer). A fixed run counts as checked by hand.
|
|
||||||
# add: runs the reader missed: { id, thread, posted: YYYY-MM-DD, answers: {...} }
|
|
||||||
# No usernames: the comment id is enough to find the comment again.
|
|
||||||
version: 1
|
|
||||||
reject: []
|
|
||||||
fix: {}
|
|
||||||
add: []
|
|
||||||
@@ -18,7 +18,7 @@ manifest: data/manifest.json # for each source: the sha256 of the current
|
|||||||
runs:
|
runs:
|
||||||
path: data/public/runs_clean.csv
|
path: data/public/runs_clean.csv
|
||||||
# sources in this order; within a source, the order the coder returns
|
# sources in this order; within a source, the order the coder returns
|
||||||
order: [reddit_spreadsheet, reddit_thread, reddit_comments, register, reported, bot, reddit_pdf]
|
order: [reddit_spreadsheet, reddit_thread, register, reported, bot, reddit_pdf]
|
||||||
|
|
||||||
sources:
|
sources:
|
||||||
reddit_spreadsheet:
|
reddit_spreadsheet:
|
||||||
@@ -69,24 +69,6 @@ sources:
|
|||||||
load: null # the public source file is the hand-checked collection/manual/reddit_results.yaml
|
load: null # the public source file is the hand-checked collection/manual/reddit_results.yaml
|
||||||
runs: reddit_results
|
runs: reddit_results
|
||||||
|
|
||||||
reddit_comments:
|
|
||||||
label: Runs riders describe in the r/fourthwing Dragonkind megathread comments
|
|
||||||
run_source: reddit comment
|
|
||||||
links:
|
|
||||||
part3: https://www.reddit.com/r/fourthwing/comments/1wvwfp9/
|
|
||||||
part4: https://www.reddit.com/r/fourthwing/comments/1wz5cnj/
|
|
||||||
scraper: https://git.kenschiano.net/DragonKind/threshing-reddit
|
|
||||||
# delivered, not extracted: the threshing-reddit scraper (its own repository) reads the threads every 6 hours and
|
|
||||||
# opens a pull request here that changes data/public/reddit_comments.json. Each comment is read into the
|
|
||||||
# "Report a run" answers (option labels of specs/report_form.yaml); only the comment id, the day and the
|
|
||||||
# answers are kept: no usernames, no comment text. `update` leaves this source alone.
|
|
||||||
extract: { kind: delivered, by: threshing-reddit }
|
|
||||||
transform: null
|
|
||||||
load: data/public/reddit_comments.json
|
|
||||||
# hand corrections (reject / fix / add a run), applied when the runs are built
|
|
||||||
manual: collection/manual/reddit_comments.yaml
|
|
||||||
runs: reddit_comments
|
|
||||||
|
|
||||||
reported:
|
reported:
|
||||||
label: Runs reported on the Atlas ("Report a run", an issue form on the Atlas's repository)
|
label: Runs reported on the Atlas ("Report a run", an issue form on the Atlas's repository)
|
||||||
run_source: reported
|
run_source: reported
|
||||||
|
|||||||
@@ -153,17 +153,6 @@ sighting_pool:
|
|||||||
1 Squadmate: { East: [Green, Orange, Red], West: [Red, Brown, Green], Center: [Red, Brown] }
|
1 Squadmate: { East: [Green, Orange, Red], West: [Red, Brown, Green], Center: [Red, Brown] }
|
||||||
2 Squadmates: { East: [Red, Orange], West: [Green, Brown, Red], Center: [Red, Brown] }
|
2 Squadmates: { East: [Red, Orange], West: [Green, Brown, Red], Center: [Red, Brown] }
|
||||||
|
|
||||||
# The dragons each bonding encounter can end with (bond or burn), from the community PDF. Only used to FLAG runs
|
|
||||||
# answered through "Report a run" (reported, reddit comment) that end with a dragon the encounter does not have.
|
|
||||||
# Orange and Brown after the two Greens: a Green's rescue, then the Orange or Brown.
|
|
||||||
encounter_colours:
|
|
||||||
"Shadow (rare)": [Blue, Black]
|
|
||||||
"Descend quickly: Red": [Red]
|
|
||||||
"Descend quickly: let the Red pass": [Green]
|
|
||||||
"Descend slowly: two Greens": [Green, Orange, Brown]
|
|
||||||
"Valley Red": [Red]
|
|
||||||
"Passed the Red: meadow": [Orange, Brown, Blue]
|
|
||||||
|
|
||||||
# First-sighting answers that are not a single colour: coded as this colour, and the row is flagged with the
|
# First-sighting answers that are not a single colour: coded as this colour, and the row is flagged with the
|
||||||
# original answer (data_flags), so nothing is lost.
|
# original answer (data_flags), so nothing is lost.
|
||||||
first_sighting_alias:
|
first_sighting_alias:
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ Every source is declared in `collection/pipeline.yaml` and collected by `python
|
|||||||
|---|---|
|
|---|---|
|
||||||
| Community "Threshing Routes" form and spreadsheet, u/ClumsyBadger (`reddit spreadsheet`) | `public/form_responses.json` (emails redacted) |
|
| Community "Threshing Routes" form and spreadsheet, u/ClumsyBadger (`reddit spreadsheet`) | `public/form_responses.json` (emails redacted) |
|
||||||
| Result pages posted in the r/fourthwing megathreads (`reddit thread`) | `collection/manual/reddit_results.yaml` |
|
| Result pages posted in the r/fourthwing megathreads (`reddit thread`) | `collection/manual/reddit_results.yaml` |
|
||||||
| Runs described in the r/fourthwing megathread comments (`reddit comment`) | `public/reddit_comments.json` (comment id, day and answers; no usernames or comment text) |
|
|
||||||
| The Atlas's "Report a run" form (`reported`) | `public/reports.json` (answers only, no usernames) |
|
| The Atlas's "Report a run" form (`reported`) | `public/reports.json` (answers only, no usernames) |
|
||||||
| DragonKind bot exports (`bot`) | `bot/scenes.json`, `bot/trajectories-<date>.jsonl` (anonymised; see `docs/BOT_DATA_PROTOCOL.md`) |
|
| DragonKind bot exports (`bot`) | `bot/scenes.json`, `bot/trajectories-<date>.jsonl` (anonymised; see `docs/BOT_DATA_PROTOCOL.md`) |
|
||||||
| Community route PDF, u/ClumsyBadger (`reddit pdf`) | not redistributed: `derived/pdf_fingerprint.json` only; it maps the choices and holds no runs |
|
| Community route PDF, u/ClumsyBadger (`reddit pdf`) | not redistributed: `derived/pdf_fingerprint.json` only; it maps the choices and holds no runs |
|
||||||
|
|||||||
+2
-17
@@ -78,11 +78,6 @@
|
|||||||
"@type": "sc:CreativeWork",
|
"@type": "sc:CreativeWork",
|
||||||
"name": "Runs posted in the r/fourthwing Dragonkind megathreads",
|
"name": "Runs posted in the r/fourthwing Dragonkind megathreads",
|
||||||
"url": "https://www.reddit.com/r/fourthwing/comments/1wvwfp9/"
|
"url": "https://www.reddit.com/r/fourthwing/comments/1wvwfp9/"
|
||||||
},
|
|
||||||
{
|
|
||||||
"@type": "sc:CreativeWork",
|
|
||||||
"name": "Runs riders describe in the r/fourthwing Dragonkind megathread comments",
|
|
||||||
"url": "https://www.reddit.com/r/fourthwing/comments/1wvwfp9/"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"distribution": [
|
"distribution": [
|
||||||
@@ -106,16 +101,6 @@
|
|||||||
"sha256": "319f6217e0a431454114a67276f429379ec383cd6ed2666443b48b8f48c66490",
|
"sha256": "319f6217e0a431454114a67276f429379ec383cd6ed2666443b48b8f48c66490",
|
||||||
"contentSize": "12623695 B"
|
"contentSize": "12623695 B"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"@type": "cr:FileObject",
|
|
||||||
"@id": "reddit_comments",
|
|
||||||
"name": "reddit_comments",
|
|
||||||
"description": "Runs described in the r/fourthwing megathread comments, read into the \"Report a run\" answers: comment id, day and answers only, no usernames or comment text.",
|
|
||||||
"contentUrl": "https://git.kenschiano.net/DragonKind/threshing-atlas/raw/branch/main/data/public/reddit_comments.json",
|
|
||||||
"encodingFormat": "application/json",
|
|
||||||
"sha256": "c180f8b82ed1119d4ff28697fcf45d0c7f22859597cd10f5e82a2e50ca1dc51a",
|
|
||||||
"contentSize": "105 B"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"@type": "cr:FileObject",
|
"@type": "cr:FileObject",
|
||||||
"@id": "reports",
|
"@id": "reports",
|
||||||
@@ -181,7 +166,7 @@
|
|||||||
"@type": "cr:Field",
|
"@type": "cr:Field",
|
||||||
"@id": "runs/run_id",
|
"@id": "runs/run_id",
|
||||||
"name": "run_id",
|
"name": "run_id",
|
||||||
"description": "Unique id of the run: sheet-<row of the form export>, thread-<result id>, comment-<Reddit comment id>, reported-<issue number> or bot-<hash>.",
|
"description": "Unique id of the run: sheet-<row of the form export>, thread-<result id>, reported-<issue number> or bot-<hash>.",
|
||||||
"dataType": "sc:Text",
|
"dataType": "sc:Text",
|
||||||
"source": {
|
"source": {
|
||||||
"fileObject": {
|
"fileObject": {
|
||||||
@@ -196,7 +181,7 @@
|
|||||||
"@type": "cr:Field",
|
"@type": "cr:Field",
|
||||||
"@id": "runs/source",
|
"@id": "runs/source",
|
||||||
"name": "source",
|
"name": "source",
|
||||||
"description": "Where the run came from. \"reddit spreadsheet\": the community Threshing Routes form and spreadsheet linked from the r/fourthwing megathreads. \"reddit thread\": a dragonkind.com result page posted in a megathread (bonded, route not recorded). \"reddit comment\": a run a rider described in a megathread comment, read automatically into the \"Report a run\" answers by the threshing-reddit scraper, which delivers them by pull request (hand corrections in collection/manual/reddit_comments.yaml). \"reported\": the Atlas's own \"Report a run\" form. \"bot\": an attempt logged by the DragonKind bot. \"register\": a bonded dragon entered in the community's Unofficial Dragon Register (outcome only, no route; the same run may also be in the spreadsheet). \"reddit pdf\": the community route PDF (a flowchart of the routes, not a log of runs, so it adds no rows today). Values: reddit spreadsheet; reddit thread; reddit comment; register; reported; bot; reddit pdf.",
|
"description": "Where the run came from. \"reddit spreadsheet\": the community Threshing Routes form and spreadsheet linked from the r/fourthwing megathreads. \"reddit thread\": a dragonkind.com result page posted in a megathread (bonded, route not recorded). \"reported\": the Atlas's own \"Report a run\" form. \"bot\": an attempt logged by the DragonKind bot. \"register\": a bonded dragon entered in the community's Unofficial Dragon Register (outcome only, no route; the same run may also be in the spreadsheet). \"reddit pdf\": the community route PDF (a flowchart of the routes, not a log of runs, so it adds no rows today). Values: reddit spreadsheet; reddit thread; register; reported; bot; reddit pdf.",
|
||||||
"dataType": "sc:Text",
|
"dataType": "sc:Text",
|
||||||
"source": {
|
"source": {
|
||||||
"fileObject": {
|
"fileObject": {
|
||||||
|
|||||||
+3
-11
@@ -35,12 +35,6 @@ files:
|
|||||||
description: >-
|
description: >-
|
||||||
The community "Threshing Routes" form export as published (headers and rows), with email addresses in
|
The community "Threshing Routes" form export as published (headers and rows), with email addresses in
|
||||||
free-text answers redacted. The source of runs_clean.
|
free-text answers redacted. The source of runs_clean.
|
||||||
reddit_comments:
|
|
||||||
path: data/public/reddit_comments.json
|
|
||||||
format: application/json
|
|
||||||
description: >-
|
|
||||||
Runs described in the r/fourthwing megathread comments, read into the "Report a run" answers: comment id, day
|
|
||||||
and answers only, no usernames or comment text.
|
|
||||||
reports:
|
reports:
|
||||||
path: data/public/reports.json
|
path: data/public/reports.json
|
||||||
format: application/json
|
format: application/json
|
||||||
@@ -69,20 +63,18 @@ files:
|
|||||||
# The columns of runs_clean. type: text, integer, boolean or date. values: every value the column may take
|
# The columns of runs_clean. type: text, integer, boolean or date. values: every value the column may take
|
||||||
# (empty cells are always allowed and mean "does not apply" or "not recorded").
|
# (empty cells are always allowed and mean "does not apply" or "not recorded").
|
||||||
columns:
|
columns:
|
||||||
run_id: { type: text, required: true, description: "Unique id of the run: sheet-<row of the form export>, thread-<result id>, comment-<Reddit comment id>, reported-<issue number> or bot-<hash>." }
|
run_id: { type: text, required: true, description: "Unique id of the run: sheet-<row of the form export>, thread-<result id>, reported-<issue number> or bot-<hash>." }
|
||||||
source:
|
source:
|
||||||
type: text
|
type: text
|
||||||
required: true
|
required: true
|
||||||
description: >-
|
description: >-
|
||||||
Where the run came from. "reddit spreadsheet": the community Threshing Routes form and spreadsheet linked from
|
Where the run came from. "reddit spreadsheet": the community Threshing Routes form and spreadsheet linked from
|
||||||
the r/fourthwing megathreads. "reddit thread": a dragonkind.com result page posted in a megathread (bonded,
|
the r/fourthwing megathreads. "reddit thread": a dragonkind.com result page posted in a megathread (bonded,
|
||||||
route not recorded). "reddit comment": a run a rider described in a megathread comment, read automatically into
|
route not recorded). "reported": the Atlas's own "Report a run" form. "bot": an attempt logged by the
|
||||||
the "Report a run" answers by the threshing-reddit scraper, which delivers them by pull request (hand
|
|
||||||
corrections in collection/manual/reddit_comments.yaml). "reported": the Atlas's own "Report a run" form. "bot": an attempt logged by the
|
|
||||||
DragonKind bot. "register": a bonded dragon entered in the community's Unofficial Dragon Register (outcome
|
DragonKind bot. "register": a bonded dragon entered in the community's Unofficial Dragon Register (outcome
|
||||||
only, no route; the same run may also be in the spreadsheet). "reddit pdf": the community route PDF (a
|
only, no route; the same run may also be in the spreadsheet). "reddit pdf": the community route PDF (a
|
||||||
flowchart of the routes, not a log of runs, so it adds no rows today).
|
flowchart of the routes, not a log of runs, so it adds no rows today).
|
||||||
values: [reddit spreadsheet, reddit thread, reddit comment, register, reported, bot, reddit pdf]
|
values: [reddit spreadsheet, reddit thread, register, reported, bot, reddit pdf]
|
||||||
entry:
|
entry:
|
||||||
type: text
|
type: text
|
||||||
description: >-
|
description: >-
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
{"source":"Runs riders describe in the r/fourthwing Dragonkind megathread comments","runs":[],"unread":0}
|
|
||||||
+1
-10
@@ -36,15 +36,6 @@ def low_bias(r, lb=CONFIG["low_bias"]):
|
|||||||
return r["goal"] not in lb["rare_goals"]
|
return r["goal"] not in lb["rare_goals"]
|
||||||
|
|
||||||
|
|
||||||
def drop_flagged(runs, cfg=CONFIG.get("drop_flagged") or {}):
|
|
||||||
"""Without the flagged runs of the sources read automatically from free text (planner/policy.yaml drop_flagged)."""
|
|
||||||
sources, keep = set(cfg.get("sources") or ()), tuple(cfg.get("except") or ())
|
|
||||||
|
|
||||||
def problems(r):
|
|
||||||
return [f for f in (r.get("data_flags") or "").split("; ") if f and not f.startswith(keep)] if keep else [f for f in (r.get("data_flags") or "").split("; ") if f]
|
|
||||||
return [r for r in runs if r["source"] not in sources or not problems(r)]
|
|
||||||
|
|
||||||
|
|
||||||
def clean(o):
|
def clean(o):
|
||||||
"""JSON-safe: numpy numbers to floats, infinities and NaN to null (as JavaScript's JSON.stringify does)."""
|
"""JSON-safe: numpy numbers to floats, infinities and NaN to null (as JavaScript's JSON.stringify does)."""
|
||||||
if isinstance(o, dict):
|
if isinstance(o, dict):
|
||||||
@@ -65,7 +56,7 @@ def main(argv=None):
|
|||||||
ap.add_argument("--out", default=str(ROOT / "data/public/policy.json"))
|
ap.add_argument("--out", default=str(ROOT / "data/public/policy.json"))
|
||||||
a = ap.parse_args(argv)
|
a = ap.parse_args(argv)
|
||||||
|
|
||||||
runs = drop_flagged(runs_io.read(a.data, sources=SOURCES))
|
runs = runs_io.read(a.data, sources=SOURCES)
|
||||||
rows = len(runs)
|
rows = len(runs)
|
||||||
samples = {
|
samples = {
|
||||||
"all": runs,
|
"all": runs,
|
||||||
|
|||||||
@@ -8,14 +8,6 @@ version: 1
|
|||||||
# the `source` values of data/public/runs_clean.csv the model learns from
|
# the `source` values of data/public/runs_clean.csv the model learns from
|
||||||
sources: [reddit spreadsheet, reported, bot]
|
sources: [reddit spreadsheet, reported, bot]
|
||||||
|
|
||||||
# Sources read automatically from free text: a run with any data flag (a broken game rule, an unrecognised answer)
|
|
||||||
# is left out of the model, since the flag may mean the text was misread or misremembered. Flags that only say where
|
|
||||||
# the run came from (`except`, matched at the start of a flag) do not count. A hand fix that clears the flags
|
|
||||||
# brings the run back. Applies once the source is also listed in `sources` above.
|
|
||||||
drop_flagged:
|
|
||||||
sources: [reddit comment]
|
|
||||||
except: ["read from a Reddit comment"]
|
|
||||||
|
|
||||||
# Two samples. "all" is every run above. "lowBias" leaves out runs where a rare sighting is more likely to have
|
# Two samples. "all" is every run above. "lowBias" leaves out runs where a rare sighting is more likely to have
|
||||||
# been reported than a miss: form submissions and reports from riders chasing Blue or Black. The bot logs every
|
# been reported than a miss: form submissions and reports from riders chasing Blue or Black. The bot logs every
|
||||||
# run, and bulk-pasted logs record every run of the players who kept them, so both stay in.
|
# run, and bulk-pasted logs record every run of the players who kept them, so both stay in.
|
||||||
|
|||||||
+14
-98
@@ -1,4 +1,4 @@
|
|||||||
/* dragons.js — original dragon silhouettes for the valley map.
|
/* dragons.js — the dragon silhouettes of the valley map (traced from the pose reference sheet) and its cadets.
|
||||||
* Each pose is built from simple parts (tapered tubes, a scalloped wing membrane, a head with horns, spines,
|
* Each pose is built from simple parts (tapered tubes, a scalloped wing membrane, a head with horns, spines,
|
||||||
* a spaded tail), so every dragon is drawn the same way but stands differently. Drawn facing right in a
|
* a spaded tail), so every dragon is drawn the same way but stands differently. Drawn facing right in a
|
||||||
* 200 x 160 box; flip with scale(-1, 1). Works in the browser (window.DragonArt) and in Node. */
|
* 200 x 160 box; flip with scale(-1, 1). Works in the browser (window.DragonArt) and in Node. */
|
||||||
@@ -124,103 +124,18 @@
|
|||||||
|
|
||||||
/* ---------- poses ---------- */
|
/* ---------- poses ---------- */
|
||||||
|
|
||||||
const POSES = {
|
/* Six silhouettes traced from the project's pose reference sheet (all facing right, in the 200 x 160 box;
|
||||||
// seated and watchful, one wing raised, tail curled round the feet
|
* flying and diving poses centred, the others standing on the bottom edge). Names keep the old pose keys:
|
||||||
sitting() {
|
* coiled is the diving dragon, resting the sleeping one, sitting the one perched on a rock. */
|
||||||
const d = [];
|
const TRACED = {
|
||||||
d.push(...wing({ shoulder: [88, 74], wrist: [62, 18], tip: [24, 30], fingers: [[14, 66], [30, 98], [56, 116]], root: [76, 112], bow: 0.3 }));
|
"flying": "M6.0 55.5 L6.0 56.9 L6.7 56.9 L7.4 55.5 L10.0 53.1 L14.0 51.5 L16.8 51.0 L22.3 51.3 L28.4 52.7 L31.2 54.1 L32.9 55.7 L34.0 59.5 L33.8 62.3 L31.0 68.0 L30.7 69.9 L31.4 69.9 L32.9 67.7 L36.2 65.4 L41.1 63.7 L48.2 63.7 L56.2 65.9 L60.9 68.7 L63.2 71.0 L64.7 74.1 L64.4 76.5 L63.5 78.8 L61.6 81.2 L61.6 81.9 L62.5 81.9 L65.6 79.5 L68.7 77.9 L73.6 76.5 L77.9 76.5 L80.9 77.4 L83.7 79.3 L84.0 80.7 L84.7 80.7 L87.0 79.1 L89.9 78.4 L94.3 78.4 L96.2 79.1 L95.8 80.2 L93.2 82.6 L89.2 83.3 L89.2 83.8 L89.9 84.2 L89.4 84.7 L84.5 85.4 L84.5 85.9 L84.9 85.9 L85.4 86.4 L80.9 87.3 L80.7 88.0 L81.9 88.2 L81.4 88.7 L78.1 89.0 L77.1 89.4 L76.9 90.4 L73.8 90.6 L73.8 91.8 L68.7 92.0 L68.7 92.7 L69.6 93.0 L69.4 93.4 L66.1 93.4 L65.8 94.1 L62.3 93.9 L62.1 95.1 L58.8 94.8 L58.5 96.0 L55.2 95.5 L54.8 96.5 L51.0 96.5 L50.8 97.4 L45.8 97.4 L45.3 97.7 L45.8 98.6 L40.4 99.8 L39.5 101.0 L35.0 102.6 L34.5 103.1 L35.0 104.0 L32.4 106.2 L30.0 110.6 L30.0 113.5 L31.2 117.5 L31.0 120.1 L31.9 120.1 L32.6 118.4 L33.8 112.5 L34.3 112.3 L34.7 112.7 L35.7 112.7 L35.2 110.6 L35.2 108.0 L35.7 107.1 L38.0 105.0 L41.6 103.1 L46.3 101.7 L52.6 100.5 L62.5 99.6 L70.1 98.4 L77.9 96.5 L84.5 94.4 L84.7 94.6 L82.8 96.3 L81.6 96.5 L80.7 98.4 L80.7 99.3 L81.6 100.5 L83.5 100.7 L86.1 99.3 L92.5 92.7 L93.6 92.3 L97.4 92.0 L100.9 90.1 L100.9 91.1 L96.2 94.1 L94.3 94.1 L91.0 98.4 L88.9 100.0 L88.0 100.0 L87.5 100.5 L87.5 102.9 L88.5 103.6 L90.6 103.6 L93.2 101.7 L96.5 97.4 L99.1 96.5 L102.8 96.3 L105.2 95.3 L108.2 92.5 L109.4 90.6 L109.9 89.0 L110.6 88.2 L113.7 87.3 L117.7 84.7 L122.4 85.4 L124.5 86.1 L126.9 87.5 L128.3 89.9 L127.1 93.4 L128.3 93.2 L130.6 91.1 L134.9 88.5 L139.6 86.6 L144.5 86.4 L147.6 87.3 L149.5 88.5 L152.3 91.5 L153.5 94.8 L153.5 97.4 L153.9 97.4 L156.5 92.7 L159.4 90.1 L162.0 88.7 L167.4 87.3 L173.5 87.5 L182.9 90.4 L186.9 92.5 L189.1 94.1 L191.6 97.2 L192.6 99.3 L192.6 101.9 L193.1 101.9 L193.8 100.7 L193.8 97.2 L190.9 90.6 L188.6 86.8 L183.2 80.2 L181.0 78.1 L169.7 72.5 L163.8 70.3 L158.4 68.9 L158.0 68.2 L159.1 67.0 L161.0 66.3 L160.8 65.6 L158.2 65.9 L156.3 66.8 L153.7 69.2 L150.4 71.3 L141.7 74.8 L136.5 75.3 L132.0 76.5 L122.6 76.2 L122.4 75.8 L124.7 73.4 L126.9 72.0 L129.2 71.0 L130.6 71.0 L130.9 71.8 L131.8 72.0 L135.1 71.5 L135.8 72.2 L136.5 72.2 L137.0 71.0 L138.2 71.0 L139.3 71.5 L139.6 72.2 L140.8 72.2 L141.9 71.3 L142.2 69.4 L141.2 68.0 L139.1 67.5 L137.5 65.9 L136.3 65.4 L134.6 64.0 L127.3 61.2 L124.7 59.5 L123.8 59.5 L123.8 60.0 L127.1 64.2 L126.9 64.7 L124.7 64.2 L124.7 65.4 L121.0 65.2 L118.8 65.6 L118.8 66.1 L121.2 66.1 L121.4 66.6 L121.0 67.0 L118.1 67.0 L115.8 67.7 L115.8 68.2 L117.4 68.2 L117.7 68.7 L117.2 69.2 L113.2 69.4 L113.0 70.3 L111.3 70.6 L111.1 71.0 L106.4 69.2 L98.4 64.9 L95.8 64.0 L93.9 62.3 L92.5 59.5 L91.3 55.5 L90.8 49.8 L89.4 47.5 L88.0 46.1 L85.9 44.9 L85.2 44.9 L85.2 45.6 L87.3 47.7 L88.0 49.4 L87.7 50.6 L74.6 45.8 L63.2 42.8 L58.1 40.9 L55.9 39.7 L53.1 39.7 L52.9 40.2 L43.9 40.9 L32.2 42.8 L18.3 46.8 L9.3 51.3 L7.2 53.4 Z",
|
||||||
d.push(ell(92, 104, 26, 36, -0.25));
|
"prowling": "M193.7 72.8 L191.0 69.2 L189.0 69.8 L187.0 68.8 L185.3 66.8 L182.0 64.5 L180.0 64.5 L174.7 61.5 L170.7 57.5 L170.0 57.8 L170.0 58.8 L173.0 63.2 L172.7 64.2 L168.0 62.2 L164.7 59.8 L163.1 57.5 L162.1 57.5 L162.1 59.5 L163.4 61.8 L167.7 66.2 L166.7 66.8 L159.7 66.8 L159.7 67.8 L162.1 68.2 L162.4 68.8 L157.1 70.1 L155.4 71.1 L155.4 72.1 L158.7 71.8 L159.1 72.5 L155.1 74.8 L152.7 77.1 L153.1 78.1 L156.1 76.8 L156.4 77.1 L153.4 81.5 L152.7 84.8 L153.7 84.8 L155.7 82.5 L156.4 82.8 L155.4 85.1 L155.1 89.4 L156.1 89.8 L157.4 87.5 L158.1 87.8 L157.7 91.8 L157.1 92.1 L151.1 89.4 L150.1 89.4 L150.1 90.1 L149.4 90.4 L145.1 88.8 L144.1 89.1 L144.1 89.8 L144.8 90.1 L144.4 90.8 L136.1 86.5 L131.8 81.8 L130.1 78.1 L130.1 75.5 L132.4 71.1 L135.1 68.5 L137.8 69.2 L139.8 70.8 L139.8 71.5 L140.8 71.5 L140.8 69.2 L138.1 66.5 L124.8 61.2 L117.1 59.5 L113.1 59.5 L113.5 60.5 L116.8 61.2 L117.5 61.8 L95.5 62.2 L82.9 64.2 L74.2 66.8 L62.6 71.5 L53.2 76.1 L42.6 82.8 L29.3 93.1 L22.3 100.1 L19.0 104.4 L18.0 108.4 L19.0 108.4 L20.6 106.1 L24.6 102.4 L31.3 98.1 L39.6 94.4 L49.6 91.8 L53.2 91.8 L54.2 93.1 L54.2 94.4 L52.6 98.8 L47.6 105.8 L46.3 109.1 L47.3 109.1 L52.6 104.4 L58.2 101.1 L64.9 98.4 L70.2 97.4 L77.9 97.8 L83.9 100.1 L87.5 103.8 L89.5 108.7 L89.2 114.7 L90.2 114.7 L91.8 111.4 L95.2 108.1 L98.2 106.1 L101.5 104.8 L108.2 104.1 L113.1 105.4 L113.8 106.8 L109.5 108.4 L109.2 109.7 L107.5 109.7 L105.2 110.7 L105.2 111.4 L107.2 111.4 L107.2 112.4 L100.2 114.1 L99.8 115.1 L101.8 115.7 L101.2 116.4 L94.8 117.7 L94.5 118.7 L96.5 118.7 L96.5 119.7 L89.2 120.4 L89.5 121.4 L91.2 122.1 L90.5 122.7 L83.9 121.7 L83.5 122.7 L85.2 124.1 L84.9 124.4 L83.2 124.4 L78.2 122.7 L78.2 123.7 L79.2 124.7 L78.5 125.4 L74.5 123.1 L73.5 123.1 L74.2 125.1 L72.9 125.4 L69.2 122.7 L67.9 122.7 L68.9 124.7 L68.2 125.4 L63.9 122.4 L62.9 122.4 L62.9 124.7 L57.9 121.4 L57.2 121.4 L57.2 122.4 L57.9 123.1 L56.6 123.4 L51.6 120.1 L50.3 120.1 L50.6 121.7 L49.9 122.1 L43.6 119.4 L41.9 119.4 L41.9 121.1 L36.9 119.7 L33.3 119.7 L34.0 121.1 L33.6 121.4 L28.0 121.1 L27.6 122.4 L22.0 122.7 L22.0 124.1 L21.3 124.7 L19.0 124.7 L14.7 126.4 L14.7 127.4 L15.3 127.7 L15.0 128.4 L11.0 130.0 L6.0 134.4 L6.0 135.7 L8.3 134.4 L8.7 134.7 L7.0 137.7 L6.7 142.7 L7.7 143.0 L9.0 147.3 L12.0 151.0 L13.7 151.3 L13.0 149.7 L14.0 149.3 L19.3 153.7 L21.3 153.7 L21.6 152.7 L24.0 153.7 L27.0 153.7 L27.6 151.7 L29.6 151.3 L35.9 148.3 L38.9 146.0 L38.9 145.0 L36.9 145.3 L32.0 147.7 L27.6 148.7 L24.3 148.7 L24.0 148.0 L25.0 146.3 L21.6 147.0 L17.6 146.7 L15.6 145.7 L14.0 144.0 L13.0 142.0 L13.0 139.0 L14.7 136.0 L19.3 132.0 L25.6 129.0 L34.9 127.0 L43.3 127.0 L52.3 128.7 L67.6 132.7 L81.5 133.4 L89.2 132.4 L94.2 131.0 L105.2 127.0 L116.5 122.1 L116.5 124.1 L114.1 124.4 L109.8 128.0 L105.8 129.4 L102.2 140.0 L101.2 141.4 L100.2 141.4 L98.5 142.7 L97.8 144.0 L98.2 145.7 L99.8 144.7 L102.2 144.7 L103.5 145.7 L107.2 145.7 L109.2 145.0 L112.1 145.7 L112.5 144.7 L113.5 144.7 L114.8 146.3 L115.8 146.3 L116.1 144.0 L115.1 142.0 L113.5 140.4 L109.2 140.0 L108.5 139.4 L109.5 136.4 L111.5 134.0 L123.1 131.4 L125.1 130.4 L128.8 126.7 L129.1 127.0 L128.1 128.7 L123.5 132.7 L123.8 135.4 L129.8 141.7 L128.1 143.4 L127.8 145.3 L129.8 145.0 L134.4 146.0 L139.1 145.7 L139.8 146.3 L141.8 145.7 L142.4 147.3 L143.4 147.3 L143.8 144.0 L140.8 141.0 L137.4 141.0 L135.4 140.0 L132.1 136.0 L131.8 134.4 L138.1 130.7 L140.1 128.7 L143.4 122.1 L147.7 122.1 L148.1 122.7 L147.4 124.1 L148.4 125.1 L148.1 127.0 L153.4 135.7 L155.1 140.4 L154.7 143.0 L151.7 145.7 L151.4 148.0 L156.7 147.0 L159.4 148.3 L162.7 148.0 L164.1 149.0 L164.1 149.7 L165.4 149.7 L165.7 147.0 L167.4 147.0 L168.4 148.3 L169.4 148.3 L169.7 146.7 L169.0 144.7 L167.7 143.0 L166.4 142.4 L162.4 142.0 L160.7 140.0 L159.7 137.7 L157.7 125.1 L161.4 121.7 L161.7 124.4 L160.7 126.4 L160.7 127.7 L161.7 128.0 L161.7 130.0 L162.7 130.7 L163.7 132.7 L170.0 140.7 L171.4 143.7 L171.0 147.3 L174.4 146.7 L175.0 147.3 L178.7 147.3 L179.7 148.3 L180.7 148.3 L181.4 147.0 L183.0 147.7 L183.0 147.0 L183.7 146.7 L184.4 148.0 L185.3 148.0 L185.3 145.3 L183.4 142.7 L182.0 142.0 L178.0 142.0 L175.4 139.7 L172.7 134.7 L169.7 125.4 L171.0 122.1 L174.0 117.4 L174.4 113.7 L175.0 113.1 L176.0 113.1 L178.4 108.7 L178.7 105.4 L179.0 105.1 L179.7 106.4 L180.7 106.4 L181.0 101.4 L179.7 99.1 L180.0 98.4 L181.0 98.4 L181.0 96.8 L179.0 93.8 L179.0 91.8 L176.7 89.4 L176.7 87.8 L173.4 84.8 L174.0 84.1 L174.0 83.1 L173.0 82.1 L173.0 78.1 L174.0 77.5 L174.7 79.1 L176.7 79.5 L179.7 78.1 L182.7 77.8 L185.3 78.5 L188.0 80.1 L189.0 80.1 L189.3 80.8 L190.7 80.8 L191.3 77.1 L193.0 77.1 L193.7 76.5 Z",
|
||||||
d.push(tube([[90, 80], [96, 58], [110, 42], [116, 34]], 13, 7));
|
"roaring": "M8.5 59.6 L6.0 63.9 L6.0 66.1 L7.1 66.1 L8.5 63.6 L14.9 57.5 L24.6 51.8 L27.4 51.1 L32.8 51.4 L36.4 53.2 L38.5 55.4 L40.7 60.4 L40.7 66.4 L38.2 76.1 L36.0 81.4 L34.6 90.4 L36.0 90.4 L36.4 88.2 L38.9 83.9 L46.7 76.1 L56.0 69.7 L62.8 66.8 L66.4 67.1 L68.2 68.9 L68.5 70.4 L68.2 73.9 L63.9 85.0 L63.2 88.6 L64.3 88.6 L67.5 84.7 L71.4 82.2 L75.0 81.1 L79.3 81.8 L83.6 85.4 L85.0 87.9 L86.8 94.0 L87.1 100.4 L88.2 100.0 L90.0 96.1 L93.6 92.2 L96.4 90.0 L101.1 87.9 L106.1 86.8 L111.1 87.5 L112.9 88.6 L113.2 91.5 L120.7 87.9 L121.4 88.2 L120.4 89.7 L117.2 90.7 L116.1 92.5 L111.1 94.3 L108.9 95.7 L108.9 96.5 L112.5 96.5 L106.4 99.7 L106.4 100.7 L108.9 101.1 L103.6 104.3 L103.6 105.4 L105.4 105.0 L105.7 106.1 L102.1 108.3 L100.7 110.0 L100.7 111.1 L102.5 110.8 L102.9 111.5 L97.1 114.3 L97.1 115.0 L98.9 115.4 L98.6 116.1 L92.1 117.2 L92.1 118.3 L93.9 119.0 L92.9 120.0 L86.4 119.0 L86.1 120.0 L87.8 121.5 L86.4 121.8 L81.8 119.3 L80.3 119.3 L80.3 120.4 L81.4 121.5 L81.1 122.2 L75.0 117.9 L73.9 117.9 L75.3 120.4 L75.0 121.1 L67.1 116.8 L66.0 117.2 L66.0 117.9 L66.8 118.3 L66.4 119.0 L61.4 117.2 L55.3 117.2 L55.0 118.6 L49.6 119.0 L43.5 120.8 L36.4 125.0 L33.2 129.3 L33.2 130.4 L33.9 130.8 L32.8 134.3 L33.5 140.4 L34.6 140.4 L35.0 139.0 L37.1 143.3 L41.0 147.6 L44.2 149.7 L48.5 151.5 L50.7 151.5 L51.0 150.1 L54.6 150.4 L58.9 149.7 L60.7 149.0 L60.7 147.9 L53.9 147.9 L50.0 146.9 L47.8 145.4 L48.5 144.7 L48.2 143.3 L42.8 141.8 L40.0 139.0 L38.5 135.1 L38.9 132.2 L41.4 128.3 L46.7 125.0 L54.6 123.6 L59.6 124.0 L67.5 126.1 L80.0 131.1 L86.1 132.2 L90.3 132.2 L96.4 131.1 L101.8 129.3 L113.9 121.8 L117.2 124.3 L117.2 125.8 L115.4 129.3 L112.5 132.6 L112.5 135.1 L118.2 140.4 L118.6 141.8 L117.9 144.3 L121.8 144.3 L123.6 146.5 L122.9 149.0 L123.2 150.8 L124.7 150.8 L127.5 149.4 L131.1 150.4 L134.3 149.7 L135.7 151.1 L136.1 153.6 L137.5 153.6 L138.2 151.9 L138.2 148.3 L139.3 148.3 L141.1 151.1 L142.2 151.1 L142.5 150.4 L142.2 147.2 L140.4 144.7 L136.8 142.9 L131.8 143.3 L129.0 142.2 L122.9 136.5 L121.4 134.0 L128.2 127.9 L130.0 123.6 L131.1 123.3 L133.6 120.4 L140.0 115.0 L140.7 113.3 L140.7 110.8 L138.2 105.0 L144.7 101.1 L146.1 101.8 L147.2 104.7 L148.3 105.7 L152.2 105.7 L158.6 104.0 L162.2 103.6 L165.4 106.1 L165.4 109.3 L164.3 110.0 L164.7 111.5 L167.2 111.5 L169.0 109.7 L169.7 109.7 L170.8 111.8 L170.1 114.7 L171.8 114.7 L172.9 114.0 L174.3 111.1 L175.1 111.8 L175.1 114.7 L175.8 114.7 L177.6 112.5 L177.6 110.0 L176.8 107.9 L174.7 105.4 L165.8 99.0 L154.7 97.2 L154.3 96.5 L158.3 91.8 L160.4 91.8 L162.9 92.9 L166.1 92.5 L169.7 89.0 L173.6 82.5 L176.5 79.3 L181.8 77.5 L184.3 77.5 L185.8 79.7 L185.1 81.8 L187.2 81.8 L188.3 81.1 L189.4 78.9 L190.4 79.7 L190.4 81.1 L191.9 81.1 L192.6 79.3 L192.2 77.2 L190.1 74.3 L190.8 73.9 L192.6 75.7 L193.6 75.7 L193.6 73.2 L191.9 71.1 L190.1 70.4 L184.0 70.0 L178.6 72.9 L172.6 74.3 L168.3 78.9 L163.3 82.2 L161.8 81.4 L161.8 77.2 L160.0 71.8 L153.3 63.2 L152.9 58.2 L154.0 57.5 L154.3 54.3 L156.1 53.9 L157.2 51.8 L159.7 49.6 L160.8 50.0 L160.4 52.1 L161.1 52.1 L162.9 50.3 L164.7 50.7 L166.5 50.0 L169.0 50.0 L173.3 51.4 L175.1 52.9 L175.1 53.9 L175.8 54.3 L179.0 53.9 L180.4 52.1 L180.1 50.0 L179.3 48.9 L177.6 48.9 L177.2 47.5 L175.8 47.5 L173.6 45.7 L173.3 42.5 L175.1 41.1 L179.3 40.3 L181.1 40.7 L181.5 39.6 L182.6 39.6 L183.3 38.9 L183.3 36.1 L181.8 34.6 L177.9 33.9 L174.7 35.0 L171.8 35.0 L170.8 34.3 L166.8 33.9 L162.2 31.0 L161.1 31.0 L161.5 32.8 L162.9 34.3 L162.5 35.0 L158.6 33.2 L155.8 30.3 L154.7 30.3 L154.7 31.4 L156.1 33.6 L155.8 34.3 L151.5 34.3 L148.6 35.7 L148.6 37.5 L144.7 37.8 L140.7 39.3 L140.4 40.3 L146.8 40.3 L146.1 41.1 L138.6 43.2 L135.4 45.3 L135.4 46.4 L139.0 45.3 L140.7 45.7 L134.7 49.3 L131.8 52.1 L131.8 52.9 L133.2 52.9 L136.5 51.1 L136.8 51.4 L132.2 56.8 L130.7 59.6 L130.7 60.7 L131.8 60.7 L134.0 58.2 L134.7 58.6 L131.8 63.9 L131.8 66.1 L132.5 66.1 L134.0 64.3 L134.7 64.6 L134.3 67.9 L133.2 68.2 L127.9 66.1 L126.8 66.1 L126.8 67.5 L125.7 67.9 L121.4 65.4 L113.2 57.9 L116.1 47.8 L122.2 36.1 L122.5 30.7 L121.1 27.1 L116.1 21.8 L115.4 21.8 L115.4 23.5 L118.6 28.2 L118.6 30.0 L108.9 25.0 L97.5 21.4 L90.7 18.5 L85.7 18.9 L85.7 20.0 L90.7 21.4 L91.1 22.1 L90.3 22.8 L77.1 24.3 L64.6 26.4 L56.4 28.5 L44.6 32.8 L36.4 37.1 L23.2 45.7 L14.6 52.9 Z M149.0 37.1 L149.7 36.4 L153.6 36.4 L156.1 37.5 L152.2 37.8 Z",
|
||||||
const t = tail([[76, 132], [56, 150], [110, 158], [168, 150]], 9);
|
"sitting": "M6.0 119.8 L6.0 131.0 L6.6 132.2 L7.5 132.2 L7.5 127.4 L9.0 121.7 L11.4 116.5 L14.8 111.4 L18.7 106.5 L25.3 100.2 L32.0 95.4 L35.9 93.5 L38.3 93.5 L41.1 96.0 L42.3 99.3 L42.3 102.6 L41.1 107.2 L41.1 109.9 L41.7 109.9 L45.0 102.6 L47.7 99.0 L51.9 94.8 L56.5 91.4 L64.9 87.2 L70.7 85.7 L74.3 85.7 L77.6 86.6 L80.7 88.1 L83.7 91.1 L85.5 94.5 L86.7 99.9 L86.4 105.0 L87.3 105.0 L89.4 98.4 L93.4 92.6 L95.8 90.5 L99.7 88.4 L103.6 87.5 L106.3 87.5 L111.8 89.6 L113.9 91.7 L114.5 94.2 L115.1 94.8 L112.1 96.6 L107.3 96.6 L107.0 97.5 L108.2 97.8 L108.2 98.7 L103.6 99.6 L103.6 100.5 L105.1 100.8 L104.5 101.7 L100.0 102.9 L99.7 104.1 L101.8 104.4 L100.9 105.3 L97.3 106.8 L97.3 107.8 L98.8 108.1 L98.5 108.7 L94.9 110.2 L94.9 111.1 L96.1 111.1 L96.4 111.7 L92.7 113.5 L92.7 114.4 L94.0 114.4 L94.3 115.0 L93.0 115.9 L90.0 116.8 L90.0 117.7 L91.2 117.7 L91.5 118.3 L90.6 119.2 L86.7 120.8 L86.7 121.4 L87.9 122.0 L86.7 123.5 L84.6 123.5 L83.1 124.1 L83.1 124.7 L84.6 125.3 L84.3 125.9 L82.5 126.8 L78.5 126.8 L78.5 127.7 L80.1 128.6 L79.1 129.5 L74.9 129.2 L74.6 130.4 L75.8 131.0 L75.2 131.9 L70.1 131.6 L70.1 132.5 L71.3 133.4 L71.0 134.1 L69.2 134.4 L65.2 133.7 L65.2 134.7 L66.1 135.3 L65.5 136.2 L60.4 135.6 L61.3 137.1 L61.0 137.7 L56.8 136.5 L56.5 137.4 L57.1 138.3 L56.2 138.6 L52.2 137.1 L51.9 138.0 L52.5 138.9 L51.6 139.2 L48.3 137.4 L47.4 137.4 L47.7 138.9 L47.1 139.2 L44.1 136.8 L43.2 136.8 L43.2 137.7 L42.6 138.0 L41.4 136.8 L40.5 134.7 L39.9 134.7 L39.5 135.6 L38.9 135.3 L38.6 134.1 L39.2 133.1 L39.2 131.6 L38.3 131.6 L38.0 131.0 L38.6 129.5 L39.2 129.2 L39.2 128.3 L42.3 125.6 L47.7 123.5 L53.2 123.5 L57.4 124.7 L60.1 126.2 L61.0 126.2 L61.0 125.3 L58.0 122.6 L53.8 121.4 L53.5 120.5 L52.5 120.1 L47.1 120.1 L45.6 120.8 L43.8 120.5 L38.6 122.6 L37.7 123.8 L36.8 123.8 L35.0 125.9 L34.1 128.9 L33.5 129.5 L32.3 129.2 L32.3 132.2 L33.2 134.4 L32.0 134.4 L31.7 135.3 L32.9 137.4 L36.8 141.3 L43.2 144.0 L47.1 144.6 L56.2 144.6 L61.0 144.0 L72.5 140.7 L82.5 136.2 L90.0 131.6 L102.7 122.6 L103.0 124.4 L101.5 128.3 L97.9 131.0 L96.1 134.4 L94.6 135.6 L92.4 135.6 L90.0 136.8 L88.2 138.6 L85.5 143.1 L81.6 144.3 L77.6 149.2 L74.3 151.3 L74.3 152.2 L76.4 152.2 L89.1 149.8 L90.3 150.4 L93.7 150.4 L95.5 149.5 L103.0 147.7 L106.6 147.7 L108.8 148.3 L113.6 147.7 L116.6 148.3 L120.6 147.4 L126.0 147.4 L129.9 146.7 L131.1 145.5 L134.2 144.3 L136.3 144.3 L140.8 146.4 L141.4 147.7 L145.0 148.9 L160.5 148.9 L164.4 149.5 L169.8 151.3 L171.0 151.3 L171.9 150.1 L173.7 149.8 L180.1 151.3 L181.0 152.2 L188.0 152.5 L190.7 153.7 L193.7 153.7 L193.7 152.5 L191.3 150.7 L190.4 148.9 L188.9 147.4 L186.7 146.4 L184.6 143.1 L183.4 142.2 L182.5 137.4 L181.6 135.9 L179.2 134.1 L175.6 132.8 L173.4 130.1 L171.6 128.9 L170.7 125.3 L166.8 121.1 L165.0 120.8 L164.1 119.8 L160.5 113.2 L154.1 107.8 L152.0 107.8 L150.8 107.2 L147.8 103.2 L145.9 99.6 L145.6 97.8 L149.0 94.2 L150.5 90.2 L151.7 89.9 L151.4 85.1 L152.3 84.8 L152.3 83.3 L151.4 80.9 L152.0 79.3 L149.6 75.7 L150.2 74.5 L147.5 71.2 L148.1 70.0 L146.5 68.2 L147.2 67.6 L147.2 66.6 L146.2 64.5 L147.5 64.2 L147.2 63.0 L148.1 62.7 L148.1 61.2 L148.7 60.6 L152.6 60.6 L153.8 59.7 L158.6 60.9 L159.2 62.1 L160.1 62.1 L161.4 60.6 L161.1 58.5 L159.5 58.2 L158.6 57.0 L156.8 56.4 L156.5 55.5 L159.8 54.9 L162.6 55.8 L162.9 55.2 L162.9 52.7 L162.0 51.5 L160.8 50.9 L157.4 50.9 L148.1 47.0 L147.2 47.0 L148.1 48.5 L147.8 49.1 L142.9 47.9 L142.3 47.9 L142.0 48.5 L140.5 48.5 L134.5 46.1 L134.5 47.3 L135.4 48.2 L140.5 51.2 L140.2 52.7 L134.5 53.0 L134.5 54.0 L137.5 54.3 L137.8 54.9 L132.9 57.0 L132.3 58.2 L135.1 58.2 L129.9 62.4 L129.9 63.0 L131.1 63.0 L132.6 62.1 L133.2 62.4 L133.2 63.0 L130.8 65.7 L130.2 67.6 L132.0 67.0 L132.3 67.3 L131.1 70.6 L131.1 72.1 L132.0 72.4 L132.9 70.9 L133.5 71.2 L132.6 73.6 L132.6 75.1 L133.9 75.4 L134.2 76.3 L135.1 76.6 L134.8 77.2 L131.7 76.0 L127.8 75.4 L121.8 73.6 L115.7 70.6 L113.0 68.2 L112.7 64.2 L113.6 60.0 L116.0 53.0 L118.4 48.5 L119.3 47.9 L120.9 48.2 L122.4 49.4 L123.0 51.2 L123.9 51.2 L124.2 50.0 L123.6 47.6 L121.8 45.8 L117.2 44.6 L116.6 44.0 L108.8 44.0 L108.2 44.6 L88.8 47.0 L79.1 48.8 L67.7 52.1 L55.9 57.6 L47.1 63.0 L39.5 68.8 L34.4 73.3 L23.8 84.5 L17.5 92.9 L13.6 99.6 L8.7 110.2 L6.9 116.2 L6.6 119.2 Z",
|
||||||
d.push(...t.d);
|
"resting": "M193.7 139.7 L185.5 129.8 L178.3 127.8 L180.7 125.1 L182.4 120.3 L181.4 119.9 L180.0 122.0 L179.4 121.6 L180.7 118.2 L181.1 112.1 L179.0 102.9 L178.0 102.9 L178.0 112.1 L177.3 115.2 L176.6 115.9 L176.3 109.0 L174.9 108.7 L173.9 103.6 L171.5 98.8 L170.2 98.5 L171.5 104.3 L171.2 105.0 L168.8 102.9 L168.1 99.5 L166.4 96.4 L165.1 96.4 L165.7 98.5 L165.4 100.2 L162.7 96.4 L160.3 94.4 L159.6 94.4 L159.9 96.4 L159.3 96.8 L155.5 93.0 L154.2 93.0 L154.5 94.4 L153.1 94.7 L149.4 92.4 L148.0 92.4 L148.4 93.7 L147.0 94.1 L143.3 92.4 L140.9 92.0 L141.6 93.4 L141.2 94.4 L130.3 94.7 L130.3 95.8 L131.7 96.1 L132.4 96.8 L128.3 98.5 L124.9 98.5 L124.5 100.2 L123.5 98.5 L123.5 95.1 L124.9 91.7 L128.9 86.9 L133.4 84.2 L137.8 82.8 L142.9 83.2 L150.1 85.9 L153.5 88.9 L154.5 88.9 L154.5 87.9 L153.5 85.9 L150.7 83.2 L144.6 79.8 L139.5 77.7 L129.6 75.3 L128.9 74.6 L117.4 74.6 L116.7 75.3 L91.1 79.1 L75.1 82.8 L61.9 87.6 L43.5 97.1 L27.5 108.7 L16.6 119.6 L12.5 124.7 L6.0 135.9 L6.0 146.8 L9.4 153.7 L10.8 153.7 L9.4 149.2 L9.4 146.2 L11.1 140.7 L14.5 135.3 L19.3 130.5 L21.7 129.1 L24.1 128.8 L25.1 130.5 L25.1 135.9 L25.8 137.7 L26.8 137.7 L27.1 133.9 L31.2 126.4 L36.3 121.3 L41.4 118.6 L44.5 118.6 L45.8 120.3 L45.8 121.6 L40.7 124.0 L40.4 125.4 L41.1 125.4 L41.4 126.1 L40.1 126.4 L40.1 127.1 L37.7 129.1 L37.7 130.2 L38.4 130.2 L38.7 130.8 L37.7 132.5 L37.3 134.6 L38.4 134.9 L39.7 134.2 L43.8 139.7 L46.2 141.4 L51.3 143.4 L54.0 143.1 L53.7 141.4 L51.6 139.4 L52.3 138.7 L58.4 142.1 L63.9 144.1 L73.4 146.2 L82.3 147.2 L99.0 146.8 L120.4 144.1 L134.4 144.5 L141.6 145.8 L148.0 147.9 L152.8 150.6 L155.5 153.7 L156.2 152.6 L155.5 148.6 L152.4 145.1 L147.0 142.1 L146.3 140.7 L142.2 139.4 L138.5 139.0 L138.1 138.0 L139.8 137.3 L142.9 137.3 L147.0 139.0 L149.0 139.0 L149.4 138.3 L154.5 137.7 L155.2 138.3 L155.2 139.7 L157.6 141.1 L159.6 140.0 L167.1 140.4 L174.2 142.4 L179.7 141.7 L182.8 142.1 L184.8 141.1 L187.5 142.1 L187.9 141.4 L189.6 141.4 L192.3 142.8 L193.7 142.8 Z",
|
||||||
d.push(...leg([84, 120], [70, 136], [86, 152], 12, 1));
|
"coiled": "M193.8 52.4 L191.4 49.8 L189.5 48.6 L181.6 45.3 L171.4 42.4 L168.8 41.2 L167.1 41.0 L166.6 40.5 L158.5 40.5 L158.1 41.0 L149.3 41.4 L125.9 41.7 L124.0 42.2 L116.7 45.7 L112.4 45.7 L111.2 46.2 L111.4 46.9 L113.3 47.2 L113.8 48.1 L109.8 50.7 L96.0 56.9 L95.5 57.4 L95.5 59.5 L93.8 58.6 L93.8 59.5 L93.3 59.8 L89.8 56.4 L89.1 56.4 L89.1 57.2 L89.8 58.1 L89.5 58.3 L87.1 56.9 L86.4 56.9 L86.2 57.9 L84.5 56.7 L83.1 56.4 L83.1 57.9 L79.3 57.9 L78.8 59.3 L76.2 59.5 L76.0 60.5 L68.3 60.2 L64.1 58.6 L57.2 57.4 L54.5 55.7 L51.7 56.0 L51.7 56.7 L52.2 56.7 L52.4 57.2 L51.7 57.9 L49.5 58.6 L48.1 58.6 L46.5 57.4 L44.3 56.9 L42.2 56.9 L41.9 57.4 L41.2 56.9 L39.3 56.9 L39.3 57.6 L42.6 58.1 L44.3 59.1 L36.0 62.2 L29.1 65.5 L23.8 69.1 L16.9 75.0 L12.4 79.5 L7.4 86.7 L6.0 90.0 L6.0 94.3 L7.0 94.8 L7.4 91.9 L9.1 88.8 L12.4 85.7 L16.7 83.3 L19.1 83.3 L21.5 85.0 L22.2 86.4 L22.2 87.6 L21.5 89.0 L21.5 90.9 L21.9 90.9 L24.3 87.4 L30.3 81.9 L35.5 78.6 L41.7 75.7 L46.5 74.3 L48.8 74.3 L49.5 75.7 L50.3 76.0 L52.4 73.3 L54.8 71.7 L59.5 69.1 L63.6 67.6 L66.7 67.1 L71.9 67.1 L79.8 68.1 L80.0 68.3 L79.3 68.8 L79.5 69.8 L79.1 70.2 L76.7 70.7 L76.7 71.9 L74.1 72.1 L73.8 73.3 L71.4 73.3 L71.0 73.8 L71.0 74.8 L69.1 75.0 L69.1 75.5 L69.8 75.7 L69.3 76.4 L66.2 76.7 L66.0 77.6 L66.7 77.9 L66.2 78.3 L62.2 79.5 L61.9 80.7 L59.1 81.7 L59.1 82.9 L58.6 83.3 L56.2 84.3 L56.2 85.2 L53.1 87.1 L53.4 88.3 L49.5 92.1 L49.3 93.6 L47.2 96.7 L47.2 98.1 L46.0 101.4 L46.5 102.4 L46.0 104.3 L46.0 108.3 L46.5 110.7 L47.9 114.0 L49.1 115.7 L53.6 119.3 L54.5 119.3 L54.5 118.6 L52.6 116.4 L50.7 113.3 L49.8 110.7 L50.0 109.3 L50.7 110.0 L51.7 110.0 L49.5 104.0 L49.8 100.9 L51.7 96.2 L54.5 92.4 L61.2 86.2 L67.9 82.4 L76.7 78.8 L77.4 79.0 L76.7 80.7 L75.3 82.4 L74.8 83.6 L73.6 84.3 L73.6 85.2 L74.3 85.7 L76.4 85.7 L77.2 85.2 L84.1 77.1 L84.5 77.4 L85.7 79.8 L87.6 79.8 L89.3 78.8 L92.6 74.8 L92.9 77.6 L95.7 81.7 L96.2 83.8 L96.7 84.0 L96.7 85.2 L97.9 86.9 L99.5 87.6 L100.5 87.4 L101.2 86.7 L101.4 84.5 L100.2 82.4 L100.5 81.7 L103.3 82.4 L103.8 82.9 L104.0 84.8 L102.4 87.4 L102.4 88.8 L101.9 89.3 L102.1 90.5 L104.3 90.5 L106.2 89.3 L106.9 87.6 L108.3 79.8 L108.8 79.3 L110.7 79.5 L114.0 81.2 L117.1 84.0 L116.9 84.5 L115.9 84.3 L115.7 85.2 L118.1 86.7 L117.6 87.4 L117.1 87.4 L117.4 88.1 L119.8 88.8 L122.1 90.2 L126.2 94.0 L127.1 94.0 L126.7 92.4 L127.4 92.1 L130.7 95.7 L131.2 95.7 L132.4 94.3 L132.4 91.9 L131.4 90.5 L130.9 87.6 L130.2 86.2 L129.5 85.9 L128.3 84.5 L127.1 81.2 L125.5 79.3 L123.8 76.0 L122.8 75.7 L123.3 78.1 L122.8 78.3 L119.8 71.9 L119.0 71.9 L119.0 73.1 L119.8 74.8 L119.5 75.2 L115.9 69.5 L115.2 69.5 L115.2 70.7 L115.7 71.4 L115.2 71.7 L111.4 66.9 L110.5 66.9 L110.0 66.2 L111.2 63.1 L114.0 59.8 L116.7 58.3 L127.4 54.3 L130.7 54.3 L137.6 56.4 L140.0 58.3 L140.7 58.3 L141.4 56.9 L143.3 56.4 L158.3 56.2 L162.1 57.6 L164.3 59.5 L164.7 59.5 L165.0 58.8 L164.3 57.4 L162.1 55.3 L159.5 53.6 L158.3 52.4 L158.1 51.2 L159.0 50.0 L160.7 49.3 L168.5 48.1 L178.1 47.9 L182.1 48.3 L189.0 50.5 L190.9 51.4 L193.0 53.3 L193.8 53.3 Z"
|
||||||
d.push(...leg([102, 104], [110, 124], [114, 150], 7, 1));
|
|
||||||
const h = head({ at: [114, 34], ang: -0.05, size: 1.05 });
|
|
||||||
d.push(...h.d);
|
|
||||||
d.push(...spines(bez([[86, 84], [84, 62], [100, 44], [110, 36]], 10), 4, -1, 2));
|
|
||||||
d.push(...spines(t.pts.slice(0, 26), (u) => 4 * (1 - u), 1, 3));
|
|
||||||
return { d, eye: h.eye, eyeR: h.eyeR };
|
|
||||||
},
|
|
||||||
// low and stalking, head forward, wings folded
|
|
||||||
prowling() {
|
|
||||||
const d = [];
|
|
||||||
d.push(...wing({ shoulder: [92, 92], wrist: [70, 64], tip: [118, 52], fingers: [[136, 70], [130, 90]], root: [104, 100], bow: 0.25, bone: 3.4 }));
|
|
||||||
d.push(ell(96, 108, 38, 18, 0.05));
|
|
||||||
d.push(tube([[124, 104], [140, 98], [152, 92], [162, 94]], 11, 7));
|
|
||||||
const t = tail([[62, 108], [36, 106], [22, 128], [6, 120]], 11);
|
|
||||||
d.push(...t.d);
|
|
||||||
d.push(...leg([72, 112], [60, 128], [70, 146], 11));
|
|
||||||
d.push(...leg([84, 116], [94, 130], [92, 146], 8));
|
|
||||||
d.push(...leg([118, 112], [126, 128], [124, 146], 8));
|
|
||||||
d.push(...leg([128, 110], [140, 126], [146, 146], 7));
|
|
||||||
const h = head({ at: [160, 94], ang: 0.12, size: 1 });
|
|
||||||
d.push(...h.d);
|
|
||||||
d.push(...spines(bez([[66, 92], [90, 84], [130, 86], [156, 88]], 14), 3.6, -1, 2));
|
|
||||||
d.push(...spines(t.pts.slice(0, 26), (u) => 3.6 * (1 - u), -1, 3));
|
|
||||||
return { d, eye: h.eye, eyeR: h.eyeR };
|
|
||||||
},
|
|
||||||
// in flight, both wings spread
|
|
||||||
flying() {
|
|
||||||
const d = [];
|
|
||||||
d.push(...wing({ shoulder: [96, 84], wrist: [70, 36], tip: [40, 6], fingers: [[30, 40], [44, 66], [70, 80]], root: [92, 94], bow: 0.32 }));
|
|
||||||
d.push(...wing({ shoulder: [110, 84], wrist: [140, 30], tip: [190, 14], fingers: [[178, 52], [160, 76], [134, 90]], root: [114, 96], bow: 0.32 }));
|
|
||||||
d.push(ell(104, 96, 30, 13, 0.2));
|
|
||||||
d.push(tube([[128, 92], [142, 86], [150, 76], [158, 72]], 9, 6));
|
|
||||||
const t = tail([[78, 92], [54, 98], [40, 120], [12, 116]], 8);
|
|
||||||
d.push(...t.d);
|
|
||||||
d.push(...leg([94, 102], [96, 116], [108, 124], 6));
|
|
||||||
d.push(...leg([116, 102], [122, 114], [132, 118], 5));
|
|
||||||
const h = head({ at: [156, 72], ang: -0.2, size: 0.9, open: 2 });
|
|
||||||
d.push(...h.d);
|
|
||||||
return { d, eye: h.eye, eyeR: h.eyeR };
|
|
||||||
},
|
|
||||||
// reared up and roaring, wings half open
|
|
||||||
roaring() {
|
|
||||||
const d = [];
|
|
||||||
d.push(...wing({ shoulder: [94, 68], wrist: [52, 40], tip: [30, 2], fingers: [[16, 46], [34, 78], [66, 96]], root: [90, 98], bow: 0.3 }));
|
|
||||||
d.push(ell(98, 100, 22, 40, 0.2));
|
|
||||||
d.push(tube([[104, 70], [112, 50], [126, 34], [136, 24]], 13, 7));
|
|
||||||
const t = tail([[86, 136], [60, 156], [30, 150], [14, 132]], 10);
|
|
||||||
d.push(...t.d);
|
|
||||||
d.push(...leg([90, 124], [104, 138], [96, 154], 12));
|
|
||||||
d.push(...leg([108, 86], [124, 92], [132, 82], 6, 1));
|
|
||||||
d.push(...leg([102, 92], [116, 104], [126, 98], 6, 1));
|
|
||||||
const h = head({ at: [134, 24], ang: -0.55, size: 1.05, open: 7 });
|
|
||||||
d.push(...h.d);
|
|
||||||
d.push(...spines(bez([[94, 86], [100, 60], [116, 40], [130, 28]], 10), 4, -1, 2));
|
|
||||||
return { d, eye: h.eye, eyeR: h.eyeR };
|
|
||||||
},
|
|
||||||
// coiled, as if wrapped around something, head lifted
|
|
||||||
coiled() {
|
|
||||||
const d = [];
|
|
||||||
const t = tail([[100, 120], [30, 150], [20, 80], [80, 74]], 15);
|
|
||||||
d.push(...t.d);
|
|
||||||
d.push(tube([[100, 120], [150, 130], [170, 96], [140, 70]], 16, 12));
|
|
||||||
d.push(tube([[140, 70], [124, 52], [128, 34], [146, 26]], 12, 7));
|
|
||||||
d.push(...wing({ shoulder: [134, 76], wrist: [106, 36], tip: [72, 26], fingers: [[64, 52], [80, 70], [104, 82]], root: [124, 90], bow: 0.28, bone: 3.4 }));
|
|
||||||
d.push(...leg([150, 116], [164, 126], [170, 142], 8));
|
|
||||||
d.push(...leg([116, 124], [114, 138], [122, 150], 8));
|
|
||||||
const h = head({ at: [144, 26], ang: 0.1, size: 1 });
|
|
||||||
d.push(...h.d);
|
|
||||||
d.push(...spines(t.pts, (u) => 3.5 * (1 - u * 0.7), -1, 3));
|
|
||||||
return { d, eye: h.eye, eyeR: h.eyeR };
|
|
||||||
},
|
|
||||||
// lying down at rest, head up
|
|
||||||
resting() {
|
|
||||||
const d = [];
|
|
||||||
d.push(...wing({ shoulder: [90, 108], wrist: [66, 84], tip: [112, 70], fingers: [[134, 88], [124, 108]], root: [100, 118], bow: 0.25, bone: 3.2 }));
|
|
||||||
d.push(ell(92, 126, 42, 18, 0));
|
|
||||||
d.push(tube([[124, 120], [140, 112], [146, 92], [158, 82]], 12, 7));
|
|
||||||
const t = tail([[54, 130], [24, 140], [20, 152], [70, 152]], 11);
|
|
||||||
d.push(...t.d);
|
|
||||||
d.push(...leg([120, 132], [132, 142], [150, 146], 8));
|
|
||||||
d.push(...leg([70, 134], [82, 144], [96, 148], 10));
|
|
||||||
const h = head({ at: [156, 84], ang: 0.05, size: 1 });
|
|
||||||
d.push(...h.d);
|
|
||||||
d.push(...spines(bez([[60, 112], [90, 104], [130, 106], [152, 88]], 14), 3.4, -1, 2));
|
|
||||||
return { d, eye: h.eye, eyeR: h.eyeR };
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
const POSES = Object.fromEntries(Object.entries(TRACED).map(([k, d]) => [k, () => ({ d: [d], eye: [0, 0], eyeR: 0 })]));
|
||||||
|
|
||||||
const cache = {};
|
const cache = {};
|
||||||
/** SVG markup for one dragon: <g> with the silhouette in `fill` and a small eye in `eyeFill`. */
|
/** SVG markup for one dragon: <g> with the silhouette in `fill` and a small eye in `eyeFill`. */
|
||||||
@@ -229,7 +144,8 @@
|
|||||||
const p = cache[pose];
|
const p = cache[pose];
|
||||||
const tf = flip ? ' transform="translate(200 0) scale(-1 1)"' : "";
|
const tf = flip ? ' transform="translate(200 0) scale(-1 1)"' : "";
|
||||||
// one path per part: parts wind in different directions, so a single combined path would punch holes
|
// one path per part: parts wind in different directions, so a single combined path would punch holes
|
||||||
return `<g${tf}><g fill="${fill}">${p.d.map((d) => `<path d="${d}"/>`).join("")}</g><circle cx="${f(p.eye[0])}" cy="${f(p.eye[1])}" r="${p.eyeR}" fill="${eyeFill}"/></g>`;
|
const eye = p.eyeR ? `<circle cx="${f(p.eye[0])}" cy="${f(p.eye[1])}" r="${p.eyeR}" fill="${eyeFill}"/>` : "";
|
||||||
|
return `<g${tf}><g fill="${fill}" fill-rule="evenodd">${p.d.map((d) => `<path d="${d}"/>`).join("")}</g>${eye}</g>`;
|
||||||
}
|
}
|
||||||
/* ---------- cadets and the thorn bush (same building blocks, 100 x 140 box, feet near y = 132) ---------- */
|
/* ---------- cadets and the thorn bush (same building blocks, 100 x 140 box, feet near y = 132) ---------- */
|
||||||
|
|
||||||
|
|||||||
+58
-13
@@ -9,7 +9,9 @@
|
|||||||
* 3 click a choice point on the highlighted route: its other options branch off, each with the chance it gives.
|
* 3 click a choice point on the highlighted route: its other options branch off, each with the chance it gives.
|
||||||
* Picking one re-plans the route from there.
|
* Picking one re-plans the route from there.
|
||||||
* 4 "Why this route?" in the side panel: intervals, how often the choice stays best, low-bias numbers, risks.
|
* 4 "Why this route?" in the side panel: intervals, how often the choice stays best, low-bias numbers, risks.
|
||||||
* A toggle adds the community's actual traffic underneath. The URL keeps the selection (#valley/blue/meadow-Blue).
|
* "Show the paths of all riders" adds, underneath, the paths every source logged (one layer each: the sheet's form
|
||||||
|
* posts and bulk logs, runs reported here, the bot, Discord) and the deaths (deliberate and failed), each layer with
|
||||||
|
* its own switch; the counts come from data/stats.json `paths` (analysis/stats/site_stats.py). The URL keeps the selection (#valley/blue/meadow-Blue).
|
||||||
*/
|
*/
|
||||||
(function () {
|
(function () {
|
||||||
"use strict";
|
"use strict";
|
||||||
@@ -39,15 +41,15 @@
|
|||||||
};
|
};
|
||||||
const RESCUE = { Orange: "tree-Greens", Brown: "tree-Greens" };
|
const RESCUE = { Orange: "tree-Greens", Brown: "tree-Greens" };
|
||||||
const SPOTS = [
|
const SPOTS = [
|
||||||
{ place: "treeRed", enc: "tree-Red", colour: "Red", pose: "prowling", flip: true, sc: 0.36 },
|
{ place: "treeRed", enc: "tree-Red", colour: "Red", pose: "roaring", flip: true, sc: 0.36 },
|
||||||
{ place: "greens", enc: "tree-Greens", colour: "Green", pose: "resting", sc: 0.3, dx: -16 },
|
{ place: "greens", enc: "tree-Greens", colour: "Green", pose: "prowling", sc: 0.3, dx: -16 },
|
||||||
{ place: "greens", enc: "tree-Greens", colour: "Green", pose: "sitting", flip: true, sc: 0.27, dx: 20, dy: -4, twin: true },
|
{ place: "greens", enc: "tree-Greens", colour: "Green", pose: "prowling", flip: true, sc: 0.27, dx: 20, dy: -4, twin: true },
|
||||||
{ place: "black", enc: "shadow-Black", colour: "Black", pose: "flying", flip: true, sc: 0.38 },
|
{ place: "black", enc: "shadow-Black", colour: "Black", pose: "resting", flip: true, sc: 0.38 },
|
||||||
{ place: "redwood", enc: "shadow-Blue", colour: "Blue", pose: "coiled", sc: 0.3 },
|
{ place: "redwood", enc: "shadow-Blue", colour: "Blue", pose: "coiled", sc: 0.3 },
|
||||||
{ place: "valleyRed", enc: "valley-Red", colour: "Red", pose: "roaring", sc: 0.36, dy: -12 },
|
{ place: "valleyRed", enc: "valley-Red", colour: "Red", pose: "roaring", sc: 0.36, dy: -12 },
|
||||||
{ place: "meadow:Orange", enc: "meadow-Orange", colour: "Orange", pose: "sitting", flip: true, sc: 0.3 },
|
{ place: "meadow:Orange", enc: "meadow-Orange", colour: "Orange", pose: "flying", flip: true, sc: 0.3 },
|
||||||
{ place: "meadow:Brown", enc: "meadow-Brown", colour: "Brown", pose: "resting", sc: 0.32 },
|
{ place: "meadow:Brown", enc: "meadow-Brown", colour: "Brown", pose: "sitting", sc: 0.32 },
|
||||||
{ place: "meadow:Blue", enc: "meadow-Blue", colour: "Blue", pose: "sitting", sc: 0.32 },
|
{ place: "meadow:Blue", enc: "meadow-Blue", colour: "Blue", pose: "coiled", sc: 0.32 },
|
||||||
];
|
];
|
||||||
const FIRST_POSE = { Red: "roaring", Brown: "sitting", Green: "prowling", Orange: "flying" };
|
const FIRST_POSE = { Red: "roaring", Brown: "sitting", Green: "prowling", Orange: "flying" };
|
||||||
Object.keys(L).filter((k) => k.startsWith("see:")).forEach((k) => {
|
Object.keys(L).filter((k) => k.startsWith("see:")).forEach((k) => {
|
||||||
@@ -85,7 +87,7 @@
|
|||||||
const st = {
|
const st = {
|
||||||
point: null, // a place picked before any dragon: show the best way from there to every dragon
|
point: null, // a place picked before any dragon: show the best way from there to every dragon
|
||||||
policy: null, runs: null, counts: {}, colour: null, focus: null, expanded: null, over: {},
|
policy: null, runs: null, counts: {}, colour: null, focus: null, expanded: null, over: {},
|
||||||
objective: "eventually", sample: "all", traffic: false, cache: new Map(), pendingHash: null, info: null,
|
objective: "eventually", sample: "all", traffic: false, layers: {}, paths: null, cache: new Map(), pendingHash: null, info: null,
|
||||||
};
|
};
|
||||||
const model = () => st.policy.samples[st.sample];
|
const model = () => st.policy.samples[st.sample];
|
||||||
function advisorFor(enc, colour = st.colour) {
|
function advisorFor(enc, colour = st.colour) {
|
||||||
@@ -432,8 +434,17 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// "Show the paths of all riders": one ink per layer (data/stats.json paths.layers; measures.yaml path_layers)
|
||||||
|
const LAYER_INK = {
|
||||||
|
form: "#6b4a33", bulk: "#2f6b57", reported: "#7a4f8f", reddit: "#a8792a", bot: "#28588a", discord: "#5865f2",
|
||||||
|
died_deliberate: "#7d8794", died_failed: "#c2410c",
|
||||||
|
};
|
||||||
|
const isDeath = (k) => k.startsWith("died_");
|
||||||
|
const layerOn = (k) => st.layers[k] !== false; // every layer starts on
|
||||||
|
|
||||||
function drawTraffic(g) {
|
function drawTraffic(g) {
|
||||||
// how many logged runs went from each place to the next (precomputed in data/stats.json)
|
if (st.paths && st.paths.layers) return drawLayers(g, st.paths.layers);
|
||||||
|
// older stats.json: how many logged runs went from each place to the next (precomputed in data/stats.json)
|
||||||
if (!st.edges) return;
|
if (!st.edges) return;
|
||||||
const max = Math.max(1, ...st.edges.map((e) => e[2]));
|
const max = Math.max(1, ...st.edges.map((e) => e[2]));
|
||||||
st.edges.forEach(([a, b, n]) => {
|
st.edges.forEach(([a, b, n]) => {
|
||||||
@@ -442,6 +453,29 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Every layer that is switched on, side by side; the death layers dashed, with a mark where their runs ended. */
|
||||||
|
function drawLayers(g, layers) {
|
||||||
|
const shown = layers.filter((l) => l.runs && layerOn(l.key));
|
||||||
|
const max = Math.max(1, ...shown.flatMap((l) => l.edges.map((e) => e[2])));
|
||||||
|
shown.forEach((l, i) => {
|
||||||
|
const off = (i - (shown.length - 1) / 2) * 6, ink = LAYER_INK[l.key] || "#6b4a33", death = isDeath(l.key);
|
||||||
|
l.edges.forEach(([a, b, n]) => {
|
||||||
|
if (!L[a] || !L[b]) return;
|
||||||
|
el("path", { d: curve(L[a], L[b], 0.05, off), fill: "none", stroke: ink, "stroke-opacity": death ? 0.5 : 0.38,
|
||||||
|
"stroke-width": 1.2 + 16 * Math.sqrt(n / max), "stroke-linecap": death ? "butt" : "round", "stroke-dasharray": death ? "10 6" : null }, g);
|
||||||
|
});
|
||||||
|
if (death && l.ends) {
|
||||||
|
const emax = Math.max(1, ...Object.values(l.ends));
|
||||||
|
Object.entries(l.ends).forEach(([p, n]) => {
|
||||||
|
if (!L[p]) return;
|
||||||
|
const r = 3 + 11 * Math.sqrt(n / emax), x = L[p].x + off, y = L[p].y;
|
||||||
|
el("circle", { cx: x, cy: y, r, fill: ink, "fill-opacity": 0.35, stroke: ink, "stroke-width": 1.5 }, g);
|
||||||
|
el("path", { d: `M${x - r * 0.5},${y - r * 0.5}L${x + r * 0.5},${y + r * 0.5}M${x + r * 0.5},${y - r * 0.5}L${x - r * 0.5},${y + r * 0.5}`, stroke: ink, "stroke-width": 1.5 }, g);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function drawRoutes(gRoute, gLab, routes) {
|
function drawRoutes(gRoute, gLab, routes) {
|
||||||
const best = Math.max(1e-12, ...routes.map((r) => r.value.x));
|
const best = Math.max(1e-12, ...routes.map((r) => r.value.x));
|
||||||
const onRoute = new Set();
|
const onRoute = new Set();
|
||||||
@@ -633,8 +667,17 @@
|
|||||||
|
|
||||||
/* ---------- panel ---------- */
|
/* ---------- panel ---------- */
|
||||||
const mini = (c, pose = "sitting") => `<svg viewBox="0 0 200 160" aria-hidden="true">${D.svg(pose, { fill: `var(${DV[c]})`, eyeFill: "var(--bg)" })}</svg>`;
|
const mini = (c, pose = "sitting") => `<svg viewBox="0 0 200 160" aria-hidden="true">${D.svg(pose, { fill: `var(${DV[c]})`, eyeFill: "var(--bg)" })}</svg>`;
|
||||||
const POSE_OF = { Red: "roaring", Orange: "flying", Brown: "resting", Green: "prowling", Blue: "coiled", Black: "flying" };
|
const POSE_OF = { Red: "roaring", Orange: "flying", Brown: "sitting", Green: "prowling", Blue: "coiled", Black: "resting" };
|
||||||
const trafficToggle = () => `<label class="ex-toggle"><input type="checkbox" id="ex-traffic"${st.traffic ? " checked" : ""}> Show where riders actually went</label>`;
|
const UNROUTED = { "reddit thread": "Reddit result pages", register: "the Dragon Register" };
|
||||||
|
function trafficToggle() {
|
||||||
|
const box = `<label class="ex-toggle"><input type="checkbox" id="ex-traffic"${st.traffic ? " checked" : ""}> Show the paths of all riders</label>`;
|
||||||
|
if (!st.traffic || !st.paths || !st.paths.layers) return box;
|
||||||
|
const rows = st.paths.layers.map((l) => `<label class="ex-layer${l.runs ? "" : " none"}"><input type="checkbox" data-layer="${esc(l.key)}"${l.runs && layerOn(l.key) ? " checked" : ""}${l.runs ? "" : " disabled"}>
|
||||||
|
<span class="sw${isDeath(l.key) ? " dash" : ""}" style="--sw: ${LAYER_INK[l.key] || "#6b4a33"}"></span><span>${esc(l.label)}</span><span class="n">${l.runs ? l.runs.toLocaleString() : "none yet"}</span></label>`).join("");
|
||||||
|
const un = Object.entries(st.paths.unrouted || {}).filter(([, n]) => n).map(([s, n]) => `${n.toLocaleString()} from ${esc(UNROUTED[s] || s)}`);
|
||||||
|
return `${box}<div class="ex-layers" role="group" aria-label="Which riders' paths to show">${rows}
|
||||||
|
<p class="small muted">Line width: how many runs took each step. Dashed lines are deaths; ✕ marks where those runs ended.${un.length ? ` Not drawn (they record the dragon, not the route): ${un.join(", ")}.` : ""}</p></div>`;
|
||||||
|
}
|
||||||
function chooser() {
|
function chooser() {
|
||||||
return `<div class="ex-choose">${COLOURS.map((c) => `<button type="button" class="ex-dchip" data-c="${c}" aria-pressed="${st.colour === c}" style="--c: var(${DV[c]})">${mini(c, POSE_OF[c])}<span>${c}</span></button>`).join("")}</div>`;
|
return `<div class="ex-choose">${COLOURS.map((c) => `<button type="button" class="ex-dchip" data-c="${c}" aria-pressed="${st.colour === c}" style="--c: var(${DV[c]})">${mini(c, POSE_OF[c])}<span>${c}</span></button>`).join("")}</div>`;
|
||||||
}
|
}
|
||||||
@@ -735,6 +778,7 @@
|
|||||||
$$("[data-o]", p).forEach((b) => b.addEventListener("click", () => { st.objective = b.dataset.o; render(); }));
|
$$("[data-o]", p).forEach((b) => b.addEventListener("click", () => { st.objective = b.dataset.o; render(); }));
|
||||||
$$("[data-s]", p).forEach((b) => b.addEventListener("click", () => { st.sample = b.dataset.s; render(); }));
|
$$("[data-s]", p).forEach((b) => b.addEventListener("click", () => { st.sample = b.dataset.s; render(); }));
|
||||||
const tr = $("#ex-traffic", p); if (tr) tr.addEventListener("change", () => { st.traffic = tr.checked; render(); });
|
const tr = $("#ex-traffic", p); if (tr) tr.addEventListener("change", () => { st.traffic = tr.checked; render(); });
|
||||||
|
$$("[data-layer]", p).forEach((b) => b.addEventListener("change", () => { st.layers[b.dataset.layer] = b.checked; render(); }));
|
||||||
const cl = $("#ex-clear", p); if (cl) cl.addEventListener("click", () => select(null));
|
const cl = $("#ex-clear", p); if (cl) cl.addEventListener("click", () => select(null));
|
||||||
$$("[data-pt]", p).forEach((b) => b.addEventListener("click", () => { st.point = b.dataset.pt; writeHash(); render(); }));
|
$$("[data-pt]", p).forEach((b) => b.addEventListener("click", () => { st.point = b.dataset.pt; writeHash(); render(); }));
|
||||||
const cp = $("#ex-clear-point", p); if (cp) cp.addEventListener("click", () => { st.point = null; writeHash(); render(); });
|
const cp = $("#ex-clear-point", p); if (cp) cp.addEventListener("click", () => { st.point = null; writeHash(); render(); });
|
||||||
@@ -846,7 +890,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** The runs selected on the page (one preset of data/stats.json): how many reached each place, and each step. */
|
/** The runs selected on the page (one preset of data/stats.json): how many reached each place, and each step. */
|
||||||
function setStats(P) {
|
function setStats(P, paths) {
|
||||||
|
if (paths) st.paths = paths;
|
||||||
st.nRuns = P.analyse.n;
|
st.nRuns = P.analyse.n;
|
||||||
st.counts = P.valley.counts;
|
st.counts = P.valley.counts;
|
||||||
st.edges = P.valley.edges;
|
st.edges = P.valley.edges;
|
||||||
|
|||||||
@@ -338,6 +338,12 @@ footer { border-top-color: var(--line); }
|
|||||||
.ex-dchip[aria-pressed="true"] { background: color-mix(in srgb, var(--c) 22%, var(--raised)); box-shadow: 0 0 14px color-mix(in srgb, var(--c) 35%, transparent), inset 0 0 0 1px var(--c); }
|
.ex-dchip[aria-pressed="true"] { background: color-mix(in srgb, var(--c) 22%, var(--raised)); box-shadow: 0 0 14px color-mix(in srgb, var(--c) 35%, transparent), inset 0 0 0 1px var(--c); }
|
||||||
.ex-card { padding: 10px 12px; border: 1px solid var(--line); border-radius: 10px; background: var(--raised); }
|
.ex-card { padding: 10px 12px; border: 1px solid var(--line); border-radius: 10px; background: var(--raised); }
|
||||||
.ex-toggle { display: flex; gap: 8px; align-items: center; font-size: var(--step--1); color: var(--muted); }
|
.ex-toggle { display: flex; gap: 8px; align-items: center; font-size: var(--step--1); color: var(--muted); }
|
||||||
|
.ex-layers { display: grid; gap: 4px; margin: 4px 0 0 24px; }
|
||||||
|
.ex-layer { display: grid; grid-template-columns: auto 22px minmax(0, 1fr) auto; gap: 8px; align-items: center; font-size: var(--step--1); color: inherit; cursor: pointer; }
|
||||||
|
.ex-layer.none { color: var(--muted); cursor: default; }
|
||||||
|
.ex-layer .sw { height: 0; border-top: 4px solid var(--sw); border-radius: 2px; }
|
||||||
|
.ex-layer .sw.dash { border-top-style: dashed; }
|
||||||
|
.ex-layer .n { color: var(--muted); font-variant-numeric: tabular-nums; }
|
||||||
.ex-head { display: grid; grid-template-columns: 64px minmax(0, 1fr) auto; gap: 10px; align-items: center; }
|
.ex-head { display: grid; grid-template-columns: 64px minmax(0, 1fr) auto; gap: 10px; align-items: center; }
|
||||||
.ex-head svg { width: 64px; height: 52px; }
|
.ex-head svg { width: 64px; height: 52px; }
|
||||||
.ex-head h2 { color: var(--c); }
|
.ex-head h2 { color: var(--c); }
|
||||||
|
|||||||
+2
-2
@@ -148,7 +148,7 @@
|
|||||||
const getPolicy = () => policyP || (policyP = fetch("data/policy.json").then((r) => r.json()).catch(() => null));
|
const getPolicy = () => policyP || (policyP = fetch("data/policy.json").then((r) => r.json()).catch(() => null));
|
||||||
const ENC_OF = { Red: "valley-Red", Orange: "meadow-Orange", Brown: "meadow-Brown", Green: "tree-Greens", Blue: "meadow-Blue", Black: "shadow-Black" };
|
const ENC_OF = { Red: "valley-Red", Orange: "meadow-Orange", Brown: "meadow-Brown", Green: "tree-Greens", Blue: "meadow-Blue", Black: "shadow-Black" };
|
||||||
const ENC_LABEL = { "valley-Red": "the valley Red", "meadow-Orange": "the meadow Orange", "meadow-Brown": "the meadow Brown", "tree-Greens": "the two Greens", "meadow-Blue": "the meadow Blue", "shadow-Black": "the Black after the shadow" };
|
const ENC_LABEL = { "valley-Red": "the valley Red", "meadow-Orange": "the meadow Orange", "meadow-Brown": "the meadow Brown", "tree-Greens": "the two Greens", "meadow-Blue": "the meadow Blue", "shadow-Black": "the Black after the shadow" };
|
||||||
const POSE = { Red: "roaring", Orange: "flying", Brown: "resting", Green: "prowling", Blue: "coiled", Black: "flying" };
|
const POSE = { Red: "roaring", Orange: "flying", Brown: "sitting", Green: "prowling", Blue: "coiled", Black: "resting" };
|
||||||
|
|
||||||
let blackP = null;
|
let blackP = null;
|
||||||
const getBlack = () => blackP || (blackP = fetch("data/black.json").then((r) => r.json()).catch(() => null));
|
const getBlack = () => blackP || (blackP = fetch("data/black.json").then((r) => r.json()).catch(() => null));
|
||||||
@@ -260,7 +260,7 @@
|
|||||||
window.AtlasUI = {
|
window.AtlasUI = {
|
||||||
render(state) {
|
render(state) {
|
||||||
renderOverview(state);
|
renderOverview(state);
|
||||||
if (window.ValleyExplorer) window.ValleyExplorer.setStats(state.P);
|
if (window.ValleyExplorer) window.ValleyExplorer.setStats(state.P, state.stats && state.stats.paths);
|
||||||
},
|
},
|
||||||
showTab,
|
showTab,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -259,86 +259,6 @@ class Reddit(unittest.TestCase):
|
|||||||
self.assertNotIn("someone", json.dumps(out))
|
self.assertNotIn("someone", json.dumps(out))
|
||||||
|
|
||||||
|
|
||||||
class RedditComments(unittest.TestCase):
|
|
||||||
"""Runs the threshing-reddit scraper delivers (data/public/reddit_comments.json), with hand corrections."""
|
|
||||||
|
|
||||||
def source(self, public, manual):
|
|
||||||
spec = read_yaml("collection/pipeline.yaml")["sources"]["reddit_comments"]
|
|
||||||
return {**spec, "load": str(public), "manual": str(manual)}
|
|
||||||
|
|
||||||
def test_coded_with_hand_corrections(self):
|
|
||||||
public = TMP / "reddit_comments.json"
|
|
||||||
public.write_text(json.dumps({"runs": [
|
|
||||||
{"id": "c1", "thread": "abc", "posted": "2026-11-17", "result": None,
|
|
||||||
"answers": {"company": "Alone", "direction": "East (toward the roar)", "outcome": "Bonded",
|
|
||||||
"outcome_color": "Green", "branch": "Tree: climbed down slowly to the two Greens"}},
|
|
||||||
{"id": "c2-1", "thread": "abc", "posted": "2026-11-17", "result": None,
|
|
||||||
"answers": {"company": "Alone", "outcome": "Bonded", "outcome_color": "Red"}},
|
|
||||||
{"id": "c3", "thread": "abc", "posted": None, "result": None,
|
|
||||||
"answers": {"company": "Alone", "outcome": "Incinerated at a bonding encounter", "outcome_color": "Red"}}]}),
|
|
||||||
encoding="utf-8")
|
|
||||||
manual = TMP / "reddit_comments_manual.yaml"
|
|
||||||
manual.write_text("reject: [c2]\nfix: {c1: {outcome_color: Blue, branch: 'Valley: passed the Red, the meadow', direction: null}}\n"
|
|
||||||
"add: [{id: c9, thread: abc, posted: '2026-11-16', "
|
|
||||||
"answers: {company: Two squadmates, direction: West (toward the scent), outcome: Died before the hour}}]\n",
|
|
||||||
encoding="utf-8")
|
|
||||||
rows = runs.reddit_comments("reddit_comments", self.source(public, manual))
|
|
||||||
self.assertEqual([r["run_id"] for r in rows], ["comment-c1", "comment-c3", "comment-c9"])
|
|
||||||
c1, c3, c9 = rows
|
|
||||||
self.assertEqual((c1["source"], c1["outcome_color"], c1["direction"], c1["hour"], c1["enc_Blue"]),
|
|
||||||
("reddit comment", "Blue", "Unknown", "Valley", "Bonded!"))
|
|
||||||
self.assertEqual(c1["data_flags"], "read from a Reddit comment")
|
|
||||||
self.assertEqual(c3["data_flags"], "read from a Reddit comment automatically, not checked by hand")
|
|
||||||
self.assertEqual((c9["company"], c9["direction"], c9["hour"]), ("2 Squadmates", "West", "DIED before the hour"))
|
|
||||||
self.assertEqual(validate.problems(rows, runs.DICT), [])
|
|
||||||
|
|
||||||
def test_game_rules_flag_impossible_runs(self):
|
|
||||||
def flags(**answers):
|
|
||||||
return runs.answers_row("x", "reddit comment", None, answers)["data_flags"]
|
|
||||||
ok = flags(company="Alone", direction="East (toward the roar)", first_sighting="Orange",
|
|
||||||
scream="Kept walking (ignored it)", resolution="Wounded cadet: tourniquet",
|
|
||||||
branch="Tree: climbed down slowly to the two Greens", outcome="Bonded", outcome_color="Brown")
|
|
||||||
self.assertEqual(ok, "") # Brown after the Greens: a Green's rescue
|
|
||||||
cases = {
|
|
||||||
"first sighting Orange not in documented pool for Alone/Center":
|
|
||||||
dict(company="Alone", direction="Toward the forest centre", first_sighting="Orange", outcome="Died before the hour"),
|
|
||||||
"Brown at the Shadow (rare) encounter, which has only Black/Blue":
|
|
||||||
dict(branch="Tree: the shadow (Blue or Black)", outcome="Bonded", outcome_color="Brown"),
|
|
||||||
"Red at the Passed the Red: meadow encounter":
|
|
||||||
dict(branch="Valley: passed the Red, the meadow", outcome="Incinerated at a bonding encounter", outcome_color="Red"),
|
|
||||||
"Green recorded on a Valley run":
|
|
||||||
dict(hour="Went to the valley centre", outcome="Bonded", outcome_color="Green"),
|
|
||||||
"does not follow 'Ignore the scream'":
|
|
||||||
dict(scream="Kept walking (ignored it)", resolution="Bullies: my squadmate's revenge", outcome="Died before the hour"),
|
|
||||||
"fight answers on a run that did not help":
|
|
||||||
dict(scream="Kept walking (ignored it)", combat_first="Pause to assess", outcome="Died before the hour"),
|
|
||||||
"a path after the fight on a run without a fight":
|
|
||||||
dict(scream="Investigated, and walked away", post_path="West", outcome="Died before the hour"),
|
|
||||||
"a second fight move without pausing to assess":
|
|
||||||
dict(scream="Investigated, and helped my squadmate", combat_first="Charge the smaller cadet",
|
|
||||||
combat_second="Engage the smaller cadet", outcome="Died before the hour"),
|
|
||||||
"died before the hour, yet reached":
|
|
||||||
dict(scream="Investigated, and helped my squadmate", resolution="I died in the fight", outcome="Bonded", outcome_color="Red"),
|
|
||||||
}
|
|
||||||
for expected, answers in cases.items():
|
|
||||||
self.assertIn(expected, flags(**answers), expected)
|
|
||||||
|
|
||||||
def test_flagged_comment_runs_stay_out_of_the_route_model(self):
|
|
||||||
sys.path.insert(0, str(ROOT / "planner"))
|
|
||||||
import build_policy
|
|
||||||
rows = [{"source": "reddit comment", "data_flags": "read from a Reddit comment automatically, not checked by hand"},
|
|
||||||
{"source": "reddit comment", "data_flags": "read from a Reddit comment; Green recorded on a Valley run (no Greens in the valley)"},
|
|
||||||
{"source": "reddit spreadsheet", "data_flags": "multiple wings"},
|
|
||||||
{"source": "reported", "data_flags": "Green recorded on a Valley run (no Greens in the valley)"}]
|
|
||||||
kept = build_policy.drop_flagged(rows)
|
|
||||||
self.assertEqual([r["source"] for r in kept], ["reddit comment", "reddit spreadsheet", "reported"])
|
|
||||||
|
|
||||||
def test_delivered_not_extracted(self):
|
|
||||||
spec = read_yaml("collection/pipeline.yaml")["sources"]["reddit_comments"]
|
|
||||||
with self.assertRaises(extract.Skip):
|
|
||||||
extract.EXTRACTORS[spec["extract"]["kind"]](spec["extract"], {})
|
|
||||||
|
|
||||||
|
|
||||||
class Reports(unittest.TestCase):
|
class Reports(unittest.TestCase):
|
||||||
def issue(self, number, answers, **kw):
|
def issue(self, number, answers, **kw):
|
||||||
form = report_form.spec()
|
form = report_form.spec()
|
||||||
|
|||||||
Reference in New Issue
Block a user