Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a770463
WIP: tracking + calc + UI work; drop Codex battle export
Apr 22, 2026
45b39dd
Expand DamageEngine + MoveDex coverage
Apr 22, 2026
94e9a39
Calc accuracy pass: types, DB coverage, abilities, items, crit
Apr 22, 2026
5b7b9a4
Merge branch 'claude/hungry-snyder-726149' into dev
Apr 22, 2026
e8ee592
Merge branch 'claude/brave-sanderson-4f4327' into dev
Apr 22, 2026
dcb13b8
V2 calc redesign: matchup HP bars, forecast bars, team footer
Apr 27, 2026
9da8dcc
Merge V2 calc redesign (matchup HP bars, forecast bars, team footer)
Apr 27, 2026
bc4d955
Calc panel: scale spacing and bars with text size
Apr 27, 2026
227dd41
Calc panel: default y=100 to clear Chat Plus on fresh install
May 6, 2026
7fa408c
DamageEngine: drop OHKO confidence to LOW when item/ability is inferred
May 6, 2026
37a8593
StatTracker: clear negative stages on White Herb consume
May 6, 2026
d0ba6e1
BattleStateFacade: split regional aspect off properties.species
May 6, 2026
7ce32ea
BattleMessageInterceptor: track Ogerpon Embody Aspect on switch-in
May 6, 2026
f704605
BattleSwitchHandlerMixin: restore 33% HP for Regenerator on switch-out
May 6, 2026
e7e799f
splitRegionalForm: accept nullable species id
May 6, 2026
be2b3ce
Merge B9: calc panel default y=100 to clear Chat Plus
May 6, 2026
a6b3096
Merge B7: soften OHKO confidence on inferred defensive item/ability
May 6, 2026
698b5fe
Merge B6: White Herb clears negative stat stages on consume
May 6, 2026
11b389b
Merge B2: split regional aspect off properties.species in toTruth
May 6, 2026
a173ecc
Merge B4: track Ogerpon Embody Aspect on switch-in
May 6, 2026
df7d763
Merge B5: restore 33% HP for Regenerator on switch-out
May 6, 2026
c904cf5
WIP: Ogerpon mask form + post-change form resolution + DamageEngine c…
May 6, 2026
5177e5a
feat: cycle-through manual overrides for opponent Item / Ability / Sp…
May 6, 2026
93afdcd
feat(overrides): add back arrow, MANUAL pill, surface Spread row in c…
May 6, 2026
03fcda0
feat(overrides): mega-stone form swap + speed line in compact mode
May 6, 2026
3696fb5
feat(overrides): expand cycle alternatives via species abilities + co…
May 6, 2026
6dcc83b
feat(overrides): show usage % on rows and add MANUAL pill to Spread
May 6, 2026
9d4297c
feat(calc): scroll the moves + team viewport when content overflows
May 6, 2026
d53e603
fix(overrides): hide cycle UI on real-revealed rows; purge stale over…
May 6, 2026
3e720c5
fix(calc): scroll wheel + scrollbar drag
May 6, 2026
eb5b620
chore: track build pipeline tools and ignore local clutter
May 6, 2026
3dab09d
feat(database): add 7 new species; refresh Smogon fallback data
May 6, 2026
75c6362
feat(ui): hide calc panel and battle log on fresh installs
May 6, 2026
7b67d71
fix(ui): restore calc panel default-on; add Mod Menu toggle (v0.9.1.1)
May 7, 2026
7bf0761
fix(calc): derive player stats heuristically when party lookup fails …
May 8, 2026
c3f055f
fix(calc): strong winds, mega sticky, return, db alias overwrite, fac…
May 15, 2026
5e569c0
chore(calc): remove Gigantamax handling — not in the Delta pack
May 19, 2026
3ed005d
feat(data): curated Trick Room Cresselia set
May 19, 2026
8711148
feat(data): scrape 7 new Delta mons + curated sets for Hydrapple-Ultr…
May 19, 2026
555cccd
feat(calc): mega-stone trump for both sides (v0.9.1.4)
May 19, 2026
05164b2
fix(calc): mega-stone trump actually fires (v0.9.1.5)
May 19, 2026
ee93886
feat(calc): mega-stone trump also swaps ability (v0.9.1.6)
May 19, 2026
0b1131e
docs: add comprehensive open-source documentation, community template…
Aug 21, 2026
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
61 changes: 61 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Bug Report
description: Report a bug, incorrect damage calculation, or visual glitch in DeltaCalc.
labels: ["bug"]
body:
- type: markdown
attributes:
value: |
Thank you for reporting an issue with DeltaCalc! Please provide as much detail as possible to help reproduce and fix the bug.

- type: input
id: version
attributes:
label: DeltaCalc Version
description: What version of DeltaCalc are you using?
placeholder: e.g. 0.9.1.6
validations:
required: true

- type: input
id: environment
attributes:
label: Minecraft & Mod Environment
description: Versions of Minecraft, Fabric Loader, Fabric Language Kotlin, and Cobblemon.
placeholder: Minecraft 1.21.1 / Fabric 0.17.2 / Cobblemon 1.7.3+1.21.1
validations:
required: true

- type: textarea
id: description
attributes:
label: Bug Description
description: A clear and concise description of the bug.
validations:
required: true

- type: textarea
id: reproduction
attributes:
label: Steps to Reproduce
description: Step-by-step instructions to reproduce the issue.
placeholder: |
1. Enter a battle against ...
2. Use move ...
3. Observe calculation showing ...
validations:
required: true

- type: textarea
id: expected
attributes:
label: Expected Behavior
description: What did you expect to happen instead?
validations:
required: true

- type: textarea
id: logs
attributes:
label: Crash Logs or Debug Dumps
description: Paste any crash logs or relevant debug dump info (e.g. from `.minecraft/latest-calc.json`).
render: text
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: true
contact_links:
- name: Cobblemon Delta Discord
url: https://discord.gg/cobblemon
about: Ask questions and discuss competitive Cobblemon Delta with the community.
- name: Modrinth Project
url: https://modrinth.com/mod/delta-calc
about: Download releases and check mod dependencies on Modrinth.
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Feature Request
description: Suggest an idea, UI improvement, or new mechanic for DeltaCalc.
labels: ["enhancement"]
body:
- type: markdown
attributes:
value: |
Thank you for suggesting an improvement to DeltaCalc!

- type: textarea
id: summary
attributes:
label: Feature Summary
description: What feature or enhancement would you like to see?
validations:
required: true

- type: textarea
id: problem
attributes:
label: Problem / Motivation
description: Is your feature request related to a specific problem or limitation?
validations:
required: false

- type: textarea
id: alternative
attributes:
label: Proposed Solution or Alternatives
description: Describe your proposed design, UI layout, or any alternative solutions considered.
validations:
required: false
63 changes: 63 additions & 0 deletions .github/ISSUE_TEMPLATE/new_delta_pokemon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: New Delta Pokémon / Form Submission
description: Submit stats, typing, abilities, or movesets for a new Cobblemon Delta species or custom form.
labels: ["delta-data", "species-request"]
body:
- type: markdown
attributes:
value: |
Use this template to submit or update data for custom Cobblemon Delta Pokémon so they can be added to DeltaCalc's battle database.

- type: input
id: pokemon_name
attributes:
label: Species Name & Form
description: Name of the Pokémon and variant (e.g. `Hydrapple-Ultra`, `Sevygarde`, `Trapinch-ATOM`).
placeholder: e.g. Hydrapple-Ultra
validations:
required: true

- type: input
id: typing
attributes:
label: Typing
description: Primary and secondary types.
placeholder: e.g. Grass / Dragon
validations:
required: true

- type: input
id: base_stats
attributes:
label: Base Stats
description: HP / Atk / Def / SpA / SpD / Spe
placeholder: e.g. 106 / 80 / 110 / 120 / 80 / 44
validations:
required: true

- type: textarea
id: abilities
attributes:
label: Abilities
description: Primary, secondary, and hidden abilities (including any custom abilities & their effects).
placeholder: |
- Supersweet Syrup
- Regenerator
- Sticky Hold (Hidden)
validations:
required: true

- type: textarea
id: signature_moves
attributes:
label: Key / Signature Moves
description: Any notable moves, custom signature moves, base power, category, or flags.
validations:
required: false

- type: input
id: source
attributes:
label: Source Reference
description: Where is this data documented? (e.g. Cobblemon Delta Discord channel, official announcement, etc.)
validations:
required: false
15 changes: 15 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
## Description
Briefly explain the motivation, context, and summary of the changes in this pull request.

## Type of Change
- [ ] Bug fix (non-breaking change fixing an issue or incorrect calculation)
- [ ] New feature (non-breaking change adding UI/calculation functionality)
- [ ] Data update (new Delta species, updated spreads, or move flags)
- [ ] Documentation update
- [ ] Refactoring / code maintenance

## Checklist
- [ ] My code follows the project's coding conventions and Kotlin style.
- [ ] I have tested these changes locally with `./gradlew check` and verified in-game (if applicable).
- [ ] Any new or modified damage calculation mechanics have been verified against known game data.
- [ ] Relevant documentation or changelog entries have been updated.
36 changes: 36 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Build DeltaCalc

on:
push:
branches: [ main, dev, "claude/**" ]
pull_request:
branches: [ main, dev ]

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
cache: 'gradle'

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Verify and Build Mod with Gradle
run: ./gradlew build --no-daemon

- name: Upload Build Artifact
uses: actions/upload-artifact@v4
if: success()
with:
name: deltacalc-build
path: build/libs/deltacalc.jar
if-no-files-found: warn
25 changes: 23 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,35 @@
# Gradle and build artifacts
.gradle/
.kotlin/
build/
run/
out/

# IDE and OS
.idea/
__pycache__/
*.pyc
.vscode/
*.iml
*.ipr
*.iws
.DS_Store
Thumbs.db
Desktop.ini

# Archives and binaries
*.jar
*.zip
*.tar.gz

# Python caches and generated DB temp files
__pycache__/
*.pyc
tools/database/generated/

# Local agent / debug clutter
.claude/
.codex_tmp/
.codex_tmp_delta/
battleinfo/
*.bak
CobblemonExtendedBattleUI-main/
cobblemon-delta-pokemon-team-builder.json
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Changelog

## 0.9.1.6-deltacalc

- Mega-stone trump now swaps the holder's ability to the mega's intrinsic, on both sides. Charizardite Y → Drought, Charizardite X → Tough Claws, Gardevoirite → Pixilate, Mawilite → Huge Power, Mewtwonite X → Steadfast, Mewtwonite Y → Insomnia, etc. Hand-verified for all 47 Gen 6-7 megas. The DB doesn't carry abilities so the trump rule reads from a curated `MEGA_ABILITY_BY_FORM_KEY` map keyed by `<species>-mega(-x|-y)?`. Ability-conditional effects (Tough Claws on contact, Pixilate's Normal→Fairy + 1.2×, etc.) fire automatically as soon as the mega stone is detected. Opponent-side ability override still respects manual user-cycled overrides; player side always overrides since there's no manual-cycle mechanism for the player.

## 0.9.1.5-deltacalc

- Fix mega-stone cycle not changing damage numbers (the v0.9.1.4 trump rule actually firing). Root cause: `computeMegaSwap` only consulted Cobblemon's `species.getForm(setOf("mega-x"))` to source the mega's base stats, and Cobblemon's actual aspect-name convention for Mega Charizard X / Y (and others) doesn't match `"mega-x"` / `"megax"`, so the lookup silently returned the base form and the swap bailed out. The calc now reads mega base stats directly from the bundled battle database (`charizard-mega-x` → 78/130/111/130/85/100, `charizard-mega-y` → 78/104/78/159/115/100, etc.) — hand-verified for every Gen 6-7 mega — and only falls back to the Cobblemon aspect lookup when the DB doesn't have the entry. Aspect-fallback candidate list also widened (`mega_x`, `x`, `mega-form`) for mods that register megas under non-standard aspects.
- Surfaced mega stones in the opponent item-cycle UI. Charizard now shows Charizardite X / Charizardite Y as cycle options, Gardevoir gets Gardevoirite, etc., for every Gen 6-7 mega-capable species — previously the cycle only included usage-derived items plus a generic common-items list, so reaching a mega stone via cycle required the species' competitive usage data to include it.

## 0.9.1.4-deltacalc

- Mega-stone trump rule for both sides: when the held item is a mega stone matching the species, the calc now forces the snapshot into its mega form (base stats, types, intrinsic ability) regardless of Cobblemon's live form. Previously this only applied to the opponent; the player side respected `partyPokemon` stats, which silently downgraded the calc when (a) the player hadn't pressed mega-evolve yet or (b) Cobblemon's post-switch-in visual glitch reverted the sprite to base form. Player `actualStats` are now re-derived heuristically from the new mega base stats whenever a mega stone is detected (precision trade-off vs. always-correct mega base; accepted per user direction). Only triggers on items in the mega-stone table — non-mega items never override live state.
- Data: scraped 7 new mons from `#custom-pokemon` (Trapinch-ATOM, Sevygarde, Hydrapple-Ultra, Applin/Dipplin/Flapple/Appletun-Ultra). Curated sets for Hydrapple-Ultra (AV Regenerator) and Sevygarde (defensive Toxic/Haze utility).
- Data: curated Trick Room Cresselia set replaces the OU defensive default.
- Removed Gigantamax handling — not in the Delta pack (Dynamax kept).

## 0.9.1.3-deltacalc

- Fix Parasol Prayer / Delta Stream: damage calc now clamps super-effective-vs-Flying moves to neutral on Flying-type defenders when either active Pokemon has the ability.
- Fix mega evolution stats lost after switch-out/switch-in: `FormTracker` preserves `isMega` across switches so the calc keeps using mega base stats even when Cobblemon's sprite reverts to base form (visual glitch). Player-side `actualStats` are re-derived from mega base stats in this state so `partyPokemon` reporting base values doesn't silently downgrade the calc.
- Fix Return / Frustration: now always calculated at 102 BP since the calc has no access to friendship; matches competitive max-friendship convention.
- Fix variant-alias overwrite in `BattleDatabase`: a two-pass indexer (primary identifiers first, aliases via `putIfAbsent`) prevents 303 variant entries from overwriting their base species' lookup key. Fixes Ursaluna defaulting to Bloodmoon, Zapdos/Moltres defaulting to Galar, Decidueye defaulting to Hisui, Camerupt defaulting to Mega, Basculegion defaulting to F, Aegislash defaulting to Blade, every typed Arceus, every regional/Gigantamax form, and similar mismatches.
- Fix Facade vs. burn: Facade now correctly bypasses burn's 0.5× physical Atk drop in addition to doubling its base power (previously netted to 1×, wiping out the BP boost).
- Harden Guts trigger: requires a recognized status name (burn/poison/paralysis/sleep/freeze + aliases) instead of any non-null status string.

## 0.9.1-deltacalc

- Rebrands the client mod as DeltaCalc for release packaging
- Adds the damage calculator panel and battle overlay improvements for Cobblemon Delta battles
- Includes battle-state export support for external analysis workflows
- Bundles a release icon and aligns packaged metadata with the DeltaCalc repository
72 changes: 72 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, caste, color, religion, or sexual
identity and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or advances of
any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders via the repository issue tracker or private message.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org),
version 2.1, available at
https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
Loading
Loading