Skip to content

fix sai no kawara rocks badge and some location displays #1449

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
AcrylonitrileButadieneStyrene merged 1 commit into from
Aug 2, 2026
Merged

fix sai no kawara rocks badge and some location displays #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion badges/2kki/chainsaw_day_night_towers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
"art": "",
"animated": true,
"batch": 215
}
}
2 changes: 1 addition & 1 deletion badges/2kki/city_of_liars_01_npc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
"art": "Paraverdant",
"animated": true,
"batch": 214
}
}
1 change: 1 addition & 0 deletions badges/2kki/hex_pillar_passage_dolphin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"reqType": "tag",
"reqString": "hex_pillar_passage_dolphin",
"map": 1826,
"mapY": 120,
"art": "3heart",
"animated": true,
"batch": 224
Expand Down
2 changes: 1 addition & 1 deletion badges/2kki/pit_to_hell_flower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
"art": "deadsquid",
"animated": true,
"batch": 220
}
}
13 changes: 11 additions & 2 deletions badges/2kki/sai_no_kawara_push_rock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
{
"group": "2_el",
"bp": 10,
"reqType": "tag",
"reqString": "sai_no_kawara_push_rock",
"reqType": "tagArrays",
"reqStringArrays": [
[
"sai_no_kawara_rock_1",
"sai_no_kawara_rock_2",
"sai_no_kawara_rock_3",
"sai_no_kawara_rock_4",
"sai_no_kawara_rock_5",
"sai_no_kawara_rock_6"
]
],
"map": 1913,
"art": "tophat",
"animated": true,
Expand Down
10 changes: 7 additions & 3 deletions badges/loveyou/ly_palliative_ward.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"bp": 10,
"reqType": "tags",
"reqStrings": ["ly_palliative_ward", "ly_palliative_ward_after_event"],
"reqCount": 1,
"reqType": "tagArrays",
"reqStringArrays": [
[
"ly_palliative_ward",
"ly_palliative_ward_after_event"
]
],
"map": 96,
"secretCondition": true,
"art": "Ticks",
Expand Down
10 changes: 7 additions & 3 deletions badges/loveyou/ly_sansara_effect.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"bp": 15,
"reqType": "tags",
"reqStrings": ["ly_sansara_effect", "ly_sansara_effect_equip"],
"reqCount": 1,
"reqType": "tagArrays",
"reqStringArrays": [
[
"ly_sansara_effect",
"ly_sansara_effect_equip"
]
],
"map": 126,
"art": "SamsungFridg",
"batch": 223
Expand Down
10 changes: 7 additions & 3 deletions badges/loveyou/ly_victim_effect.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"bp": 10,
"reqType": "tags",
"reqStrings": ["ly_victim_effect", "ly_victim_effect_after_event"],
"reqCount": 1,
"reqType": "tagArrays",
"reqStringArrays": [
[
"ly_victim_effect",
"ly_victim_effect_after_event"
]
],
"map": 65,
"art": "systemaciel",
"batch": 221
Expand Down
2 changes: 1 addition & 1 deletion badges/muma/muma_ending_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"art": "VoxSilentii",
"animated": true,
"batch": 216
}
}
1 change: 1 addition & 0 deletions badges/unevendream/ud_visit_rainy_street.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"bp": 10,
"reqType": "tag",
"reqString": "ud_visit_rainy_street",
"map": 177,
"art": "Aurora",
"animated": true,
"batch": 225
Expand Down
5 changes: 5 additions & 0 deletions conditions/2kki/sai_no_kawara_rock_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"map": 1913,
"trigger": "eventAction",
"value": "201"
}
5 changes: 5 additions & 0 deletions conditions/2kki/sai_no_kawara_rock_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"map": 1913,
"trigger": "eventAction",
"value": "204"
}
5 changes: 5 additions & 0 deletions conditions/2kki/sai_no_kawara_rock_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"map": 1913,
"trigger": "eventAction",
"value": "207"
}
5 changes: 5 additions & 0 deletions conditions/2kki/sai_no_kawara_rock_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"map": 1913,
"trigger": "eventAction",
"value": "210"
}
5 changes: 5 additions & 0 deletions conditions/2kki/sai_no_kawara_rock_5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"map": 1913,
"trigger": "eventAction",
"value": "213"
}
5 changes: 5 additions & 0 deletions conditions/2kki/sai_no_kawara_rock_6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"map": 1913,
"trigger": "eventAction",
"value": "216"
}
16 changes: 8 additions & 8 deletions lang/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,9 @@
"condition": "Change the time to night at the Industrial Towers by interacting with Glitchman with the Bunny Ears effect"
},
"dream_fishing": {
"name": "Solid Fish",
"description": "With darkness and silence through the night....",
"condition": "Visit all water-based worlds with fish: Ocean Subsurface, Rotten Fish Lake, Fish World, Mackerel Desert, Sushi World, Flying Fish World, Lamplit Stones, Streetlight Docks, Depths, and Bioluminescent Cavern",
"checkbox": {
"ocean_subsurface": "Ocean Subsurface",
"rotten_fish_lake": "Rotten Fish Lake",
Expand All @@ -1104,10 +1107,7 @@
"fish_streetlight": "Streetlight Docks",
"fish_depths": "Depths",
"fish_bioluminescent": "Bioluminescent Cavern"
},
"name": "Solid Fish",
"description": "With darkness and silence through the night....",
"condition": "Visit all water-based worlds with fish: Ocean Subsurface, Rotten Fish Lake, Fish World, Mackerel Desert, Sushi World, Flying Fish World, Lamplit Stones, Streetlight Docks, Depths, and Bioluminescent Cavern"
}
},
"decrepit_smile": {
"name": "Decrepit Smile",
Expand Down Expand Up @@ -1990,6 +1990,9 @@
"condition": "Interact with the 3 different flavored Chocolate Bars in Chocolate World"
},
"sad_jellyfish": {
"name": "Sad Jellyfish",
"description": "Always out of your reach.",
"condition": "Witness the sad jellyfish in all areas they appear in: Forest Pier, Chaotic Buildings, Overgrown Condominium, Doll House, Fantasy Isle, Monolith Jungle, Twilight Park, Moonlight Lantern Forest, Black Wilderness, and Watching Forest",
"checkbox": {
"sad_jellyfish_forest_pier": "Forest Pier",
"sad_jellyfish_chaotic_buildings": "Chaotic Buildings",
Expand All @@ -2001,10 +2004,7 @@
"sad_jellyfish_twl_park": "Twilight Park",
"sad_jellyfish_black_wilderness": "Black Wilderness",
"sad_jellyfish_watching_forest": "Watching Forest"
},
"name": "Sad Jellyfish",
"description": "Always out of your reach.",
"condition": "Witness the sad jellyfish in all areas they appear in: Forest Pier, Chaotic Buildings, Overgrown Condominium, Doll House, Fantasy Isle, Monolith Jungle, Twilight Park, Moonlight Lantern Forest, Black Wilderness, and Watching Forest"
}
},
"monmon": {
"name": "Monmon",
Expand Down
16 changes: 8 additions & 8 deletions lang/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,9 @@
"condition": "Change the time to night at the Industrial Towers by interacting with Glitchman with the Bunny Ears effect"
},
"dream_fishing": {
"name": "Solid Fish",
"description": "With darkness and silence through the night....",
"condition": "Visit all water-based worlds with fish: Ocean Subsurface, Rotten Fish Lake, Fish World, Mackerel Desert, Sushi World, Flying Fish World, Lamplit Stones, Streetlight Docks, Depths, and Bioluminescent Cavern",
"checkbox": {
"ocean_subsurface": "Ocean Subsurface",
"rotten_fish_lake": "Rotten Fish Lake",
Expand All @@ -1104,10 +1107,7 @@
"fish_streetlight": "Streetlight Docks",
"fish_depths": "Depths",
"fish_bioluminescent": "Bioluminescent Cavern"
},
"name": "Solid Fish",
"description": "With darkness and silence through the night....",
"condition": "Visit all water-based worlds with fish: Ocean Subsurface, Rotten Fish Lake, Fish World, Mackerel Desert, Sushi World, Flying Fish World, Lamplit Stones, Streetlight Docks, Depths, and Bioluminescent Cavern"
}
},
"decrepit_smile": {
"name": "Decrepit Smile",
Expand Down Expand Up @@ -1990,6 +1990,9 @@
"condition": "Interact with the 3 different flavored Chocolate Bars in Chocolate World"
},
"sad_jellyfish": {
"name": "Sad Jellyfish",
"description": "Always out of your reach.",
"condition": "Witness the sad jellyfish in all areas they appear in: Forest Pier, Chaotic Buildings, Overgrown Condominium, Doll House, Fantasy Isle, Monolith Jungle, Twilight Park, Moonlight Lantern Forest, Black Wilderness, and Watching Forest",
"checkbox": {
"sad_jellyfish_forest_pier": "Forest Pier",
"sad_jellyfish_chaotic_buildings": "Chaotic Buildings",
Expand All @@ -2001,10 +2004,7 @@
"sad_jellyfish_twl_park": "Twilight Park",
"sad_jellyfish_black_wilderness": "Black Wilderness",
"sad_jellyfish_watching_forest": "Watching Forest"
},
"name": "Sad Jellyfish",
"description": "Always out of your reach.",
"condition": "Witness the sad jellyfish in all areas they appear in: Forest Pier, Chaotic Buildings, Overgrown Condominium, Doll House, Fantasy Isle, Monolith Jungle, Twilight Park, Moonlight Lantern Forest, Black Wilderness, and Watching Forest"
}
},
"monmon": {
"name": "Monmon",
Expand Down
16 changes: 8 additions & 8 deletions lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,9 @@
"condition": "Change the time to night at the Industrial Towers by interacting with Glitchman with the Bunny Ears effect"
},
"dream_fishing": {
"name": "Solid Fish",
"description": "With darkness and silence through the night....",
"condition": "Visit all water-based worlds with fish: Ocean Subsurface, Rotten Fish Lake, Fish World, Mackerel Desert, Sushi World, Flying Fish World, Lamplit Stones, Streetlight Docks, Depths, and Bioluminescent Cavern",
"checkbox": {
"ocean_subsurface": "Ocean Subsurface",
"rotten_fish_lake": "Rotten Fish Lake",
Expand All @@ -1104,10 +1107,7 @@
"fish_streetlight": "Streetlight Docks",
"fish_depths": "Depths",
"fish_bioluminescent": "Bioluminescent Cavern"
},
"name": "Solid Fish",
"description": "With darkness and silence through the night....",
"condition": "Visit all water-based worlds with fish: Ocean Subsurface, Rotten Fish Lake, Fish World, Mackerel Desert, Sushi World, Flying Fish World, Lamplit Stones, Streetlight Docks, Depths, and Bioluminescent Cavern"
}
},
"decrepit_smile": {
"name": "Decrepit Smile",
Expand Down Expand Up @@ -1990,6 +1990,9 @@
"condition": "Interact with the 3 different flavored Chocolate Bars in Chocolate World"
},
"sad_jellyfish": {
"name": "Sad Jellyfish",
"description": "Always out of your reach.",
"condition": "Witness the sad jellyfish in all areas they appear in: Forest Pier, Chaotic Buildings, Overgrown Condominium, Doll House, Fantasy Isle, Monolith Jungle, Twilight Park, Moonlight Lantern Forest, Black Wilderness, and Watching Forest",
"checkbox": {
"sad_jellyfish_forest_pier": "Forest Pier",
"sad_jellyfish_chaotic_buildings": "Chaotic Buildings",
Expand All @@ -2001,10 +2004,7 @@
"sad_jellyfish_twl_park": "Twilight Park",
"sad_jellyfish_black_wilderness": "Black Wilderness",
"sad_jellyfish_watching_forest": "Watching Forest"
},
"name": "Sad Jellyfish",
"description": "Always out of your reach.",
"condition": "Witness the sad jellyfish in all areas they appear in: Forest Pier, Chaotic Buildings, Overgrown Condominium, Doll House, Fantasy Isle, Monolith Jungle, Twilight Park, Moonlight Lantern Forest, Black Wilderness, and Watching Forest"
}
},
"monmon": {
"name": "Monmon",
Expand Down
16 changes: 8 additions & 8 deletions lang/eo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,9 @@
"condition": "Change the time to night at the Industrial Towers by interacting with Glitchman with the Bunny Ears effect"
},
"dream_fishing": {
"name": "Solid Fish",
"description": "With darkness and silence through the night....",
"condition": "Visit all water-based worlds with fish: Ocean Subsurface, Rotten Fish Lake, Fish World, Mackerel Desert, Sushi World, Flying Fish World, Lamplit Stones, Streetlight Docks, Depths, and Bioluminescent Cavern",
"checkbox": {
"ocean_subsurface": "Ocean Subsurface",
"rotten_fish_lake": "Rotten Fish Lake",
Expand All @@ -1104,10 +1107,7 @@
"fish_streetlight": "Streetlight Docks",
"fish_depths": "Depths",
"fish_bioluminescent": "Bioluminescent Cavern"
},
"name": "Solid Fish",
"description": "With darkness and silence through the night....",
"condition": "Visit all water-based worlds with fish: Ocean Subsurface, Rotten Fish Lake, Fish World, Mackerel Desert, Sushi World, Flying Fish World, Lamplit Stones, Streetlight Docks, Depths, and Bioluminescent Cavern"
}
},
"decrepit_smile": {
"name": "Decrepit Smile",
Expand Down Expand Up @@ -1990,6 +1990,9 @@
"condition": "Interact with the 3 different flavored Chocolate Bars in Chocolate World"
},
"sad_jellyfish": {
"name": "Sad Jellyfish",
"description": "Always out of your reach.",
"condition": "Witness the sad jellyfish in all areas they appear in: Forest Pier, Chaotic Buildings, Overgrown Condominium, Doll House, Fantasy Isle, Monolith Jungle, Twilight Park, Moonlight Lantern Forest, Black Wilderness, and Watching Forest",
"checkbox": {
"sad_jellyfish_forest_pier": "Forest Pier",
"sad_jellyfish_chaotic_buildings": "Chaotic Buildings",
Expand All @@ -2001,10 +2004,7 @@
"sad_jellyfish_twl_park": "Twilight Park",
"sad_jellyfish_black_wilderness": "Black Wilderness",
"sad_jellyfish_watching_forest": "Watching Forest"
},
"name": "Sad Jellyfish",
"description": "Always out of your reach.",
"condition": "Witness the sad jellyfish in all areas they appear in: Forest Pier, Chaotic Buildings, Overgrown Condominium, Doll House, Fantasy Isle, Monolith Jungle, Twilight Park, Moonlight Lantern Forest, Black Wilderness, and Watching Forest"
}
},
"monmon": {
"name": "Monmon",
Expand Down
16 changes: 8 additions & 8 deletions lang/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,9 @@
"condition": "Change the time to night at the Industrial Towers by interacting with Glitchman with the Bunny Ears effect"
},
"dream_fishing": {
"name": "Solid Fish",
"description": "With darkness and silence through the night....",
"condition": "Visit all water-based worlds with fish: Ocean Subsurface, Rotten Fish Lake, Fish World, Mackerel Desert, Sushi World, Flying Fish World, Lamplit Stones, Streetlight Docks, Depths, and Bioluminescent Cavern",
"checkbox": {
"ocean_subsurface": "Ocean Subsurface",
"rotten_fish_lake": "Rotten Fish Lake",
Expand All @@ -1104,10 +1107,7 @@
"fish_streetlight": "Streetlight Docks",
"fish_depths": "Depths",
"fish_bioluminescent": "Bioluminescent Cavern"
},
"name": "Solid Fish",
"description": "With darkness and silence through the night....",
"condition": "Visit all water-based worlds with fish: Ocean Subsurface, Rotten Fish Lake, Fish World, Mackerel Desert, Sushi World, Flying Fish World, Lamplit Stones, Streetlight Docks, Depths, and Bioluminescent Cavern"
}
},
"decrepit_smile": {
"name": "Decrepit Smile",
Expand Down Expand Up @@ -1990,6 +1990,9 @@
"condition": "Interact with the 3 different flavored Chocolate Bars in Chocolate World"
},
"sad_jellyfish": {
"name": "Sad Jellyfish",
"description": "Always out of your reach.",
"condition": "Witness the sad jellyfish in all areas they appear in: Forest Pier, Chaotic Buildings, Overgrown Condominium, Doll House, Fantasy Isle, Monolith Jungle, Twilight Park, Moonlight Lantern Forest, Black Wilderness, and Watching Forest",
"checkbox": {
"sad_jellyfish_forest_pier": "Forest Pier",
"sad_jellyfish_chaotic_buildings": "Chaotic Buildings",
Expand All @@ -2001,10 +2004,7 @@
"sad_jellyfish_twl_park": "Twilight Park",
"sad_jellyfish_black_wilderness": "Black Wilderness",
"sad_jellyfish_watching_forest": "Watching Forest"
},
"name": "Sad Jellyfish",
"description": "Always out of your reach.",
"condition": "Witness the sad jellyfish in all areas they appear in: Forest Pier, Chaotic Buildings, Overgrown Condominium, Doll House, Fantasy Isle, Monolith Jungle, Twilight Park, Moonlight Lantern Forest, Black Wilderness, and Watching Forest"
}
},
"monmon": {
"name": "Monmon",
Expand Down
Loading
Loading