Skip to content

Add thwack #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jacoby6000 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add thwack #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9e34da
set up thwack category
Jacoby6000 Jun 16, 2023
cc09dd9
ingest thwack
Jacoby6000 Jun 16, 2023
f259ebc
Merge branch 'main' into add-thwack
mergify[bot] Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,383 changes: 2,382 additions & 1 deletion changelog.txt
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def seconds_to_millis(n):
"recovery": seconds_to_millis,
"combo": seconds_to_millis,
"holding": seconds_to_millis,
"thwack": seconds_to_millis,
}

def main():
Expand Down
1 change: 1 addition & 0 deletions src/components/category_presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ CATEGORY_PRESETS.set("Holding", buildPreset("holding"));
CATEGORY_PRESETS.set("Windup", buildPreset("windup"));
CATEGORY_PRESETS.set("Release", buildPreset("release"));
CATEGORY_PRESETS.set("Recovery", buildPreset("recovery"));
CATEGORY_PRESETS.set("Thwack", buildPreset("thwack"));
CATEGORY_PRESETS.set("Combo", buildPreset("combo"));
CATEGORY_PRESETS.set("All Damage", buildPreset("damage"));

Expand Down
28 changes: 27 additions & 1 deletion src/metrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ export enum MetricPath {
RELEASE_LEAPING_STRIKE = "attacks.sprintAttack.release",
RELEASE_SPRINT_CHARGE = "attacks.sprintCharge.release",
RELEASE_THROW = "attacks.throw.release",

THWACK_AVERAGE_LIGHT = "attacks.average.light.thwack",
THWACK_SLASH_LIGHT = "attacks.slash.light.thwack",
THWACK_OVERHEAD_LIGHT = "attacks.overhead.light.thwack",
THWACK_STAB_LIGHT = "attacks.stab.light.thwack",
THWACK_AVERAGE_HEAVY = "attacks.average.heavy.thwack",
THWACK_SLASH_HEAVY = "attacks.slash.heavy.thwack",
THWACK_OVERHEAD_HEAVY = "attacks.overhead.heavy.thwack",
THWACK_STAB_HEAVY = "attacks.stab.heavy.thwack",
THWACK_SPECIAL = "attacks.special.thwack",
THWACK_LEAPING_STRIKE = "attacks.sprintAttack.thwack",
THWACK_SPRINT_CHARGE = "attacks.sprintCharge.thwack",
THWACK_THROW = "attacks.throw.thwack",

RECOVERY_AVERAGE_LIGHT = "attacks.average.light.recovery",
RECOVERY_SLASH_LIGHT = "attacks.slash.light.recovery",
Expand Down Expand Up @@ -137,6 +150,19 @@ export enum MetricLabel {
RELEASE_LEAPING_STRIKE = "Release - Leaping Strike",
RELEASE_SPRINT_CHARGE = "Release - Sprint Charge",
RELEASE_THROW = "Release - Throw",

THWACK_LIGHT_AVERAGE = "Thwack - Average (Light)",
THWACK_HEAVY_AVERAGE = "Thwack - Average (Heavy)",
THWACK_SLASH_LIGHT = "Thwack - Slash (Light)",
THWACK_SLASH_HEAVY = "Thwack - Slash (Heavy)",
THWACK_STAB_LIGHT = "Thwack - Stab (Light)",
THWACK_STAB_HEAVY = "Thwack - Stab (Heavy)",
THWACK_OVERHEAD_LIGHT = "Thwack - Overhead (Light)",
THWACK_OVERHEAD_HEAVY = "Thwack - Overhead (Heavy)",
THWACK_SPECIAL = "Thwack - Special",
THWACK_LEAPING_STRIKE = "Thwack - Leaping Strike",
THWACK_SPRINT_CHARGE = "Thwack - Sprint Charge",
THWACK_THROW = "Thwack - Throw",

RECOVERY_LIGHT_AVERAGE = "Recovery - Average (Light)",
RECOVERY_HEAVY_AVERAGE = "Recovery - Average (Heavy)",
Expand Down Expand Up @@ -191,7 +217,7 @@ export enum MetricLabel {
export function unitGroup(path: MetricPath) {
if (path.includes(".damage")) {
return Unit.DAMAGE;
} else if (path.includes(".windup") || path.includes(".recovery") || path.includes(".combo") || path.includes(".holding")) {
} else if (path.includes(".windup") || path.includes(".recovery") || path.includes(".combo") || path.includes(".holding") || path.includes(".thwack")) {
return Unit.INVERSE_SPEED;
} else if (path.includes(".release")) {
return Unit.SPEED;
Expand Down
12 changes: 12 additions & 0 deletions src/stats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,18 @@ export function generateMetrics(inputWeapons: Weapon[], numberOfTargets: number,
new InverseMetric(MetricLabel.RECOVERY_LEAPING_STRIKE, MetricPath.RECOVERY_LEAPING_STRIKE),
new InverseMetric(MetricLabel.RECOVERY_SPRINT_CHARGE, MetricPath.RECOVERY_SPRINT_CHARGE),
new InverseMetric(MetricLabel.RECOVERY_THROW, MetricPath.RECOVERY_THROW),
new InverseMetric(MetricLabel.THWACK_LIGHT_AVERAGE, MetricPath.THWACK_AVERAGE_LIGHT),
new InverseMetric(MetricLabel.THWACK_HEAVY_AVERAGE, MetricPath.THWACK_AVERAGE_HEAVY),
new InverseMetric(MetricLabel.THWACK_SLASH_LIGHT, MetricPath.THWACK_SLASH_LIGHT),
new InverseMetric(MetricLabel.THWACK_SLASH_HEAVY, MetricPath.THWACK_SLASH_HEAVY),
new InverseMetric(MetricLabel.THWACK_OVERHEAD_LIGHT, MetricPath.THWACK_OVERHEAD_LIGHT),
new InverseMetric(MetricLabel.THWACK_OVERHEAD_HEAVY, MetricPath.THWACK_OVERHEAD_HEAVY),
new InverseMetric(MetricLabel.THWACK_STAB_LIGHT, MetricPath.THWACK_STAB_LIGHT),
new InverseMetric(MetricLabel.THWACK_STAB_HEAVY, MetricPath.THWACK_STAB_HEAVY),
new InverseMetric(MetricLabel.THWACK_SPECIAL, MetricPath.THWACK_SPECIAL),
new InverseMetric(MetricLabel.THWACK_LEAPING_STRIKE, MetricPath.THWACK_LEAPING_STRIKE),
new InverseMetric(MetricLabel.THWACK_SPRINT_CHARGE, MetricPath.THWACK_SPRINT_CHARGE),
new InverseMetric(MetricLabel.THWACK_THROW, MetricPath.THWACK_THROW),

new InverseMetric(MetricLabel.COMBO_LIGHT_AVERAGE, MetricPath.COMBO_AVERAGE_LIGHT),
new InverseMetric(MetricLabel.COMBO_HEAVY_AVERAGE, MetricPath.COMBO_AVERAGE_HEAVY),
Expand Down
1 change: 1 addition & 0 deletions src/weapon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export type SpecialAttack = {
windup: number;
release: number;
recovery: number;
thwack: number;
combo: number;
range?: number; // Not measured yet
cleaveOverride?: boolean;
Expand Down
16 changes: 8 additions & 8 deletions src/weapons/axe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -62,7 +62,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -97,7 +97,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -128,7 +128,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -163,7 +163,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": -1.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -194,7 +194,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": -1.0,
"feint": 0.175,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -320,7 +320,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 33.0,
"feint": 0.17499999999999996,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -349,7 +349,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 33.0,
"feint": 0.17499999999999996,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down
16 changes: 8 additions & 8 deletions src/weapons/battle_axe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -57,7 +57,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -92,7 +92,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -123,7 +123,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -158,7 +158,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": -1.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -189,7 +189,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": -1.0,
"feint": 0.175,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -315,7 +315,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 33.0,
"feint": 0.17499999999999996,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -344,7 +344,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 33.0,
"feint": 0.17499999999999996,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down
16 changes: 8 additions & 8 deletions src/weapons/carryable__candelabra.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -45,7 +45,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -78,7 +78,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -109,7 +109,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -142,7 +142,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": -1.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -173,7 +173,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": -1.0,
"feint": 0.175,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -335,7 +335,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 33.0,
"feint": 0.17499999999999996,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -364,7 +364,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 33.0,
"feint": 0.17499999999999996,
"thwack": 1.2,
"thwack": 1200.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down
16 changes: 8 additions & 8 deletions src/weapons/cudgel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 0.8,
"thwack": 800.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -60,7 +60,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -95,7 +95,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 0.8,
"thwack": 800.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -126,7 +126,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 50.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -161,7 +161,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": -1.0,
"feint": 0.175,
"thwack": 0.8,
"thwack": 800.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -192,7 +192,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": -1.0,
"feint": 0.175,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -318,7 +318,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 33.0,
"feint": 0.17499999999999996,
"thwack": 0.8000000000000002,
"thwack": 800.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down Expand Up @@ -347,7 +347,7 @@
"verticalTurnLimitStrength": 50.0,
"reverseTurnLimitStrength": 33.0,
"feint": 0.17499999999999996,
"thwack": 1.0,
"thwack": 1000.0,
"hitSuccess": -1.0,
"blocked": 0.75,
"worldHit": -1.0,
Expand Down
Loading