Skip to content

Add support for medallion for TR and MM. #11

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
gmenuel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for medallion for TR and MM. #11

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
16 changes: 16 additions & 0 deletions css/bosses.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,19 @@
background-position: 0 100%;
background-size: 200%;
}
.bosses.medallion-unknown {
background-position: 0 100%;
background-size: 200%;
}
.bosses.medallion-bombos {
background-position: 100% 91.182365%;
background-size: 200%;
}
.bosses.medallion-ether {
background-position: 100% 93.386774%;
background-size: 200%;
}
.bosses.medallion-quake {
background-position: 100% 95.591182%;
background-size: 200%;
}
12 changes: 12 additions & 0 deletions css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,12 @@ footer {
--item-scale-x: 0.5;
--item-scale-y: 0.5;
}
.boss8medallion {
--item-x: 5.5;
--item-y: 5;
--item-scale-x: 0.5;
--item-scale-y: 0.5;
}
.boss8chest {
--item-x: 5;
--item-y: 6;
Expand All @@ -408,6 +414,12 @@ footer {
--item-x: 6;
--item-y: 5;
}
.boss9medallion {
--item-x: 6.5;
--item-y: 5;
--item-scale-x: 0.5;
--item-scale-y: 0.5;
}
.boss9reward {
--item-x: 6.5;
--item-y: 5.5;
Expand Down
Binary file modified img/bosses.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.
15 changes: 2 additions & 13 deletions js/caves.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,11 +1537,7 @@ window.caves = {
y: '81.22%',
state(items) {
if (!items.access('mire')) return '';
return items.has('sword') &&
items.has('bombos') &&
items.has('ether') &&
items.has('quake') &&
items.has('moonpearl')
return items.access('miredungeon')
? 'available'
: 'visible';
},
Expand All @@ -1558,15 +1554,8 @@ window.caves = {
x: '93.86%',
y: '7.47%',
state(items) {
if (!items.access('dmne')) return '';

if (
items.has('sword') &&
items.has('hammer') &&
items.has('bombos') &&
items.has('ether') &&
items.has('quake') &&
items.has('moonpearl')
items.access('turtlerock')
) { return 'available'; }

return items.access('dwdmne') ? 'visible' : '';
Expand Down
6 changes: 1 addition & 5 deletions js/item_randomizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,11 +750,7 @@ window.item_randomizer = {
y: '81.22%',
state(items) {
if (!items.access('mire')) return '';
return items.has('sword') &&
items.has('bombos') &&
items.has('ether') &&
items.has('quake') &&
items.has('moonpearl')
return items.access('miredungeon') && (items.has('hookshot') || items.has('boots'))
? 'available'
: 'visible';
},
Expand Down
39 changes: 34 additions & 5 deletions js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,18 @@ $(() => {
],
type: 'bosses',
};
if (i == 8 || i == 9)
{
this.items[`boss${i}medallion`] = {
values: [
'medallion-unknown',
'medallion-bombos',
'medallion-ether',
'medallion-quake',
],
type: 'bosses',
};
}
const dungeonChests = {
values: [],
type: 'bosses',
Expand Down Expand Up @@ -1002,7 +1014,7 @@ $(() => {
}
div.removeClass(item);

if (item.endsWith('reward') || item.endsWith('chest')) {
if (item.endsWith('reward') || item.endsWith('chest') || item.endsWith('medallion')) {
div.addClass(item);
div.addClass(itemState);
} else if (itemState === 'none') {
Expand Down Expand Up @@ -1142,6 +1154,19 @@ $(() => {
);
case 'mire':
return this.has('glove2') && this.has('flute');
case 'miredungeon':
const needed_medallion8 = this.safeGetItem('boss8medallion').substring(10);
return (
this.access('mire', allZones) &&
this.has('sword') &&
(
needed_medallion8 != 'unknown' && this.has(needed_medallion8) ||
this.has('bombos') &&
this.has('ether') &&
this.has('quake')
) &&
this.has('moonpearl')
);
case 'dwbumpexit':
return this.state.mode === 'item' && this.has('cape') && this.access('dwwest', allZones);
case 'dwdmisland':
Expand All @@ -1152,13 +1177,17 @@ $(() => {
this.access('dwdmne')
);
case 'turtlerock':
const needed_medallion9 = this.safeGetItem('boss9medallion').substring(10);
return (
this.access('dmne', allZones) &&
this.access('dwdmne', allZones) &&
this.has('hammer') &&
this.has('sword') &&
this.has('bombos') &&
this.has('ether') &&
this.has('quake') &&
(
needed_medallion9 != 'unknown' && this.has(needed_medallion9) ||
this.has('bombos') &&
this.has('ether') &&
this.has('quake')
) &&
this.has('moonpearl')
);
case 'dwdmledge':
Expand Down