Skip to content

Fix quest reward notification auto-hiding #21

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

Open
Treeways wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix quest reward notification auto-hiding #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8cf2e9d
Fix quest reward notification auto-hiding
Treeways Aug 17, 2024
3752255
bump version
CodeTriangle Aug 23, 2024
30a3ab0
add vermillion shops
CodeTriangle Aug 24, 2024
735dd10
logic changes 29 Aug
CodeTriangle Aug 29, 2024
e9fefb8
add lock icon when item is needed
CodeTriangle Aug 29, 2024
137a06c
update package metadata
CodeTriangle Aug 29, 2024
9c1266c
Revert old fix for quest reward notification auto-hiding
Treeways Aug 31, 2024
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
Binary file modified assets/media/font/icons-multiworld.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ccmod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "mw-rando",
"version": "0.6.0-pre.5",
"version": "0.6.1",
"title": "Multiworld randomizer",
"description": "Client for CrossCode Archipelago Integration",
"repository": "https://github.com/CodeTriangle/CCMultiworldRandomizer",
Expand Down
12 changes: 6 additions & 6 deletions data/in/quests-qr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"open": "open3"
},
"condition": [
[ "quest", "Kidding Around" ]
[ "quest", "The Goatfather" ]
],
"reward": [
[ "item", "Vanilla Ice Cream", 2 ]
Expand Down Expand Up @@ -878,6 +878,7 @@
"condition": [
[ "item", "Purple Bolt Shade", 1 ],
[ "item", "Azure Drop Shade", 1 ],
[ "item", "Wave" ],
[ "quest", "Lakeside Escort" ]
],
"reward": [
Expand Down Expand Up @@ -1041,8 +1042,7 @@
"open": "open2"
},
"condition": [
[ "item", "Heat" ],
[ "item", "Cold" ],
[ "item", "Blue Ice Shade" ],
[ "item", "Red Flame Shade", 1 ]
]
},
Expand All @@ -1053,8 +1053,7 @@
"open": "open2"
},
"condition": [
[ "item", "Heat" ],
[ "item", "Cold" ],
[ "item", "Blue Ice Shade" ],
[ "item", "Red Flame Shade", 1 ]

]
Expand Down Expand Up @@ -1232,7 +1231,8 @@
},
"condition": [
[ "quest", "Intensive Tree Care" ],
[ "item", "Heat" ]
[ "item", "Heat" ],
[ "item", "Cold" ]
],
"reward": [
[ "item", "Ginger Tom. Salad", 4 ],
Expand Down
38 changes: 38 additions & 0 deletions data/in/shops.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,44 @@
"Willis Waldmahl",
"Pumpkin Spice Cof."
]
},
"Vermillion Weapons": {
"location": {
"shop": "aridWeapons"
},
"region": {
"linear": "22",
"open": "open18"
},
"slots": [
"Steel Goggles",
"Steel Edge",
"Steel Mail",
"Steel Boots",
"Silver Goggles",
"Silver Edge",
"Silver Mail",
"Silver Boots"
]
},
"Vermillion Items": {
"location": {
"shop": "aridItems"
},
"region": {
"linear": "22",
"open": "open18"
},
"slots": [
"Sandwich",
"Hi-Sandwich",
"Green Leaf Tea",
"Just Water",
"Spicy Bun",
"Fruit Drink",
"Rice Cracker",
"Veggie Sticks"
]
}
}
}
98 changes: 97 additions & 1 deletion data/out/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4075,6 +4075,26 @@
"496": 3235824767,
"551": 3235824768,
"637": 3235824769
},
"aridWeapons": {
"204": 3235824770,
"205": 3235824771,
"206": 3235824772,
"207": 3235824773,
"264": 3235824774,
"266": 3235824775,
"268": 3235824776,
"270": 3235824777
},
"aridItems": {
"1": 3235824778,
"27": 3235824779,
"2": 3235824780,
"366": 3235824781,
"64": 3235824782,
"70": 3235824783,
"73": 3235824784,
"67": 3235824785
}
}
},
Expand Down Expand Up @@ -4160,7 +4180,9 @@
"rhombusWeapons1": 3235924450,
"rhombusItems1": 3235924459,
"rhombusCurios": 3235924475,
"rhombusBacker": 3235924478
"rhombusBacker": 3235924478,
"aridWeapons": 3235924491,
"aridItems": 3235924500
},
"byShopAndId": {
"rookieHarborItems": {
Expand Down Expand Up @@ -4389,6 +4411,26 @@
"496": 3235924488,
"551": 3235924489,
"637": 3235924490
},
"aridWeapons": {
"204": 3235924492,
"205": 3235924493,
"206": 3235924494,
"207": 3235924495,
"264": 3235924496,
"266": 3235924497,
"268": 3235924498,
"270": 3235924499
},
"aridItems": {
"1": 3235924501,
"27": 3235924502,
"2": 3235924503,
"366": 3235924504,
"64": 3235924505,
"70": 3235924506,
"73": 3235924507,
"67": 3235924508
}
}
}
Expand Down Expand Up @@ -5207,6 +5249,60 @@
"3235924490": {
"en_US": "Unlocks the slot selling \\c[3]Pumpkin Spice Cof.\\c[0] in \\c[3]Chef Backer Goods\\c[0]."
},
"3235924491": {
"en_US": "Unlocks \\c[3]all item slots\\c[0] in the shop \\c[3]Vermillion Equipment\\c[0]."
},
"3235924492": {
"en_US": "Unlocks the slot selling \\c[3]Steel Goggles\\c[0] in \\c[3]Vermillion Equipment\\c[0]."
},
"3235924493": {
"en_US": "Unlocks the slot selling \\c[3]Steel Edge\\c[0] in \\c[3]Vermillion Equipment\\c[0]."
},
"3235924494": {
"en_US": "Unlocks the slot selling \\c[3]Steel Mail\\c[0] in \\c[3]Vermillion Equipment\\c[0]."
},
"3235924495": {
"en_US": "Unlocks the slot selling \\c[3]Steel Boots\\c[0] in \\c[3]Vermillion Equipment\\c[0]."
},
"3235924496": {
"en_US": "Unlocks the slot selling \\c[3]Silver Goggles\\c[0] in \\c[3]Vermillion Equipment\\c[0]."
},
"3235924497": {
"en_US": "Unlocks the slot selling \\c[3]Silver Edge\\c[0] in \\c[3]Vermillion Equipment\\c[0]."
},
"3235924498": {
"en_US": "Unlocks the slot selling \\c[3]Silver Mail\\c[0] in \\c[3]Vermillion Equipment\\c[0]."
},
"3235924499": {
"en_US": "Unlocks the slot selling \\c[3]Silver Boots\\c[0] in \\c[3]Vermillion Equipment\\c[0]."
},
"3235924500": {
"en_US": "Unlocks \\c[3]all item slots\\c[0] in the shop \\c[3]Vermillion Consumables\\c[0]."
},
"3235924501": {
"en_US": "Unlocks the slot selling \\c[3]Sandwich\\c[0] in \\c[3]Vermillion Consumables\\c[0]."
},
"3235924502": {
"en_US": "Unlocks the slot selling \\c[3]Hi-Sandwich\\c[0] in \\c[3]Vermillion Consumables\\c[0]."
},
"3235924503": {
"en_US": "Unlocks the slot selling \\c[3]Green Leaf Tea\\c[0] in \\c[3]Vermillion Consumables\\c[0]."
},
"3235924504": {
"en_US": "Unlocks the slot selling \\c[3]Just Water\\c[0] in \\c[3]Vermillion Consumables\\c[0]."
},
"3235924505": {
"en_US": "Unlocks the slot selling \\c[3]Spicy Bun\\c[0] in \\c[3]Vermillion Consumables\\c[0]."
},
"3235924506": {
"en_US": "Unlocks the slot selling \\c[3]Fruit Drink\\c[0] in \\c[3]Vermillion Consumables\\c[0]."
},
"3235924507": {
"en_US": "Unlocks the slot selling \\c[3]Rice Cracker\\c[0] in \\c[3]Vermillion Consumables\\c[0]."
},
"3235924508": {
"en_US": "Unlocks the slot selling \\c[3]Veggie Sticks\\c[0] in \\c[3]Vermillion Consumables\\c[0]."
},
"3235824050": {
"en_US": "Unlocks the next dungeon or overworld area in story order."
},
Expand Down
20 changes: 19 additions & 1 deletion data/out/items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,5 +264,23 @@
"Slot Unlock: Mooncake (Rhombus Backer Items)": 3235924487,
"Slot Unlock: Guacamole Toast (Rhombus Backer Items)": 3235924488,
"Slot Unlock: Willis Waldmahl (Rhombus Backer Items)": 3235924489,
"Slot Unlock: Pumpkin Spice Cof. (Rhombus Backer Items)": 3235924490
"Slot Unlock: Pumpkin Spice Cof. (Rhombus Backer Items)": 3235924490,
"Shop Unlock: Vermillion Weapons": 3235924491,
"Slot Unlock: Steel Goggles (Vermillion Weapons)": 3235924492,
"Slot Unlock: Steel Edge (Vermillion Weapons)": 3235924493,
"Slot Unlock: Steel Mail (Vermillion Weapons)": 3235924494,
"Slot Unlock: Steel Boots (Vermillion Weapons)": 3235924495,
"Slot Unlock: Silver Goggles (Vermillion Weapons)": 3235924496,
"Slot Unlock: Silver Edge (Vermillion Weapons)": 3235924497,
"Slot Unlock: Silver Mail (Vermillion Weapons)": 3235924498,
"Slot Unlock: Silver Boots (Vermillion Weapons)": 3235924499,
"Shop Unlock: Vermillion Items": 3235924500,
"Slot Unlock: Sandwich (Vermillion Items)": 3235924501,
"Slot Unlock: Hi-Sandwich (Vermillion Items)": 3235924502,
"Slot Unlock: Green Leaf Tea (Vermillion Items)": 3235924503,
"Slot Unlock: Just Water (Vermillion Items)": 3235924504,
"Slot Unlock: Spicy Bun (Vermillion Items)": 3235924505,
"Slot Unlock: Fruit Drink (Vermillion Items)": 3235924506,
"Slot Unlock: Rice Cracker (Vermillion Items)": 3235924507,
"Slot Unlock: Veggie Sticks (Vermillion Items)": 3235924508
}
18 changes: 17 additions & 1 deletion data/out/locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,5 +767,21 @@
"Shop Slot: Mooncake (Rhombus Backer Items)": 3235824766,
"Shop Slot: Guacamole Toast (Rhombus Backer Items)": 3235824767,
"Shop Slot: Willis Waldmahl (Rhombus Backer Items)": 3235824768,
"Shop Slot: Pumpkin Spice Cof. (Rhombus Backer Items)": 3235824769
"Shop Slot: Pumpkin Spice Cof. (Rhombus Backer Items)": 3235824769,
"Shop Slot: Steel Goggles (Vermillion Weapons)": 3235824770,
"Shop Slot: Steel Edge (Vermillion Weapons)": 3235824771,
"Shop Slot: Steel Mail (Vermillion Weapons)": 3235824772,
"Shop Slot: Steel Boots (Vermillion Weapons)": 3235824773,
"Shop Slot: Silver Goggles (Vermillion Weapons)": 3235824774,
"Shop Slot: Silver Edge (Vermillion Weapons)": 3235824775,
"Shop Slot: Silver Mail (Vermillion Weapons)": 3235824776,
"Shop Slot: Silver Boots (Vermillion Weapons)": 3235824777,
"Shop Slot: Sandwich (Vermillion Items)": 3235824778,
"Shop Slot: Hi-Sandwich (Vermillion Items)": 3235824779,
"Shop Slot: Green Leaf Tea (Vermillion Items)": 3235824780,
"Shop Slot: Just Water (Vermillion Items)": 3235824781,
"Shop Slot: Spicy Bun (Vermillion Items)": 3235824782,
"Shop Slot: Fruit Drink (Vermillion Items)": 3235824783,
"Shop Slot: Rice Cracker (Vermillion Items)": 3235824784,
"Shop Slot: Veggie Sticks (Vermillion Items)": 3235824785
}
30 changes: 7 additions & 23 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"devDependencies": {
"@types/node": "^20.4.9",
"esbuild": "^0.18.15",
"nax-ccuilib": "conorlawton/nax-ccuilib",
"nax-module-cache": "github:conorlawton/nax-module-cache",
"nax-ccuilib": "naxane/nax-ccuilib",
"nax-module-cache": "github:naxane/nax-module-cache",
"nodemon": "^3.0.1",
"typescript": "^5.1.6",
"ultimate-crosscode-typedefs": "github:krypciak/ultimate-crosscode-typedefs"
Expand Down
Loading