diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md index 733cd4c..872425c 100644 --- a/DEPLOYMENT.md +++ b/DEPLOYMENT.md @@ -138,9 +138,12 @@ services: The app listens inside Docker on port `4173`. The database lives at `/mnt/usbssds/apps/iwanttoheal/data/game.db` because that host directory is -mounted into the container as `/app/data`. The startup command installs -dependencies, applies schema migrations, builds the web app, and starts the -production server. +mounted into the container as `/app/data`. This is persistent runtime data, not +code. Do not commit it and do not copy the Mac `data/game.db` over it during +deploys. + +The startup command installs dependencies, applies schema/static-content +updates, builds the web app, and starts the production server. Test the local TrueNAS service: @@ -220,11 +223,22 @@ cd /mnt/usbssds/apps/iwanttoheal/app git pull ``` +Before restarting, back up the persistent database: + +```sh +cp /mnt/usbssds/apps/iwanttoheal/data/game.db \ + "/mnt/usbssds/apps/iwanttoheal/data/game-before-update-$(date +%Y%m%d-%H%M%S).db" +``` + Restart the `iwanttoheal` app in the TrueNAS Apps UI after pulling. The app command runs `npm ci`, `npm run db:init`, `npm run build`, and `npm start` on startup, so dependency, schema, and browser bundle changes are applied each time the container restarts. +`npm run db:init` updates schema and seeded static game content. It should not +erase accounts, characters, inventory, or save progress. Character resets are +separate manual operations and should only be run intentionally. + Normal update workflow: ```sh @@ -236,10 +250,14 @@ git push origin main # TrueNAS shell cd /mnt/usbssds/apps/iwanttoheal/app git pull +cp /mnt/usbssds/apps/iwanttoheal/data/game.db \ + "/mnt/usbssds/apps/iwanttoheal/data/game-before-update-$(date +%Y%m%d-%H%M%S).db" ``` Then restart the TrueNAS app. +For the shorter checklist, see [docs/push-updates.md](docs/push-updates.md). + ### Existing auth-only app If `iwanttoheal-auth` was already created during earlier testing, the simplest diff --git a/IWantToHeal-Thor-debug.apk b/IWantToHeal-Thor-debug.apk deleted file mode 100644 index f5b3507..0000000 Binary files a/IWantToHeal-Thor-debug.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.10.apk b/IWantToHeal-Thor-v1.0.10.apk deleted file mode 100644 index ec70ee9..0000000 Binary files a/IWantToHeal-Thor-v1.0.10.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.11.apk b/IWantToHeal-Thor-v1.0.11.apk deleted file mode 100644 index e02bbda..0000000 Binary files a/IWantToHeal-Thor-v1.0.11.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.12 2.apk b/IWantToHeal-Thor-v1.0.12 2.apk deleted file mode 100644 index e88cdca..0000000 Binary files a/IWantToHeal-Thor-v1.0.12 2.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.12.apk b/IWantToHeal-Thor-v1.0.12.apk deleted file mode 100644 index b92fe7b..0000000 Binary files a/IWantToHeal-Thor-v1.0.12.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.13.apk b/IWantToHeal-Thor-v1.0.13.apk deleted file mode 100644 index 5d9c300..0000000 Binary files a/IWantToHeal-Thor-v1.0.13.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.14.apk b/IWantToHeal-Thor-v1.0.14.apk deleted file mode 100644 index 26e1a2d..0000000 Binary files a/IWantToHeal-Thor-v1.0.14.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.15.apk b/IWantToHeal-Thor-v1.0.15.apk deleted file mode 100644 index 4fc2224..0000000 Binary files a/IWantToHeal-Thor-v1.0.15.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.16.apk b/IWantToHeal-Thor-v1.0.16.apk deleted file mode 100644 index a602124..0000000 Binary files a/IWantToHeal-Thor-v1.0.16.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.17 2.apk b/IWantToHeal-Thor-v1.0.17 2.apk deleted file mode 100644 index ecc0552..0000000 Binary files a/IWantToHeal-Thor-v1.0.17 2.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.17.apk b/IWantToHeal-Thor-v1.0.17.apk deleted file mode 100644 index f0bbdcb..0000000 Binary files a/IWantToHeal-Thor-v1.0.17.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.18.apk b/IWantToHeal-Thor-v1.0.18.apk deleted file mode 100644 index 9061417..0000000 Binary files a/IWantToHeal-Thor-v1.0.18.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.19.apk b/IWantToHeal-Thor-v1.0.19.apk deleted file mode 100644 index ec65c30..0000000 Binary files a/IWantToHeal-Thor-v1.0.19.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.2.apk b/IWantToHeal-Thor-v1.0.2.apk deleted file mode 100644 index 9250bed..0000000 Binary files a/IWantToHeal-Thor-v1.0.2.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.20.apk b/IWantToHeal-Thor-v1.0.20.apk deleted file mode 100644 index 53ab602..0000000 Binary files a/IWantToHeal-Thor-v1.0.20.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.21.apk b/IWantToHeal-Thor-v1.0.21.apk deleted file mode 100644 index 52f253d..0000000 Binary files a/IWantToHeal-Thor-v1.0.21.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.23.apk b/IWantToHeal-Thor-v1.0.23.apk deleted file mode 100644 index e85cb75..0000000 Binary files a/IWantToHeal-Thor-v1.0.23.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.22.apk b/IWantToHeal-Thor-v1.0.27.apk similarity index 96% rename from IWantToHeal-Thor-v1.0.22.apk rename to IWantToHeal-Thor-v1.0.27.apk index 28cb367..64547e5 100644 Binary files a/IWantToHeal-Thor-v1.0.22.apk and b/IWantToHeal-Thor-v1.0.27.apk differ diff --git a/IWantToHeal-Thor-v1.0.3.apk b/IWantToHeal-Thor-v1.0.3.apk deleted file mode 100644 index d06d652..0000000 Binary files a/IWantToHeal-Thor-v1.0.3.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.4.apk b/IWantToHeal-Thor-v1.0.4.apk deleted file mode 100644 index d5c8f33..0000000 Binary files a/IWantToHeal-Thor-v1.0.4.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.5.apk b/IWantToHeal-Thor-v1.0.5.apk deleted file mode 100644 index d398685..0000000 Binary files a/IWantToHeal-Thor-v1.0.5.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.8.apk b/IWantToHeal-Thor-v1.0.8.apk deleted file mode 100644 index 2c285b7..0000000 Binary files a/IWantToHeal-Thor-v1.0.8.apk and /dev/null differ diff --git a/IWantToHeal-Thor-v1.0.9.apk b/IWantToHeal-Thor-v1.0.9.apk deleted file mode 100644 index 78ec0c3..0000000 Binary files a/IWantToHeal-Thor-v1.0.9.apk and /dev/null differ diff --git a/README.md b/README.md index fd85810..e53157e 100644 --- a/README.md +++ b/README.md @@ -57,13 +57,13 @@ For an online production build, see [DEPLOYMENT.md](DEPLOYMENT.md). - Dungeon XP rewards, level-up handling, talent-point awards, and ability unlocks - SQLite-backed class talent trees with ranks, tiers, prerequisites, refunds, and immediate persistence -- Seven equipment slots, starter item-level 1 gear, inventory comparison, and - persistent equipping +- Nine equipment slots, empty starter inventory, craftable item-level 1 gear, + inventory comparison, and persistent equipping - Aggregate item level, healing power, and resource bonuses that affect combat -- Five SQLite-authored dungeon difficulty tiers with level gates, combat - scaling, XP multipliers, and item-level reward bands -- Encounter-specific weighted loot tables for every difficulty, with authored - drop chances, slot pools, and item-level 5 through 25 reward variants +- Four playable SQLite-authored content tiers at item levels 1, 10, 20, and 25 + with level gates, combat scaling, XP multipliers, and reward bands +- Gear progression through item levels 1, 5, 10, 15, 20, and 25 with + boss-coin crafting and upgrade steps - One live loot roll per defeated encounter, shown in the combat log and dungeon-complete summary - Atomic inventory awards with retry-safe roll records and stacked duplicate diff --git a/android/app/build.gradle b/android/app/build.gradle index 7b98a08..89f62c2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.warren.iwanttoheal" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 42 - versionName "1.0.25" + versionCode 43 + versionName "1.0.27" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/android/app/src/main/java/com/warren/iwanttoheal/ControllerBridgeActivity.java b/android/app/src/main/java/com/warren/iwanttoheal/ControllerBridgeActivity.java index 33be3c6..9845f6e 100644 --- a/android/app/src/main/java/com/warren/iwanttoheal/ControllerBridgeActivity.java +++ b/android/app/src/main/java/com/warren/iwanttoheal/ControllerBridgeActivity.java @@ -11,7 +11,7 @@ import java.io.File; public abstract class ControllerBridgeActivity extends BridgeActivity { public static final String EXTRA_INITIAL_URL = "com.warren.iwanttoheal.INITIAL_URL"; - private static final long DPAD_THROTTLE_MS = 125; + private static final long DPAD_THROTTLE_MS = 220; private long lastDpadDispatchAt = 0; @Override diff --git a/db/seed.sql b/db/seed.sql index 38dba07..a654f52 100644 --- a/db/seed.sql +++ b/db/seed.sql @@ -25,28 +25,35 @@ WHERE slug = 'citadel-of-the-ember-crown'; INSERT OR IGNORE INTO difficulties (id, slug, name, dropped_item_level, unlock_level, health_multiplier, damage_multiplier, experience_multiplier, description) VALUES - (1, 'initiate', 'Initiate', 5, 1, 1.0, 1.0, 1.0, 'Entry-level dungeon difficulty.'), - (2, 'veteran', 'Veteran', 10, 5, 1.35, 1.2, 1.5, 'Enemies deal more damage and drop stronger gear.'), - (3, 'champion', 'Champion', 15, 10, 1.7, 1.45, 2.2, 'Demanding encounters for developed characters.'), - (4, 'mythic', 'Mythic', 20, 15, 2.1, 1.75, 3.0, 'Endgame dungeon difficulty.'), - (5, 'ascendant', 'Ascendant', 25, 20, 2.6, 2.1, 4.0, 'The current pinnacle difficulty.'), + (1, 'initiate', 'Initiate', 1, 1, 0.8, 0.8, 1.0, 'Entry-level dungeon difficulty for crafting the first real set.'), + (2, 'veteran', 'Veteran', 10, 10, 1.45, 1.25, 2.0, 'A major step up that rewards refined gear components.'), + (3, 'champion', 'Champion', 15, 15, 1.7, 1.45, 2.2, 'Gear-only upgrade tier between Veteran and Mythic.'), + (4, 'mythic', 'Mythic', 20, 20, 2.25, 1.85, 3.5, 'Endgame dungeon difficulty.'), + (5, 'ascendant', 'Ascendant', 25, 25, 2.8, 2.25, 4.5, 'The current pinnacle difficulty.'), (101, 'raid-normal', 'Normal', 7, 1, 1.0, 1.0, 1.25, 'The opening raid difficulty, tuned for an eighteen-player party.'); UPDATE difficulties SET dropped_item_level = CASE slug - WHEN 'raid-normal' THEN 10 ELSE dropped_item_level END, + WHEN 'initiate' THEN 1 WHEN 'raid-normal' THEN 10 ELSE dropped_item_level END, unlock_level = CASE slug - WHEN 'initiate' THEN 1 WHEN 'veteran' THEN 5 WHEN 'champion' THEN 10 - WHEN 'mythic' THEN 15 WHEN 'ascendant' THEN 20 ELSE unlock_level END, + WHEN 'initiate' THEN 1 WHEN 'veteran' THEN 10 WHEN 'champion' THEN 15 + WHEN 'mythic' THEN 20 WHEN 'ascendant' THEN 25 ELSE unlock_level END, health_multiplier = CASE slug - WHEN 'initiate' THEN 1.0 WHEN 'veteran' THEN 1.35 WHEN 'champion' THEN 1.7 - WHEN 'mythic' THEN 2.1 WHEN 'ascendant' THEN 2.6 ELSE health_multiplier END, + WHEN 'initiate' THEN 0.8 WHEN 'veteran' THEN 1.45 WHEN 'champion' THEN 1.7 + WHEN 'mythic' THEN 2.25 WHEN 'ascendant' THEN 2.8 ELSE health_multiplier END, damage_multiplier = CASE slug - WHEN 'initiate' THEN 1.0 WHEN 'veteran' THEN 1.2 WHEN 'champion' THEN 1.45 - WHEN 'mythic' THEN 1.75 WHEN 'ascendant' THEN 2.1 ELSE damage_multiplier END, + WHEN 'initiate' THEN 0.8 WHEN 'veteran' THEN 1.25 WHEN 'champion' THEN 1.45 + WHEN 'mythic' THEN 1.85 WHEN 'ascendant' THEN 2.25 ELSE damage_multiplier END, experience_multiplier = CASE slug - WHEN 'initiate' THEN 1.0 WHEN 'veteran' THEN 1.5 WHEN 'champion' THEN 2.2 - WHEN 'mythic' THEN 3.0 WHEN 'ascendant' THEN 4.0 ELSE experience_multiplier END; + WHEN 'initiate' THEN 1.0 WHEN 'veteran' THEN 2.0 WHEN 'champion' THEN 2.2 + WHEN 'mythic' THEN 3.5 WHEN 'ascendant' THEN 4.5 ELSE experience_multiplier END, + description = CASE slug + WHEN 'initiate' THEN 'Entry-level dungeon difficulty for crafting the first real set.' + WHEN 'veteran' THEN 'A major step up that rewards refined gear components.' + WHEN 'champion' THEN 'Gear-only upgrade tier between Veteran and Mythic.' + WHEN 'mythic' THEN 'Endgame dungeon difficulty.' + WHEN 'ascendant' THEN 'The current pinnacle difficulty.' + ELSE description END; INSERT OR IGNORE INTO dungeon_difficulties (dungeon_id, difficulty_id) VALUES (1, 1), @@ -345,6 +352,9 @@ DELETE FROM crafting_recipes; INSERT INTO crafting_recipes (id, item_id, difficulty_id, source_dungeon_id, source_encounter_id) VALUES + (901, 101, 1, 1, 3), (902, 102, 1, 1, 3), (903, 103, 1, 1, 3), + (904, 104, 1, 1, 12), (905, 105, 1, 1, 12), (906, 106, 1, 1, 12), + (907, 100, 1, 1, 22), (908, 108, 1, 1, 22), (909, 109, 1, 1, 22), (1001, 5, 1, 1, 3), (1002, 2, 1, 1, 3), (1003, 6, 1, 1, 3), (1004, 4, 1, 1, 12), (1005, 1, 1, 1, 12), (1006, 7, 1, 1, 12), (1007, 3, 1, 1, 22), (1008, 8, 1, 1, 22), (1009, 9, 1, 1, 22), @@ -429,6 +439,10 @@ INSERT OR IGNORE INTO character_inventory (character_id, item_id, quantity, equi (3, 100, 1, 1), (3, 101, 1, 1), (3, 102, 1, 1), (3, 103, 1, 1), (3, 104, 1, 1), (3, 108, 1, 1), (3, 105, 1, 1), (3, 109, 1, 1), (3, 106, 1, 1), (3, 107, 1, 0); +DELETE FROM character_inventory +WHERE character_id IN (1, 2, 3) + AND item_id BETWEEN 100 AND 109; + -- Coin gearing override: every boss/difficulty drops one boss coin, and each -- craft costs the target item level in that source boss coin. UPDATE crafting_recipes @@ -452,17 +466,19 @@ WHERE id BETWEEN 1001 AND 1409 UPDATE crafting_recipes SET difficulty_id = CASE (SELECT item_level FROM items WHERE items.id = crafting_recipes.item_id) + WHEN 1 THEN 1 WHEN 5 THEN 1 WHEN 10 THEN 2 - WHEN 15 THEN 3 + WHEN 15 THEN 2 WHEN 20 THEN 4 WHEN 25 THEN 5 ELSE difficulty_id END -WHERE id BETWEEN 1001 AND 1409; +WHERE id BETWEEN 901 AND 1409; UPDATE items SET rarity = CASE item_level + WHEN 1 THEN 'common' WHEN 5 THEN 'common' WHEN 10 THEN 'uncommon' WHEN 15 THEN 'rare' @@ -476,7 +492,8 @@ UPDATE items SET name = ( SELECT CASE items.item_level - WHEN 5 THEN '' + WHEN 1 THEN 'Raw ' + WHEN 5 THEN 'Honed ' WHEN 10 THEN 'Green ' WHEN 15 THEN 'Blue ' WHEN 20 THEN 'Purple ' @@ -532,7 +549,8 @@ SELECT difficulties.dropped_item_level, encounters.slug || '-coin-ilvl-' || difficulties.dropped_item_level, CASE difficulties.dropped_item_level - WHEN 5 THEN '' + WHEN 1 THEN 'Raw ' + WHEN 5 THEN 'Honed ' WHEN 10 THEN 'Green ' WHEN 15 THEN 'Blue ' WHEN 20 THEN 'Purple ' @@ -540,6 +558,7 @@ SELECT ELSE '' END || encounters.name || ' Coin', CASE difficulties.dropped_item_level + WHEN 1 THEN 'common' WHEN 5 THEN 'common' WHEN 10 THEN 'uncommon' WHEN 15 THEN 'rare' @@ -709,7 +728,6 @@ INSERT INTO generated_loot_tiers (item_level, dungeon_id, raid_id, dungeon_difficulty_id, raid_difficulty_id, recipe_base, craft_quantity) VALUES (10, 3, 2, 2, 101, 1100, 2), - (15, 4, 5, 3, 103, 1200, 3), (20, 6, 7, 4, 104, 1300, 4), (25, 8, 9, 5, 105, 1400, 5); @@ -792,19 +810,58 @@ VALUES UPDATE difficulties SET dropped_item_level = 10, - unlock_level = 5, - health_multiplier = 1.35, - damage_multiplier = 1.2, - experience_multiplier = 1.75, + unlock_level = 10, + health_multiplier = 1.45, + damage_multiplier = 1.25, + experience_multiplier = 2.0, description = 'Veteran raid difficulty with extra monster-part drops.' WHERE id = 101; INSERT OR IGNORE INTO difficulties (id, slug, name, dropped_item_level, unlock_level, health_multiplier, damage_multiplier, experience_multiplier, description) VALUES - (103, 'raid-champion', 'Champion Raid', 15, 10, 1.7, 1.45, 2.4, 'Champion raid difficulty with extra monster-part drops.'), - (104, 'raid-mythic', 'Mythic Raid', 20, 15, 2.1, 1.75, 3.2, 'Mythic raid difficulty with extra monster-part drops.'), - (105, 'raid-ascendant', 'Ascendant Raid', 25, 20, 2.6, 2.1, 4.2, 'Ascendant raid difficulty with extra monster-part drops.'); + (103, 'raid-champion', 'Champion Raid', 15, 15, 1.7, 1.45, 2.4, 'Gear-only raid upgrade tier between Veteran and Mythic.'), + (104, 'raid-mythic', 'Mythic Raid', 20, 20, 2.25, 1.85, 3.5, 'Mythic raid difficulty with extra monster-part drops.'), + (105, 'raid-ascendant', 'Ascendant Raid', 25, 25, 2.8, 2.25, 4.5, 'Ascendant raid difficulty with extra monster-part drops.'); + +UPDATE difficulties +SET dropped_item_level = CASE id + WHEN 103 THEN 15 + WHEN 104 THEN 20 + WHEN 105 THEN 25 + ELSE dropped_item_level + END, + unlock_level = CASE id + WHEN 103 THEN 15 + WHEN 104 THEN 20 + WHEN 105 THEN 25 + ELSE unlock_level + END, + health_multiplier = CASE id + WHEN 103 THEN 1.7 + WHEN 104 THEN 2.25 + WHEN 105 THEN 2.8 + ELSE health_multiplier + END, + damage_multiplier = CASE id + WHEN 103 THEN 1.45 + WHEN 104 THEN 1.85 + WHEN 105 THEN 2.25 + ELSE damage_multiplier + END, + experience_multiplier = CASE id + WHEN 103 THEN 2.4 + WHEN 104 THEN 3.5 + WHEN 105 THEN 4.5 + ELSE experience_multiplier + END, + description = CASE id + WHEN 103 THEN 'Gear-only raid upgrade tier between Veteran and Mythic.' + WHEN 104 THEN 'Mythic raid difficulty with extra monster-part drops.' + WHEN 105 THEN 'Ascendant raid difficulty with extra monster-part drops.' + ELSE description + END +WHERE id IN (103, 104, 105); DELETE FROM dungeon_difficulties WHERE dungeon_id = 2 AND difficulty_id <> 101; @@ -1161,6 +1218,19 @@ SET slug = CASE id END WHERE id BETWEEN 860 AND 871; +DELETE FROM dungeon_difficulties; +INSERT OR IGNORE INTO dungeon_difficulties (dungeon_id, difficulty_id) VALUES + (1, 1), + (1, 2), + (1, 4), + (1, 5), + (3, 2), + (6, 4), + (8, 5), + (2, 101), + (7, 104), + (9, 105); + DELETE FROM crafting_recipe_components WHERE recipe_id BETWEEN 1001 AND 1009; INSERT OR IGNORE INTO crafting_recipe_components (recipe_id, item_id, quantity) VALUES @@ -1196,17 +1266,19 @@ WHERE id BETWEEN 1001 AND 1409 UPDATE crafting_recipes SET difficulty_id = CASE (SELECT item_level FROM items WHERE items.id = crafting_recipes.item_id) + WHEN 1 THEN 1 WHEN 5 THEN 1 WHEN 10 THEN 2 - WHEN 15 THEN 3 + WHEN 15 THEN 2 WHEN 20 THEN 4 WHEN 25 THEN 5 ELSE difficulty_id END -WHERE id BETWEEN 1001 AND 1409; +WHERE id BETWEEN 901 AND 1409; UPDATE items SET rarity = CASE item_level + WHEN 1 THEN 'common' WHEN 5 THEN 'common' WHEN 10 THEN 'uncommon' WHEN 15 THEN 'rare' @@ -1220,7 +1292,8 @@ UPDATE items SET name = ( SELECT CASE items.item_level - WHEN 5 THEN '' + WHEN 1 THEN 'Raw ' + WHEN 5 THEN 'Honed ' WHEN 10 THEN 'Green ' WHEN 15 THEN 'Blue ' WHEN 20 THEN 'Purple ' @@ -1264,7 +1337,8 @@ SELECT difficulties.dropped_item_level, encounters.slug || '-coin-ilvl-' || difficulties.dropped_item_level, CASE difficulties.dropped_item_level - WHEN 5 THEN '' + WHEN 1 THEN 'Raw ' + WHEN 5 THEN 'Honed ' WHEN 10 THEN 'Green ' WHEN 15 THEN 'Blue ' WHEN 20 THEN 'Purple ' @@ -1272,6 +1346,7 @@ SELECT ELSE '' END || encounters.name || ' Coin', CASE difficulties.dropped_item_level + WHEN 1 THEN 'common' WHEN 5 THEN 'common' WHEN 10 THEN 'uncommon' WHEN 15 THEN 'rare' diff --git a/docs/gearing-system.md b/docs/gearing-system.md index 7d41c47..99a9097 100644 --- a/docs/gearing-system.md +++ b/docs/gearing-system.md @@ -1,172 +1,139 @@ # Gearing System -## Goal +## Current Rule -Gearing should move from boss-specific multi-item drop tables to one clear currency loop: +The game uses fewer playable content tiers and more gear upgrade steps. -1. Kill bosses. -2. Earn boss coins. -3. Craft gear with those coins. -4. Upgrade that boss gear into the next item-level tier with higher-rarity coins. +Content tiers: -This keeps boss loot readable, removes low-percentage frustration, and makes every boss kill progress a targeted gear goal. +| Content Tier | Unlock Level | Purpose | +| --- | ---: | --- | +| iLvl 1 | 1 | First real gear set | +| iLvl 10 | 10 | Midgame jump | +| iLvl 20 | 20 | Endgame jump | +| iLvl 25 | 25 | Hard endgame | + +Gear tiers: + +| Gear Tier | How It Is Used | +| ---: | --- | +| 1 | Crafted from iLvl 1 content | +| 5 | Upgrade tier from iLvl 1 content coins | +| 10 | Crafted/upgraded from iLvl 10 content coins | +| 15 | Gear-only upgrade tier from iLvl 10 content coins | +| 20 | Crafted/upgraded from iLvl 20 content coins | +| 25 | Crafted/upgraded from iLvl 25 content coins | + +This keeps the dungeon/raid picker simple while still giving players steady gear goals. + +## New Characters + +New characters start with no gear equipped. + +The first goal is to clear iLvl 1 content, earn raw boss coins, and craft the first iLvl 1 set. Starter gear exists as craftable gear, not automatic inventory. ## Coin Tiers -Coins are component items. Each coin is tied to a boss source and an item-level tier. +Coins are component items. Each coin is tied to a boss and a content tier. -| Item Level | Display Color | Rarity Key | Example | -| --- | --- | --- | --- | -| 5 | White | common | Bulldrome Coin | +| Content Tier | Coin Prefix | Rarity Key | Example | +| ---: | --- | --- | --- | +| 1 | Raw | common | Raw Bulldrome Coin | | 10 | Green | uncommon | Green Bulldrome Coin | -| 15 | Blue | rare | Blue Bulldrome Coin | | 20 | Purple | epic | Purple Bulldrome Coin | | 25 | Orange | legendary | Orange Bulldrome Coin | -Implementation note: the current TypeScript rarity union supports `common`, `uncommon`, `rare`, and `epic`. Orange needs a new rarity key, recommended as `legendary`, plus UI color styling. +iLvl 5 and iLvl 15 gear do not have their own playable content tier. They use coins from the previous playable tier: + +| Gear Tier | Coin Tier Used | +| ---: | ---: | +| 1 | 1 | +| 5 | 1 | +| 10 | 10 | +| 15 | 10 | +| 20 | 20 | +| 25 | 25 | ## Boss Loot -Each boss has one loot roll. - -For now, each successful boss loot roll awards 1 to 3 coins: - -| Roll Result | Coins Awarded | -| --- | --- | -| Low roll | 1 coin | -| Normal roll | 2 coins | -| High roll | 3 coins | - -Recommended weighting: - -| Coins | Chance | -| --- | --- | -| 1 | 50% | -| 2 | 35% | -| 3 | 15% | - -The coin source comes from the defeated boss. Bulldrome drops Bulldrome coins, Rathian drops Rathian coins, and so on. - -The coin tier comes from content difficulty or roguelike depth: - -| Source | Coin Tier | -| --- | --- | -| Item level 5 content | White level 5 coins | -| Item level 10 content | Green level 10 coins | -| Item level 15 content | Blue level 15 coins | -| Item level 20 content | Purple level 20 coins | -| Item level 25 content | Orange level 25 coins | - -## Crafting Costs - -Gear is crafted with boss coins from the same boss and item-level tier. - -| Gear Item Level | Cost | -| --- | --- | -| 5 | 5 white boss coins | -| 10 | 10 green boss coins | -| 15 | 15 blue boss coins | -| 20 | 20 purple boss coins | -| 25 | 25 orange boss coins | - -Example: - -- Bulldrome item-level 5 helmet costs 5 white Bulldrome coins. -- Bulldrome item-level 10 helmet costs 10 green Bulldrome coins. -- Rathian item-level 20 gloves cost 20 purple Rathian coins. - -## Gear Upgrades - -Crafting can create gear directly, but upgrades should become the preferred long-term path. - -Upgrade rule: - -- Existing boss gear upgrades into the next item-level version of the same boss gear. -- Upgrade cost uses coins from the next tier. -- Required coin quantity equals the target item level. +Each boss drops one boss coin for the selected content tier. Examples: -| Upgrade | Cost | -| --- | --- | -| Bulldrome item level 5 gear -> Bulldrome item level 10 gear | 10 green Bulldrome coins | -| Bulldrome item level 10 gear -> Bulldrome item level 15 gear | 15 blue Bulldrome coins | -| Bulldrome item level 15 gear -> Bulldrome item level 20 gear | 20 purple Bulldrome coins | -| Bulldrome item level 20 gear -> Bulldrome item level 25 gear | 25 orange Bulldrome coins | +- Bulldrome at iLvl 1 drops Raw Bulldrome Coins. +- Tigrex at iLvl 10 drops Green Tigrex Coins. +- Barroth at iLvl 20 drops Purple Barroth Coins. +- Anjanath at iLvl 25 drops Orange Anjanath Coins. -Upgrade should consume the old item and award the upgraded item. This avoids duplicate clutter and keeps equipment identity clear. +## Crafting And Upgrades + +The first gear item in a boss/item line can be crafted directly. Higher versions should be reached through Upgrade. + +Current rule: + +- Craft iLvl 1 boss gear directly. +- Upgrade iLvl 1 -> 5 with iLvl 1 coins. +- Craft or upgrade iLvl 10 gear from iLvl 10 content. +- Upgrade iLvl 10 -> 15 with iLvl 10 coins. +- Craft or upgrade iLvl 20 gear from iLvl 20 content. +- Craft or upgrade iLvl 25 gear from iLvl 25 content. + +Upgrade consumes the old item and awards the upgraded item. This avoids duplicate clutter and keeps item identity clear. + +Examples: + +| Upgrade | Cost Source | +| --- | --- | +| Raw Bulldrome Helmet iLvl 1 -> Honed Bulldrome Helmet iLvl 5 | Raw Bulldrome Coins | +| Green Tigrex Helmet iLvl 10 -> Blue Tigrex Helmet iLvl 15 | Green Tigrex Coins | +| Purple Bulldrome Helmet iLvl 20 -> Orange Bulldrome Helmet iLvl 25 | Orange Bulldrome Coins | + +## UI Behavior + +The dungeon and raid picker only shows playable content tiers: + +```text +iLvl 1 -> iLvl 10 -> iLvl 20 -> iLvl 25 +``` + +The equipment screen still shows gear recipes for: + +```text +iLvl 1 -> iLvl 5 -> iLvl 10 -> iLvl 15 -> iLvl 20 -> iLvl 25 +``` + +Direct crafting is blocked for recipes that have a lower item-level version in the same boss/item line. Use the selected item's Upgrade button for those. ## Roguelike Loot -Roguelike bosses should award coins when defeated, using the same 1 to 3 coin roll. +Roguelike gear should follow the same tier brackets. -Roguelike coin tier should scale by wave band: +Recommended mapping: -| Waves | Coin Tier | -| --- | --- | -| 1-4 | Level 5 white coins | -| 5-9 | Level 10 green coins | -| 10-14 | Level 15 blue coins | -| 15-19 | Level 20 purple coins | -| 20+ | Level 25 orange coins | - -Boss identity can be handled two ways: - -1. Boss-based coins: use the actual boss template selected for that roguelike boss. -2. Roguelike coins: use a generic roguelike coin per tier. - -Recommended first pass: boss-based coins. It reuses the same crafting economy as dungeons and makes roguelike runs feel connected to the main gear chase. - -## Roguelike Checkpoints - -Checkpoints should unlock every 5 waves. - -| Highest Cleared Wave | Future Start Wave | -| --- | --- | -| 0-4 | 1 | -| 5-9 | 5 | +| Stage Band | Coin Tier | +| --- | ---: | +| 1-4 | 1 | +| 5-9 | 10 | | 10-14 | 10 | -| 15-19 | 15 | -| 20+ | Highest unlocked 5-wave checkpoint | +| 15-19 | 20 | +| 20+ | 25 | -Checkpoint rule: +Boss-based coins are still preferred. A roguelike boss should award coins for its actual boss template when possible. -- Unlock a checkpoint after clearing its boss band. -- Starting from a checkpoint begins at that wave band with matching coin tier. -- Runs should still record leaderboard progress from the selected start wave so full runs and checkpoint runs can be ranked separately later. +## Data Notes -Current implementation note: the roguelike screen always starts at stage 1 and only awards XP per boss. Checkpoints need saved character progress and a start-wave selector. +Authoritative gearing data lives in SQLite seed data: -## Current Code Fit +- `db/seed.sql` +- `src/offline-starter-profile.json` -The existing system already has most of the required foundation: +Run this after changing seed data: -- `items.slot = 'component'` can represent coins. -- `character_inventory.quantity` already stacks components. -- `crafting_recipes` and `crafting_recipe_components` already support coin costs. -- `encounter_loot_rolls` and `encounter_loot_roll_items` already persist retry-safe loot awards. -- `completeRoguelike` is already called after each roguelike boss kill for XP, so coin awards can attach to that same flow. +```sh +npm run db:init +npm run offline:export +``` -Needed changes: +`npm run build` already runs `offline:export`, so a production build also refreshes the offline starter profile. -- Replace current 4-component boss drop tables with one boss coin per boss per tier. -- Change boss loot roll count from multiple chance slots to one 1-3 coin roll. -- Add orange/legendary rarity support. -- Add upgrade recipes or a dedicated upgrade endpoint. -- Add roguelike boss coin awards. -- Add roguelike checkpoint persistence and start-wave selection. -- Export updated offline starter data after seed changes. - -## Suggestions - -Use guaranteed coin drops for now. One to three coins per boss gives steady progress and makes craft timing easy to understand. - -Keep coins boss-specific, not slot-specific. Slot-specific components add complexity without much decision value. - -Use upgrade-first UI. Show the next upgrade for equipped gear before showing the full crafting catalog. - -Keep direct crafting and upgrading at the same coin cost for the target tier. Direct crafting helps new slots catch up; upgrading preserves boss gear identity. - -Add a pity floor only if needed later. If boss kills always award coins, the system already has deterministic progress. - -Use one orange rarity key: `legendary`. Avoid storing display color names as rarity values; colors can change without data migration. +TrueNAS keeps its own persistent `data/game.db`. Pushing code does not merge or replace that database. The TrueNAS app applies seed/schema changes when the container starts and runs `npm run db:init`. diff --git a/docs/push-updates.md b/docs/push-updates.md new file mode 100644 index 0000000..73d9eb7 --- /dev/null +++ b/docs/push-updates.md @@ -0,0 +1,164 @@ +# Push Updates + +Use this when pushing code from the Mac to `git.whoagland.com`, then updating the TrueNAS-hosted server. + +## Rules + +- Git deploys code only. +- TrueNAS save data lives in `/mnt/usbssds/apps/iwanttoheal/data/game.db`. +- Do not commit, copy, or replace `data/game.db`. +- Do not run character reset commands unless you intentionally want a wipe. +- Restarting the TrueNAS app runs `npm ci`, `npm run db:init`, `npm run build`, and `npm start`. + +## Step 1: Build Web Locally + +```sh +cd /Users/warren/Documents/testgame/testgame +npm run build +``` + +This validates TypeScript, builds the browser app, and refreshes `src/offline-starter-profile.json`. + +## Step 2: Optional Android APK + +Only run this when building a new APK. + +```sh +set -e + +cd /Users/warren/Documents/testgame/testgame + +export JAVA_HOME="/Applications/Android Studio.app/Contents/jbr/Contents/Home" +export PATH="$JAVA_HOME/bin:$PATH" + +VERSION="1.0.27" + +CURRENT_CODE=$(grep -E 'versionCode [0-9]+' android/app/build.gradle | awk '{print $2}') +NEXT_CODE=$((CURRENT_CODE + 1)) + +perl -0pi -e "s/versionCode\s+\d+/versionCode $NEXT_CODE/" android/app/build.gradle +perl -0pi -e "s/versionName\s+\"[^\"]+\"/versionName \"$VERSION\"/" android/app/build.gradle + +VITE_API_BASE_URL="https://iwanttoheal.phenomrom.com" npm run android:sync + +cd android +./gradlew clean assembleDebug +cd .. + +cp android/app/build/outputs/apk/debug/app-debug.apk "IWantToHeal-Thor-v$VERSION.apk" +ls -lh "IWantToHeal-Thor-v$VERSION.apk" +``` + +## Step 3: Commit And Push Code + +```sh +cd /Users/warren/Documents/testgame/testgame + +git add . +git commit -m "Update game 1.0.27" +git push origin main +``` + +Check before committing: + +```sh +git status --short +``` + +Expected: source/doc/build-output changes only. Do not stage `data/game.db`. + +## Step 4: Optional Gitea Release For APK + +Only run this when Step 2 created a new APK. + +```sh +set -e + +cd /Users/warren/Documents/testgame/testgame + +export GITEA_URL="https://git.whoagland.com" +export GITEA_OWNER="phenom" +export GITEA_REPO="i-want-to-heal" +export GITEA_TOKEN="PASTE_TOKEN_HERE" + +VERSION="1.0.26" +APK="IWantToHeal-Thor-v$VERSION.apk" + +RELEASE_JSON=$(curl -sS -X POST "$GITEA_URL/api/v1/repos/$GITEA_OWNER/$GITEA_REPO/releases" \ + -H "Authorization: token $GITEA_TOKEN" \ + -H "Content-Type: application/json" \ + -d "{\"tag_name\":\"v$VERSION\",\"target_commitish\":\"main\",\"name\":\"v$VERSION\",\"body\":\"I Want to Heal Android build v$VERSION\",\"draft\":false,\"prerelease\":false}") + +RELEASE_ID=$(python3 -c 'import sys,json; data=json.load(sys.stdin); print(data.get("id") or data)' <<< "$RELEASE_JSON") + +curl -sS -X POST "$GITEA_URL/api/v1/repos/$GITEA_OWNER/$GITEA_REPO/releases/$RELEASE_ID/assets?name=$APK" \ + -H "Authorization: token $GITEA_TOKEN" \ + -F "attachment=@$APK" +``` + +## Step 5: Update TrueNAS + +```sh +cd /mnt/usbssds/apps/iwanttoheal/app +git pull +``` + +Before restarting, make a DB backup: + +```sh +cp /mnt/usbssds/apps/iwanttoheal/data/game.db \ + "/mnt/usbssds/apps/iwanttoheal/data/game-before-update-$(date +%Y%m%d-%H%M%S).db" +``` + +Then restart the `iwanttoheal` app in the TrueNAS Apps UI. + +## What Happens On Restart + +The app command runs: + +```sh +npm ci && npm run db:init && npm run build && npm start +``` + +That means: + +- dependency changes apply +- schema changes apply +- seed/static-content updates apply +- browser files rebuild +- existing accounts and characters stay in `data/game.db` + +`npm run db:init` should not wipe saves. Character wipes are separate manual reset operations. + +## Resetting TrueNAS Characters + +Only run a reset when intentionally starting everyone over. + +Resetting the Mac database does not reset TrueNAS. TrueNAS has its own persistent DB at: + +```text +/mnt/usbssds/apps/iwanttoheal/data/game.db +``` + +Back it up first, then run the reset command or reset SQL on TrueNAS. + +## If Something Looks Wrong + +Check the mounted DB path: + +```sh +ls -lh /mnt/usbssds/apps/iwanttoheal/data/game.db +``` + +Check the latest code: + +```sh +cd /mnt/usbssds/apps/iwanttoheal/app +git log --oneline -5 +``` + +Check the app API: + +```sh +curl http://127.0.0.1:4173/api/auth/session +``` diff --git a/docs/ui-mockups/dungeon-option-a.svg b/docs/ui-mockups/dungeon-option-a.svg new file mode 100644 index 0000000..6200586 --- /dev/null +++ b/docs/ui-mockups/dungeon-option-a.svg @@ -0,0 +1,60 @@ + + + + ADVENTURE + Dungeons + B Back + + Pick Dungeon + + + + AH + Ashen Halls + Level 1 • 6 Players + Selected + + + + + SC + Sunken Crypt + Level 5 • 6 Players + + + + + GM + Grove Maw + Level 10 • 6 Players + + + Pick Part + + + Part 1 + 3 fights + + + + Part 2 + Locked + + + + Part 3 + Locked + + + Pick Difficulty + + Normal + + Heroic + + Mythic L10 + + + Start + Idea A: All choices are button grids. D-pad works everywhere. No native dropdown. + diff --git a/docs/ui-mockups/dungeon-option-b.svg b/docs/ui-mockups/dungeon-option-b.svg new file mode 100644 index 0000000..b7d064b --- /dev/null +++ b/docs/ui-mockups/dungeon-option-b.svg @@ -0,0 +1,44 @@ + + + + ADVENTURE + Dungeons + LB/RB Change + + + + AH + CURRENT DUNGEON + Ashen Halls + Guide a six-player party through burning halls. + Level 1 • 6 Players • 100 XP + + Ashen Halls + Sunken Crypt + Grove Maw + + + + Setup + Part + + 1 + + 2 + + 3 + + Difficulty + + Normal + + Heroic + + + Prev + + Next + + Start + Idea B: One big focused dungeon. Shoulder buttons or side buttons cycle dungeon. + diff --git a/docs/ui-mockups/dungeon-option-c.svg b/docs/ui-mockups/dungeon-option-c.svg new file mode 100644 index 0000000..6ae150d --- /dev/null +++ b/docs/ui-mockups/dungeon-option-c.svg @@ -0,0 +1,48 @@ + + + + ADVENTURE + Mission Board + A Start + + + Available Runs + + + Ashen Halls • Part 1 + Normal • iLvl 1 • 100 XP + + + + Ashen Halls • Part 1 + Heroic • iLvl 5 • 140 XP + + + + Sunken Crypt • Part 1 + Normal • Locked Level 5 + + + + Ashen Halls • Part 2 + Normal • Locked until Part 1 clear + + + + + AH + SELECTED RUN + Ashen Halls + Part 1 • Normal + Fastest path for controller play. One list item is the exact run. + No separate dungeon, phase, or difficulty controls. + + + Health 1.00x Damage 1.00x XP 1.0x + + Start + + Loot + + Idea C: Flat mission list. Most controller-friendly, least setup flexibility on one screen. + diff --git a/docs/ui-mockups/dungeon-option-d.svg b/docs/ui-mockups/dungeon-option-d.svg new file mode 100644 index 0000000..cea54dc --- /dev/null +++ b/docs/ui-mockups/dungeon-option-d.svg @@ -0,0 +1,72 @@ + + + + ADVENTURE + Dungeons + B Back • A Select + + 1. Pick Item Level + + + 5 + Initiate + + + + 10 + Veteran + + + + 15 + Champion + + + + 20 + Mythic + + + + 25 + Level 20 + + + 2. Pick Run + + + + AH + Ashen Halls + Mythic • iLvl 20 + Part 1 unlocked + + + + + SC + Sunken Crypt + Mythic • iLvl 20 + Part 1 unlocked + + + + + GM + Grove Maw + Mythic • iLvl 20 + Locked dungeon + + + 3. Pick Part + + Part 1 + + Part 2 + + Part 3 + + Start + + Idea D: submenu flow. Pick item level first, then only compatible dungeon cards appear. + diff --git a/server/game-api.mjs b/server/game-api.mjs index ff4aab8..adcd8b7 100644 --- a/server/game-api.mjs +++ b/server/game-api.mjs @@ -363,13 +363,6 @@ function initializeCharacter(database, accountId, characterName, classId) { ;[...starterSpells, null].slice(0, 6).forEach((spellId, index) => { insertSlot.run(characterId, index + 1, spellId) }) - const insertItem = database.prepare(` - INSERT INTO character_inventory (character_id, item_id, quantity, equipped) - VALUES (?, ?, 1, ?) - `) - for (let itemId = 100; itemId <= 107; itemId += 1) { - insertItem.run(characterId, itemId, itemId === 107 ? 0 : 1) - } return characterId } @@ -1692,11 +1685,24 @@ function craftItem(database, characterId, recipeId) { crafting_recipes.item_id AS itemId, crafting_recipes.difficulty_id AS difficultyId, crafting_recipes.source_dungeon_id AS sourceDungeonId, - crafting_recipes.source_encounter_id AS sourceEncounterId + crafting_recipes.source_encounter_id AS sourceEncounterId, + items.slot, + items.item_level AS itemLevel FROM crafting_recipes + JOIN items ON items.id = crafting_recipes.item_id WHERE crafting_recipes.id = ? `).get(recipeId) if (!recipe) throw new Error('That crafting recipe does not exist.') + const lowerTierRecipe = database.prepare(` + SELECT crafting_recipes.id + FROM crafting_recipes + JOIN items ON items.id = crafting_recipes.item_id + WHERE crafting_recipes.source_encounter_id = ? + AND items.slot = ? + AND items.item_level < ? + LIMIT 1 + `).get(recipe.sourceEncounterId, recipe.slot, recipe.itemLevel) + if (lowerTierRecipe) throw new Error('Upgrade the previous item tier instead.') const components = database.prepare(` SELECT @@ -1777,8 +1783,10 @@ function upgradeItem(database, characterId, itemId) { JOIN items ON items.id = crafting_recipes.item_id WHERE crafting_recipes.source_encounter_id = ? AND items.slot = ? - AND items.item_level = ? - `).get(currentRecipe.sourceEncounterId, item.slot, item.itemLevel + 5) + AND items.item_level > ? + ORDER BY items.item_level + LIMIT 1 + `).get(currentRecipe.sourceEncounterId, item.slot, item.itemLevel) if (!targetRecipe) throw new Error('No upgrade is available for this item.') const components = database.prepare(` diff --git a/src/App.css b/src/App.css index ce7fef9..354e11a 100644 --- a/src/App.css +++ b/src/App.css @@ -1734,6 +1734,151 @@ h2 { outline-color: #a85d20; } +.run-setup-panel, +.run-summary-card { + background: var(--panel-light); + border: 2px solid #090a0d; + margin-top: 14px; + outline: 2px solid #3e3d47; + padding: 16px; +} + +.run-setup-heading { + align-items: center; + display: flex; + gap: 16px; + justify-content: space-between; +} + +.run-setup-heading h2, +.run-summary-copy h2 { + font-size: 14px; +} + +.run-setup-heading small { + color: var(--muted); + font-size: 16px; + text-align: right; +} + +.tier-grid { + display: grid; + gap: 10px; + grid-template-columns: repeat(auto-fit, minmax(145px, 1fr)); + margin-top: 14px; +} + +.tier-grid button, +.activity-card { + background: #15161c; + border: 2px solid #090a0d; + color: var(--ink); + cursor: pointer; + outline: 2px solid #41404a; +} + +.tier-grid button { + display: grid; + gap: 7px; + min-height: 70px; + padding: 11px; + text-align: left; +} + +.tier-grid button:hover:not(:disabled), +.tier-grid button.selected, +.activity-card:hover:not(:disabled), +.activity-card.selected { + outline-color: var(--gold); +} + +.tier-grid button.selected, +.activity-card.selected { + background: #29291f; + box-shadow: inset 0 0 0 2px #6e5727; +} + +.tier-grid strong, +.tier-grid span, +.activity-card strong, +.activity-card small, +.activity-card i { + display: block; +} + +.tier-grid strong, +.activity-card strong { + font-family: 'Press Start 2P', monospace; + font-size: 8px; +} + +.tier-grid span, +.activity-card small, +.activity-card i { + color: var(--muted); + font-size: 15px; + font-style: normal; +} + +.tier-grid button.locked, +.activity-card.locked { + cursor: not-allowed; + filter: grayscale(0.75); + opacity: 0.55; +} + +.activity-card-grid { + display: grid; + gap: 12px; + grid-template-columns: repeat(auto-fit, minmax(245px, 1fr)); + margin-top: 14px; +} + +.activity-card { + align-items: center; + display: grid; + gap: 8px 12px; + grid-template-columns: 72px minmax(0, 1fr); + min-height: 112px; + padding: 12px; + text-align: left; +} + +.activity-card .dungeon-art { + grid-row: span 3; + height: 68px; + width: 68px; +} + +.run-summary-card { + align-items: center; + display: grid; + gap: 18px; + grid-template-columns: 92px minmax(0, 1fr) minmax(190px, 260px); +} + +.run-summary-copy p:not(.eyebrow) { + color: var(--muted); + font-size: 18px; + margin-top: 6px; +} + +.part-picker { + display: grid; + gap: 8px; +} + +.part-picker .primary-button.selected-part { + background: #f0cb79; + outline-color: #fff; +} + +.part-picker .primary-button.locked { + cursor: not-allowed; + filter: grayscale(0.65); + opacity: 0.62; +} + .dungeon-card h2 { font-size: 16px; } @@ -4724,6 +4869,71 @@ h2 { padding: 9px 10px; } + .run-setup-panel, + .run-summary-card { + margin-top: 8px; + padding: 8px; + } + + .run-setup-heading { + align-items: flex-start; + flex-direction: column; + gap: 6px; + } + + .run-setup-heading small { + font-size: 14px; + line-height: 1.1; + text-align: left; + } + + .tier-grid { + gap: 6px; + grid-template-columns: repeat(2, minmax(0, 1fr)); + margin-top: 8px; + } + + .tier-grid button { + min-height: 52px; + padding: 8px; + } + + .activity-card-grid { + gap: 8px; + grid-template-columns: 1fr; + margin-top: 8px; + } + + .activity-card { + gap: 5px 10px; + grid-template-columns: 56px minmax(0, 1fr); + min-height: 78px; + padding: 8px; + } + + .activity-card .dungeon-art { + height: 52px; + width: 52px; + } + + .run-summary-card { + gap: 10px; + grid-template-columns: 64px minmax(0, 1fr); + } + + .run-summary-card > .dungeon-art { + height: 58px; + } + + .run-summary-copy p:not(.eyebrow) { + font-size: 15px; + line-height: 1; + } + + .part-picker { + grid-column: 1 / -1; + } + .activity-select, .part-buttons { grid-column: 1 / -1; diff --git a/src/App.tsx b/src/App.tsx index 48b8f44..ffe01dd 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -282,10 +282,32 @@ function App() { ?? dungeonOptions[0]! const raid = raidOptions.find((candidate) => candidate.id === selectedRaidId) ?? raidOptions[0] - const activity = screen === 'raids' && raid ? raid : dungeon const activityOptions = screen === 'raids' ? raidOptions : dungeonOptions + const tierOptions = activityOptions + .flatMap((option) => option.difficulties) + .filter((difficulty, index, all) => ( + all.findIndex((candidate) => candidate.droppedItemLevel === difficulty.droppedItemLevel) === index + )) + .sort((a, b) => a.droppedItemLevel - b.droppedItemLevel) + const savedDifficulty = profile.dungeons + .flatMap((option) => option.difficulties) + .find((candidate) => candidate.id === selectedDifficultyId) + const selectedTier = tierOptions.find((candidate) => ( + candidate.droppedItemLevel === savedDifficulty?.droppedItemLevel + && profile.character.level >= candidate.unlockLevel + )) + ?? tierOptions.slice().reverse().find((candidate) => profile.character.level >= candidate.unlockLevel) + ?? tierOptions[0] + const selectedTierItemLevel = selectedTier?.droppedItemLevel ?? 0 + const tierActivityOptions = activityOptions.filter((option) => + option.difficulties.some((difficulty) => difficulty.droppedItemLevel === selectedTierItemLevel), + ) + const selectedActivityId = screen === 'raids' && raid ? raid.id : dungeon.id + const activity = tierActivityOptions.find((candidate) => candidate.id === selectedActivityId) + ?? tierActivityOptions[0] + ?? (screen === 'raids' && raid ? raid : dungeon) const selectedDifficulty = activity.difficulties.find( - (candidate) => candidate.id === selectedDifficultyId, + (candidate) => candidate.droppedItemLevel === selectedTierItemLevel, ) ?? activity.difficulties[0] const difficultyLocked = profile.character.level < selectedDifficulty.unlockLevel const completedSections = activity.contentType === 'raid' @@ -570,44 +592,108 @@ function App() { title={activity.contentType === 'raid' ? 'Raids' : 'Dungeons'} onBack={() => setScreen('menu')} /> -
+
+
+
+

Step 1

+

Item Level

+
+ {screen === 'raids' ? 'Raid' : 'Dungeon'} tiers unlock by character level. +
+
+ {tierOptions.map((difficulty) => { + const locked = profile.character.level < difficulty.unlockLevel + const selected = difficulty.droppedItemLevel === selectedDifficulty.droppedItemLevel + return ( + + ) + })} +
+
+ +
+
+
+

Step 2

+

{screen === 'raids' ? 'Pick Raid' : 'Pick Dungeon'}

+
+ {selectedDifficulty.name} rewards iLvl {selectedDifficulty.droppedItemLevel} components. +
+
+ {tierActivityOptions.map((candidate) => { + const difficulty = candidate.difficulties.find( + (option) => option.droppedItemLevel === selectedDifficulty.droppedItemLevel, + ) ?? candidate.difficulties[0] + const locked = profile.character.level < difficulty.unlockLevel + const selected = candidate.id === activity.id + return ( + + ) + })} +
+
+ +
{activityInitials(activity.name)}
-
-

{activity.locationName}

+
+

Step 3

{activity.name}

{activity.description}

Level {activity.recommendedLevel} {activity.partySize} Players {selectedDifficulty.name} - Component Level {selectedDifficulty.droppedItemLevel} + iLvl {selectedDifficulty.droppedItemLevel} {Math.round(activity.experienceReward * selectedDifficulty.experienceMultiplier)} XP
- {activityOptions.length > 1 && ( - - )} -
+
{parts.map((p) => (
-
-
-

Challenge Tier

-

Difficulty

-
- -
{selectedDifficulty.name} diff --git a/src/components/CombatScreen.tsx b/src/components/CombatScreen.tsx index 68490f6..08d9cb7 100644 --- a/src/components/CombatScreen.tsx +++ b/src/components/CombatScreen.tsx @@ -35,6 +35,7 @@ import { } from '../dualScreen' const TICK_MS = 700 +const TARGET_RENDER_THROTTLE_MS = 180 type RoguelikeMode = 'dungeon' | 'raid' type RoguelikeUpgradeTiming = 'boss' | 'encounter' @@ -73,6 +74,16 @@ type FloatingCombatText = { value: number } +type SinglePlayerCombatState = { + party: PartyMember[] + resource: number + enemyHealth: number + cooldowns: Record + elapsedTicks: number + castsTowardFree: number + freeCastReady: boolean +} + const ROGUELIKE_MECHANICS: RoguelikeMechanic[] = [ 'party-pulse', 'searing-mark', @@ -340,13 +351,18 @@ export function CombatScreen({ const sectionName = isRoguelike ? 'Stage' : dungeon.contentType === 'raid' ? 'Phase' : 'Part' const contentName = isRoguelike ? 'Roguelike' : dungeon.contentType === 'raid' ? 'Raid' : 'Dungeon' const initialEncounterIndex = (startPart - 1) * 3 - const [party, setParty] = useState(partyTemplate) + const initialCombatState = useMemo(() => ({ + party: partyTemplate, + resource: maxResource, + enemyHealth: encounters[initialEncounterIndex].maxHealth, + cooldowns: {}, + elapsedTicks: 0, + castsTowardFree: 0, + freeCastReady: false, + }), [encounters, initialEncounterIndex, maxResource, partyTemplate]) + const [combatState, setCombatState] = useState(() => initialCombatState) const [selectedId, setSelectedId] = useState(partyTemplate[0].id) - const [resource, setResource] = useState(maxResource) const [encounterIndex, setEncounterIndex] = useState(initialEncounterIndex) - const [enemyHealth, setEnemyHealth] = useState(encounters[initialEncounterIndex].maxHealth) - const [cooldowns, setCooldowns] = useState>({}) - const [, setElapsedTicks] = useState(0) const [status, setStatus] = useState<'playing' | 'won' | 'lost' | 'part-complete' | 'upgrade-choice'>('playing') const [paused, setPaused] = useState(false) const [targetGroup, setTargetGroup] = useState<0 | 1 | 2>(0) @@ -360,8 +376,6 @@ export function CombatScreen({ const [floatingTexts, setFloatingTexts] = useState([]) const [roguelikeUpgrades, setRoguelikeUpgrades] = useState([]) const [upgradeChoices, setUpgradeChoices] = useState([]) - const [, setCastsTowardFree] = useState(0) - const [freeCastReady, setFreeCastReady] = useState(false) const rewardClaimedRef = useRef(false) const profileRefreshedRef = useRef(false) const rolledEncounterIdsRef = useRef(new Set()) @@ -371,10 +385,11 @@ export function CombatScreen({ const partStartTimesRef = useRef>({}) const nextLogId = useRef(2) const nextFloatingTextId = useRef(1) - const partyRef = useRef(partyTemplate) - const enemyHealthRef = useRef(encounters[initialEncounterIndex].maxHealth) - const elapsedTicksRef = useRef(0) + const combatRef = useRef(initialCombatState) const selectedIdRef = useRef(partyTemplate[0].id) + const selectedRenderTimeoutRef = useRef(null) + const lastSelectedRenderAtRef = useRef(0) + const { party, resource, enemyHealth, cooldowns, freeCastReady } = combatState const encounter = encounters[encounterIndex] const currentPart = getCurrentPart(encounterIndex) const firstEncounterIndex = (startPart - 1) * 3 @@ -416,9 +431,38 @@ export function CombatScreen({ }) }, [paused]) + const setCombat = useCallback(( + nextState: SinglePlayerCombatState | ((current: SinglePlayerCombatState) => SinglePlayerCombatState), + ) => { + const next = typeof nextState === 'function' + ? nextState(combatRef.current) + : nextState + combatRef.current = next + setCombatState(next) + }, []) + const setSelectedTargetId = useCallback((id: string) => { + if (selectedIdRef.current === id) return selectedIdRef.current = id - setSelectedId(id) + const now = performance.now() + const elapsed = now - lastSelectedRenderAtRef.current + if (elapsed >= TARGET_RENDER_THROTTLE_MS) { + lastSelectedRenderAtRef.current = now + setSelectedId(id) + return + } + if (selectedRenderTimeoutRef.current !== null) return + selectedRenderTimeoutRef.current = window.setTimeout(() => { + selectedRenderTimeoutRef.current = null + lastSelectedRenderAtRef.current = performance.now() + setSelectedId(selectedIdRef.current) + }, TARGET_RENDER_THROTTLE_MS - elapsed) + }, []) + + useEffect(() => () => { + if (selectedRenderTimeoutRef.current !== null) { + window.clearTimeout(selectedRenderTimeoutRef.current) + } }, []) const addLog = useCallback((text: string, tone: CombatLogEntry['tone']) => { @@ -468,18 +512,19 @@ export function CombatScreen({ : [] const nextEncounters = roguelikeMode ? nextRoguelikeEncounters : staticEncounters const freshParty = partyTemplate.map((member) => ({ ...member })) - partyRef.current = freshParty - enemyHealthRef.current = nextEncounters[initialEncounterIndex].maxHealth + setCombat({ + party: freshParty, + resource: maxResource, + enemyHealth: nextEncounters[initialEncounterIndex].maxHealth, + cooldowns: {}, + elapsedTicks: 0, + castsTowardFree: 0, + freeCastReady: false, + }) if (roguelikeMode) setRoguelikeEncounters(nextRoguelikeEncounters) setRoguelikeStage(1) - setParty(freshParty) setSelectedTargetId(partyTemplate[0].id) - setResource(maxResource) setEncounterIndex(initialEncounterIndex) - setEnemyHealth(nextEncounters[initialEncounterIndex].maxHealth) - setCooldowns({}) - elapsedTicksRef.current = 0 - setElapsedTicks(0) setStatus('playing') setPaused(false) setTargetGroup(0) @@ -490,8 +535,6 @@ export function CombatScreen({ setFloatingTexts([]) setRoguelikeUpgrades([]) setUpgradeChoices([]) - setCastsTowardFree(0) - setFreeCastReady(false) rewardClaimedRef.current = false profileRefreshedRef.current = false rolledEncounterIdsRef.current = new Set() @@ -500,18 +543,19 @@ export function CombatScreen({ runStartedAtRef.current = Date.now() partStartTimesRef.current = { [startPart]: runStartedAtRef.current } setLog([{ id: nextLogId.current++, text: 'A new run begins.', tone: 'system' }]) - }, [difficulty, initialEncounterIndex, maxResource, partyTemplate, roguelikeMode, roguelikePool, setSelectedTargetId, startPart, staticEncounters]) + }, [difficulty, initialEncounterIndex, maxResource, partyTemplate, roguelikeMode, roguelikePool, setCombat, setSelectedTargetId, startPart, staticEncounters]) const castSpell = useCallback( (spell: Spell) => { - const effectiveCost = spellResourceCost(spell, roguelikeUpgrades, freeCastReady) - if (status !== 'playing' || cooldowns[spell.id] > 0 || resource < effectiveCost) return - const healer = partyRef.current.find((member) => member.id === 'mira') + const current = combatRef.current + const effectiveCost = spellResourceCost(spell, roguelikeUpgrades, current.freeCastReady) + if (status !== 'playing' || current.cooldowns[spell.id] > 0 || current.resource < effectiveCost) return + const healer = current.party.find((member) => member.id === 'mira') if (!healer || healer.health <= 0) return const targetId = selectedIdRef.current - const selected = partyRef.current.find((member) => member.id === targetId) + const selected = current.party.find((member) => member.id === targetId) if (!selected || selected.health <= 0) return - const extraTarget = (blockedIds: string[]) => partyRef.current + const extraTarget = (blockedIds: string[]) => current.party .filter((member) => member.health > 0 && !blockedIds.includes(member.id)) .sort((left, right) => (left.health / left.maxHealth) - (right.health / right.maxHealth))[0] const directTargets = new Set([targetId]) @@ -547,28 +591,7 @@ export function CombatScreen({ if (extra) directTargets.add(extra.id) } - setResource((value) => value - effectiveCost) - resourceSpentRef.current += effectiveCost - setCooldowns((current) => ({ - ...current, - [spell.id]: spell.cooldown * cooldownMultiplier(spell, roguelikeUpgrades), - })) - if (upgradeStackCount(roguelikeUpgrades, 'fifth-cast-free') > 0) { - if (freeCastReady) { - setFreeCastReady(false) - setCastsTowardFree(0) - } else { - setCastsTowardFree((current) => { - const next = current + 1 - if (next >= 5) { - setFreeCastReady(true) - return 0 - } - return next - }) - } - } - const nextParty = partyRef.current.map((member) => { + const nextParty = current.party.map((member) => { if (member.health <= 0) return member if (spell.kind === 'group') { const power = Math.round(spell.power * (1.25 ** upgradeStackCount(roguelikeUpgrades, 'group-heal-boost'))) @@ -602,11 +625,35 @@ export function CombatScreen({ hotTicks: hotTargets.has(member.id) ? 5 : member.hotTicks, } }) - partyRef.current = nextParty - setParty(nextParty) + const freeCastStacks = upgradeStackCount(roguelikeUpgrades, 'fifth-cast-free') + const nextFreeCastReady = freeCastStacks > 0 && current.freeCastReady + ? false + : current.freeCastReady + const nextCastsTowardFree = freeCastStacks > 0 + ? current.freeCastReady + ? 0 + : current.castsTowardFree + 1 >= 5 + ? 0 + : current.castsTowardFree + 1 + : current.castsTowardFree + const gainedFreeCast = freeCastStacks > 0 + && !current.freeCastReady + && current.castsTowardFree + 1 >= 5 + resourceSpentRef.current += effectiveCost + setCombat({ + ...current, + party: nextParty, + resource: current.resource - effectiveCost, + cooldowns: { + ...current.cooldowns, + [spell.id]: spell.cooldown * cooldownMultiplier(spell, roguelikeUpgrades), + }, + castsTowardFree: nextCastsTowardFree, + freeCastReady: gainedFreeCast || nextFreeCastReady, + }) addLog(`${spell.name} cast on ${spell.kind === 'group' ? 'the party' : selected.name}${effectiveCost === 0 ? ' for free' : ''}.`, 'heal') }, - [activeSetEffects, addFloatingHeal, addLog, cooldowns, freeCastReady, resource, roguelikeUpgrades, status], + [activeSetEffects, addFloatingHeal, addLog, roguelikeUpgrades, setCombat, status], ) const finishRun = useCallback( @@ -669,7 +716,7 @@ export function CombatScreen({ ) const selectRelativeTarget = useCallback((direction: -1 | 1) => { - const living = partyRef.current.filter((member) => member.health > 0) + const living = combatRef.current.party.filter((member) => member.health > 0) if (living.length === 0) return const currentIndex = living.findIndex((member) => member.id === selectedIdRef.current) const nextIndex = currentIndex < 0 @@ -680,14 +727,14 @@ export function CombatScreen({ const selectDirectionalTarget = useCallback((action: InputAction) => { const columns = dungeon.partySize >= 10 ? 6 : 3 - const currentIndex = partyRef.current.findIndex((member) => member.id === selectedIdRef.current) + const currentIndex = combatRef.current.party.findIndex((member) => member.id === selectedIdRef.current) if (currentIndex < 0) { - setSelectedTargetId(partyRef.current[0].id) + setSelectedTargetId(combatRef.current.party[0].id) return } const currentRow = Math.floor(currentIndex / columns) const currentColumn = currentIndex % columns - const candidates = partyRef.current + const candidates = combatRef.current.party .map((member, index) => ({ member, index, @@ -721,14 +768,15 @@ export function CombatScreen({ const selectDirectTarget = useCallback((slot: number) => { const index = slot + (dungeon.partySize > 6 ? targetGroup * 6 : 0) - const member = partyRef.current[index] + const member = combatRef.current.party[index] if (member) setSelectedTargetId(member.id) }, [dungeon.partySize, setSelectedTargetId, targetGroup]) const chooseRoguelikeUpgrade = useCallback((upgrade: RoguelikeUpgrade) => { if (!roguelikeMode) return + const current = combatRef.current const clearedBoss = encounters[encounterIndex]?.isBoss ?? false - const recoveredParty = partyRef.current.map((member) => ({ + const recoveredParty = current.party.map((member) => ({ ...member, health: member.health <= 0 ? 0 @@ -747,24 +795,24 @@ export function CombatScreen({ ? nextSegment[0] : encounters[encounterIndex + 1] if (!nextEncounter) return - partyRef.current = recoveredParty - enemyHealthRef.current = nextEncounter.maxHealth setRoguelikeUpgrades((current) => [...current, upgrade]) if (clearedBoss) { setRoguelikeStage(nextStage) setRoguelikeEncounters((current) => [...current, ...nextSegment]) } - setParty(recoveredParty) setEncounterIndex((current) => current + 1) - setEnemyHealth(nextEncounter.maxHealth) - elapsedTicksRef.current = 0 - setElapsedTicks(0) - setCooldowns({}) - setResource((value) => clamp(value + Math.round(maxResource * 0.25), 0, maxResource)) + setCombat({ + ...current, + party: recoveredParty, + enemyHealth: nextEncounter.maxHealth, + elapsedTicks: 0, + cooldowns: {}, + resource: clamp(current.resource + Math.round(maxResource * 0.25), 0, maxResource), + }) setUpgradeChoices([]) setStatus('playing') addLog(`${upgrade.name} gained. ${nextEncounter.enemyName} approaches.`, 'system') - }, [addLog, difficulty, encounterIndex, encounters, maxResource, roguelikeMode, roguelikePool, roguelikeStage]) + }, [addLog, difficulty, encounterIndex, encounters, maxResource, roguelikeMode, roguelikePool, roguelikeStage, setCombat]) useGameAction((action, device) => { if (action === 'pause' || (action === 'back' && device === 'pc')) { @@ -783,10 +831,10 @@ export function CombatScreen({ if (action === 'toggleTargetGroup') { if (dungeon.partySize <= 6) return setTargetGroup((current) => { - const groupCount = Math.max(1, Math.ceil(partyRef.current.length / 6)) + const groupCount = Math.max(1, Math.ceil(combatRef.current.party.length / 6)) const next = ((current + 1) % groupCount) as 0 | 1 | 2 - const selectedIndex = partyRef.current.findIndex((member) => member.id === selectedIdRef.current) - const nextMember = partyRef.current[(selectedIndex < 0 ? 0 : selectedIndex % 6) + next * 6] + const selectedIndex = combatRef.current.party.findIndex((member) => member.id === selectedIdRef.current) + const nextMember = combatRef.current.party[(selectedIndex < 0 ? 0 : selectedIndex % 6) + next * 6] if (nextMember) setSelectedTargetId(nextMember.id) return next }) @@ -809,20 +857,17 @@ export function CombatScreen({ useEffect(() => { if (status !== 'playing' || paused) return const timer = window.setInterval(() => { - const nextElapsedTicks = elapsedTicksRef.current + 1 - elapsedTicksRef.current = nextElapsedTicks - setElapsedTicks(nextElapsedTicks) - setResource((value) => clamp(value + 2.4, 0, maxResource)) - setCooldowns((current) => - Object.fromEntries( - Object.entries(current).map(([id, seconds]) => [ - id, - Math.max(0, seconds - TICK_MS / 1000), - ]), - ), + const current = combatRef.current + const nextElapsedTicks = current.elapsedTicks + 1 + const nextCooldowns = Object.fromEntries( + Object.entries(current.cooldowns).map(([id, seconds]) => [ + id, + Math.max(0, seconds - TICK_MS / 1000), + ]), ) + let nextResource = clamp(current.resource + 2.4, 0, maxResource) - const living = partyRef.current.filter((member) => member.health > 0) + const living = current.party.filter((member) => member.health > 0) if (living.length === 0) { if (isRoguelike) finishRoguelikeRun(encounterIndex) setStatus('lost') @@ -854,12 +899,12 @@ export function CombatScreen({ if (appliesHealingReduction) addLog(`${primaryTarget.name} receives reduced healing.`, 'danger') if (tankBuster) addLog(`${encounter.enemyName} crushes the tanks.`, 'danger') if (resourceDrain) { - setResource((value) => clamp(value - 8, 0, maxResource)) + nextResource = clamp(nextResource - 8, 0, maxResource) addLog(`${encounter.enemyName} drains ${gameClass.resourceName}.`, 'danger') } - const healerBeforeDamage = partyRef.current.find((member) => member.id === 'mira') - const nextParty = partyRef.current.map((member) => { + const healerBeforeDamage = current.party.find((member) => member.id === 'mira') + const nextParty = current.party.map((member) => { if (member.health <= 0) return member let damage = member.id === primaryTarget.id ? encounter.damage : 0 if (member.role === 'Tank') damage += encounter.tankDamage @@ -898,8 +943,6 @@ export function CombatScreen({ } }) const healerAfterDamage = nextParty.find((member) => member.id === 'mira') - partyRef.current = nextParty - setParty(nextParty) if ( healerBeforeDamage @@ -911,16 +954,30 @@ export function CombatScreen({ } if (nextParty.every((member) => member.health <= 0)) { + setCombat({ + ...current, + party: nextParty, + resource: nextResource, + cooldowns: nextCooldowns, + elapsedTicks: nextElapsedTicks, + enemyHealth: current.enemyHealth, + }) if (isRoguelike) finishRoguelikeRun(encounterIndex) setStatus('lost') addLog('The party has fallen.', 'danger') return } - const nextEnemyHealth = enemyHealthRef.current - encounter.partyDamage + const nextEnemyHealth = current.enemyHealth - encounter.partyDamage if (nextEnemyHealth > 0) { - enemyHealthRef.current = nextEnemyHealth - setEnemyHealth(nextEnemyHealth) + setCombat({ + ...current, + party: nextParty, + resource: nextResource, + cooldowns: nextCooldowns, + elapsedTicks: nextElapsedTicks, + enemyHealth: nextEnemyHealth, + }) return } @@ -929,8 +986,14 @@ export function CombatScreen({ } if (isRoguelike && (upgradesEveryEncounter || encounter.isBoss)) { - enemyHealthRef.current = 0 - setEnemyHealth(0) + setCombat({ + ...current, + party: nextParty, + resource: nextResource, + cooldowns: nextCooldowns, + elapsedTicks: nextElapsedTicks, + enemyHealth: 0, + }) setUpgradeChoices(chooseRandom(roguelikeUpgradeCatalog, 3)) setStatus('upgrade-choice') addLog(`${encounter.enemyName} defeated. Choose an upgrade.`, 'loot') @@ -938,16 +1001,28 @@ export function CombatScreen({ } if (isPartBoss && !isFinalBoss) { - enemyHealthRef.current = 0 - setEnemyHealth(0) + setCombat({ + ...current, + party: nextParty, + resource: nextResource, + cooldowns: nextCooldowns, + elapsedTicks: nextElapsedTicks, + enemyHealth: 0, + }) setStatus('part-complete') addLog(`${encounter.enemyName} is defeated.`, 'loot') return } if (encounterIndex === encounters.length - 1) { - enemyHealthRef.current = 0 - setEnemyHealth(0) + setCombat({ + ...current, + party: nextParty, + resource: nextResource, + cooldowns: nextCooldowns, + elapsedTicks: nextElapsedTicks, + enemyHealth: 0, + }) finishRun(currentPart, startPart) addLog(`${encounter.enemyName} is defeated. Rolling its loot table.`, 'loot') return @@ -965,13 +1040,15 @@ export function CombatScreen({ maxHealthPenaltyTicks: undefined, healingReductionTicks: undefined, })) - partyRef.current = recoveredParty - enemyHealthRef.current = nextEncounter.maxHealth - setParty(recoveredParty) setEncounterIndex((value) => value + 1) - setEnemyHealth(nextEncounter.maxHealth) - elapsedTicksRef.current = 0 - setElapsedTicks(0) + setCombat({ + ...current, + party: recoveredParty, + resource: nextResource, + cooldowns: nextCooldowns, + elapsedTicks: 0, + enemyHealth: nextEncounter.maxHealth, + }) addLog(`${encounter.enemyName} defeated. ${nextEncounter.enemyName} approaches.`, 'system') }, TICK_MS) return () => window.clearInterval(timer) @@ -994,6 +1071,7 @@ export function CombatScreen({ gameClass.resourceName, requestLootRoll, profile.character.name, + setCombat, startPart, status, currentPart, @@ -1398,19 +1476,20 @@ export function CombatScreen({ const nextIndex = encounterIndex + 1 partStartTimesRef.current[currentPart + 1] = Date.now() const nextEncounter = encounters[nextIndex] - const recoveredParty = partyRef.current.map((member) => ({ + const current = combatRef.current + const recoveredParty = current.party.map((member) => ({ ...member, health: clamp(member.health + 35, 0, member.maxHealth), debuff: undefined, debuffTicks: undefined, })) - partyRef.current = recoveredParty - enemyHealthRef.current = nextEncounter.maxHealth - setParty(recoveredParty) setEncounterIndex(nextIndex) - setEnemyHealth(nextEncounter.maxHealth) - elapsedTicksRef.current = 0 - setElapsedTicks(0) + setCombat({ + ...current, + party: recoveredParty, + enemyHealth: nextEncounter.maxHealth, + elapsedTicks: 0, + }) setStatus('playing') addLog(`Proceeding to ${sectionName} ${currentPart + 1}. ${nextEncounter.enemyName} approaches.`, 'system') }} diff --git a/src/components/EquipmentScreen.tsx b/src/components/EquipmentScreen.tsx index 60f8913..d726775 100644 --- a/src/components/EquipmentScreen.tsx +++ b/src/components/EquipmentScreen.tsx @@ -61,15 +61,24 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false } firstRecipe?.id ?? null, ) const selectedRecipe = profile.craftingRecipes.find((recipe) => recipe.id === selectedRecipeId) + const selectedRecipeRequiresUpgrade = selectedRecipe + ? profile.craftingRecipes.some((recipe) => + recipe.sourceEncounterId === selectedRecipe.sourceEncounterId + && recipe.item.slot === selectedRecipe.item.slot + && recipe.item.itemLevel < selectedRecipe.item.itemLevel, + ) + : false const selectedItemRecipe = selectedItem ? profile.craftingRecipes.find((recipe) => recipe.item.id === selectedItem.id) : undefined const upgradeRecipe = selectedItem && selectedItemRecipe - ? profile.craftingRecipes.find((recipe) => - recipe.sourceEncounterId === selectedItemRecipe.sourceEncounterId - && recipe.item.slot === selectedItem.slot - && recipe.item.itemLevel === selectedItem.itemLevel + 5, - ) + ? profile.craftingRecipes + .filter((recipe) => + recipe.sourceEncounterId === selectedItemRecipe.sourceEncounterId + && recipe.item.slot === selectedItem.slot + && recipe.item.itemLevel > selectedItem.itemLevel, + ) + .sort((left, right) => left.item.itemLevel - right.item.itemLevel)[0] : undefined const equippedBySlot = useMemo( () => new Map( @@ -503,11 +512,11 @@ export function EquipmentScreen({ profile, onBack, onUpdated, embedded = false }
)} diff --git a/src/gameRepository.ts b/src/gameRepository.ts index 2e924aa..422cecf 100644 --- a/src/gameRepository.ts +++ b/src/gameRepository.ts @@ -760,8 +760,7 @@ function emptyCharacterData(classId: number): CharacterData { const gc = static_.classes.find((c) => c.id === classId)! const talentRanks: Record = {} for (const t of gc.talents) talentRanks[String(t.id)] = 0 - const starterItemIds = [100, 101, 102, 103, 104, 105, 106, 107, 108, 109] - const inventory: Item[] = static_.inventory.filter((i) => starterItemIds.includes(i.id)).map((i) => ({ ...i })) + const inventory: Item[] = [] const startingAbilitySlots: Array = gc.spells .filter((s) => s.unlockLevel === 1) .slice(0, 5) @@ -1164,6 +1163,12 @@ function createLocalRepository(store: LocalSaveStore): GameRepository { const profile = buildProfile(save) const recipe = profile.craftingRecipes.find((candidate) => candidate.id === recipeId) if (!recipe) throw new Error('That crafting recipe does not exist.') + const requiresUpgrade = profile.craftingRecipes.some((candidate) => + candidate.sourceEncounterId === recipe.sourceEncounterId + && candidate.item.slot === recipe.item.slot + && candidate.item.itemLevel < recipe.item.itemLevel, + ) + if (requiresUpgrade) throw new Error('Upgrade the previous item tier instead.') const missing = recipe.components.find((component) => component.owned < component.quantity) if (missing) { throw new Error(`Need ${missing.quantity} ${missing.item.name} to craft this item.`) @@ -1191,11 +1196,13 @@ function createLocalRepository(store: LocalSaveStore): GameRepository { if (item.slot === 'component') throw new Error('Components cannot be upgraded.') const currentRecipe = profile.craftingRecipes.find((recipe) => recipe.item.id === item.id) const targetRecipe = currentRecipe - ? profile.craftingRecipes.find((recipe) => - recipe.sourceEncounterId === currentRecipe.sourceEncounterId - && recipe.item.slot === item.slot - && recipe.item.itemLevel === item.itemLevel + 5, - ) + ? profile.craftingRecipes + .filter((recipe) => + recipe.sourceEncounterId === currentRecipe.sourceEncounterId + && recipe.item.slot === item.slot + && recipe.item.itemLevel > item.itemLevel, + ) + .sort((left, right) => left.item.itemLevel - right.item.itemLevel)[0] : null if (!targetRecipe) throw new Error('No upgrade is available for this item.') const missing = targetRecipe.components.find((component) => component.owned < component.quantity) diff --git a/src/input.tsx b/src/input.tsx index c65cb03..61351f0 100644 --- a/src/input.tsx +++ b/src/input.tsx @@ -121,6 +121,7 @@ const STORAGE_KEY = 'ashen-halls-input-bindings-v1' const PREFERENCES_STORAGE_KEY = 'ashen-halls-input-preferences-v1' const GAME_ACTION_EVENT = 'ashen-halls-game-action' const NATIVE_CONTROLLER_EVENT = 'ashen-halls-native-controller' +const COMBAT_TARGET_NAVIGATION_THROTTLE_MS = 220 type CaptureState = { device: InputDevice @@ -446,7 +447,7 @@ export function InputProvider({ children }: { children: ReactNode }) { const combatActive = Boolean(document.querySelector('[data-combat-active="true"]')) if (combatActive && !uiOverlay && isCombatTargetAction(action)) { const now = performance.now() - if (now - lastCombatNavigationRef.current < 125) return + if (now - lastCombatNavigationRef.current < COMBAT_TARGET_NAVIGATION_THROTTLE_MS) return lastCombatNavigationRef.current = now } diff --git a/src/offline-starter-profile.json b/src/offline-starter-profile.json index 5ec34fe..7fd4f5f 100644 --- a/src/offline-starter-profile.json +++ b/src/offline-starter-profile.json @@ -812,182 +812,11 @@ "necklace", "trinket" ], - "inventory": [ - { - "id": 104, - "slug": "novice-slippers", - "name": "Novice Slippers", - "slot": "boots", - "rarity": "common", - "itemLevel": 1, - "healingPower": 0, - "maxResourceBonus": 1, - "glyph": "b", - "description": "Comfortable enough for a first expedition.", - "setId": null, - "setSlug": null, - "setName": null, - "quantity": 1, - "equipped": true - }, - { - "id": 102, - "slug": "novice-vestment", - "name": "Novice Vestment", - "slot": "chest", - "rarity": "common", - "itemLevel": 1, - "healingPower": 1, - "maxResourceBonus": 0, - "glyph": "C", - "description": "Unadorned robes issued to apprentice healers.", - "setId": null, - "setSlug": null, - "setName": null, - "quantity": 1, - "equipped": true - }, - { - "id": 103, - "slug": "novice-wraps", - "name": "Novice Wraps", - "slot": "gloves", - "rarity": "common", - "itemLevel": 1, - "healingPower": 1, - "maxResourceBonus": 0, - "glyph": "g", - "description": "Soft wraps that leave the fingers free for spellwork.", - "setId": null, - "setSlug": null, - "setName": null, - "quantity": 1, - "equipped": true - }, - { - "id": 101, - "slug": "novice-cowl", - "name": "Novice Cowl", - "slot": "helmet", - "rarity": "common", - "itemLevel": 1, - "healingPower": 0, - "maxResourceBonus": 1, - "glyph": "^", - "description": "Plain cloth that helps steady a beginner's thoughts.", - "setId": null, - "setSlug": null, - "setName": null, - "quantity": 1, - "equipped": true - }, - { - "id": 109, - "slug": "novice-pendant", - "name": "Novice Pendant", - "slot": "necklace", - "rarity": "common", - "itemLevel": 1, - "healingPower": 1, - "maxResourceBonus": 0, - "glyph": "n", - "description": "A simple charm worn by apprentice healers.", - "setId": null, - "setSlug": null, - "setName": null, - "quantity": 1, - "equipped": true - }, - { - "id": 108, - "slug": "novice-trousers", - "name": "Novice Trousers", - "slot": "pants", - "rarity": "common", - "itemLevel": 1, - "healingPower": 0, - "maxResourceBonus": 1, - "glyph": "P", - "description": "Plain trousers for a first expedition.", - "setId": null, - "setSlug": null, - "setName": null, - "quantity": 1, - "equipped": true - }, - { - "id": 105, - "slug": "novice-band", - "name": "Novice Band", - "slot": "ring", - "rarity": "common", - "itemLevel": 1, - "healingPower": 0, - "maxResourceBonus": 1, - "glyph": "o", - "description": "A copper band etched with a minor restorative rune.", - "setId": null, - "setSlug": null, - "setName": null, - "quantity": 1, - "equipped": true - }, - { - "id": 106, - "slug": "novice-token", - "name": "Novice Token", - "slot": "trinket", - "rarity": "common", - "itemLevel": 1, - "healingPower": 1, - "maxResourceBonus": 0, - "glyph": "*", - "description": "A small charm commemorating the healer's oath.", - "setId": null, - "setSlug": null, - "setName": null, - "quantity": 1, - "equipped": true - }, - { - "id": 100, - "slug": "novice-crook", - "name": "Novice Crook", - "slot": "weapon", - "rarity": "common", - "itemLevel": 1, - "healingPower": 1, - "maxResourceBonus": 0, - "glyph": "/", - "description": "A simple focus carried by every new healer.", - "setId": null, - "setSlug": null, - "setName": null, - "quantity": 1, - "equipped": true - }, - { - "id": 107, - "slug": "novice-wand", - "name": "Novice Wand", - "slot": "weapon", - "rarity": "common", - "itemLevel": 1, - "healingPower": 0, - "maxResourceBonus": 2, - "glyph": "!", - "description": "A spare focus that favors a deeper resource pool.", - "setId": null, - "setSlug": null, - "setName": null, - "quantity": 1, - "equipped": false - } - ], + "inventory": [], "gearStats": { - "averageItemLevel": 1, - "healingPower": 5, - "maxResourceBonus": 4 + "averageItemLevel": 0, + "healingPower": 0, + "maxResourceBonus": 0 }, "setBonuses": [ { @@ -1022,6 +851,366 @@ } ], "craftingRecipes": [ + { + "id": 904, + "difficultyId": 1, + "sourceDungeonId": 1, + "sourceEncounterId": 12, + "item": { + "id": 104, + "slug": "novice-slippers", + "name": "Raw Yian Kut-Ku Boots", + "slot": "boots", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 1, + "glyph": "b", + "description": "Crafted with Yian Kut-Ku coins.", + "setId": null, + "setSlug": null, + "setName": null + }, + "components": [ + { + "item": { + "id": 281201, + "slug": "yian-kut-ku-coin-ilvl-1", + "name": "Raw Yian Kut-Ku Coin", + "slot": "component", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 0, + "glyph": "$", + "description": "A boss coin from Yian Kut-Ku used for item level 1 crafting." + }, + "quantity": 1, + "owned": 0 + } + ], + "canCraft": false + }, + { + "id": 902, + "difficultyId": 1, + "sourceDungeonId": 1, + "sourceEncounterId": 3, + "item": { + "id": 102, + "slug": "novice-vestment", + "name": "Raw Bulldrome Chest", + "slot": "chest", + "rarity": "common", + "itemLevel": 1, + "healingPower": 1, + "maxResourceBonus": 0, + "glyph": "C", + "description": "Crafted with Bulldrome coins.", + "setId": null, + "setSlug": null, + "setName": null + }, + "components": [ + { + "item": { + "id": 280301, + "slug": "bulldrome-coin-ilvl-1", + "name": "Raw Bulldrome Coin", + "slot": "component", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 0, + "glyph": "$", + "description": "A boss coin from Bulldrome used for item level 1 crafting." + }, + "quantity": 1, + "owned": 0 + } + ], + "canCraft": false + }, + { + "id": 903, + "difficultyId": 1, + "sourceDungeonId": 1, + "sourceEncounterId": 3, + "item": { + "id": 103, + "slug": "novice-wraps", + "name": "Raw Bulldrome Gloves", + "slot": "gloves", + "rarity": "common", + "itemLevel": 1, + "healingPower": 1, + "maxResourceBonus": 0, + "glyph": "g", + "description": "Crafted with Bulldrome coins.", + "setId": null, + "setSlug": null, + "setName": null + }, + "components": [ + { + "item": { + "id": 280301, + "slug": "bulldrome-coin-ilvl-1", + "name": "Raw Bulldrome Coin", + "slot": "component", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 0, + "glyph": "$", + "description": "A boss coin from Bulldrome used for item level 1 crafting." + }, + "quantity": 1, + "owned": 0 + } + ], + "canCraft": false + }, + { + "id": 901, + "difficultyId": 1, + "sourceDungeonId": 1, + "sourceEncounterId": 3, + "item": { + "id": 101, + "slug": "novice-cowl", + "name": "Raw Bulldrome Helmet", + "slot": "helmet", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 1, + "glyph": "^", + "description": "Crafted with Bulldrome coins.", + "setId": null, + "setSlug": null, + "setName": null + }, + "components": [ + { + "item": { + "id": 280301, + "slug": "bulldrome-coin-ilvl-1", + "name": "Raw Bulldrome Coin", + "slot": "component", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 0, + "glyph": "$", + "description": "A boss coin from Bulldrome used for item level 1 crafting." + }, + "quantity": 1, + "owned": 0 + } + ], + "canCraft": false + }, + { + "id": 909, + "difficultyId": 1, + "sourceDungeonId": 1, + "sourceEncounterId": 22, + "item": { + "id": 109, + "slug": "novice-pendant", + "name": "Raw Rathian Necklace", + "slot": "necklace", + "rarity": "common", + "itemLevel": 1, + "healingPower": 1, + "maxResourceBonus": 0, + "glyph": "n", + "description": "Crafted with Rathian coins.", + "setId": null, + "setSlug": null, + "setName": null + }, + "components": [ + { + "item": { + "id": 282201, + "slug": "rathian-coin-ilvl-1", + "name": "Raw Rathian Coin", + "slot": "component", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 0, + "glyph": "$", + "description": "A boss coin from Rathian used for item level 1 crafting." + }, + "quantity": 1, + "owned": 0 + } + ], + "canCraft": false + }, + { + "id": 908, + "difficultyId": 1, + "sourceDungeonId": 1, + "sourceEncounterId": 22, + "item": { + "id": 108, + "slug": "novice-trousers", + "name": "Raw Rathian Pants", + "slot": "pants", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 1, + "glyph": "P", + "description": "Crafted with Rathian coins.", + "setId": null, + "setSlug": null, + "setName": null + }, + "components": [ + { + "item": { + "id": 282201, + "slug": "rathian-coin-ilvl-1", + "name": "Raw Rathian Coin", + "slot": "component", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 0, + "glyph": "$", + "description": "A boss coin from Rathian used for item level 1 crafting." + }, + "quantity": 1, + "owned": 0 + } + ], + "canCraft": false + }, + { + "id": 905, + "difficultyId": 1, + "sourceDungeonId": 1, + "sourceEncounterId": 12, + "item": { + "id": 105, + "slug": "novice-band", + "name": "Raw Yian Kut-Ku Ring", + "slot": "ring", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 1, + "glyph": "o", + "description": "Crafted with Yian Kut-Ku coins.", + "setId": null, + "setSlug": null, + "setName": null + }, + "components": [ + { + "item": { + "id": 281201, + "slug": "yian-kut-ku-coin-ilvl-1", + "name": "Raw Yian Kut-Ku Coin", + "slot": "component", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 0, + "glyph": "$", + "description": "A boss coin from Yian Kut-Ku used for item level 1 crafting." + }, + "quantity": 1, + "owned": 0 + } + ], + "canCraft": false + }, + { + "id": 906, + "difficultyId": 1, + "sourceDungeonId": 1, + "sourceEncounterId": 12, + "item": { + "id": 106, + "slug": "novice-token", + "name": "Raw Yian Kut-Ku Trinket", + "slot": "trinket", + "rarity": "common", + "itemLevel": 1, + "healingPower": 1, + "maxResourceBonus": 0, + "glyph": "*", + "description": "Crafted with Yian Kut-Ku coins.", + "setId": null, + "setSlug": null, + "setName": null + }, + "components": [ + { + "item": { + "id": 281201, + "slug": "yian-kut-ku-coin-ilvl-1", + "name": "Raw Yian Kut-Ku Coin", + "slot": "component", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 0, + "glyph": "$", + "description": "A boss coin from Yian Kut-Ku used for item level 1 crafting." + }, + "quantity": 1, + "owned": 0 + } + ], + "canCraft": false + }, + { + "id": 907, + "difficultyId": 1, + "sourceDungeonId": 1, + "sourceEncounterId": 22, + "item": { + "id": 100, + "slug": "novice-crook", + "name": "Raw Rathian Weapon", + "slot": "weapon", + "rarity": "common", + "itemLevel": 1, + "healingPower": 1, + "maxResourceBonus": 0, + "glyph": "/", + "description": "Crafted with Rathian coins.", + "setId": null, + "setSlug": null, + "setName": null + }, + "components": [ + { + "item": { + "id": 282201, + "slug": "rathian-coin-ilvl-1", + "name": "Raw Rathian Coin", + "slot": "component", + "rarity": "common", + "itemLevel": 1, + "healingPower": 0, + "maxResourceBonus": 0, + "glyph": "$", + "description": "A boss coin from Rathian used for item level 1 crafting." + }, + "quantity": 1, + "owned": 0 + } + ], + "canCraft": false + }, { "id": 1004, "difficultyId": 1, @@ -1030,7 +1219,7 @@ "item": { "id": 4, "slug": "cinderstep-boots", - "name": "Yian Kut-Ku Boots", + "name": "Honed Yian Kut-Ku Boots", "slot": "boots", "rarity": "common", "itemLevel": 5, @@ -1045,16 +1234,16 @@ "components": [ { "item": { - "id": 281205, - "slug": "yian-kut-ku-coin-ilvl-5", - "name": "Yian Kut-Ku Coin", + "id": 281201, + "slug": "yian-kut-ku-coin-ilvl-1", + "name": "Raw Yian Kut-Ku Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Yian Kut-Ku used for item level 5 crafting." + "description": "A boss coin from Yian Kut-Ku used for item level 1 crafting." }, "quantity": 5, "owned": 0 @@ -1070,7 +1259,7 @@ "item": { "id": 2, "slug": "wardens-cinderwrap", - "name": "Bulldrome Chest", + "name": "Honed Bulldrome Chest", "slot": "chest", "rarity": "common", "itemLevel": 5, @@ -1085,16 +1274,16 @@ "components": [ { "item": { - "id": 280305, - "slug": "bulldrome-coin-ilvl-5", - "name": "Bulldrome Coin", + "id": 280301, + "slug": "bulldrome-coin-ilvl-1", + "name": "Raw Bulldrome Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Bulldrome used for item level 5 crafting." + "description": "A boss coin from Bulldrome used for item level 1 crafting." }, "quantity": 5, "owned": 0 @@ -1110,7 +1299,7 @@ "item": { "id": 6, "slug": "furnace-tenders-wraps", - "name": "Bulldrome Gloves", + "name": "Honed Bulldrome Gloves", "slot": "gloves", "rarity": "common", "itemLevel": 5, @@ -1125,16 +1314,16 @@ "components": [ { "item": { - "id": 280305, - "slug": "bulldrome-coin-ilvl-5", - "name": "Bulldrome Coin", + "id": 280301, + "slug": "bulldrome-coin-ilvl-1", + "name": "Raw Bulldrome Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Bulldrome used for item level 5 crafting." + "description": "A boss coin from Bulldrome used for item level 1 crafting." }, "quantity": 5, "owned": 0 @@ -1150,7 +1339,7 @@ "item": { "id": 5, "slug": "adepts-hood", - "name": "Bulldrome Helmet", + "name": "Honed Bulldrome Helmet", "slot": "helmet", "rarity": "common", "itemLevel": 5, @@ -1165,16 +1354,16 @@ "components": [ { "item": { - "id": 280305, - "slug": "bulldrome-coin-ilvl-5", - "name": "Bulldrome Coin", + "id": 280301, + "slug": "bulldrome-coin-ilvl-1", + "name": "Raw Bulldrome Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Bulldrome used for item level 5 crafting." + "description": "A boss coin from Bulldrome used for item level 1 crafting." }, "quantity": 5, "owned": 0 @@ -1190,7 +1379,7 @@ "item": { "id": 9, "slug": "sootglass-pendant", - "name": "Rathian Necklace", + "name": "Honed Rathian Necklace", "slot": "necklace", "rarity": "common", "itemLevel": 5, @@ -1205,16 +1394,16 @@ "components": [ { "item": { - "id": 282205, - "slug": "rathian-coin-ilvl-5", - "name": "Rathian Coin", + "id": 282201, + "slug": "rathian-coin-ilvl-1", + "name": "Raw Rathian Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Rathian used for item level 5 crafting." + "description": "A boss coin from Rathian used for item level 1 crafting." }, "quantity": 5, "owned": 0 @@ -1230,7 +1419,7 @@ "item": { "id": 8, "slug": "ashwalker-legwraps", - "name": "Rathian Pants", + "name": "Honed Rathian Pants", "slot": "pants", "rarity": "common", "itemLevel": 5, @@ -1245,16 +1434,16 @@ "components": [ { "item": { - "id": 282205, - "slug": "rathian-coin-ilvl-5", - "name": "Rathian Coin", + "id": 282201, + "slug": "rathian-coin-ilvl-1", + "name": "Raw Rathian Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Rathian used for item level 5 crafting." + "description": "A boss coin from Rathian used for item level 1 crafting." }, "quantity": 5, "owned": 0 @@ -1270,7 +1459,7 @@ "item": { "id": 1, "slug": "emberglass-sigil", - "name": "Yian Kut-Ku Ring", + "name": "Honed Yian Kut-Ku Ring", "slot": "ring", "rarity": "common", "itemLevel": 5, @@ -1285,16 +1474,16 @@ "components": [ { "item": { - "id": 281205, - "slug": "yian-kut-ku-coin-ilvl-5", - "name": "Yian Kut-Ku Coin", + "id": 281201, + "slug": "yian-kut-ku-coin-ilvl-1", + "name": "Raw Yian Kut-Ku Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Yian Kut-Ku used for item level 5 crafting." + "description": "A boss coin from Yian Kut-Ku used for item level 1 crafting." }, "quantity": 5, "owned": 0 @@ -1310,7 +1499,7 @@ "item": { "id": 7, "slug": "warden-ember", - "name": "Yian Kut-Ku Trinket", + "name": "Honed Yian Kut-Ku Trinket", "slot": "trinket", "rarity": "common", "itemLevel": 5, @@ -1325,16 +1514,16 @@ "components": [ { "item": { - "id": 281205, - "slug": "yian-kut-ku-coin-ilvl-5", - "name": "Yian Kut-Ku Coin", + "id": 281201, + "slug": "yian-kut-ku-coin-ilvl-1", + "name": "Raw Yian Kut-Ku Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Yian Kut-Ku used for item level 5 crafting." + "description": "A boss coin from Yian Kut-Ku used for item level 1 crafting." }, "quantity": 5, "owned": 0 @@ -1350,7 +1539,7 @@ "item": { "id": 3, "slug": "ashwood-crook", - "name": "Rathian Weapon", + "name": "Honed Rathian Weapon", "slot": "weapon", "rarity": "common", "itemLevel": 5, @@ -1365,16 +1554,16 @@ "components": [ { "item": { - "id": 282205, - "slug": "rathian-coin-ilvl-5", - "name": "Rathian Coin", + "id": 282201, + "slug": "rathian-coin-ilvl-1", + "name": "Raw Rathian Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Rathian used for item level 5 crafting." + "description": "A boss coin from Rathian used for item level 1 crafting." }, "quantity": 5, "owned": 0 @@ -1744,7 +1933,7 @@ }, { "id": 1204, - "difficultyId": 3, + "difficultyId": 2, "sourceDungeonId": 1, "sourceEncounterId": 12, "item": { @@ -1765,16 +1954,16 @@ "components": [ { "item": { - "id": 281215, - "slug": "yian-kut-ku-coin-ilvl-15", - "name": "Blue Yian Kut-Ku Coin", + "id": 281210, + "slug": "yian-kut-ku-coin-ilvl-10", + "name": "Green Yian Kut-Ku Coin", "slot": "component", - "rarity": "rare", - "itemLevel": 15, + "rarity": "uncommon", + "itemLevel": 10, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Yian Kut-Ku used for item level 15 crafting." + "description": "A boss coin from Yian Kut-Ku used for item level 10 crafting." }, "quantity": 15, "owned": 0 @@ -1784,7 +1973,7 @@ }, { "id": 1202, - "difficultyId": 3, + "difficultyId": 2, "sourceDungeonId": 1, "sourceEncounterId": 3, "item": { @@ -1805,16 +1994,16 @@ "components": [ { "item": { - "id": 280315, - "slug": "bulldrome-coin-ilvl-15", - "name": "Blue Bulldrome Coin", + "id": 280310, + "slug": "bulldrome-coin-ilvl-10", + "name": "Green Bulldrome Coin", "slot": "component", - "rarity": "rare", - "itemLevel": 15, + "rarity": "uncommon", + "itemLevel": 10, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Bulldrome used for item level 15 crafting." + "description": "A boss coin from Bulldrome used for item level 10 crafting." }, "quantity": 15, "owned": 0 @@ -1824,7 +2013,7 @@ }, { "id": 1203, - "difficultyId": 3, + "difficultyId": 2, "sourceDungeonId": 1, "sourceEncounterId": 3, "item": { @@ -1845,16 +2034,16 @@ "components": [ { "item": { - "id": 280315, - "slug": "bulldrome-coin-ilvl-15", - "name": "Blue Bulldrome Coin", + "id": 280310, + "slug": "bulldrome-coin-ilvl-10", + "name": "Green Bulldrome Coin", "slot": "component", - "rarity": "rare", - "itemLevel": 15, + "rarity": "uncommon", + "itemLevel": 10, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Bulldrome used for item level 15 crafting." + "description": "A boss coin from Bulldrome used for item level 10 crafting." }, "quantity": 15, "owned": 0 @@ -1864,7 +2053,7 @@ }, { "id": 1201, - "difficultyId": 3, + "difficultyId": 2, "sourceDungeonId": 1, "sourceEncounterId": 3, "item": { @@ -1885,16 +2074,16 @@ "components": [ { "item": { - "id": 280315, - "slug": "bulldrome-coin-ilvl-15", - "name": "Blue Bulldrome Coin", + "id": 280310, + "slug": "bulldrome-coin-ilvl-10", + "name": "Green Bulldrome Coin", "slot": "component", - "rarity": "rare", - "itemLevel": 15, + "rarity": "uncommon", + "itemLevel": 10, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Bulldrome used for item level 15 crafting." + "description": "A boss coin from Bulldrome used for item level 10 crafting." }, "quantity": 15, "owned": 0 @@ -1904,7 +2093,7 @@ }, { "id": 1209, - "difficultyId": 3, + "difficultyId": 2, "sourceDungeonId": 1, "sourceEncounterId": 22, "item": { @@ -1925,16 +2114,16 @@ "components": [ { "item": { - "id": 282215, - "slug": "rathian-coin-ilvl-15", - "name": "Blue Rathian Coin", + "id": 282210, + "slug": "rathian-coin-ilvl-10", + "name": "Green Rathian Coin", "slot": "component", - "rarity": "rare", - "itemLevel": 15, + "rarity": "uncommon", + "itemLevel": 10, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Rathian used for item level 15 crafting." + "description": "A boss coin from Rathian used for item level 10 crafting." }, "quantity": 15, "owned": 0 @@ -1944,7 +2133,7 @@ }, { "id": 1208, - "difficultyId": 3, + "difficultyId": 2, "sourceDungeonId": 1, "sourceEncounterId": 22, "item": { @@ -1965,16 +2154,16 @@ "components": [ { "item": { - "id": 282215, - "slug": "rathian-coin-ilvl-15", - "name": "Blue Rathian Coin", + "id": 282210, + "slug": "rathian-coin-ilvl-10", + "name": "Green Rathian Coin", "slot": "component", - "rarity": "rare", - "itemLevel": 15, + "rarity": "uncommon", + "itemLevel": 10, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Rathian used for item level 15 crafting." + "description": "A boss coin from Rathian used for item level 10 crafting." }, "quantity": 15, "owned": 0 @@ -1984,7 +2173,7 @@ }, { "id": 1205, - "difficultyId": 3, + "difficultyId": 2, "sourceDungeonId": 1, "sourceEncounterId": 12, "item": { @@ -2005,16 +2194,16 @@ "components": [ { "item": { - "id": 281215, - "slug": "yian-kut-ku-coin-ilvl-15", - "name": "Blue Yian Kut-Ku Coin", + "id": 281210, + "slug": "yian-kut-ku-coin-ilvl-10", + "name": "Green Yian Kut-Ku Coin", "slot": "component", - "rarity": "rare", - "itemLevel": 15, + "rarity": "uncommon", + "itemLevel": 10, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Yian Kut-Ku used for item level 15 crafting." + "description": "A boss coin from Yian Kut-Ku used for item level 10 crafting." }, "quantity": 15, "owned": 0 @@ -2024,7 +2213,7 @@ }, { "id": 1206, - "difficultyId": 3, + "difficultyId": 2, "sourceDungeonId": 1, "sourceEncounterId": 12, "item": { @@ -2045,16 +2234,16 @@ "components": [ { "item": { - "id": 281215, - "slug": "yian-kut-ku-coin-ilvl-15", - "name": "Blue Yian Kut-Ku Coin", + "id": 281210, + "slug": "yian-kut-ku-coin-ilvl-10", + "name": "Green Yian Kut-Ku Coin", "slot": "component", - "rarity": "rare", - "itemLevel": 15, + "rarity": "uncommon", + "itemLevel": 10, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Yian Kut-Ku used for item level 15 crafting." + "description": "A boss coin from Yian Kut-Ku used for item level 10 crafting." }, "quantity": 15, "owned": 0 @@ -2064,7 +2253,7 @@ }, { "id": 1207, - "difficultyId": 3, + "difficultyId": 2, "sourceDungeonId": 1, "sourceEncounterId": 22, "item": { @@ -2085,16 +2274,16 @@ "components": [ { "item": { - "id": 282215, - "slug": "rathian-coin-ilvl-15", - "name": "Blue Rathian Coin", + "id": 282210, + "slug": "rathian-coin-ilvl-10", + "name": "Green Rathian Coin", "slot": "component", - "rarity": "rare", - "itemLevel": 15, + "rarity": "uncommon", + "itemLevel": 10, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Rathian used for item level 15 crafting." + "description": "A boss coin from Rathian used for item level 10 crafting." }, "quantity": 15, "owned": 0 @@ -3201,12 +3390,12 @@ "id": 1, "slug": "initiate", "name": "Initiate", - "droppedItemLevel": 5, + "droppedItemLevel": 1, "unlockLevel": 1, - "healthMultiplier": 1, - "damageMultiplier": 1, + "healthMultiplier": 0.8, + "damageMultiplier": 0.8, "experienceMultiplier": 1, - "description": "Entry-level dungeon difficulty." + "description": "Entry-level dungeon difficulty for crafting the first real set." }, { "dungeonId": 1, @@ -3214,23 +3403,11 @@ "slug": "veteran", "name": "Veteran", "droppedItemLevel": 10, - "unlockLevel": 5, - "healthMultiplier": 1.35, - "damageMultiplier": 1.2, - "experienceMultiplier": 1.5, - "description": "Enemies deal more damage and drop stronger gear." - }, - { - "dungeonId": 1, - "id": 3, - "slug": "champion", - "name": "Champion", - "droppedItemLevel": 15, "unlockLevel": 10, - "healthMultiplier": 1.7, - "damageMultiplier": 1.45, - "experienceMultiplier": 2.2, - "description": "Demanding encounters for developed characters." + "healthMultiplier": 1.45, + "damageMultiplier": 1.25, + "experienceMultiplier": 2, + "description": "A major step up that rewards refined gear components." }, { "dungeonId": 1, @@ -3238,10 +3415,10 @@ "slug": "mythic", "name": "Mythic", "droppedItemLevel": 20, - "unlockLevel": 15, - "healthMultiplier": 2.1, - "damageMultiplier": 1.75, - "experienceMultiplier": 3, + "unlockLevel": 20, + "healthMultiplier": 2.25, + "damageMultiplier": 1.85, + "experienceMultiplier": 3.5, "description": "Endgame dungeon difficulty." }, { @@ -3250,10 +3427,10 @@ "slug": "ascendant", "name": "Ascendant", "droppedItemLevel": 25, - "unlockLevel": 20, - "healthMultiplier": 2.6, - "damageMultiplier": 2.1, - "experienceMultiplier": 4, + "unlockLevel": 25, + "healthMultiplier": 2.8, + "damageMultiplier": 2.25, + "experienceMultiplier": 4.5, "description": "The current pinnacle difficulty." } ], @@ -3310,16 +3487,16 @@ "difficultyId": 1, "dropWeight": 100, "dropChance": 1, - "id": 280305, - "slug": "bulldrome-coin-ilvl-5", - "name": "Bulldrome Coin", + "id": 280301, + "slug": "bulldrome-coin-ilvl-1", + "name": "Raw Bulldrome Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Bulldrome used for item level 5 crafting.", + "description": "A boss coin from Bulldrome used for item level 1 crafting.", "setId": null, "setSlug": null, "setName": null @@ -3343,25 +3520,6 @@ "setSlug": null, "setName": null }, - { - "encounterId": 3, - "difficultyId": 3, - "dropWeight": 100, - "dropChance": 1, - "id": 280315, - "slug": "bulldrome-coin-ilvl-15", - "name": "Blue Bulldrome Coin", - "slot": "component", - "rarity": "rare", - "itemLevel": 15, - "healingPower": 0, - "maxResourceBonus": 0, - "glyph": "$", - "description": "A boss coin from Bulldrome used for item level 15 crafting.", - "setId": null, - "setSlug": null, - "setName": null - }, { "encounterId": 3, "difficultyId": 4, @@ -3454,16 +3612,16 @@ "difficultyId": 1, "dropWeight": 100, "dropChance": 1, - "id": 281205, - "slug": "yian-kut-ku-coin-ilvl-5", - "name": "Yian Kut-Ku Coin", + "id": 281201, + "slug": "yian-kut-ku-coin-ilvl-1", + "name": "Raw Yian Kut-Ku Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Yian Kut-Ku used for item level 5 crafting.", + "description": "A boss coin from Yian Kut-Ku used for item level 1 crafting.", "setId": null, "setSlug": null, "setName": null @@ -3487,25 +3645,6 @@ "setSlug": null, "setName": null }, - { - "encounterId": 12, - "difficultyId": 3, - "dropWeight": 100, - "dropChance": 1, - "id": 281215, - "slug": "yian-kut-ku-coin-ilvl-15", - "name": "Blue Yian Kut-Ku Coin", - "slot": "component", - "rarity": "rare", - "itemLevel": 15, - "healingPower": 0, - "maxResourceBonus": 0, - "glyph": "$", - "description": "A boss coin from Yian Kut-Ku used for item level 15 crafting.", - "setId": null, - "setSlug": null, - "setName": null - }, { "encounterId": 12, "difficultyId": 4, @@ -3598,16 +3737,16 @@ "difficultyId": 1, "dropWeight": 100, "dropChance": 1, - "id": 282205, - "slug": "rathian-coin-ilvl-5", - "name": "Rathian Coin", + "id": 282201, + "slug": "rathian-coin-ilvl-1", + "name": "Raw Rathian Coin", "slot": "component", "rarity": "common", - "itemLevel": 5, + "itemLevel": 1, "healingPower": 0, "maxResourceBonus": 0, "glyph": "$", - "description": "A boss coin from Rathian used for item level 5 crafting.", + "description": "A boss coin from Rathian used for item level 1 crafting.", "setId": null, "setSlug": null, "setName": null @@ -3631,25 +3770,6 @@ "setSlug": null, "setName": null }, - { - "encounterId": 22, - "difficultyId": 3, - "dropWeight": 100, - "dropChance": 1, - "id": 282215, - "slug": "rathian-coin-ilvl-15", - "name": "Blue Rathian Coin", - "slot": "component", - "rarity": "rare", - "itemLevel": 15, - "healingPower": 0, - "maxResourceBonus": 0, - "glyph": "$", - "description": "A boss coin from Rathian used for item level 15 crafting.", - "setId": null, - "setSlug": null, - "setName": null - }, { "encounterId": 22, "difficultyId": 4, @@ -3718,10 +3838,10 @@ "slug": "raid-normal", "name": "Normal", "droppedItemLevel": 10, - "unlockLevel": 5, - "healthMultiplier": 1.35, - "damageMultiplier": 1.2, - "experienceMultiplier": 1.75, + "unlockLevel": 10, + "healthMultiplier": 1.45, + "damageMultiplier": 1.25, + "experienceMultiplier": 2, "description": "Veteran raid difficulty with extra monster-part drops." } ], @@ -3958,11 +4078,11 @@ "slug": "veteran", "name": "Veteran", "droppedItemLevel": 10, - "unlockLevel": 5, - "healthMultiplier": 1.35, - "damageMultiplier": 1.2, - "experienceMultiplier": 1.5, - "description": "Enemies deal more damage and drop stronger gear." + "unlockLevel": 10, + "healthMultiplier": 1.45, + "damageMultiplier": 1.25, + "experienceMultiplier": 2, + "description": "A major step up that rewards refined gear components." } ], "encounters": [ @@ -4191,226 +4311,8 @@ "experienceReward": 245, "description": "A three-boss hunt featuring Nargacuga, Azuros, and Diablos.", "locationName": "The Monster Frontier", - "difficulties": [ - { - "dungeonId": 4, - "id": 3, - "slug": "champion", - "name": "Champion", - "droppedItemLevel": 15, - "unlockLevel": 10, - "healthMultiplier": 1.7, - "damageMultiplier": 1.45, - "experienceMultiplier": 2.2, - "description": "Demanding encounters for developed characters." - } - ], - "encounters": [ - { - "id": 401, - "dungeonId": 4, - "sequence": 1, - "slug": "nargacuga-dungeon-approach", - "enemyName": "Nargacuga Approach", - "encounterType": "trash", - "maxHealth": 1325, - "damage": 18, - "tankDamage": 10, - "partyDamage": 28, - "description": "Hunters clear the path before Nargacuga.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 402, - "dungeonId": 4, - "sequence": 2, - "slug": "nargacuga-dungeon-guardians", - "enemyName": "Nargacuga Guardians", - "encounterType": "trash", - "maxHealth": 1395, - "damage": 19, - "tankDamage": 11, - "partyDamage": 30, - "description": "Hunters clear the path before Nargacuga.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 403, - "dungeonId": 4, - "sequence": 3, - "slug": "nargacuga-dungeon-boss", - "enemyName": "Nargacuga", - "encounterType": "boss", - "maxHealth": 1655, - "damage": 23, - "tankDamage": 15, - "partyDamage": 34, - "description": "Nargacuga drops boss coins for item level 15 crafting.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": true, - "lootTables": [ - { - "encounterId": 403, - "difficultyId": 3, - "dropWeight": 100, - "dropChance": 1, - "id": 320315, - "slug": "nargacuga-dungeon-boss-coin-ilvl-15", - "name": "Blue Nargacuga Coin", - "slot": "component", - "rarity": "rare", - "itemLevel": 15, - "healingPower": 0, - "maxResourceBonus": 0, - "glyph": "$", - "description": "A boss coin from Nargacuga used for item level 15 crafting.", - "setId": null, - "setSlug": null, - "setName": null - } - ] - }, - { - "id": 404, - "dungeonId": 4, - "sequence": 4, - "slug": "azuros-dungeon-approach", - "enemyName": "Azuros Approach", - "encounterType": "trash", - "maxHealth": 1445, - "damage": 20, - "tankDamage": 12, - "partyDamage": 31, - "description": "Hunters clear the path before Azuros.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 405, - "dungeonId": 4, - "sequence": 5, - "slug": "azuros-dungeon-guardians", - "enemyName": "Azuros Guardians", - "encounterType": "trash", - "maxHealth": 1515, - "damage": 21, - "tankDamage": 13, - "partyDamage": 33, - "description": "Hunters clear the path before Azuros.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 406, - "dungeonId": 4, - "sequence": 6, - "slug": "azuros-dungeon-boss", - "enemyName": "Azuros", - "encounterType": "boss", - "maxHealth": 1775, - "damage": 25, - "tankDamage": 17, - "partyDamage": 37, - "description": "Azuros drops boss coins for item level 15 crafting.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": true, - "lootTables": [ - { - "encounterId": 406, - "difficultyId": 3, - "dropWeight": 100, - "dropChance": 1, - "id": 320615, - "slug": "azuros-dungeon-boss-coin-ilvl-15", - "name": "Blue Azuros Coin", - "slot": "component", - "rarity": "rare", - "itemLevel": 15, - "healingPower": 0, - "maxResourceBonus": 0, - "glyph": "$", - "description": "A boss coin from Azuros used for item level 15 crafting.", - "setId": null, - "setSlug": null, - "setName": null - } - ] - }, - { - "id": 407, - "dungeonId": 4, - "sequence": 7, - "slug": "diablos-dungeon-approach", - "enemyName": "Diablos Approach", - "encounterType": "trash", - "maxHealth": 1565, - "damage": 22, - "tankDamage": 14, - "partyDamage": 34, - "description": "Hunters clear the path before Diablos.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 408, - "dungeonId": 4, - "sequence": 8, - "slug": "diablos-dungeon-guardians", - "enemyName": "Diablos Guardians", - "encounterType": "trash", - "maxHealth": 1635, - "damage": 23, - "tankDamage": 15, - "partyDamage": 36, - "description": "Hunters clear the path before Diablos.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 409, - "dungeonId": 4, - "sequence": 9, - "slug": "diablos-dungeon-boss", - "enemyName": "Diablos", - "encounterType": "boss", - "maxHealth": 1895, - "damage": 27, - "tankDamage": 19, - "partyDamage": 40, - "description": "Diablos drops boss coins for item level 15 crafting.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": true, - "lootTables": [ - { - "encounterId": 409, - "difficultyId": 3, - "dropWeight": 100, - "dropChance": 1, - "id": 320915, - "slug": "diablos-dungeon-boss-coin-ilvl-15", - "name": "Blue Diablos Coin", - "slot": "component", - "rarity": "rare", - "itemLevel": 15, - "healingPower": 0, - "maxResourceBonus": 0, - "glyph": "$", - "description": "A boss coin from Diablos used for item level 15 crafting.", - "setId": null, - "setSlug": null, - "setName": null - } - ] - } - ], + "difficulties": [], + "encounters": [], "completionLoot": [], "leaderboard": [], "leaderboards": { @@ -4431,226 +4333,8 @@ "experienceReward": 325, "description": "A raid-scale hunt against Nargacuga, Azuros, and Diablos.", "locationName": "The Monster Frontier", - "difficulties": [ - { - "dungeonId": 5, - "id": 103, - "slug": "raid-champion", - "name": "Champion Raid", - "droppedItemLevel": 15, - "unlockLevel": 10, - "healthMultiplier": 1.7, - "damageMultiplier": 1.45, - "experienceMultiplier": 2.4, - "description": "Champion raid difficulty with extra monster-part drops." - } - ], - "encounters": [ - { - "id": 501, - "dungeonId": 5, - "sequence": 1, - "slug": "nargacuga-raid-approach", - "enemyName": "Nargacuga Approach", - "encounterType": "trash", - "maxHealth": 2225, - "damage": 18, - "tankDamage": 10, - "partyDamage": 52, - "description": "Hunters clear the raid path before Nargacuga.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 502, - "dungeonId": 5, - "sequence": 2, - "slug": "nargacuga-raid-guardians", - "enemyName": "Nargacuga Guardians", - "encounterType": "trash", - "maxHealth": 2295, - "damage": 19, - "tankDamage": 11, - "partyDamage": 54, - "description": "Hunters clear the raid path before Nargacuga.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 503, - "dungeonId": 5, - "sequence": 3, - "slug": "nargacuga-raid-boss", - "enemyName": "Nargacuga", - "encounterType": "boss", - "maxHealth": 2555, - "damage": 23, - "tankDamage": 15, - "partyDamage": 58, - "description": "Nargacuga drops boss coins for item level 15 crafting.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": true, - "lootTables": [ - { - "encounterId": 503, - "difficultyId": 103, - "dropWeight": 100, - "dropChance": 1, - "id": 330315, - "slug": "nargacuga-raid-boss-coin-ilvl-15", - "name": "Blue Nargacuga Coin", - "slot": "component", - "rarity": "rare", - "itemLevel": 15, - "healingPower": 0, - "maxResourceBonus": 0, - "glyph": "$", - "description": "A boss coin from Nargacuga used for item level 15 crafting.", - "setId": null, - "setSlug": null, - "setName": null - } - ] - }, - { - "id": 504, - "dungeonId": 5, - "sequence": 4, - "slug": "azuros-raid-approach", - "enemyName": "Azuros Approach", - "encounterType": "trash", - "maxHealth": 2345, - "damage": 20, - "tankDamage": 12, - "partyDamage": 55, - "description": "Hunters clear the raid path before Azuros.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 505, - "dungeonId": 5, - "sequence": 5, - "slug": "azuros-raid-guardians", - "enemyName": "Azuros Guardians", - "encounterType": "trash", - "maxHealth": 2415, - "damage": 21, - "tankDamage": 13, - "partyDamage": 57, - "description": "Hunters clear the raid path before Azuros.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 506, - "dungeonId": 5, - "sequence": 6, - "slug": "azuros-raid-boss", - "enemyName": "Azuros", - "encounterType": "boss", - "maxHealth": 2675, - "damage": 25, - "tankDamage": 17, - "partyDamage": 61, - "description": "Azuros drops boss coins for item level 15 crafting.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": true, - "lootTables": [ - { - "encounterId": 506, - "difficultyId": 103, - "dropWeight": 100, - "dropChance": 1, - "id": 330615, - "slug": "azuros-raid-boss-coin-ilvl-15", - "name": "Blue Azuros Coin", - "slot": "component", - "rarity": "rare", - "itemLevel": 15, - "healingPower": 0, - "maxResourceBonus": 0, - "glyph": "$", - "description": "A boss coin from Azuros used for item level 15 crafting.", - "setId": null, - "setSlug": null, - "setName": null - } - ] - }, - { - "id": 507, - "dungeonId": 5, - "sequence": 7, - "slug": "diablos-raid-approach", - "enemyName": "Diablos Approach", - "encounterType": "trash", - "maxHealth": 2465, - "damage": 22, - "tankDamage": 14, - "partyDamage": 58, - "description": "Hunters clear the raid path before Diablos.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 508, - "dungeonId": 5, - "sequence": 8, - "slug": "diablos-raid-guardians", - "enemyName": "Diablos Guardians", - "encounterType": "trash", - "maxHealth": 2535, - "damage": 23, - "tankDamage": 15, - "partyDamage": 60, - "description": "Hunters clear the raid path before Diablos.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": false, - "lootTables": [] - }, - { - "id": 509, - "dungeonId": 5, - "sequence": 9, - "slug": "diablos-raid-boss", - "enemyName": "Diablos", - "encounterType": "boss", - "maxHealth": 2795, - "damage": 27, - "tankDamage": 19, - "partyDamage": 64, - "description": "Diablos drops boss coins for item level 15 crafting.", - "imageUrl": "/boss-placeholder.svg", - "isBoss": true, - "lootTables": [ - { - "encounterId": 509, - "difficultyId": 103, - "dropWeight": 100, - "dropChance": 1, - "id": 330915, - "slug": "diablos-raid-boss-coin-ilvl-15", - "name": "Blue Diablos Coin", - "slot": "component", - "rarity": "rare", - "itemLevel": 15, - "healingPower": 0, - "maxResourceBonus": 0, - "glyph": "$", - "description": "A boss coin from Diablos used for item level 15 crafting.", - "setId": null, - "setSlug": null, - "setName": null - } - ] - } - ], + "difficulties": [], + "encounters": [], "completionLoot": [], "leaderboard": [], "leaderboards": { @@ -4678,10 +4362,10 @@ "slug": "mythic", "name": "Mythic", "droppedItemLevel": 20, - "unlockLevel": 15, - "healthMultiplier": 2.1, - "damageMultiplier": 1.75, - "experienceMultiplier": 3, + "unlockLevel": 20, + "healthMultiplier": 2.25, + "damageMultiplier": 1.85, + "experienceMultiplier": 3.5, "description": "Endgame dungeon difficulty." } ], @@ -4918,10 +4602,10 @@ "slug": "raid-mythic", "name": "Mythic Raid", "droppedItemLevel": 20, - "unlockLevel": 15, - "healthMultiplier": 2.1, - "damageMultiplier": 1.75, - "experienceMultiplier": 3.2, + "unlockLevel": 20, + "healthMultiplier": 2.25, + "damageMultiplier": 1.85, + "experienceMultiplier": 3.5, "description": "Mythic raid difficulty with extra monster-part drops." } ], @@ -5158,10 +4842,10 @@ "slug": "ascendant", "name": "Ascendant", "droppedItemLevel": 25, - "unlockLevel": 20, - "healthMultiplier": 2.6, - "damageMultiplier": 2.1, - "experienceMultiplier": 4, + "unlockLevel": 25, + "healthMultiplier": 2.8, + "damageMultiplier": 2.25, + "experienceMultiplier": 4.5, "description": "The current pinnacle difficulty." } ], @@ -5398,10 +5082,10 @@ "slug": "raid-ascendant", "name": "Ascendant Raid", "droppedItemLevel": 25, - "unlockLevel": 20, - "healthMultiplier": 2.6, - "damageMultiplier": 2.1, - "experienceMultiplier": 4.2, + "unlockLevel": 25, + "healthMultiplier": 2.8, + "damageMultiplier": 2.25, + "experienceMultiplier": 4.5, "description": "Ascendant raid difficulty with extra monster-part drops." } ],