Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8f5a957963 | |||
| f8a1fbc5e2 | |||
| bab2dce6c3 | |||
| cb38042eca | |||
| 753bba581a |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -7,8 +7,8 @@ android {
|
||||
applicationId "com.warren.iwanttoheal"
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
versionCode 54
|
||||
versionName "1.0.35"
|
||||
versionCode 59
|
||||
versionName "1.0.39"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
aaptOptions {
|
||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||
|
||||
+461
-38
@@ -106,9 +106,8 @@ SET slug = 'rathian',
|
||||
image_url = COALESCE(NULLIF(image_url, ''), '/boss-placeholder.svg')
|
||||
WHERE id = 22;
|
||||
|
||||
INSERT OR IGNORE INTO mechanics
|
||||
(id, encounter_id, name, mechanic_type, interval_seconds, power, description)
|
||||
VALUES
|
||||
WITH mechanics_seed(id, encounter_id, name, mechanic_type, interval_seconds, power, description) AS (
|
||||
VALUES
|
||||
(1, 3, 'Cinder Pulse', 'party_damage', 4.9, 12, 'Deals damage to the full party.'),
|
||||
(2, 3, 'Searing Mark', 'dispellable_dot', 7.7, 7, 'Marks one target with recurring damage until cleansed.'),
|
||||
(10, 12, 'Ember Wave', 'party_damage', 5.6, 14, 'A wave of ember energy hits the entire party.'),
|
||||
@@ -120,7 +119,17 @@ VALUES
|
||||
(102, 105, 'Pillar of Judgment', 'party_damage', 5.2, 16, 'Columns of flame erupt beneath the raid.'),
|
||||
(103, 105, 'Inquisitor''s Brand', 'dispellable_dot', 7.8, 10, 'A burning brand persists until cleansed.'),
|
||||
(104, 108, 'Crownflare', 'party_damage', 4.9, 18, 'The Ember Crown releases a raid-wide flare.'),
|
||||
(105, 108, 'Royal Decree', 'dispellable_dot', 7.1, 12, 'A lethal decree marks one raider for cleansing.');
|
||||
(105, 108, 'Royal Decree', 'dispellable_dot', 7.1, 12, 'A lethal decree marks one raider for cleansing.')
|
||||
)
|
||||
INSERT OR IGNORE INTO mechanics
|
||||
(id, encounter_id, name, mechanic_type, interval_seconds, power, description)
|
||||
SELECT id, encounter_id, name, mechanic_type, interval_seconds, power, description
|
||||
FROM mechanics_seed
|
||||
WHERE EXISTS (
|
||||
SELECT 1
|
||||
FROM encounters
|
||||
WHERE encounters.id = mechanics_seed.encounter_id
|
||||
);
|
||||
|
||||
INSERT OR IGNORE INTO classes
|
||||
(id, slug, name, resource_name, max_resource, theme_color, description)
|
||||
@@ -392,6 +401,16 @@ UPDATE items SET glyph = '/' WHERE slug = 'ashwood-crook';
|
||||
UPDATE items SET glyph = 'b' WHERE slug = 'cinderstep-boots';
|
||||
UPDATE items SET glyph = '^' WHERE slug = 'adepts-hood';
|
||||
|
||||
INSERT OR IGNORE INTO encounters
|
||||
(id, dungeon_id, sequence, slug, name, encounter_type, max_health, base_damage, tank_damage, party_damage, description)
|
||||
VALUES
|
||||
(3, 1, 9003, 'legacy-loot-encounter-3', 'Legacy Loot Encounter 3', 'boss', 1, 1, 1, 1, 'Temporary legacy seed row.'),
|
||||
(12, 1, 9012, 'legacy-loot-encounter-12', 'Legacy Loot Encounter 12', 'boss', 1, 1, 1, 1, 'Temporary legacy seed row.'),
|
||||
(22, 1, 9022, 'legacy-loot-encounter-22', 'Legacy Loot Encounter 22', 'boss', 1, 1, 1, 1, 'Temporary legacy seed row.'),
|
||||
(102, 2, 9102, 'legacy-loot-encounter-102', 'Legacy Loot Encounter 102', 'boss', 1, 1, 1, 1, 'Temporary legacy seed row.'),
|
||||
(105, 2, 9105, 'legacy-loot-encounter-105', 'Legacy Loot Encounter 105', 'boss', 1, 1, 1, 1, 'Temporary legacy seed row.'),
|
||||
(108, 2, 9108, 'legacy-loot-encounter-108', 'Legacy Loot Encounter 108', 'boss', 1, 1, 1, 1, 'Temporary legacy seed row.');
|
||||
|
||||
DELETE FROM encounter_loot;
|
||||
|
||||
INSERT INTO encounter_loot
|
||||
@@ -516,20 +535,20 @@ WHERE character_id IN (1, 2, 3)
|
||||
-- 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
|
||||
SET source_dungeon_id = 1,
|
||||
source_encounter_id = 3
|
||||
SET source_dungeon_id = CASE WHEN EXISTS (SELECT 1 FROM encounters WHERE id = 3) THEN 1 ELSE NULL END,
|
||||
source_encounter_id = (SELECT id FROM encounters WHERE id = 3)
|
||||
WHERE id BETWEEN 1001 AND 1409
|
||||
AND item_id IN (SELECT id FROM items WHERE slot IN ('helmet', 'chest', 'gloves'));
|
||||
|
||||
UPDATE crafting_recipes
|
||||
SET source_dungeon_id = 1,
|
||||
source_encounter_id = 12
|
||||
SET source_dungeon_id = CASE WHEN EXISTS (SELECT 1 FROM encounters WHERE id = 12) THEN 1 ELSE NULL END,
|
||||
source_encounter_id = (SELECT id FROM encounters WHERE id = 12)
|
||||
WHERE id BETWEEN 1001 AND 1409
|
||||
AND item_id IN (SELECT id FROM items WHERE slot IN ('boots', 'ring', 'trinket'));
|
||||
|
||||
UPDATE crafting_recipes
|
||||
SET source_dungeon_id = 1,
|
||||
source_encounter_id = 22
|
||||
SET source_dungeon_id = CASE WHEN EXISTS (SELECT 1 FROM encounters WHERE id = 22) THEN 1 ELSE NULL END,
|
||||
source_encounter_id = (SELECT id FROM encounters WHERE id = 22)
|
||||
WHERE id BETWEEN 1001 AND 1409
|
||||
AND item_id IN (SELECT id FROM items WHERE slot IN ('weapon', 'pants', 'necklace'));
|
||||
|
||||
@@ -557,7 +576,7 @@ SET rarity = CASE item_level
|
||||
WHERE id IN (SELECT item_id FROM crafting_recipes);
|
||||
|
||||
UPDATE items
|
||||
SET name = (
|
||||
SET name = COALESCE((
|
||||
SELECT
|
||||
CASE items.item_level
|
||||
WHEN 1 THEN 'Raw '
|
||||
@@ -585,14 +604,14 @@ SET name = (
|
||||
JOIN encounters ON encounters.id = crafting_recipes.source_encounter_id
|
||||
WHERE crafting_recipes.item_id = items.id
|
||||
LIMIT 1
|
||||
),
|
||||
description = (
|
||||
), name),
|
||||
description = COALESCE((
|
||||
SELECT 'Crafted with ' || encounters.name || ' coins.'
|
||||
FROM crafting_recipes
|
||||
JOIN encounters ON encounters.id = crafting_recipes.source_encounter_id
|
||||
WHERE crafting_recipes.item_id = items.id
|
||||
LIMIT 1
|
||||
)
|
||||
), description)
|
||||
WHERE id IN (SELECT item_id FROM crafting_recipes);
|
||||
|
||||
CREATE TEMP TABLE IF NOT EXISTS coin_sources (
|
||||
@@ -611,11 +630,11 @@ DELETE FROM coin_sources;
|
||||
|
||||
INSERT INTO coin_sources
|
||||
SELECT
|
||||
280000 + encounters.id * 100 + difficulties.dropped_item_level,
|
||||
280000 + encounters.id * 1000 + difficulties.id,
|
||||
encounters.id,
|
||||
difficulties.id,
|
||||
difficulties.dropped_item_level,
|
||||
encounters.slug || '-coin-ilvl-' || difficulties.dropped_item_level,
|
||||
encounters.slug || '-coin-diff-' || difficulties.id || '-ilvl-' || difficulties.dropped_item_level,
|
||||
CASE difficulties.dropped_item_level
|
||||
WHEN 1 THEN 'Raw '
|
||||
WHEN 5 THEN 'Honed '
|
||||
@@ -647,6 +666,18 @@ INSERT OR IGNORE INTO items
|
||||
SELECT item_id, slug, name, 'component', rarity, item_level, 0, 0, glyph, description
|
||||
FROM coin_sources;
|
||||
|
||||
UPDATE coin_sources
|
||||
SET item_id = (
|
||||
SELECT items.id
|
||||
FROM items
|
||||
WHERE items.slug = coin_sources.slug
|
||||
)
|
||||
WHERE EXISTS (
|
||||
SELECT 1
|
||||
FROM items
|
||||
WHERE items.slug = coin_sources.slug
|
||||
);
|
||||
|
||||
UPDATE items
|
||||
SET slug = (SELECT slug FROM coin_sources WHERE coin_sources.item_id = items.id),
|
||||
name = (SELECT name FROM coin_sources WHERE coin_sources.item_id = items.id),
|
||||
@@ -859,8 +890,8 @@ INSERT OR IGNORE INTO locations (id, slug, name, description) VALUES
|
||||
(3, 'monster-frontier', 'The Monster Frontier', 'Hunting grounds used for tiered monster-part progression.');
|
||||
|
||||
UPDATE dungeons
|
||||
SET slug = 'tigrex-raid',
|
||||
name = 'Tigrex Raid',
|
||||
SET slug = 'legacy-generated-raid-2',
|
||||
name = 'Legacy Generated Raid 2',
|
||||
location_id = 3,
|
||||
recommended_level = 5,
|
||||
content_type = 'raid',
|
||||
@@ -943,6 +974,68 @@ SELECT dungeon_id, dungeon_difficulty_id FROM generated_loot_tiers
|
||||
UNION ALL
|
||||
SELECT raid_id, raid_difficulty_id FROM generated_loot_tiers;
|
||||
|
||||
UPDATE crafting_recipes
|
||||
SET source_dungeon_id = NULL,
|
||||
source_encounter_id = NULL
|
||||
WHERE source_dungeon_id IN (
|
||||
SELECT dungeon_id FROM generated_loot_tiers
|
||||
UNION
|
||||
SELECT raid_id FROM generated_loot_tiers
|
||||
)
|
||||
OR source_encounter_id IN (
|
||||
SELECT id
|
||||
FROM encounters
|
||||
WHERE dungeon_id IN (
|
||||
SELECT dungeon_id FROM generated_loot_tiers
|
||||
UNION
|
||||
SELECT raid_id FROM generated_loot_tiers
|
||||
)
|
||||
);
|
||||
|
||||
DELETE FROM encounter_loot_roll_items
|
||||
WHERE roll_id IN (
|
||||
SELECT id
|
||||
FROM encounter_loot_rolls
|
||||
WHERE encounter_id IN (
|
||||
SELECT id
|
||||
FROM encounters
|
||||
WHERE dungeon_id IN (
|
||||
SELECT dungeon_id FROM generated_loot_tiers
|
||||
UNION
|
||||
SELECT raid_id FROM generated_loot_tiers
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
DELETE FROM encounter_loot_rolls
|
||||
WHERE encounter_id IN (
|
||||
SELECT id
|
||||
FROM encounters
|
||||
WHERE dungeon_id IN (
|
||||
SELECT dungeon_id FROM generated_loot_tiers
|
||||
UNION
|
||||
SELECT raid_id FROM generated_loot_tiers
|
||||
)
|
||||
);
|
||||
|
||||
DELETE FROM encounter_loot
|
||||
WHERE encounter_id IN (
|
||||
SELECT id
|
||||
FROM encounters
|
||||
WHERE dungeon_id IN (
|
||||
SELECT dungeon_id FROM generated_loot_tiers
|
||||
UNION
|
||||
SELECT raid_id FROM generated_loot_tiers
|
||||
)
|
||||
);
|
||||
|
||||
DELETE FROM encounters
|
||||
WHERE dungeon_id IN (
|
||||
SELECT dungeon_id FROM generated_loot_tiers
|
||||
UNION
|
||||
SELECT raid_id FROM generated_loot_tiers
|
||||
);
|
||||
|
||||
UPDATE encounters
|
||||
SET slug = CASE id
|
||||
WHEN 100 THEN 'tigrex-raid-approach'
|
||||
@@ -975,7 +1068,23 @@ SET slug = CASE id
|
||||
WHEN 108 THEN 'Gypceros drops boss coins for item level 10 crafting.'
|
||||
ELSE 'Hunters clear the raid path.'
|
||||
END
|
||||
WHERE id BETWEEN 100 AND 108;
|
||||
WHERE id BETWEEN 100 AND 108
|
||||
AND NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM encounters AS conflict
|
||||
WHERE conflict.id NOT BETWEEN 100 AND 108
|
||||
AND conflict.slug IN (
|
||||
'tigrex-raid-approach',
|
||||
'tigrex-raid-guardians',
|
||||
'tigrex-raid',
|
||||
'rathalos-raid-approach',
|
||||
'rathalos-raid-guardians',
|
||||
'rathalos-raid',
|
||||
'gypceros-raid-approach',
|
||||
'gypceros-raid-guardians',
|
||||
'gypceros-raid'
|
||||
)
|
||||
);
|
||||
|
||||
INSERT OR IGNORE INTO encounters
|
||||
(id, dungeon_id, sequence, slug, name, encounter_type, max_health, base_damage, tank_damage, party_damage, description)
|
||||
@@ -1063,7 +1172,12 @@ SELECT
|
||||
1.0
|
||||
FROM generated_loot_tiers
|
||||
JOIN generated_bosses ON generated_bosses.item_level = generated_loot_tiers.item_level
|
||||
JOIN generated_drop_patterns ON generated_drop_patterns.boss_index = generated_bosses.boss_index;
|
||||
JOIN generated_drop_patterns ON generated_drop_patterns.boss_index = generated_bosses.boss_index
|
||||
WHERE EXISTS (
|
||||
SELECT 1
|
||||
FROM encounters
|
||||
WHERE encounters.id = generated_loot_tiers.dungeon_id * 100 + generated_bosses.boss_index * 3 + 3
|
||||
);
|
||||
|
||||
INSERT OR IGNORE INTO encounter_loot (encounter_id, item_id, difficulty_id, drop_weight, drop_chance)
|
||||
SELECT
|
||||
@@ -1077,7 +1191,15 @@ SELECT
|
||||
1.0
|
||||
FROM generated_loot_tiers
|
||||
JOIN generated_bosses ON generated_bosses.item_level = generated_loot_tiers.item_level
|
||||
JOIN generated_drop_patterns ON generated_drop_patterns.boss_index = generated_bosses.boss_index;
|
||||
JOIN generated_drop_patterns ON generated_drop_patterns.boss_index = generated_bosses.boss_index
|
||||
WHERE EXISTS (
|
||||
SELECT 1
|
||||
FROM encounters
|
||||
WHERE encounters.id = CASE generated_loot_tiers.raid_id
|
||||
WHEN 2 THEN 102 + generated_bosses.boss_index * 3
|
||||
ELSE generated_loot_tiers.raid_id * 100 + generated_bosses.boss_index * 3 + 3
|
||||
END
|
||||
);
|
||||
|
||||
CREATE TEMP TABLE IF NOT EXISTS generated_recipe_offsets (
|
||||
recipe_offset INTEGER PRIMARY KEY,
|
||||
@@ -1105,12 +1227,8 @@ SET source_dungeon_id = (
|
||||
WHERE id BETWEEN 1101 AND 1409;
|
||||
|
||||
UPDATE crafting_recipes
|
||||
SET source_dungeon_id = 2,
|
||||
source_encounter_id = 102 + (
|
||||
SELECT generated_recipe_offsets.boss_index * 3
|
||||
FROM generated_recipe_offsets
|
||||
WHERE crafting_recipes.id = 2000 + generated_recipe_offsets.recipe_offset
|
||||
)
|
||||
SET source_dungeon_id = NULL,
|
||||
source_encounter_id = NULL
|
||||
WHERE id BETWEEN 2001 AND 2009;
|
||||
|
||||
DELETE FROM crafting_recipe_components
|
||||
@@ -1319,20 +1437,20 @@ INSERT OR IGNORE INTO crafting_recipe_components (recipe_id, item_id, quantity)
|
||||
|
||||
-- Final coin gearing override. Keep this after legacy loot edits.
|
||||
UPDATE crafting_recipes
|
||||
SET source_dungeon_id = 1,
|
||||
source_encounter_id = 3
|
||||
SET source_dungeon_id = CASE WHEN EXISTS (SELECT 1 FROM encounters WHERE id = 3) THEN 1 ELSE NULL END,
|
||||
source_encounter_id = (SELECT id FROM encounters WHERE id = 3)
|
||||
WHERE id BETWEEN 1001 AND 1409
|
||||
AND item_id IN (SELECT id FROM items WHERE slot IN ('helmet', 'chest', 'gloves'));
|
||||
|
||||
UPDATE crafting_recipes
|
||||
SET source_dungeon_id = 1,
|
||||
source_encounter_id = 12
|
||||
SET source_dungeon_id = CASE WHEN EXISTS (SELECT 1 FROM encounters WHERE id = 12) THEN 1 ELSE NULL END,
|
||||
source_encounter_id = (SELECT id FROM encounters WHERE id = 12)
|
||||
WHERE id BETWEEN 1001 AND 1409
|
||||
AND item_id IN (SELECT id FROM items WHERE slot IN ('boots', 'ring', 'trinket'));
|
||||
|
||||
UPDATE crafting_recipes
|
||||
SET source_dungeon_id = 1,
|
||||
source_encounter_id = 22
|
||||
SET source_dungeon_id = CASE WHEN EXISTS (SELECT 1 FROM encounters WHERE id = 22) THEN 1 ELSE NULL END,
|
||||
source_encounter_id = (SELECT id FROM encounters WHERE id = 22)
|
||||
WHERE id BETWEEN 1001 AND 1409
|
||||
AND item_id IN (SELECT id FROM items WHERE slot IN ('weapon', 'pants', 'necklace'));
|
||||
|
||||
@@ -1375,7 +1493,7 @@ SET rarity = CASE item_level
|
||||
WHERE id IN (SELECT item_id FROM crafting_recipes);
|
||||
|
||||
UPDATE items
|
||||
SET name = (
|
||||
SET name = COALESCE((
|
||||
SELECT
|
||||
CASE items.item_level
|
||||
WHEN 1 THEN 'Raw '
|
||||
@@ -1403,25 +1521,318 @@ SET name = (
|
||||
JOIN encounters ON encounters.id = crafting_recipes.source_encounter_id
|
||||
WHERE crafting_recipes.item_id = items.id
|
||||
LIMIT 1
|
||||
),
|
||||
description = (
|
||||
), name),
|
||||
description = COALESCE((
|
||||
SELECT 'Crafted with ' || encounters.name || ' coins.'
|
||||
FROM crafting_recipes
|
||||
JOIN encounters ON encounters.id = crafting_recipes.source_encounter_id
|
||||
WHERE crafting_recipes.item_id = items.id
|
||||
LIMIT 1
|
||||
), description)
|
||||
WHERE id IN (SELECT item_id FROM crafting_recipes);
|
||||
|
||||
-- Single-boss hunting grounds. Keep this late so legacy three-boss hunt
|
||||
-- seed data and generated monster tiers are normalized into separate runs.
|
||||
CREATE TEMP TABLE IF NOT EXISTS single_boss_dungeons (
|
||||
dungeon_id INTEGER PRIMARY KEY,
|
||||
boss_name TEXT NOT NULL,
|
||||
boss_slug TEXT NOT NULL,
|
||||
item_level INTEGER NOT NULL,
|
||||
difficulty_floor INTEGER NOT NULL,
|
||||
location_id INTEGER NOT NULL,
|
||||
experience_reward INTEGER NOT NULL
|
||||
);
|
||||
|
||||
DELETE FROM single_boss_dungeons;
|
||||
INSERT INTO single_boss_dungeons
|
||||
(dungeon_id, boss_name, boss_slug, item_level, difficulty_floor, location_id, experience_reward)
|
||||
VALUES
|
||||
(1, 'Bulldrome', 'bulldrome', 1, 1, 1, 125),
|
||||
(2, 'Yian Kut-Ku', 'yian-kut-ku', 1, 1, 1, 125),
|
||||
(3, 'Rathian', 'rathian', 1, 1, 1, 125),
|
||||
(4, 'Tigrex', 'tigrex', 10, 2, 3, 205),
|
||||
(5, 'Rathalos', 'rathalos', 10, 2, 3, 205),
|
||||
(6, 'Gypceros', 'gypceros', 10, 2, 3, 205),
|
||||
(7, 'Nargacuga', 'nargacuga', 15, 3, 3, 245),
|
||||
(8, 'Azuros', 'azuros', 15, 3, 3, 245),
|
||||
(9, 'Diablos', 'diablos', 15, 3, 3, 245),
|
||||
(10, 'Barroth', 'barroth', 20, 4, 3, 285),
|
||||
(11, 'Tobi Kadachi', 'tobi-kadachi', 20, 4, 3, 285),
|
||||
(12, 'Monoblos', 'monoblos', 20, 4, 3, 285),
|
||||
(13, 'Anjanath', 'anjanath', 25, 5, 3, 325),
|
||||
(14, 'Bazelgeuse', 'bazelgeuse', 25, 5, 3, 325),
|
||||
(15, 'Odogaron', 'odogaron', 25, 5, 3, 325);
|
||||
|
||||
CREATE TEMP TABLE IF NOT EXISTS single_boss_raids (
|
||||
raid_id INTEGER PRIMARY KEY,
|
||||
dungeon_id INTEGER NOT NULL,
|
||||
difficulty_id INTEGER NOT NULL,
|
||||
experience_reward INTEGER NOT NULL
|
||||
);
|
||||
|
||||
DELETE FROM single_boss_raids;
|
||||
INSERT INTO single_boss_raids (raid_id, dungeon_id, difficulty_id, experience_reward)
|
||||
VALUES
|
||||
(20, 4, 101, 275),
|
||||
(21, 5, 101, 275),
|
||||
(22, 6, 101, 275),
|
||||
(23, 7, 103, 325),
|
||||
(24, 8, 103, 325),
|
||||
(25, 9, 103, 325),
|
||||
(26, 10, 104, 375),
|
||||
(27, 11, 104, 375),
|
||||
(28, 12, 104, 375),
|
||||
(29, 13, 105, 425),
|
||||
(30, 14, 105, 425),
|
||||
(31, 15, 105, 425);
|
||||
|
||||
UPDATE dungeons
|
||||
SET slug = 'retired-dungeon-' || id
|
||||
WHERE id BETWEEN 1 AND 31;
|
||||
|
||||
INSERT OR IGNORE INTO dungeons
|
||||
(id, location_id, slug, name, recommended_level, content_type, party_size, completion_item_level, experience_reward, description)
|
||||
SELECT
|
||||
dungeon_id,
|
||||
location_id,
|
||||
boss_slug || '-hunting-ground',
|
||||
boss_name || ' Hunting Ground',
|
||||
CASE difficulty_floor WHEN 1 THEN 1 ELSE item_level END,
|
||||
'dungeon',
|
||||
6,
|
||||
NULL,
|
||||
experience_reward,
|
||||
'A focused hunt through ' || boss_name || ' territory.'
|
||||
FROM single_boss_dungeons;
|
||||
|
||||
UPDATE dungeons
|
||||
SET location_id = (SELECT location_id FROM single_boss_dungeons WHERE dungeon_id = dungeons.id),
|
||||
slug = (SELECT boss_slug || '-hunting-ground' FROM single_boss_dungeons WHERE dungeon_id = dungeons.id),
|
||||
name = (SELECT boss_name || ' Hunting Ground' FROM single_boss_dungeons WHERE dungeon_id = dungeons.id),
|
||||
recommended_level = (SELECT CASE difficulty_floor WHEN 1 THEN 1 ELSE item_level END FROM single_boss_dungeons WHERE dungeon_id = dungeons.id),
|
||||
content_type = 'dungeon',
|
||||
party_size = 6,
|
||||
completion_item_level = NULL,
|
||||
experience_reward = (SELECT experience_reward FROM single_boss_dungeons WHERE dungeon_id = dungeons.id),
|
||||
description = (SELECT 'A focused hunt through ' || boss_name || ' territory.' FROM single_boss_dungeons WHERE dungeon_id = dungeons.id)
|
||||
WHERE id IN (SELECT dungeon_id FROM single_boss_dungeons);
|
||||
|
||||
INSERT OR IGNORE INTO dungeons
|
||||
(id, location_id, slug, name, recommended_level, content_type, party_size, completion_item_level, experience_reward, description)
|
||||
SELECT
|
||||
single_boss_raids.raid_id,
|
||||
single_boss_dungeons.location_id,
|
||||
'apex-' || single_boss_dungeons.boss_slug || '-raid',
|
||||
'Apex ' || single_boss_dungeons.boss_name || ' Raid',
|
||||
single_boss_dungeons.item_level,
|
||||
'raid',
|
||||
18,
|
||||
NULL,
|
||||
single_boss_raids.experience_reward,
|
||||
'A raid-scale hunt against Apex ' || single_boss_dungeons.boss_name || '.'
|
||||
FROM single_boss_raids
|
||||
JOIN single_boss_dungeons ON single_boss_dungeons.dungeon_id = single_boss_raids.dungeon_id;
|
||||
|
||||
UPDATE dungeons
|
||||
SET slug = (SELECT 'apex-' || single_boss_dungeons.boss_slug || '-raid' FROM single_boss_raids JOIN single_boss_dungeons ON single_boss_dungeons.dungeon_id = single_boss_raids.dungeon_id WHERE single_boss_raids.raid_id = dungeons.id),
|
||||
name = (SELECT 'Apex ' || single_boss_dungeons.boss_name || ' Raid' FROM single_boss_raids JOIN single_boss_dungeons ON single_boss_dungeons.dungeon_id = single_boss_raids.dungeon_id WHERE single_boss_raids.raid_id = dungeons.id),
|
||||
location_id = (SELECT single_boss_dungeons.location_id FROM single_boss_raids JOIN single_boss_dungeons ON single_boss_dungeons.dungeon_id = single_boss_raids.dungeon_id WHERE single_boss_raids.raid_id = dungeons.id),
|
||||
recommended_level = (SELECT single_boss_dungeons.item_level FROM single_boss_raids JOIN single_boss_dungeons ON single_boss_dungeons.dungeon_id = single_boss_raids.dungeon_id WHERE single_boss_raids.raid_id = dungeons.id),
|
||||
content_type = 'raid',
|
||||
party_size = 18,
|
||||
completion_item_level = NULL,
|
||||
experience_reward = (SELECT experience_reward FROM single_boss_raids WHERE single_boss_raids.raid_id = dungeons.id),
|
||||
description = (SELECT 'A raid-scale hunt against Apex ' || single_boss_dungeons.boss_name || '.' FROM single_boss_raids JOIN single_boss_dungeons ON single_boss_dungeons.dungeon_id = single_boss_raids.dungeon_id WHERE single_boss_raids.raid_id = dungeons.id)
|
||||
WHERE id IN (SELECT raid_id FROM single_boss_raids);
|
||||
|
||||
UPDATE crafting_recipes
|
||||
SET source_dungeon_id = NULL,
|
||||
source_encounter_id = NULL
|
||||
WHERE id BETWEEN 1001 AND 1409;
|
||||
|
||||
DELETE FROM encounter_loot_roll_items
|
||||
WHERE roll_id IN (
|
||||
SELECT id
|
||||
FROM encounter_loot_rolls
|
||||
WHERE encounter_id IN (
|
||||
SELECT id FROM encounters
|
||||
WHERE dungeon_id IN (SELECT dungeon_id FROM single_boss_dungeons)
|
||||
OR dungeon_id IN (SELECT raid_id FROM single_boss_raids)
|
||||
)
|
||||
);
|
||||
|
||||
DELETE FROM encounter_loot_rolls
|
||||
WHERE encounter_id IN (
|
||||
SELECT id FROM encounters
|
||||
WHERE dungeon_id IN (SELECT dungeon_id FROM single_boss_dungeons)
|
||||
OR dungeon_id IN (SELECT raid_id FROM single_boss_raids)
|
||||
);
|
||||
|
||||
DELETE FROM encounters WHERE dungeon_id IN (SELECT dungeon_id FROM single_boss_dungeons);
|
||||
DELETE FROM encounters WHERE dungeon_id IN (SELECT raid_id FROM single_boss_raids);
|
||||
|
||||
INSERT INTO encounters
|
||||
(id, dungeon_id, sequence, slug, name, encounter_type, max_health, base_damage, tank_damage, party_damage, description)
|
||||
SELECT
|
||||
single_boss_dungeons.dungeon_id * 100 + offset.value,
|
||||
single_boss_dungeons.dungeon_id,
|
||||
offset.value,
|
||||
single_boss_dungeons.boss_slug || '-' || offset.slug,
|
||||
CASE offset.encounter_type
|
||||
WHEN 'boss' THEN single_boss_dungeons.boss_name
|
||||
ELSE single_boss_dungeons.boss_name || ' ' || offset.name
|
||||
END,
|
||||
offset.encounter_type,
|
||||
offset.health + single_boss_dungeons.item_level * 35,
|
||||
offset.damage + single_boss_dungeons.difficulty_floor,
|
||||
offset.tank_damage + single_boss_dungeons.difficulty_floor,
|
||||
offset.party_damage + single_boss_dungeons.difficulty_floor * 2,
|
||||
CASE offset.encounter_type
|
||||
WHEN 'boss' THEN single_boss_dungeons.boss_name || ' drops boss coins for crafting.'
|
||||
ELSE 'Hunters clear the path before ' || single_boss_dungeons.boss_name || '.'
|
||||
END
|
||||
FROM single_boss_dungeons
|
||||
JOIN (
|
||||
SELECT 1 AS value, 'approach' AS slug, 'Approach' AS name, 'trash' AS encounter_type, 430 AS health, 13 AS damage, 8 AS tank_damage, 24 AS party_damage
|
||||
UNION ALL SELECT 2, 'guardians', 'Guardians', 'trash', 520, 15, 9, 26
|
||||
UNION ALL SELECT 3, 'boss', '', 'boss', 860, 19, 14, 29
|
||||
) AS offset;
|
||||
|
||||
INSERT INTO encounters
|
||||
(id, dungeon_id, sequence, slug, name, encounter_type, max_health, base_damage, tank_damage, party_damage, description)
|
||||
SELECT
|
||||
single_boss_raids.raid_id * 100 + offset.value,
|
||||
single_boss_raids.raid_id,
|
||||
offset.value,
|
||||
single_boss_dungeons.boss_slug || '-raid-' || offset.slug,
|
||||
CASE offset.encounter_type
|
||||
WHEN 'boss' THEN 'Apex ' || single_boss_dungeons.boss_name
|
||||
ELSE 'Apex ' || single_boss_dungeons.boss_name || ' ' || offset.name
|
||||
END,
|
||||
offset.encounter_type,
|
||||
offset.health + single_boss_dungeons.item_level * 35 + 900,
|
||||
offset.damage + single_boss_dungeons.difficulty_floor,
|
||||
offset.tank_damage + single_boss_dungeons.difficulty_floor,
|
||||
offset.party_damage + single_boss_dungeons.difficulty_floor * 2 + 22,
|
||||
CASE offset.encounter_type
|
||||
WHEN 'boss' THEN 'Apex ' || single_boss_dungeons.boss_name || ' drops raid coins for crafting.'
|
||||
ELSE 'Hunters clear the raid path before Apex ' || single_boss_dungeons.boss_name || '.'
|
||||
END
|
||||
FROM single_boss_raids
|
||||
JOIN single_boss_dungeons
|
||||
ON single_boss_dungeons.dungeon_id = single_boss_raids.dungeon_id
|
||||
JOIN (
|
||||
SELECT 1 AS value, 'approach' AS slug, 'Approach' AS name, 'trash' AS encounter_type, 650 AS health, 15 AS damage, 9 AS tank_damage, 28 AS party_damage
|
||||
UNION ALL SELECT 2, 'guardians', 'Guardians', 'trash', 720, 16, 10, 30
|
||||
UNION ALL SELECT 3, 'boss', '', 'boss', 980, 20, 14, 34
|
||||
) AS offset;
|
||||
|
||||
DELETE FROM dungeon_difficulties;
|
||||
INSERT OR IGNORE INTO dungeon_difficulties (dungeon_id, difficulty_id)
|
||||
SELECT dungeon_id, difficulties.id
|
||||
FROM single_boss_dungeons
|
||||
JOIN difficulties ON difficulties.id BETWEEN single_boss_dungeons.difficulty_floor AND 5
|
||||
WHERE difficulties.id BETWEEN 1 AND 5;
|
||||
|
||||
INSERT OR IGNORE INTO dungeon_difficulties (dungeon_id, difficulty_id)
|
||||
SELECT raid_id, difficulty_id
|
||||
FROM single_boss_raids;
|
||||
|
||||
CREATE TEMP TABLE IF NOT EXISTS recipe_source_override (
|
||||
recipe_id INTEGER PRIMARY KEY,
|
||||
dungeon_id INTEGER NOT NULL,
|
||||
encounter_id INTEGER NOT NULL
|
||||
);
|
||||
|
||||
DELETE FROM recipe_source_override;
|
||||
INSERT INTO recipe_source_override (recipe_id, dungeon_id, encounter_id) VALUES
|
||||
(1001, 1, 103), (1002, 1, 103), (1003, 1, 103),
|
||||
(1004, 2, 203), (1005, 2, 203), (1006, 2, 203),
|
||||
(1007, 3, 303), (1008, 3, 303), (1009, 3, 303),
|
||||
(1101, 4, 403), (1102, 4, 403), (1103, 4, 403),
|
||||
(1104, 5, 503), (1105, 5, 503), (1106, 5, 503),
|
||||
(1107, 6, 603), (1108, 6, 603), (1109, 6, 603),
|
||||
(1201, 7, 703), (1202, 7, 703), (1203, 7, 703),
|
||||
(1204, 8, 803), (1205, 8, 803), (1206, 8, 803),
|
||||
(1207, 9, 903), (1208, 9, 903), (1209, 9, 903),
|
||||
(1301, 10, 1003), (1302, 10, 1003), (1303, 10, 1003),
|
||||
(1304, 11, 1103), (1305, 11, 1103), (1306, 11, 1103),
|
||||
(1307, 12, 1203), (1308, 12, 1203), (1309, 12, 1203),
|
||||
(1401, 13, 1303), (1402, 13, 1303), (1403, 13, 1303),
|
||||
(1404, 14, 1403), (1405, 14, 1403), (1406, 14, 1403),
|
||||
(1407, 15, 1503), (1408, 15, 1503), (1409, 15, 1503);
|
||||
|
||||
UPDATE crafting_recipes
|
||||
SET source_dungeon_id = (SELECT dungeon_id FROM recipe_source_override WHERE recipe_id = crafting_recipes.id),
|
||||
source_encounter_id = (SELECT encounter_id FROM recipe_source_override WHERE recipe_id = crafting_recipes.id)
|
||||
WHERE id IN (SELECT recipe_id FROM recipe_source_override);
|
||||
|
||||
UPDATE crafting_recipes
|
||||
SET source_dungeon_id = (
|
||||
SELECT single_boss_raids.raid_id
|
||||
FROM generated_recipe_offsets
|
||||
JOIN single_boss_raids
|
||||
ON single_boss_raids.dungeon_id = 4 + generated_recipe_offsets.boss_index
|
||||
WHERE crafting_recipes.id = 2000 + generated_recipe_offsets.recipe_offset
|
||||
),
|
||||
source_encounter_id = (
|
||||
SELECT single_boss_raids.raid_id * 100 + 3
|
||||
FROM generated_recipe_offsets
|
||||
JOIN single_boss_raids
|
||||
ON single_boss_raids.dungeon_id = 4 + generated_recipe_offsets.boss_index
|
||||
WHERE crafting_recipes.id = 2000 + generated_recipe_offsets.recipe_offset
|
||||
),
|
||||
difficulty_id = 101
|
||||
WHERE id BETWEEN 2001 AND 2009;
|
||||
|
||||
UPDATE items
|
||||
SET name = COALESCE((
|
||||
SELECT
|
||||
CASE items.item_level
|
||||
WHEN 1 THEN 'Raw '
|
||||
WHEN 5 THEN 'Honed '
|
||||
WHEN 10 THEN 'Green '
|
||||
WHEN 15 THEN 'Blue '
|
||||
WHEN 20 THEN 'Purple '
|
||||
WHEN 25 THEN 'Orange '
|
||||
ELSE ''
|
||||
END
|
||||
|| encounters.name || ' '
|
||||
|| CASE items.slot
|
||||
WHEN 'weapon' THEN 'Weapon'
|
||||
WHEN 'helmet' THEN 'Helmet'
|
||||
WHEN 'chest' THEN 'Chest'
|
||||
WHEN 'gloves' THEN 'Gloves'
|
||||
WHEN 'boots' THEN 'Boots'
|
||||
WHEN 'pants' THEN 'Pants'
|
||||
WHEN 'ring' THEN 'Ring'
|
||||
WHEN 'necklace' THEN 'Necklace'
|
||||
WHEN 'trinket' THEN 'Trinket'
|
||||
ELSE items.name
|
||||
END
|
||||
FROM crafting_recipes
|
||||
JOIN encounters ON encounters.id = crafting_recipes.source_encounter_id
|
||||
WHERE crafting_recipes.item_id = items.id
|
||||
LIMIT 1
|
||||
), name),
|
||||
description = COALESCE((
|
||||
SELECT 'Crafted with ' || encounters.name || ' coins.'
|
||||
FROM crafting_recipes
|
||||
JOIN encounters ON encounters.id = crafting_recipes.source_encounter_id
|
||||
WHERE crafting_recipes.item_id = items.id
|
||||
LIMIT 1
|
||||
), description)
|
||||
WHERE id IN (SELECT item_id FROM crafting_recipes);
|
||||
|
||||
DELETE FROM coin_sources;
|
||||
|
||||
INSERT INTO coin_sources
|
||||
SELECT
|
||||
280000 + encounters.id * 100 + difficulties.dropped_item_level,
|
||||
280000 + encounters.id * 1000 + difficulties.id,
|
||||
encounters.id,
|
||||
difficulties.id,
|
||||
difficulties.dropped_item_level,
|
||||
encounters.slug || '-coin-ilvl-' || difficulties.dropped_item_level,
|
||||
encounters.slug || '-coin-diff-' || difficulties.id || '-ilvl-' || difficulties.dropped_item_level,
|
||||
CASE difficulties.dropped_item_level
|
||||
WHEN 1 THEN 'Raw '
|
||||
WHEN 5 THEN 'Honed '
|
||||
@@ -1453,6 +1864,18 @@ INSERT OR IGNORE INTO items
|
||||
SELECT item_id, slug, name, 'component', rarity, item_level, 0, 0, glyph, description
|
||||
FROM coin_sources;
|
||||
|
||||
UPDATE coin_sources
|
||||
SET item_id = (
|
||||
SELECT items.id
|
||||
FROM items
|
||||
WHERE items.slug = coin_sources.slug
|
||||
)
|
||||
WHERE EXISTS (
|
||||
SELECT 1
|
||||
FROM items
|
||||
WHERE items.slug = coin_sources.slug
|
||||
);
|
||||
|
||||
UPDATE items
|
||||
SET slug = (SELECT slug FROM coin_sources WHERE coin_sources.item_id = items.id),
|
||||
name = (SELECT name FROM coin_sources WHERE coin_sources.item_id = items.id),
|
||||
|
||||
+33
-4
@@ -790,6 +790,15 @@ export function getProfile(database, characterId, accountId) {
|
||||
WHERE rank <= 10
|
||||
ORDER BY dungeonId, difficultyId, startPart, completedParts, rank
|
||||
`).all()
|
||||
const dungeonCompletionCounts = new Map(database.prepare(`
|
||||
SELECT dungeon_id AS dungeonId, COUNT(*) AS count
|
||||
FROM dungeon_runs
|
||||
WHERE character_id = ?
|
||||
AND result = 'victory'
|
||||
AND start_part = 1
|
||||
AND completed_parts >= 1
|
||||
GROUP BY dungeon_id
|
||||
`).all(characterId).map((row) => [row.dungeonId, row.count]))
|
||||
|
||||
const settings = Object.fromEntries(
|
||||
database.prepare('SELECT key, value FROM game_settings').all()
|
||||
@@ -869,6 +878,7 @@ export function getProfile(database, characterId, accountId) {
|
||||
}),
|
||||
dungeons: dungeons.map((dungeon) => ({
|
||||
...dungeon,
|
||||
completionCount: dungeonCompletionCounts.get(dungeon.id) ?? 0,
|
||||
difficulties: dungeonDifficulties.filter(
|
||||
(difficulty) => difficulty.dungeonId === dungeon.id,
|
||||
),
|
||||
@@ -1866,6 +1876,13 @@ function talentEffectCapacity(level) {
|
||||
return Math.min(4, Math.max(0, Math.floor(level / 5)))
|
||||
}
|
||||
|
||||
function talentEffectSource(effectType) {
|
||||
if (effectType.startsWith('mend_')) return 'Mend'
|
||||
if (effectType.startsWith('radiance_')) return 'Radiance'
|
||||
if (effectType.startsWith('shield_') || effectType.startsWith('shielded_')) return 'Shield'
|
||||
return effectType
|
||||
}
|
||||
|
||||
function allocateTalent(database, characterId, talentId) {
|
||||
const character = database.prepare(`
|
||||
SELECT class_id AS classId, level, talent_points AS talentPoints
|
||||
@@ -1880,7 +1897,8 @@ function allocateTalent(database, characterId, talentId) {
|
||||
max_rank AS maxRank,
|
||||
tier,
|
||||
prerequisite_talent_id AS prerequisiteTalentId,
|
||||
prerequisite_rank AS prerequisiteRank
|
||||
prerequisite_rank AS prerequisiteRank,
|
||||
effect_type AS effectType
|
||||
FROM talents
|
||||
WHERE id = ?
|
||||
`).get(talentId)
|
||||
@@ -1905,14 +1923,25 @@ function allocateTalent(database, characterId, talentId) {
|
||||
} else {
|
||||
const capacity = talentEffectCapacity(character.level)
|
||||
if (capacity <= 0) throw new Error('Spell effects unlock at level 5.')
|
||||
const activeCount = database.prepare(`
|
||||
SELECT COUNT(*) AS count
|
||||
const activeTalents = database.prepare(`
|
||||
SELECT
|
||||
talents.id,
|
||||
talents.name,
|
||||
talents.effect_type AS effectType
|
||||
FROM character_talents
|
||||
JOIN talents ON talents.id = character_talents.talent_id
|
||||
WHERE character_talents.character_id = ?
|
||||
AND talents.class_id = ?
|
||||
AND character_talents.rank > 0
|
||||
`).get(characterId, character.classId).count
|
||||
`).all(characterId, character.classId)
|
||||
const source = talentEffectSource(talent.effectType)
|
||||
const sourceConflict = activeTalents.find(
|
||||
(candidate) => candidate.id !== talentId && talentEffectSource(candidate.effectType) === source,
|
||||
)
|
||||
if (sourceConflict) {
|
||||
throw new Error(`Only one ${source} spell effect can be active.`)
|
||||
}
|
||||
const activeCount = activeTalents.length
|
||||
if (activeCount >= capacity) {
|
||||
throw new Error(`Level ${character.level} allows ${capacity} active spell effect${capacity === 1 ? '' : 's'}.`)
|
||||
}
|
||||
|
||||
+283
-24
@@ -1683,7 +1683,8 @@ h2 {
|
||||
|
||||
.equipment-screen .equipment-layout,
|
||||
.equipment-screen .crafting-panel,
|
||||
.talent-screen .talent-tree {
|
||||
.talent-screen .talent-tree,
|
||||
.talent-screen .spell-effect-layout {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
}
|
||||
@@ -1800,6 +1801,35 @@ h2 {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.activity-pager {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.activity-pager button {
|
||||
background: #15161c;
|
||||
border: 2px solid #090a0d;
|
||||
color: var(--ink);
|
||||
cursor: pointer;
|
||||
font: inherit;
|
||||
font-size: 11px;
|
||||
min-height: 34px;
|
||||
outline: 2px solid #41404a;
|
||||
padding: 6px 8px;
|
||||
}
|
||||
|
||||
.activity-pager button:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.45;
|
||||
}
|
||||
|
||||
.activity-pager span {
|
||||
color: var(--muted);
|
||||
font-size: 13px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.tier-grid {
|
||||
display: grid;
|
||||
gap: 10px;
|
||||
@@ -2068,6 +2098,16 @@ h2 {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.activity-pager button {
|
||||
font-size: 9px;
|
||||
min-height: 28px;
|
||||
padding: 4px 6px;
|
||||
}
|
||||
|
||||
.activity-pager span {
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.dungeon-run-screen .eyebrow {
|
||||
font-size: 7px;
|
||||
margin-bottom: 5px;
|
||||
@@ -2272,6 +2312,20 @@ h2 {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.activity-pager {
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.activity-pager button {
|
||||
font-size: 8px;
|
||||
min-height: 24px;
|
||||
padding: 3px 5px;
|
||||
}
|
||||
|
||||
.activity-pager span {
|
||||
font-size: 9px;
|
||||
}
|
||||
|
||||
.dungeon-choice-grid {
|
||||
grid-auto-rows: minmax(52px, max-content);
|
||||
}
|
||||
@@ -3465,16 +3519,17 @@ h2 {
|
||||
.spell-effect-layout {
|
||||
display: grid;
|
||||
gap: 14px;
|
||||
grid-template-columns: 260px minmax(0, 1fr) 260px;
|
||||
grid-template-columns: 220px minmax(0, 1fr);
|
||||
margin-top: 17px;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
.effect-slots-panel,
|
||||
.effect-pool-panel,
|
||||
.effect-detail-panel {
|
||||
.effect-pool-panel {
|
||||
background: #191b25;
|
||||
border: 2px solid #090a0d;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
min-height: 0;
|
||||
outline: 2px solid #3a3944;
|
||||
padding: 12px;
|
||||
@@ -3544,25 +3599,68 @@ h2 {
|
||||
font-size: 9px;
|
||||
}
|
||||
|
||||
.effect-pool {
|
||||
.selected-effect-strip {
|
||||
align-items: center;
|
||||
background: #20222d;
|
||||
border: 2px solid #090a0d;
|
||||
display: grid;
|
||||
gap: 10px;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 12px;
|
||||
grid-template-columns: minmax(0, 1fr) auto;
|
||||
margin-top: 12px;
|
||||
outline: 2px solid #3a3944;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.selected-effect-strip strong,
|
||||
.selected-effect-strip small {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.selected-effect-strip strong {
|
||||
color: var(--gold);
|
||||
font-family: 'Press Start 2P', monospace;
|
||||
font-size: 9px;
|
||||
line-height: 1.35;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.selected-effect-strip small {
|
||||
color: var(--muted);
|
||||
font-size: 15px;
|
||||
line-height: 1;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.selected-effect-strip .primary-button {
|
||||
min-width: 120px;
|
||||
padding: 9px 12px;
|
||||
}
|
||||
|
||||
.effect-pool {
|
||||
align-content: start;
|
||||
display: grid;
|
||||
flex: 1;
|
||||
gap: 10px;
|
||||
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||
grid-template-rows: repeat(2, 62px);
|
||||
margin-top: 12px;
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.effect-pool > button {
|
||||
align-items: center;
|
||||
align-content: center;
|
||||
background: #20222d;
|
||||
border: 2px solid #090a0d;
|
||||
color: var(--ink);
|
||||
cursor: pointer;
|
||||
display: grid;
|
||||
gap: 10px;
|
||||
grid-template-columns: 34px minmax(0, 1fr) auto;
|
||||
min-height: 72px;
|
||||
gap: 6px;
|
||||
grid-template-columns: 26px minmax(0, 1fr);
|
||||
min-height: 0;
|
||||
outline: 2px solid #3a3944;
|
||||
padding: 9px;
|
||||
overflow: hidden;
|
||||
padding: 7px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
@@ -3587,7 +3685,7 @@ h2 {
|
||||
color: var(--gold);
|
||||
display: flex;
|
||||
font-family: 'Press Start 2P', monospace;
|
||||
height: 34px;
|
||||
height: 26px;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
@@ -3598,28 +3696,70 @@ h2 {
|
||||
|
||||
.effect-pool strong {
|
||||
font-family: 'Press Start 2P', monospace;
|
||||
font-size: 8px;
|
||||
font-size: 7px;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.effect-pool small {
|
||||
color: var(--muted);
|
||||
font-size: 14px;
|
||||
font-size: 11px;
|
||||
line-height: 1;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.effect-detail-panel h2 {
|
||||
color: var(--gold);
|
||||
font-size: 22px;
|
||||
margin-top: 10px;
|
||||
.effect-pool > button i {
|
||||
grid-column: 1 / -1;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.effect-detail-panel p {
|
||||
color: var(--muted);
|
||||
font-size: 17px;
|
||||
line-height: 1.1;
|
||||
margin: 12px 0;
|
||||
.effect-pager {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
justify-content: flex-end;
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.effect-pager button {
|
||||
background: #15161c;
|
||||
border: 2px solid #090a0d;
|
||||
color: var(--ink);
|
||||
cursor: pointer;
|
||||
font-family: 'Press Start 2P', monospace;
|
||||
font-size: 7px;
|
||||
min-height: 28px;
|
||||
outline: 2px solid #41404a;
|
||||
padding: 4px 8px;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.effect-pager button:disabled {
|
||||
color: #676773;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.effect-pager span {
|
||||
color: var(--gold);
|
||||
font-family: 'Press Start 2P', monospace;
|
||||
font-size: 8px;
|
||||
}
|
||||
|
||||
@media (max-width: 800px) {
|
||||
.spell-effect-layout {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.effect-slots-panel {
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
}
|
||||
|
||||
.effect-pool {
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
}
|
||||
|
||||
.selected-effect-strip {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
|
||||
.talent-tier {
|
||||
@@ -7535,6 +7675,125 @@ h2 {
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.workshop-shell .spell-effect-layout {
|
||||
gap: 6px;
|
||||
grid-template-columns: 172px minmax(0, 1fr);
|
||||
margin-top: 5px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-slots-panel,
|
||||
.workshop-shell .effect-pool-panel {
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-slots-panel {
|
||||
gap: 5px;
|
||||
grid-auto-rows: minmax(43px, 1fr);
|
||||
}
|
||||
|
||||
.workshop-shell .effect-slot {
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-slot span,
|
||||
.workshop-shell .effect-pool > button i,
|
||||
.workshop-shell .effect-panel-heading > span,
|
||||
.workshop-shell .effect-pager span {
|
||||
font-size: 6px;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-slot strong {
|
||||
font-size: 6px;
|
||||
line-height: 1.15;
|
||||
margin-top: 3px;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-slot small {
|
||||
font-size: 9px;
|
||||
line-height: 1;
|
||||
margin-top: 2px;
|
||||
max-height: 18px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-panel-heading h2 {
|
||||
font-size: 9px;
|
||||
line-height: 1.1;
|
||||
}
|
||||
|
||||
.workshop-shell .selected-effect-strip {
|
||||
gap: 6px;
|
||||
grid-template-columns: minmax(0, 1fr) auto;
|
||||
margin-top: 5px;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.workshop-shell .selected-effect-strip .eyebrow {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.workshop-shell .selected-effect-strip strong {
|
||||
font-size: 7px;
|
||||
line-height: 1.1;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.workshop-shell .selected-effect-strip small {
|
||||
font-size: 10px;
|
||||
line-height: 1;
|
||||
margin-top: 3px;
|
||||
max-height: 20px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.workshop-shell .selected-effect-strip .primary-button {
|
||||
font-size: 7px;
|
||||
min-height: 25px;
|
||||
min-width: 72px;
|
||||
padding: 3px 6px;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-pool {
|
||||
gap: 5px;
|
||||
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||
grid-template-rows: repeat(2, 52px);
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-pool > button {
|
||||
gap: 4px;
|
||||
grid-template-columns: 22px minmax(0, 1fr);
|
||||
padding: 4px;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-pool > button > span {
|
||||
height: 22px;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-pool strong {
|
||||
font-size: 6px;
|
||||
line-height: 1.15;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-pool small {
|
||||
font-size: 9px;
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-pager {
|
||||
gap: 5px;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.workshop-shell .effect-pager button {
|
||||
font-size: 6px;
|
||||
min-height: 22px;
|
||||
padding: 2px 5px;
|
||||
}
|
||||
|
||||
.workshop-shell .talent-tier {
|
||||
gap: 6px;
|
||||
grid-template-columns: 66px minmax(0, 1fr);
|
||||
|
||||
+74
-48
@@ -55,6 +55,7 @@ const MENU_ITEMS: Array<{
|
||||
|
||||
const LAST_DIFFICULTY_KEY = 'i-want-to-heal:last-difficulty'
|
||||
const SHOW_LEADERBOARDS = false
|
||||
const ACTIVITY_PAGE_SIZE = 6
|
||||
|
||||
function activityInitials(name: string) {
|
||||
return name
|
||||
@@ -81,14 +82,15 @@ function App() {
|
||||
return Number.isFinite(saved) && saved > 0 ? saved : 1
|
||||
})
|
||||
const [selectedDungeonId, setSelectedDungeonId] = useState(1)
|
||||
const [selectedRaidId, setSelectedRaidId] = useState(2)
|
||||
const [selectedRaidId, setSelectedRaidId] = useState(20)
|
||||
const [roguelikeKind, setRoguelikeKind] = useState<'dungeon' | 'raid'>('dungeon')
|
||||
const [roguelikeVariant, setRoguelikeVariant] = useState<RoguelikeVariant>('pve')
|
||||
const [roguelikeUpgradeTiming, setRoguelikeUpgradeTiming] = useState<RoguelikeUpgradeTiming>('encounter')
|
||||
const [roguelikeAbilityLabelMode, setRoguelikeAbilityLabelMode] = useState<RoguelikeAbilityLabelMode>('ability')
|
||||
const [pvpContentType, setPvpContentType] = useState<PvpContentType>('dungeon')
|
||||
const [selectedPart, setSelectedPart] = useState(1)
|
||||
const [selectedHardMode, setSelectedHardMode] = useState(false)
|
||||
const [selectedMarathonMode, setSelectedMarathonMode] = useState(false)
|
||||
const [activityPage, setActivityPage] = useState(0)
|
||||
const [combatContentId, setCombatContentId] = useState(1)
|
||||
const [leaderboardCategory, setLeaderboardCategory] = useState<'part_1' | 'part_2' | 'part_3' | 'full_run'>('part_1')
|
||||
const [showLoot, setShowLoot] = useState(false)
|
||||
@@ -236,7 +238,8 @@ function App() {
|
||||
<CombatScreen
|
||||
difficulty={difficulty}
|
||||
dungeon={dungeon}
|
||||
hardMode={selectedHardMode && combatContentId > 0}
|
||||
hardMode={false}
|
||||
marathonMode={selectedMarathonMode && combatContentId > 0}
|
||||
profile={profile}
|
||||
roguelikeMode={combatContentId < 0 ? roguelikeKind : undefined}
|
||||
roguelikeUpgradeTiming={combatContentId < 0 ? roguelikeUpgradeTiming : undefined}
|
||||
@@ -296,7 +299,7 @@ function App() {
|
||||
setSelectedDifficultyId(baseDungeon?.difficulties[0]?.id ?? 1)
|
||||
}
|
||||
setSelectedPart(1)
|
||||
setSelectedHardMode(false)
|
||||
setSelectedMarathonMode(false)
|
||||
setScreen('combat')
|
||||
}
|
||||
const tierOptions = activityOptions
|
||||
@@ -318,6 +321,12 @@ function App() {
|
||||
const tierActivityOptions = activityOptions.filter((option) =>
|
||||
option.difficulties.some((difficulty) => difficulty.droppedItemLevel === selectedTierItemLevel),
|
||||
)
|
||||
const activityPageCount = Math.max(1, Math.ceil(tierActivityOptions.length / ACTIVITY_PAGE_SIZE))
|
||||
const currentActivityPage = Math.min(activityPage, activityPageCount - 1)
|
||||
const pagedActivityOptions = tierActivityOptions.slice(
|
||||
currentActivityPage * ACTIVITY_PAGE_SIZE,
|
||||
currentActivityPage * ACTIVITY_PAGE_SIZE + ACTIVITY_PAGE_SIZE,
|
||||
)
|
||||
const selectedActivityId = screen === 'raids' && raid ? raid.id : dungeon.id
|
||||
const activity = tierActivityOptions.find((candidate) => candidate.id === selectedActivityId)
|
||||
?? tierActivityOptions[0]
|
||||
@@ -326,15 +335,9 @@ function App() {
|
||||
(candidate) => candidate.droppedItemLevel === selectedTierItemLevel,
|
||||
) ?? activity.difficulties[0]
|
||||
const difficultyLocked = profile.character.level < selectedDifficulty.unlockLevel
|
||||
const completedSections = activity.contentType === 'raid'
|
||||
? profile.completedRaidPhases
|
||||
: profile.completedDungeonParts
|
||||
const sectionName = activity.contentType === 'raid' ? 'Phase' : 'Part'
|
||||
const parts = [
|
||||
{ part: 1, name: `${sectionName} 1`, encounterCount: 3, unlocked: true, hardUnlocked: completedSections >= 1 },
|
||||
{ part: 2, name: `${sectionName} 2`, encounterCount: 3, unlocked: completedSections >= 1, hardUnlocked: completedSections >= 2 },
|
||||
{ part: 3, name: `${sectionName} 3`, encounterCount: 3, unlocked: completedSections >= 2, hardUnlocked: completedSections >= 3 },
|
||||
]
|
||||
const activityCompletionCount = activity.completionCount ?? 0
|
||||
const marathonUnlocked = activityCompletionCount >= 10
|
||||
const cloudSync = getCloudSyncStatus()
|
||||
const canShowCloudSync = account.id !== -1 && cloudSync.available
|
||||
const lootPreviewEncounters = [...activity.encounters]
|
||||
@@ -640,10 +643,30 @@ function App() {
|
||||
<p className="eyebrow">Pick Run</p>
|
||||
<h2>{screen === 'raids' ? 'Raid' : 'Dungeon'}</h2>
|
||||
</div>
|
||||
<small>{selectedDifficulty.name} rewards iLvl {selectedDifficulty.droppedItemLevel} components.</small>
|
||||
{activityPageCount > 1 ? (
|
||||
<div className="activity-pager" aria-label={`${screen === 'raids' ? 'Raid' : 'Dungeon'} pages`}>
|
||||
<button
|
||||
disabled={currentActivityPage === 0}
|
||||
onClick={() => setActivityPage((page) => Math.max(0, page - 1))}
|
||||
type="button"
|
||||
>
|
||||
Prev
|
||||
</button>
|
||||
<span>{currentActivityPage + 1}/{activityPageCount}</span>
|
||||
<button
|
||||
disabled={currentActivityPage >= activityPageCount - 1}
|
||||
onClick={() => setActivityPage((page) => Math.min(activityPageCount - 1, page + 1))}
|
||||
type="button"
|
||||
>
|
||||
Next
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<small>{selectedDifficulty.name} rewards iLvl {selectedDifficulty.droppedItemLevel} components.</small>
|
||||
)}
|
||||
</div>
|
||||
<div className="activity-card-grid dungeon-choice-grid">
|
||||
{tierActivityOptions.map((candidate) => {
|
||||
{pagedActivityOptions.map((candidate) => {
|
||||
const difficulty = candidate.difficulties.find(
|
||||
(option) => option.droppedItemLevel === selectedDifficulty.droppedItemLevel,
|
||||
) ?? candidate.difficulties[0]
|
||||
@@ -695,6 +718,7 @@ function App() {
|
||||
disabled={locked}
|
||||
key={difficulty.id}
|
||||
onClick={() => {
|
||||
setActivityPage(0)
|
||||
const nextActivity = activity.difficulties.some(
|
||||
(candidate) => candidate.droppedItemLevel === difficulty.droppedItemLevel,
|
||||
)
|
||||
@@ -725,43 +749,45 @@ function App() {
|
||||
<div className="run-setup-heading">
|
||||
<div>
|
||||
<p className="eyebrow">Start</p>
|
||||
<h2>{sectionName}</h2>
|
||||
<h2>Run</h2>
|
||||
</div>
|
||||
<small>{difficultyLocked ? `Unlocks at level ${selectedDifficulty.unlockLevel}` : 'Choose a section to launch.'}</small>
|
||||
<small>
|
||||
{difficultyLocked
|
||||
? `Unlocks at level ${selectedDifficulty.unlockLevel}`
|
||||
: marathonUnlocked
|
||||
? 'Marathon keeps health and mana between boss kills.'
|
||||
: `Marathon unlocks after 10 clears (${activityCompletionCount}/10).`}
|
||||
</small>
|
||||
</div>
|
||||
<div className="part-picker">
|
||||
{parts.map((p) => (
|
||||
<div className="part-start-row" key={p.part}>
|
||||
<button
|
||||
className={`primary-button ${selectedPart === p.part && !selectedHardMode ? 'selected-part' : ''} ${!p.unlocked ? 'locked' : ''}`}
|
||||
disabled={difficultyLocked || !p.unlocked}
|
||||
onClick={() => {
|
||||
setSelectedPart(p.part)
|
||||
setSelectedHardMode(false)
|
||||
setCombatContentId(activity.id)
|
||||
setSelectedDifficultyId(selectedDifficulty.id)
|
||||
setScreen('combat')
|
||||
}}
|
||||
type="button"
|
||||
>
|
||||
{p.name}
|
||||
</button>
|
||||
<button
|
||||
className={`primary-button hard-mode-button ${selectedPart === p.part && selectedHardMode ? 'selected-part' : ''} ${!p.hardUnlocked ? 'locked' : ''}`}
|
||||
disabled={difficultyLocked || !p.hardUnlocked}
|
||||
onClick={() => {
|
||||
setSelectedPart(p.part)
|
||||
setSelectedHardMode(true)
|
||||
setCombatContentId(activity.id)
|
||||
setSelectedDifficultyId(selectedDifficulty.id)
|
||||
setScreen('combat')
|
||||
}}
|
||||
type="button"
|
||||
>
|
||||
Hard
|
||||
</button>
|
||||
</div>
|
||||
))}
|
||||
<button
|
||||
className="primary-button selected-part"
|
||||
disabled={difficultyLocked}
|
||||
onClick={() => {
|
||||
setSelectedPart(1)
|
||||
setSelectedMarathonMode(false)
|
||||
setCombatContentId(activity.id)
|
||||
setSelectedDifficultyId(selectedDifficulty.id)
|
||||
setScreen('combat')
|
||||
}}
|
||||
type="button"
|
||||
>
|
||||
Start Hunt
|
||||
</button>
|
||||
<button
|
||||
className={`primary-button ${selectedMarathonMode ? 'selected-part' : ''} ${!marathonUnlocked ? 'locked' : ''}`}
|
||||
disabled={difficultyLocked || !marathonUnlocked}
|
||||
onClick={() => {
|
||||
setSelectedPart(1)
|
||||
setSelectedMarathonMode(true)
|
||||
setCombatContentId(activity.id)
|
||||
setSelectedDifficultyId(selectedDifficulty.id)
|
||||
setScreen('combat')
|
||||
}}
|
||||
type="button"
|
||||
>
|
||||
Marathon
|
||||
</button>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
@@ -341,6 +341,7 @@ export function CombatScreen({
|
||||
difficulty,
|
||||
dungeon,
|
||||
hardMode = false,
|
||||
marathonMode = false,
|
||||
profile,
|
||||
startPart = 1,
|
||||
roguelikeMode,
|
||||
@@ -353,6 +354,7 @@ export function CombatScreen({
|
||||
difficulty: Difficulty
|
||||
dungeon: Dungeon
|
||||
hardMode?: boolean
|
||||
marathonMode?: boolean
|
||||
profile: CharacterProfile
|
||||
startPart?: number
|
||||
roguelikeMode?: RoguelikeMode
|
||||
@@ -416,7 +418,7 @@ export function CombatScreen({
|
||||
const [combatState, setCombatState] = useState<SinglePlayerCombatState>(() => initialCombatState)
|
||||
const [selectedId, setSelectedId] = useState(partyTemplate[0].id)
|
||||
const [encounterIndex, setEncounterIndex] = useState(initialEncounterIndex)
|
||||
const [status, setStatus] = useState<'playing' | 'won' | 'lost' | 'part-complete' | 'upgrade-choice'>('playing')
|
||||
const [status, setStatus] = useState<'playing' | 'won' | 'lost' | 'part-complete' | 'marathon-choice' | 'upgrade-choice'>('playing')
|
||||
const [paused, setPaused] = useState(false)
|
||||
const [speedMultiplier, setSpeedMultiplier] = useState<1 | 2>(1)
|
||||
const [targetGroup, setTargetGroup] = useState<0 | 1 | 2>(0)
|
||||
@@ -430,6 +432,7 @@ export function CombatScreen({
|
||||
const [floatingTexts, setFloatingTexts] = useState<FloatingCombatText[]>([])
|
||||
const [roguelikeUpgrades, setRoguelikeUpgrades] = useState<RoguelikeUpgrade[]>([])
|
||||
const [upgradeChoices, setUpgradeChoices] = useState<RoguelikeUpgrade[]>([])
|
||||
const [marathonBossesDefeated, setMarathonBossesDefeated] = useState(0)
|
||||
const rewardClaimedRef = useRef(false)
|
||||
const profileRefreshedRef = useRef(false)
|
||||
const rolledEncounterIdsRef = useRef(new Set<string>())
|
||||
@@ -439,6 +442,7 @@ export function CombatScreen({
|
||||
const partStartTimesRef = useRef<Record<number, number>>({})
|
||||
const nextLogId = useRef(2)
|
||||
const nextFloatingTextId = useRef(1)
|
||||
const marathonBossesDefeatedRef = useRef(0)
|
||||
const combatRef = useRef(initialCombatState)
|
||||
const selectedIdRef = useRef(partyTemplate[0].id)
|
||||
const runCombatTickRef = useRef<() => void>(() => {})
|
||||
@@ -553,10 +557,10 @@ export function CombatScreen({
|
||||
|
||||
const requestLootRoll = useCallback(
|
||||
(encounterId: number, rollIndex = 0) => {
|
||||
const rollKey = `${encounterId}:${rollIndex}`
|
||||
const rollKey = `${encounterId}:${rollIndex}:${marathonBossesDefeatedRef.current}`
|
||||
if (rolledEncounterIdsRef.current.has(rollKey)) return
|
||||
rolledEncounterIdsRef.current.add(rollKey)
|
||||
const runToken = rollIndex === 0 ? runTokenRef.current : `${runTokenRef.current}-hard-${rollIndex}`
|
||||
const runToken = `${runTokenRef.current}-${marathonBossesDefeatedRef.current}-${rollIndex}`
|
||||
rollEncounterLoot(encounterId, difficulty.id, runToken)
|
||||
.then((result) => {
|
||||
setLootRolls((current) => [...current, result])
|
||||
@@ -609,10 +613,12 @@ export function CombatScreen({
|
||||
setFloatingTexts([])
|
||||
setRoguelikeUpgrades([])
|
||||
setUpgradeChoices([])
|
||||
setMarathonBossesDefeated(0)
|
||||
rewardClaimedRef.current = false
|
||||
profileRefreshedRef.current = false
|
||||
rolledEncounterIdsRef.current = new Set()
|
||||
runTokenRef.current = crypto.randomUUID()
|
||||
marathonBossesDefeatedRef.current = 0
|
||||
resourceSpentRef.current = 0
|
||||
runStartedAtRef.current = Date.now()
|
||||
partStartTimesRef.current = { [startPart]: runStartedAtRef.current }
|
||||
@@ -1201,6 +1207,9 @@ export function CombatScreen({
|
||||
}
|
||||
|
||||
if (isPartBoss && !isFinalBoss) {
|
||||
const nextMarathonKills = marathonBossesDefeatedRef.current + 1
|
||||
marathonBossesDefeatedRef.current = nextMarathonKills
|
||||
setMarathonBossesDefeated(nextMarathonKills)
|
||||
setCombat({
|
||||
...current,
|
||||
party: nextParty,
|
||||
@@ -1209,12 +1218,28 @@ export function CombatScreen({
|
||||
elapsedTicks: nextElapsedTicks,
|
||||
enemyHealth: 0,
|
||||
})
|
||||
setStatus('part-complete')
|
||||
setStatus(marathonMode && encounter.isBoss ? 'marathon-choice' : 'part-complete')
|
||||
addLog(`${encounter.enemyName} is defeated.`, 'loot')
|
||||
return
|
||||
}
|
||||
|
||||
if (encounterIndex === encounters.length - 1) {
|
||||
if (marathonMode && encounter.isBoss) {
|
||||
const nextMarathonKills = marathonBossesDefeatedRef.current + 1
|
||||
marathonBossesDefeatedRef.current = nextMarathonKills
|
||||
setMarathonBossesDefeated(nextMarathonKills)
|
||||
setCombat({
|
||||
...current,
|
||||
party: nextParty,
|
||||
resource: nextResource,
|
||||
cooldowns: nextCooldowns,
|
||||
elapsedTicks: nextElapsedTicks,
|
||||
enemyHealth: 0,
|
||||
})
|
||||
setStatus('marathon-choice')
|
||||
addLog(`${encounter.enemyName} is defeated. Continue marathon or end the hunt.`, 'loot')
|
||||
return
|
||||
}
|
||||
setCombat({
|
||||
...current,
|
||||
party: nextParty,
|
||||
@@ -1267,6 +1292,7 @@ export function CombatScreen({
|
||||
isPartBoss,
|
||||
isFinalBoss,
|
||||
isRoguelike,
|
||||
marathonMode,
|
||||
upgradesEveryEncounter,
|
||||
roguelikeUpgradeCatalog,
|
||||
roguelikeUpgrades,
|
||||
@@ -1620,7 +1646,7 @@ export function CombatScreen({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{status !== 'playing' && status !== 'part-complete' && status !== 'upgrade-choice' && (
|
||||
{status !== 'playing' && status !== 'part-complete' && status !== 'marathon-choice' && status !== 'upgrade-choice' && (
|
||||
<div className="result-screen">
|
||||
<div>
|
||||
<p className="eyebrow">{status === 'won' ? `${contentName} Complete` : 'Party Defeated'}</p>
|
||||
@@ -1735,6 +1761,36 @@ export function CombatScreen({
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{status === 'marathon-choice' && (
|
||||
<div className="result-screen">
|
||||
<div>
|
||||
<p className="eyebrow">Marathon</p>
|
||||
<h2>{encounter.enemyName} Defeated</h2>
|
||||
<p>
|
||||
{marathonBossesDefeated} boss{marathonBossesDefeated === 1 ? '' : 'es'} defeated.
|
||||
Continue with current health and {gameClass.resourceName}, or end the hunt.
|
||||
</p>
|
||||
<button
|
||||
onClick={() => {
|
||||
const current = combatRef.current
|
||||
setCombat({
|
||||
...current,
|
||||
enemyHealth: encounter.maxHealth * enemyCount,
|
||||
elapsedTicks: 0,
|
||||
})
|
||||
setStatus('playing')
|
||||
addLog(`Marathon continues. Another ${encounter.enemyName} appears.`, 'danger')
|
||||
}}
|
||||
type="button"
|
||||
>
|
||||
Continue Marathon
|
||||
</button>
|
||||
<button className="secondary-result-button" onClick={() => finishRun(currentPart, startPart)} type="button">
|
||||
End
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{status === 'part-complete' && (
|
||||
<div className="result-screen">
|
||||
<div>
|
||||
|
||||
@@ -16,6 +16,19 @@ type Props = {
|
||||
|
||||
const EFFECT_SLOT_LEVELS = [5, 10, 15, 20] as const
|
||||
const EFFECT_CLASS_ID = 1
|
||||
const EFFECTS_PER_PAGE = 8
|
||||
const EFFECT_SOURCE_LABELS: Record<string, string> = {
|
||||
mend: 'Mend',
|
||||
radiance: 'Radiance',
|
||||
shield: 'Shield',
|
||||
}
|
||||
|
||||
function effectSource(effectType: string) {
|
||||
if (effectType.startsWith('mend_')) return 'mend'
|
||||
if (effectType.startsWith('radiance_')) return 'radiance'
|
||||
if (effectType.startsWith('shield_') || effectType.startsWith('shielded_')) return 'shield'
|
||||
return effectType
|
||||
}
|
||||
|
||||
function effectCapacity(level: number) {
|
||||
return EFFECT_SLOT_LEVELS.filter((slotLevel) => level >= slotLevel).length
|
||||
@@ -30,6 +43,7 @@ export function TalentScreen({ profile, onBack, onUpdated, embedded = false }: P
|
||||
const [busyTalentId, setBusyTalentId] = useState<number | null>(null)
|
||||
const [resetting, setResetting] = useState(false)
|
||||
const [selectedTalentId, setSelectedTalentId] = useState<number | null>(null)
|
||||
const [effectPage, setEffectPage] = useState(0)
|
||||
const [message, setMessage] = useState('')
|
||||
const scrollRef = useRef<number>(0)
|
||||
const gameClass = profile.classes.find(
|
||||
@@ -42,6 +56,11 @@ export function TalentScreen({ profile, onBack, onUpdated, embedded = false }: P
|
||||
?? selectedEffects[0]
|
||||
?? gameClass.talents[0]
|
||||
?? null
|
||||
const effectPageCount = Math.max(1, Math.ceil(gameClass.talents.length / EFFECTS_PER_PAGE))
|
||||
const visibleTalents = gameClass.talents.slice(
|
||||
effectPage * EFFECTS_PER_PAGE,
|
||||
effectPage * EFFECTS_PER_PAGE + EFFECTS_PER_PAGE,
|
||||
)
|
||||
|
||||
useEffect(() => {
|
||||
window.scrollTo(0, scrollRef.current)
|
||||
@@ -52,6 +71,10 @@ export function TalentScreen({ profile, onBack, onUpdated, embedded = false }: P
|
||||
setSelectedTalentId(selectedTalent?.id ?? null)
|
||||
}, [gameClass.talents, selectedTalent?.id, selectedTalentId])
|
||||
|
||||
useEffect(() => {
|
||||
setEffectPage((page) => Math.min(page, effectPageCount - 1))
|
||||
}, [effectPageCount])
|
||||
|
||||
function saveScroll() {
|
||||
scrollRef.current = window.scrollY
|
||||
}
|
||||
@@ -59,6 +82,9 @@ export function TalentScreen({ profile, onBack, onUpdated, embedded = false }: P
|
||||
function lockReason(talent: Talent) {
|
||||
if (!isEffectClass) return 'Coming soon'
|
||||
if (talent.rank > 0) return ''
|
||||
const source = effectSource(talent.effectType)
|
||||
const sourceConflict = selectedEffects.find((effect) => effectSource(effect.effectType) === source)
|
||||
if (sourceConflict) return `${EFFECT_SOURCE_LABELS[source] ?? source} already selected`
|
||||
if (capacity <= 0) return 'Unlocks at level 5'
|
||||
if (selectedEffects.length >= capacity) {
|
||||
return `Active slots full (${capacity}/${capacity})`
|
||||
@@ -182,8 +208,35 @@ export function TalentScreen({ profile, onBack, onUpdated, embedded = false }: P
|
||||
</div>
|
||||
<span>{selectedEffects.length}/{capacity} active</span>
|
||||
</div>
|
||||
<div className="selected-effect-strip">
|
||||
<div>
|
||||
<p className="eyebrow">Selected Effect</p>
|
||||
{selectedTalent ? (
|
||||
<>
|
||||
<strong>{selectedTalent.name}</strong>
|
||||
<small>{selectedTalent.description}</small>
|
||||
</>
|
||||
) : (
|
||||
<small>No effect selected.</small>
|
||||
)}
|
||||
</div>
|
||||
{selectedTalent && (
|
||||
<button
|
||||
className="primary-button"
|
||||
disabled={Boolean(lockReason(selectedTalent)) || busyTalentId === selectedTalent.id}
|
||||
onClick={() => toggleEffect(selectedTalent)}
|
||||
type="button"
|
||||
>
|
||||
{busyTalentId === selectedTalent.id
|
||||
? 'Saving...'
|
||||
: selectedTalent.rank > 0
|
||||
? 'Remove'
|
||||
: 'Activate'}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
<div className="effect-pool">
|
||||
{gameClass.talents.map((talent) => {
|
||||
{visibleTalents.map((talent) => {
|
||||
const reason = lockReason(talent)
|
||||
const active = talent.rank > 0
|
||||
const selected = selectedTalent?.id === talent.id
|
||||
@@ -202,38 +255,33 @@ export function TalentScreen({ profile, onBack, onUpdated, embedded = false }: P
|
||||
<span>{talent.glyph}</span>
|
||||
<div>
|
||||
<strong>{talent.name}</strong>
|
||||
<small>{talent.description}</small>
|
||||
<small>{EFFECT_SOURCE_LABELS[effectSource(talent.effectType)] ?? 'Spell'}</small>
|
||||
</div>
|
||||
<i>{isBusy ? 'Saving' : active ? 'Active' : reason || 'Available'}</i>
|
||||
</button>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<aside className="effect-detail-panel">
|
||||
<p className="eyebrow">Selected Effect</p>
|
||||
{selectedTalent ? (
|
||||
<>
|
||||
<h2>{selectedTalent.name}</h2>
|
||||
<p>{selectedTalent.description}</p>
|
||||
{effectPageCount > 1 && (
|
||||
<div className="effect-pager">
|
||||
<button
|
||||
className="primary-button"
|
||||
disabled={Boolean(lockReason(selectedTalent)) || busyTalentId === selectedTalent.id}
|
||||
onClick={() => toggleEffect(selectedTalent)}
|
||||
disabled={effectPage === 0}
|
||||
onClick={() => setEffectPage((page) => Math.max(0, page - 1))}
|
||||
type="button"
|
||||
>
|
||||
{busyTalentId === selectedTalent.id
|
||||
? 'Saving...'
|
||||
: selectedTalent.rank > 0
|
||||
? 'Remove Effect'
|
||||
: 'Activate Effect'}
|
||||
Prev
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<p>No effect selected.</p>
|
||||
<span>{effectPage + 1}/{effectPageCount}</span>
|
||||
<button
|
||||
disabled={effectPage >= effectPageCount - 1}
|
||||
onClick={() => setEffectPage((page) => Math.min(effectPageCount - 1, page + 1))}
|
||||
type="button"
|
||||
>
|
||||
Next
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
</aside>
|
||||
</section>
|
||||
</div>
|
||||
)}
|
||||
|
||||
|
||||
+1
-1
@@ -42,7 +42,7 @@ export type DualScreenCombatState = {
|
||||
partySize: number
|
||||
selectedId: string
|
||||
log: CombatLogEntry[]
|
||||
status: 'playing' | 'won' | 'lost' | 'part-complete' | 'upgrade-choice'
|
||||
status: 'playing' | 'won' | 'lost' | 'part-complete' | 'marathon-choice' | 'upgrade-choice'
|
||||
resource: number
|
||||
maxResource: number
|
||||
resourceName: string
|
||||
|
||||
@@ -70,6 +70,7 @@ type OfflineSave = {
|
||||
activeClassId: number
|
||||
completedDungeonParts: number
|
||||
completedRaidPhases: number
|
||||
dungeonCompletions?: Record<string, number>
|
||||
characters: Record<number, CharacterData>
|
||||
lootRolls: Record<string, LootRoll>
|
||||
}
|
||||
@@ -159,6 +160,9 @@ function upgradeV1Save(v1: { profile: CharacterProfile; lootRolls: Record<string
|
||||
activeClassId: p.character.classId,
|
||||
completedDungeonParts: p.completedDungeonParts,
|
||||
completedRaidPhases: p.completedRaidPhases ?? 0,
|
||||
dungeonCompletions: Object.fromEntries(
|
||||
p.dungeons.map((dungeon) => [String(dungeon.id), dungeon.completionCount ?? 0]),
|
||||
),
|
||||
characters,
|
||||
lootRolls: v1.lootRolls ?? {},
|
||||
}
|
||||
@@ -314,6 +318,10 @@ function buildProfile(save: OfflineSave): CharacterProfile {
|
||||
updateCraftingRecipes(static_)
|
||||
static_.completedDungeonParts = save.completedDungeonParts
|
||||
static_.completedRaidPhases = save.completedRaidPhases
|
||||
static_.dungeons = static_.dungeons.map((dungeon) => ({
|
||||
...dungeon,
|
||||
completionCount: save.dungeonCompletions?.[String(dungeon.id)] ?? dungeon.completionCount ?? 0,
|
||||
}))
|
||||
|
||||
return static_
|
||||
}
|
||||
@@ -432,6 +440,13 @@ function talentEffectCapacity(level: number) {
|
||||
return Math.min(4, Math.max(0, Math.floor(level / 5)))
|
||||
}
|
||||
|
||||
function talentEffectSource(effectType: string) {
|
||||
if (effectType.startsWith('mend_')) return 'Mend'
|
||||
if (effectType.startsWith('radiance_')) return 'Radiance'
|
||||
if (effectType.startsWith('shield_') || effectType.startsWith('shielded_')) return 'Shield'
|
||||
return effectType
|
||||
}
|
||||
|
||||
type ComponentTemplate = { id: number; slug: string; name: string; itemLevel: number; glyph: string; description: string }
|
||||
const COMPONENT_ITEMS: Record<number, ComponentTemplate> = {
|
||||
1: { id: 600, slug: 'minor-component', name: 'Minor Component', itemLevel: 1, glyph: '◆', description: 'A basic crafting component.' },
|
||||
@@ -484,6 +499,9 @@ function mergeProfileIntoSave(profile: CharacterProfile, existingSave?: OfflineS
|
||||
activeClassId: profile.character.classId,
|
||||
completedDungeonParts: profile.completedDungeonParts,
|
||||
completedRaidPhases: profile.completedRaidPhases,
|
||||
dungeonCompletions: Object.fromEntries(
|
||||
profile.dungeons.map((dungeon) => [String(dungeon.id), dungeon.completionCount ?? 0]),
|
||||
),
|
||||
characters,
|
||||
lootRolls: clone(existingSave?.lootRolls ?? {}),
|
||||
}
|
||||
@@ -951,6 +969,10 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
|
||||
} else {
|
||||
save.completedDungeonParts = Math.max(save.completedDungeonParts, partCount)
|
||||
}
|
||||
save.dungeonCompletions = {
|
||||
...(save.dungeonCompletions ?? {}),
|
||||
[String(dungeonId)]: (save.dungeonCompletions?.[String(dungeonId)] ?? 0) + 1,
|
||||
}
|
||||
|
||||
let bonusItem: DungeonReward['bonusItem'] = null
|
||||
if ((startPart ?? 1) === 1 && partCount >= 3 && dungeon.completionLoot.length > 0) {
|
||||
@@ -1112,6 +1134,16 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
|
||||
} else {
|
||||
const capacity = talentEffectCapacity(cd.level)
|
||||
if (capacity <= 0) throw new Error('Spell effects unlock at level 5.')
|
||||
const source = talentEffectSource(talent.effectType)
|
||||
const sourceConflict = gameClass.talents.find(
|
||||
(candidate) =>
|
||||
candidate.id !== talentId
|
||||
&& (cd.talentRanks[String(candidate.id)] ?? 0) > 0
|
||||
&& talentEffectSource(candidate.effectType) === source,
|
||||
)
|
||||
if (sourceConflict) {
|
||||
throw new Error(`Only one ${source} spell effect can be active.`)
|
||||
}
|
||||
const activeCount = gameClass.talents.reduce(
|
||||
(total, candidate) => total + ((cd.talentRanks[String(candidate.id)] ?? 0) > 0 ? 1 : 0),
|
||||
0,
|
||||
|
||||
+3633
-2602
File diff suppressed because it is too large
Load Diff
@@ -168,6 +168,7 @@ export type Dungeon = {
|
||||
difficulties: Difficulty[]
|
||||
encounters: DungeonEncounter[]
|
||||
completionLoot: Array<Omit<Item, 'quantity' | 'equipped'>>
|
||||
completionCount?: number
|
||||
leaderboard: LeaderboardEntry[]
|
||||
leaderboards: {
|
||||
part_1: LeaderboardEntry[]
|
||||
|
||||
Reference in New Issue
Block a user