Skip to content

Commit

Permalink
add goerlitz kyu5 - kyu3
Browse files Browse the repository at this point in the history
  • Loading branch information
nknapp committed Sep 13, 2024
1 parent 9802458 commit 06fece4
Show file tree
Hide file tree
Showing 19 changed files with 392 additions and 131 deletions.
2 changes: 1 addition & 1 deletion .astro/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_variables": {
"lastUpdateCheck": 1724336920287
"lastUpdateCheck": 1726216070593
}
}
449 changes: 346 additions & 103 deletions artwork/poster.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/core/model/Defence.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const defences = [
"juji garami",
"hiji kimo osae",
"uchi kaiten sankyo",
"aiki nage",
] as const;

export type Defence = (typeof defences)[number];
1 change: 1 addition & 0 deletions src/core/model/Dojo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export interface ResolvedDojo {
export interface DojoInfo {
id: string;
name: string;
compareToAifd?: boolean;
logo?: string | URL;
}

Expand Down
1 change: 1 addition & 0 deletions src/data/dojos/aikido-dojo-darmstadt/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
id: "aikido-dojo-darmstadt",
name: "Aikido Dojo Darmstadt",
logo: logo,
compareToAifd: true,
},
details: () => import("./details"),
} as Dojo;
6 changes: 6 additions & 0 deletions src/data/dojos/dojos.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,18 @@ describe("dojos", () => {
id: "aikido-dojo-darmstadt",
name: "Aikido Dojo Darmstadt",
logo: "/src/data/dojos/aikido-dojo-darmstadt/logo.png",
compareToAifd: true,
},
{
id: "aikido-foederation",
name: "Aikido Föderation Darmstadt e.V.",
logo: "/src/data/dojos/aikido-foederation/logo.svg",
},
{
id: "kenkokan",
logo: "/src/data/dojos/kenkokan/logo_150.png",
name: "Kenkokan Görlitz",
},
]);
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@ import type { DojoDetails } from "$core/model/Dojo";

export default {
exams: [kyu5, kyu4, kyu3, kyu2, kyu1],
sourceLink: "https://www.kenkokan.de/",
additionalText: {
en: "The exam tables have not been verified by the dojo yet.",
de: "The Prüfungsordnung wurde noch nicht vom Dojo geprüft und kann Fehler enthalten",
},
} satisfies DojoDetails;
Original file line number Diff line number Diff line change
@@ -1,26 +1,6 @@
import type { Directions, Exam, TechniqueMetadata } from "$core/model";
import { goerlitzTree } from "@/data/dojos/goerlitz/exams/utils/goerlitzTree.ts";
import { goerlitzTree } from "./utils/goerlitzTree.ts";

function pinAttacksTachiWaza(directions: Directions<TechniqueMetadata>) {
return {
"ai hanmi katate dori": directions,
"shomen uchi": directions,
"gyuako hanmi katate dori": directions,
"ryote dori": directions,
"kata dori": directions,
"yokomen uchi": directions,
"ushiro ryote dori": directions,
"katate ryote dori": directions,
"kata dori men uchi": directions,
"ushiro ryo kata dori": directions,
"mae ryo kata dori": directions,
"jodan tsuki": directions,
"chudan tsuki": directions,
"ushiro ryo hiji dori": directions,
"ushiro eri dori": directions,
"ushiro katate dori kubi shime": directions,
};
}
export const kyu1: Exam = {
id: "kyu1",
label: {
Expand Down Expand Up @@ -167,7 +147,28 @@ export const kyu1: Exam = {
"jodan tsuki": { "single-direction": {} },
"chudan tsuki": { "single-direction": {} },
},
// "aiki nage": { shomen uchi: { "single-direction: {}} },
"aiki nage": { "shomen uchi": { "single-direction": {} } },
},
}),
};

function pinAttacksTachiWaza(directions: Directions<TechniqueMetadata>) {
return {
"ai hanmi katate dori": directions,
"shomen uchi": directions,
"gyuako hanmi katate dori": directions,
"ryote dori": directions,
"kata dori": directions,
"yokomen uchi": directions,
"ushiro ryote dori": directions,
"katate ryote dori": directions,
"kata dori men uchi": directions,
"ushiro ryo kata dori": directions,
"mae ryo kata dori": directions,
"jodan tsuki": directions,
"chudan tsuki": directions,
"ushiro ryo hiji dori": directions,
"ushiro eri dori": directions,
"ushiro katate dori kubi shime": directions,
};
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Exam } from "$core/model";
import { goerlitzTree } from "@/data/dojos/goerlitz/exams/utils/goerlitzTree.ts";
import { goerlitzTree } from "./utils/goerlitzTree.ts";

export const kyu2: Exam = {
id: "kyu2",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import type { Dojo } from "$core/model/Dojo";
import logo from "./logo_150.png?url";

export default {
draft: true,
info: {
id: "goerlitz",
name: "Görlitz",
id: "kenkokan",
name: "Kenkokan Görlitz",
logo,
},
details: () => import("./details"),
} satisfies Dojo;
Binary file added src/data/dojos/kenkokan/logo_150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/data/dojos/table-completenes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { buildExamTable } from "$core/buildExamTable";
import type { DojoDetails } from "$core/model/Dojo";
import { techniqueAsString } from "$core/model/Technique.test-helper";

const dojos = (await listDojos()).filter((dojo) => dojo.id !== "aifd");
const dojos = (await listDojos()).filter((dojo) => dojo.compareToAifd);

test.each(dojos)("no AiFD techniques are missing in $name", async ({ id }) => {
const dojo = await loadDojo(id);
Expand Down
Binary file added src/data/speechpacks/default/audio/aiki-nage.mp3
Binary file not shown.
2 changes: 2 additions & 0 deletions src/data/speechpacks/default/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { SpeechPack } from "$core/model";
import ai_hanmi_katate_dori from "./audio/ai-hanmi-katate-dori.mp3";
import aiki_nage from "./audio/aiki-nage.mp3.mp3";
import chudan_tsuki from "./audio/chudan-tsuki.mp3";
import gokyo from "./audio/gokyo.mp3";
import gyuako_hanmi_katate_dori from "./audio/gyuako-hanmi-katate-dori.mp3";
Expand Down Expand Up @@ -111,4 +112,5 @@ export default {
// directions
omote: omote,
ura: ura,
"aiki nage": aiki_nage,
} satisfies SpeechPack;

0 comments on commit 06fece4

Please sign in to comment.