Skip to content
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

Bottle tracking #32

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

Bottle tracking #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
117eee9
bottle tracking
cheuer May 21, 2024
58ee533
remove debug print
cheuer May 21, 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 added images/items/bottle_bee.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.
Binary file added images/items/bottle_blue.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.
Binary file added images/items/bottle_empty.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.
Binary file added images/items/bottle_fairy.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.
Binary file added images/items/bottle_goodbee.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.
Binary file added images/items/bottle_green.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.
Binary file added images/items/bottle_red.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.
136 changes: 136 additions & 0 deletions items/items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,142 @@
}
]
},
{
"name": "Bottle 1",
"type": "progressive",
"allow_disabled": "false",
"loop": true,
"stages": [
{
"img": "images/items/bottle_empty.png",
"img_mods": "@disabled"
},
{
"img": "images/items/bottle_empty.png",
"codes": "bottle0,bottle"
},
{
"img": "images/items/bottle_red.png"
},
{
"img": "images/items/bottle_green.png"
},
{
"img": "images/items/bottle_blue.png"
},
{
"img": "images/items/bottle_fairy.png"
},
{
"img": "images/items/bottle_bee.png"
},
{
"img": "images/items/bottle_goodbee.png"
}
]
},
{
"name": "Bottle 2",
"type": "progressive",
"allow_disabled": "false",
"loop": true,
"stages": [
{
"img": "images/items/bottle_empty.png",
"img_mods": "@disabled"
},
{
"img": "images/items/bottle_empty.png",
"codes": "bottle1,bottle"
},
{
"img": "images/items/bottle_red.png"
},
{
"img": "images/items/bottle_green.png"
},
{
"img": "images/items/bottle_blue.png"
},
{
"img": "images/items/bottle_fairy.png"
},
{
"img": "images/items/bottle_bee.png"
},
{
"img": "images/items/bottle_goodbee.png"
}
]
},
{
"name": "Bottle 3",
"type": "progressive",
"allow_disabled": "false",
"loop": true,
"stages": [
{
"img": "images/items/bottle_empty.png",
"img_mods": "@disabled"
},
{
"img": "images/items/bottle_empty.png",
"codes": "bottle2,bottle"
},
{
"img": "images/items/bottle_red.png"
},
{
"img": "images/items/bottle_green.png"
},
{
"img": "images/items/bottle_blue.png"
},
{
"img": "images/items/bottle_fairy.png"
},
{
"img": "images/items/bottle_bee.png"
},
{
"img": "images/items/bottle_goodbee.png"
}
]
},
{
"name": "Bottle 4",
"type": "progressive",
"allow_disabled": "false",
"loop": true,
"stages": [
{
"img": "images/items/bottle_empty.png",
"img_mods": "@disabled"
},
{
"img": "images/items/bottle_empty.png",
"codes": "bottle3,bottle"
},
{
"img": "images/items/bottle_red.png"
},
{
"img": "images/items/bottle_green.png"
},
{
"img": "images/items/bottle_blue.png"
},
{
"img": "images/items/bottle_fairy.png"
},
{
"img": "images/items/bottle_bee.png"
},
{
"img": "images/items/bottle_goodbee.png"
}
]
},
// Somaria
{
"name": "Cane of Somaria",
Expand Down
12 changes: 11 additions & 1 deletion layouts/broadcast.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"armor"
],
[
"bottle",
"",
"somaria",
"byrna",
"cape",
Expand Down Expand Up @@ -69,6 +69,16 @@
"item": "mushroom_used",
"width": 24,
"margin": "88,18,0,0"
},
{
"type": "itemgrid",
"item_size": 16,
"item_margin": "0,1",
"margin": "-101,65,0,0",
"rows":[
[ "bottle0", "bottle1" ],
[ "bottle2", "bottle3" ]
]
}
]
},
Expand Down
106 changes: 61 additions & 45 deletions layouts/shared_base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,66 @@
{
"shared_item_grid": {
"type": "itemgrid",
"h_alignment": "center",
"item_margin": "1,2",
"item_size": 42,
"rows": [
[
"bow",
"boomerang_red",
"hookshot",
"bombs",
"powder_used",
"mushroom_used",
"boots",
"owsword"
],
[
"firerod",
"icerod",
"bombos",
"ether",
"quake",
"halfmagic",
"lift1",
"shield"
],
[
"lamp",
"hammer",
"ocarina",
"net",
"book",
"shovel_used",
"flippers",
"armor"
],
[
"bottle",
"somaria",
"byrna",
"cape",
"mirror",
"agas",
"moonpearl",
"gomode"
]
"type": "container",
"margin": 0,
"content": [
{
"type": "itemgrid",
"h_alignment": "center",
"item_margin": "1,2",
"item_size": 42,
"rows": [
[
"bow",
"boomerang_red",
"hookshot",
"bombs",
"powder_used",
"mushroom_used",
"boots",
"owsword"
],
[
"firerod",
"icerod",
"bombos",
"ether",
"quake",
"halfmagic",
"lift1",
"shield"
],
[
"lamp",
"hammer",
"ocarina",
"net",
"book",
"shovel_used",
"flippers",
"armor"
],
[
"",
"somaria",
"byrna",
"cape",
"mirror",
"agas",
"moonpearl",
"gomode"
]
]
},
{
"type": "itemgrid",
"item_size": 21,
"item_margin": "0,1",
"margin": "-153,72,0,0",
"rows":[
[ "bottle0", "bottle1" ],
[ "bottle2", "bottle3" ]
]
}
]
},
"shared_pendant_grid": {
Expand Down
13 changes: 6 additions & 7 deletions scripts/auto/itemupdates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,15 @@ function updateFlute(segment)
end

function updateBottles(segment)
local item = Tracker:FindObjectForCode("bottle")
local count = 0
for i = 0, 3, 1 do
if segment:ReadUInt8(0x7ef35c + i) > 0 then
count = count + 1
local item = Tracker:FindObjectForCode("bottle"..i)
local contents = segment:ReadUInt8(0x7ef35c + i)
if contents == 0 then
item.CurrentStage = 0
else
item.CurrentStage = contents - 1
end
end
if count > item.CurrentStage or not STATUS.AutotrackerInGame then
item.CurrentStage = count
end
end

function updateBatIndicatorStatus(status)
Expand Down