diff --git a/src/data/fishing/location.json b/src/data/fishing/location.json index 64cff8d6..974f48b6 100644 --- a/src/data/fishing/location.json +++ b/src/data/fishing/location.json @@ -182,5 +182,15 @@ "name": "The Serpent's Heart", "fish": ["dawncatcher", "akai_maou", "divda_ray", "formalo_ray"], "location": "enkanomiya" + }, + "25943": { + "name": "Underground Waterway", + "fish": ["medaka", "betta", "akai_maou", "brown_shirakodai", "bitter_pufferfish"], + "location": "chasm" + }, + "25944": { + "name": "Underground Waterway", + "fish": ["sweet-flower_medaka", "dawncatcher", "crystalfish", "akai_maou", "pufferfish"], + "location": "chasm" } } diff --git a/src/locales/en.json b/src/locales/en.json index 86c10c62..b75e1d39 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -23,9 +23,7 @@ "message": "Your best Genshin Impact companion! Paimon.moe helps you plan what to farm with an ascension calculator, and it also tracks your progress with a todo list and a wish counter.", "visitor": "{count} visitors in the last 7 days", "banner": { - "featured": [ - "Eula" - ], + "featured": ["Eula"], "summoned": "Summoned", "percentage": "from all {rarity}", "avg": "Pity average", @@ -143,10 +141,7 @@ "manualButton": "Enable Manual Input", "errorBanner": "Banner time mismatch! Please adjust your server on the settings page. Still not working? Please leave a message on Discord 😅", "globalWishTally": "Global Wish Stats", - "pityTooltip": [ - "Shows your current {rarity} pity", - "{count} pulls to guaranteed {rarity}" - ], + "pityTooltip": ["Shows your current {rarity} pity", "{count} pulls to guaranteed {rarity}"], "import": { "title": "Import Wish History", "faqsButton": "FAQ - READ FIRST", @@ -182,11 +177,7 @@ "server": "Select your server:", "wishTallyCheck": "Submit pity for global wish stats", "wishTally": "We are doing a global wish stats! You can submit your wish stats to participate. All pity data will be aggregated to know what is the average pity of paimon.moe users.", - "wishTallyCollected": [ - "What will be collected:", - "and", - "pity from your wish history" - ], + "wishTallyCollected": ["What will be collected:", "and", "pity from your wish history"], "forceUpdateCheck": "Force update wish history (enable only if your wish history is not updating)", "header": [ "Import and backup your Genshin Impact wish history to keep it for more than 6 months. It also automatically tracks your pity and statistics about your wishes!", @@ -364,11 +355,7 @@ "exportFinish": "Export success, please wait until your browser downloads the file!", "wishTallyTitle": "Submit Wish Stats", "wishTally": "We are doing a global wish stats! You can submit your wish stats to participate. All pity data will be aggregated to know what is the average pity of paimon.moe users.", - "wishTallyCollected": [ - "What will be collected:", - "and", - "pity from your wish history" - ], + "wishTallyCollected": ["What will be collected:", "and", "pity from your wish history"], "wishTallySubmit": "Submit Wish Stats", "wishTallyThankyou": "Thank you for participating!", "manualTitle": "Manual Input Settings", @@ -380,22 +367,13 @@ "subtitle": "After a 1x Wish:", "pressWhenYouGet": "Press {button} when you get {rarity}★", "p1": "It will automatically add the lifetime pulls, 5★, and 4★ pity", - "p2": [ - "When the", - "pity reaches 10, it will automatically be reset to 0" - ], - "p3": [ - "When the", - "pity reaches 90, it will automatically be reset to 0" - ], + "p2": ["When the", "pity reaches 10, it will automatically be reset to 0"], + "p3": ["When the", "pity reaches 90, it will automatically be reset to 0"], "p4": [ "After a 10x Wish, press", "but keep in mind that the pity counter might not be accurate, because there is no way to tell when the drop occured (maybe you got it on the 1st or even the 10th pull). To ensure that the counter is still accurate, you need to check the history table and add it one-by-one like you do 1x Wishes." ], - "p5": [ - "You can also press the", - "button to edit the values manually!" - ], + "p5": ["You can also press the", "button to edit the values manually!"], "p6": "Press the arrow on the bottom to see your pulls' details. A popup will show up when you get a 5★ or 4★. You can also add or edit the table manually." } }, @@ -534,11 +512,7 @@ "calculateTalent": "Calculate Talent Material?", "inputTalentLevel": "Input the 1st, 2nd & 3rd current talent level", "inputTalentNotice": "If it has a different color, subtract it by 3", - "inputTalent": [ - "1st talent lvl", - "2nd talent lvl", - "3rd talent lvl" - ], + "inputTalent": ["1st talent lvl", "2nd talent lvl", "3rd talent lvl"], "talentToLevel": "to level", "calculate": "Calculate", "unknownInformation": "There are some unknown information", @@ -547,11 +521,7 @@ "expWasted": "EXP Wasted", "addToTodo": "Add to Todo List", "addedToTodo": "Added to Todo List", - "talent": [ - "Attack", - "Skill", - "Burst" - ] + "talent": ["Attack", "Skill", "Burst"] }, "expTable": { "level": "Level", @@ -643,10 +613,7 @@ "todo": { "title": "Todo List", "summary": "Summary", - "empty": [ - "Nothing to do yet 😀", - "Add some from the Items page or the Calculator!" - ], + "empty": ["Nothing to do yet 😀", "Add some from the Items page or the Calculator!"], "farmableToday": "Farmable Today", "resin": "Resin needed", "based": "Based on AR:{ar} and WL:{wl}", @@ -945,6 +912,7 @@ "liyue": "Liyue", "inazuma": "Inazuma", "enkanomiya": "Enkanomiya", + "chasm": "Chasm", "setEmpty": "Set as empty", "emptyTime": "Time when the spot is empty:", "clear": "Clear", @@ -958,4 +926,4 @@ "dataSynced": "Data has been synced!", "driveError": "Drive sync not available right now 😔" } -} \ No newline at end of file +} diff --git a/src/routes/fishing/index.svelte b/src/routes/fishing/index.svelte index 8259d8c5..24b875a0 100644 --- a/src/routes/fishing/index.svelte +++ b/src/routes/fishing/index.svelte @@ -7,6 +7,7 @@ liyue: [], inazuma: [], enkanomiya: [], + chasm: [], }; for (const [id, location] of Object.entries(locations)) { spots[location.location].push({ ...location, id }); diff --git a/static/images/fishing/locations/20055.png b/static/images/fishing/locations/20055.png index ef95269a..94302d87 100644 Binary files a/static/images/fishing/locations/20055.png and b/static/images/fishing/locations/20055.png differ diff --git a/static/images/fishing/locations/22148.png b/static/images/fishing/locations/22148.png index c3f29a6e..125d890d 100644 Binary files a/static/images/fishing/locations/22148.png and b/static/images/fishing/locations/22148.png differ diff --git a/static/images/fishing/locations/22149.png b/static/images/fishing/locations/22149.png index 63395212..8f8e51a8 100644 Binary files a/static/images/fishing/locations/22149.png and b/static/images/fishing/locations/22149.png differ diff --git a/static/images/fishing/locations/22150.png b/static/images/fishing/locations/22150.png index 70333766..2ad8c6c4 100644 Binary files a/static/images/fishing/locations/22150.png and b/static/images/fishing/locations/22150.png differ diff --git a/static/images/fishing/locations/25943.png b/static/images/fishing/locations/25943.png new file mode 100644 index 00000000..c6a4e40e Binary files /dev/null and b/static/images/fishing/locations/25943.png differ diff --git a/static/images/fishing/locations/25944.png b/static/images/fishing/locations/25944.png new file mode 100644 index 00000000..623a3da3 Binary files /dev/null and b/static/images/fishing/locations/25944.png differ