Skip to content

Replace Agahnim item by an eleventh dungeon #22

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
Ninban wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Replace Agahnim item by an eleventh dungeon #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bdf3b2
Replace Agahnim item by an eleventh dungeon
Ninban Feb 3, 2018
8e3e468
Replace trackerData.items.agahnim references by trackerData.items.boss11
Ninban Feb 4, 2018
b314857
Add borders to small keys numbers because they were hard to see
Ninban Feb 8, 2018
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 removed public/images/agahnim0.png
View file
Open in desktop
Binary file not shown.
Binary file added public/images/boss111.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.
0 public/images/agahnim1.png → public/images/boss112.png
View file
Open in desktop
File renamed without changes
Binary file modified public/images/smallkey1.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 modified public/images/smallkey2.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 modified public/images/smallkey3.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 modified public/images/smallkey4.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 modified public/images/smallkey5.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 modified public/images/smallkey6.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.
63 changes: 51 additions & 12 deletions public/script/chests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ function glitchedLinkInDarkWorld() {
}

function canGoBeatAgahnim1(allowOutOfLogicGlitches) {
return !trackerData.items.agahnim
return trackerData.items.boss11 === 1
&& (trackerData.items.lantern || allowOutOfLogicGlitches)
&& (trackerData.items.cape || trackerData.items.sword >= 2)
&& trackerData.items.sword >= 1;
}

function canEnterNorthEastDarkWorld(logic, agahnimCheck, allowOutOfLogicGlitches) {
if (logic === 'majorGlitches') {
return trackerData.items.agahnim
return trackerData.items.boss11 === 2
|| (agahnimCheck && canGoBeatAgahnim1(allowOutOfLogicGlitches))
|| (trackerData.items.moonpearl
&& ((canLiftDarkRocks() && (trackerData.items.boots || trackerData.items.flippers))
Expand All @@ -99,7 +99,7 @@ function canEnterNorthEastDarkWorld(logic, agahnimCheck, allowOutOfLogicGlitches
|| (trackerData.items.moonpearl && (trackerData.items.mirror || trackerData.items.boots))));
}
else if (logic === 'owGlitches') {
return trackerData.items.agahnim
return trackerData.items.boss11 === 2
|| (agahnimCheck && canGoBeatAgahnim1(allowOutOfLogicGlitches))
|| (trackerData.items.moonpearl
&& ((canLiftDarkRocks() && (trackerData.items.boots || trackerData.items.flippers))
Expand All @@ -109,7 +109,7 @@ function canEnterNorthEastDarkWorld(logic, agahnimCheck, allowOutOfLogicGlitches
|| (trackerData.items.moonpearl && (trackerData.items.mirror || trackerData.items.boots))));
}
else if (logic === 'glitchless') {
return trackerData.items.agahnim
return trackerData.items.boss11 === 2
|| (agahnimCheck && canGoBeatAgahnim1(allowOutOfLogicGlitches))
|| (trackerData.items.hammer && canLiftRocks() && trackerData.items.moonpearl)
|| (canLiftDarkRocks() && trackerData.items.flippers && trackerData.items.moonpearl);
Expand All @@ -122,7 +122,7 @@ function canEnterNorthWestDarkWorld(logic, agahnimCheck, allowOutOfLogicGlitches
|| (trackerData.items.moonpearl
&& (canLiftDarkRocks()
|| (trackerData.items.hammer && canLiftRocks())
|| ((trackerData.items.agahnim || (agahnimCheck && canGoBeatAgahnim1(allowOutOfLogicGlitches)))
|| ((trackerData.items.boss11 === 2 || (agahnimCheck && canGoBeatAgahnim1(allowOutOfLogicGlitches)))
&& trackerData.items.hookshot
&& (trackerData.items.hammer || canLiftRocks() || trackerData.items.flippers))));
}
Expand All @@ -131,7 +131,7 @@ function canEnterNorthWestDarkWorld(logic, agahnimCheck, allowOutOfLogicGlitches
|| (trackerData.items.moonpearl
&& (canLiftDarkRocks()
|| (trackerData.items.hammer && canLiftRocks())
|| ((trackerData.items.agahnim || (agahnimCheck && canGoBeatAgahnim1(allowOutOfLogicGlitches)))
|| ((trackerData.items.boss11 === 2 || (agahnimCheck && canGoBeatAgahnim1(allowOutOfLogicGlitches)))
&& trackerData.items.hookshot
&& (trackerData.items.hammer || canLiftRocks() || trackerData.items.flippers))));
}
Expand All @@ -149,15 +149,15 @@ function canEnterSouthDarkWorld(logic, agahnimCheck, allowOutOfLogicGlitches) {
|| (trackerData.items.moonpearl
&& (canLiftDarkRocks()
|| (trackerData.items.hammer && canLiftRocks())
|| ((trackerData.items.agahnim || (agahnimCheck && canGoBeatAgahnim1(allowOutOfLogicGlitches)))
|| ((trackerData.items.boss11 === 2 || (agahnimCheck && canGoBeatAgahnim1(allowOutOfLogicGlitches)))
&& (trackerData.items.hammer || (trackerData.items.hookshot && (trackerData.items.flippers || canLiftRocks()))))));
}
else if (logic === 'owGlitches') {
return (canEnterWestDeathMountain(logic, allowOutOfLogicGlitches) && (trackerData.items.mirror || (trackerData.items.boots && trackerData.items.moonpearl)))
|| (trackerData.items.moonpearl
&& (canLiftDarkRocks()
|| (trackerData.items.hammer && canLiftRocks())
|| ((trackerData.items.agahnim || (agahnimCheck && canGoBeatAgahnim1(allowOutOfLogicGlitches)))
|| ((trackerData.items.boss11 === 2 || (agahnimCheck && canGoBeatAgahnim1(allowOutOfLogicGlitches)))
&& (trackerData.items.hammer || (trackerData.items.hookshot && (trackerData.items.flippers || canLiftRocks()))))));
}
else if (logic === 'glitchless') {
Expand Down Expand Up @@ -2265,6 +2265,45 @@ dungeons[10] = {
}
};

dungeons[11] = {
name: "Castle Tower",
label: "CT",
x: "24.9%",
y: "54.1%",
image: "boss112.png",
canEnter: function (logic, allowOutOfLogicGlitches) {
return canGoBeatAgahnim1(allowOutOfLogicGlitches);
},
isBeatable: function() {
const availability = new Availability();
if (this.canEnter('glitchless', false)) {
availability.glitchless = 'available';
availability.owGlitches = 'available';
availability.majorGlitches = 'available';
}
else if (this.canEnter('glitchless', true)) {
availability.glitchless = 'glitchavailable';
availability.owGlitches = 'glitchavailable';
availability.majorGlitches = 'glitchavailable';
}
return availability;
},
canGetChest: function() {
const availability = new Availability();
if (this.canEnter('glitchless', false)) {
availability.glitchless = 'available';
availability.owGlitches = 'available';
availability.majorGlitches = 'available';
}
else if (this.canEnter('glitchless', true)) {
availability.glitchless = 'glitchavailable';
availability.owGlitches = 'glitchavailable';
availability.majorGlitches = 'glitchavailable';
}
return availability;
}
};

//define overworld chests
const chests = [];

Expand Down Expand Up @@ -3317,7 +3356,7 @@ chests[37] = {
const availability = new Availability();
availability.glitchless = 'possible';
if (trackerData.items.boots) {
if (trackerData.items.agahnim) {
if (trackerData.items.boss11 === 2) {
availability.glitchless = 'available';
}
else if (canGoBeatAgahnim1(false)) {
Expand Down Expand Up @@ -4113,7 +4152,7 @@ chests[61] = {
}
if (crystalCount === 2 && trackerData.items.moonpearl) {
if (canEnterSouthDarkWorld('glitchless', false, false)
&& (trackerData.items.hammer || (trackerData.items.mirror && trackerData.items.agahnim))) {
&& (trackerData.items.hammer || (trackerData.items.mirror && trackerData.items.boss11 === 2))) {
availability.glitchless = 'available';
}
else if (canEnterSouthDarkWorld('glitchless', true, false)
Expand All @@ -4130,7 +4169,7 @@ chests[61] = {
}
else if (crystalCount === 2) {
if (canEnterSouthDarkWorld('owGlitches', false, false)
&& ((trackerData.items.hammer && trackerData.items.moonpearl) || (trackerData.items.mirror && trackerData.items.agahnim))) {
&& ((trackerData.items.hammer && trackerData.items.moonpearl) || (trackerData.items.mirror && trackerData.items.boss11 === 2))) {
availability.owGlitches = 'available'
}
else if (canEnterSouthDarkWorld('owGlitches', true, false)
Expand All @@ -4142,7 +4181,7 @@ chests[61] = {
availability.owGlitches = 'glitchagahnim';
}
if (canEnterSouthDarkWorld('majorGlitches', false, false)
&& ((trackerData.items.hammer && glitchedLinkInDarkWorld()) || (trackerData.items.mirror && trackerData.items.agahnim))) {
&& ((trackerData.items.hammer && glitchedLinkInDarkWorld()) || (trackerData.items.mirror && trackerData.items.boss11 === 2))) {
availability.majorGlitches = 'available'
}
else if (canEnterSouthDarkWorld('majorGlitches', true, false)
Expand Down
33 changes: 17 additions & 16 deletions public/script/items.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var defaultItemGrid = [
"boss0",
"boss1",
"boss2",
"agahnim",
"boss11",
"blank",
],
];
Expand Down Expand Up @@ -99,7 +99,7 @@ var itemsInit = {
boss8: 1,
boss9: 1,
boss10: 1,
agahnim: 0,
boss11: 1,

blank: false
};
Expand All @@ -115,15 +115,16 @@ var dungeonchestsInit = {
7: 3,
8: 2,
9: 5,
10: 20
10: 20,
11: 0
};

var bigkeyInit = [false, false, false, false, false, false, false, false, false, false, false];
var smallkeyInit = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
var bigkeyInit = [false, false, false, false, false, false, false, false, false, false, false, false];
var smallkeyInit = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];

var dungeonbeatenInit = [false, false, false, false, false, false, false, false, false, false, false];
var prizesInit = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
var medallionsInit = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
var dungeonbeatenInit = [false, false, false, false, false, false, false, false, false, false, false, false];
var prizesInit = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
var medallionsInit = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];


var itemsMin = {
Expand All @@ -143,16 +144,15 @@ var itemsMin = {
boss1: 1,
boss2: 1,

agahnim:0,

boss3: 1,
boss4: 1,
boss5: 1,
boss6: 1,
boss7: 1,
boss8: 1,
boss9: 1,
boss10: 1
boss10: 1,
boss11: 1
};

var itemsMax = {
Expand All @@ -172,8 +172,6 @@ var itemsMax = {
boss1: 2,
boss2: 2,

agahnim: 1,

boss3: 2,
boss4: 2,
boss5: 2,
Expand All @@ -182,8 +180,9 @@ var itemsMax = {
boss8: 2,
boss9: 2,
boss10: 2,

chest0: 3,
boss11: 2,

chest0: 3,
chest1: 2,
chest2: 2,
chest3: 5,
Expand All @@ -194,6 +193,7 @@ var itemsMax = {
chest8: 2,
chest9: 5,
chest10: 20,
chest11: 0,

key0: 0,
key1: 1,
Expand All @@ -205,5 +205,6 @@ var itemsMax = {
key7: 2,
key8: 3,
key9: 4,
key10: 4
key10: 4,
key11: 2
};
4 changes: 2 additions & 2 deletions public/script/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ Vue.component('tracker-cell', {
},
bigKeyImage: function() {
if(this.bossNum && this.trackerOptions && this.trackerOptions.showbigkeys && this.trackerData.bigkeys) {
if(this.trackerData.bigkeys[this.bossNum]) {
if(this.trackerData.bigkeys[this.bossNum] && this.bossNum < 11) {
return "url(/images/bigkey.png)";
} else {
return "url(/images/nothing.png)";
Expand All @@ -740,7 +740,7 @@ Vue.component('tracker-cell', {
return null;
},
prizeImage: function() {
if(this.bossNum && this.bossNum !== "10" && this.trackerOptions && this.trackerOptions.showprizes) {
if(this.bossNum && this.bossNum < 10 && this.trackerOptions && this.trackerOptions.showprizes) {
return "url(/images/dungeon" + this.trackerData.prizes[this.bossNum] + ".png)";
}
return null;
Expand Down