Skip to content

Commit 870b857

Browse files
Andrewki44Andrewki44
authored
Merge pull request #65 from Andrewki44:v0.3.3
V0.3.3
2 parents 430d887 + 06f4d85 commit 870b857

8 files changed

Lines changed: 34 additions & 13 deletions

File tree

‎images/maps/regions/moonflow/Moonflow.png‎

9 Bytes
Loading

‎locations/Spira.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1604,7 +1604,7 @@
16041604
},
16051605
{
16061606
"name": "Inside Sin",
1607-
"hosted_item": "exoray, geminisword, geminiclub, adamantoise, behemothking",
1607+
"hosted_item": "ahriman, exoray, geminisword, geminiclub, adamantoise, behemothking",
16081608
"access_rules": ["@Monster Arena/Fiend Capture, @Inside Sin"],
16091609
"clear_as_group": false
16101610
},

‎locations/monster arena/Monster Arena.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
},
297297
{
298298
"name": "Funguar",
299-
"access_rules": ["@Mushroom Rock Road", "@Djose"],
299+
"access_rules": ["@Mushroom Rock Road", "@Djose", "@Moonflow"],
300300
"hosted_item": "funguarcomplete"
301301
},
302302
{
@@ -380,7 +380,7 @@
380380
},
381381
{
382382
"name": "Snow Flan",
383-
"access_rules": ["@Djose"],
383+
"access_rules": ["@Djose", "@Moonflow"],
384384
"hosted_item": "snowflancomplete"
385385
},
386386
{
@@ -921,13 +921,13 @@
921921
"sections": [
922922
{
923923
"name": "Bandersnatch (3x Wolf)",
924-
"access_rules": ["@Mt. Gagazet"],
924+
"access_rules": ["@Mt. Gagazet/Outside"],
925925
"hosted_item": "bandersnatch",
926926
"clear_as_group": false
927927
},
928928
{
929929
"name": "Ahriman (4x Eye)",
930-
"access_rules": ["@Mt. Gagazet/Inside", "@Zanarkand"],
930+
"access_rules": ["@Mt. Gagazet/Inside", "@Zanarkand", "@Inside Sin"],
931931
"hosted_item": "ahriman",
932932
"clear_as_group": false
933933
},
@@ -939,13 +939,13 @@
939939
},
940940
{
941941
"name": "Grenade (5x Bomb)",
942-
"access_rules": ["@Mt. Gagazet"],
942+
"access_rules": ["@Mt. Gagazet/Outside"],
943943
"hosted_item": "grenade",
944944
"clear_as_group": false
945945
},
946946
{
947947
"name": "Grat",
948-
"access_rules": ["@Mt. Gagazet"],
948+
"access_rules": ["@Mt. Gagazet/Outside"],
949949
"hosted_item": "grat",
950950
"clear_as_group": false
951951
},
@@ -957,7 +957,7 @@
957957
},
958958
{
959959
"name": "Bashura",
960-
"access_rules": ["@Mt. Gagazet", "@Zanarkand"],
960+
"access_rules": ["@Mt. Gagazet/Outside", "@Zanarkand"],
961961
"hosted_item": "bashura",
962962
"clear_as_group": false
963963
},
@@ -999,7 +999,7 @@
999999
"sections": [
10001000
{
10011001
"name": "Bandersnatch",
1002-
"access_rules": ["@Mt. Gagazet"],
1002+
"access_rules": ["@Mt. Gagazet/Outside"],
10031003
"hosted_item": "bandersnatchcomplete"
10041004
},
10051005
{
@@ -1014,12 +1014,12 @@
10141014
},
10151015
{
10161016
"name": "Grenade",
1017-
"access_rules": ["@Mt. Gagazet"],
1017+
"access_rules": ["@Mt. Gagazet/Outside"],
10181018
"hosted_item": "grenadecomplete"
10191019
},
10201020
{
10211021
"name": "Grat",
1022-
"access_rules": ["@Mt. Gagazet"],
1022+
"access_rules": ["@Mt. Gagazet/Outside"],
10231023
"hosted_item": "gratcomplete"
10241024
},
10251025
{
@@ -1029,7 +1029,7 @@
10291029
},
10301030
{
10311031
"name": "Bashura",
1032-
"access_rules": ["@Mt. Gagazet", "@Zanarkand"],
1032+
"access_rules": ["@Mt. Gagazet/Outside", "@Zanarkand"],
10331033
"hosted_item": "bashuracomplete"
10341034
},
10351035
{

‎locations/regions/Inside Sin.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
"name": "Monster Captures",
111111
"map_locations": [{ "map": "Inside Sin", "x": 170, "y": 905}],
112112
"sections": [
113+
{"name": "Ahriman (4x Eye)", "ref": "Monster Arena/Fiend Capture/Inside Sin/Fiends/Ahriman (4x Eye)"},
113114
{"name": "Exoray (5x Fungus)", "ref": "Monster Arena/Fiend Capture/Inside Sin/Fiends/Exoray (5x Fungus)"},
114115
{"name": "Gemini (Sword) (10x Iron Giant)", "ref": "Monster Arena/Fiend Capture/Inside Sin/Fiends/Gemini (Sword) (10x Iron Giant)"},
115116
{"name": "Gemini (Club) (10x Iron Giant)", "ref": "Monster Arena/Fiend Capture/Inside Sin/Fiends/Gemini (Club) (10x Iron Giant)"},
@@ -125,6 +126,7 @@
125126
"name": "Monster Captures",
126127
"map_locations": [{ "map": "Inside Sin", "x": 190, "y": 905, "shape": "diamond"}],
127128
"sections": [
129+
{"name": "Ahriman", "ref": "Monster Arena/Fiend Capture/Inside Sin/Fiends/Ahriman"},
128130
{"name": "Exoray", "ref": "Monster Arena/Fiend Capture/Inside Sin/Captures Required for Logic/Exoray"},
129131
{"name": "Gemini (Sword)", "ref": "Monster Arena/Fiend Capture/Inside Sin/Captures Required for Logic/Gemini (Sword)"},
130132
{"name": "Gemini (Club)", "ref": "Monster Arena/Fiend Capture/Inside Sin/Captures Required for Logic/Gemini (Club)"},

‎locations/regions/Macalania.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
{
175175
"name": "Right Side (Chest)",
176176
"map_locations": [{ "map": "Lake Macalania", "x": 680, "y": 540}],
177-
"access_rules": ["crawler"],
177+
"access_rules": ["wendigo"],
178178
"sections": [{"name": "4000 gil"}]
179179
}
180180
]

‎locations/regions/Mt. Gagazet.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@
141141
"name": "Monster Captures",
142142
"map_locations": [{ "map": "Gagazet Cave", "x": 750, "y": 510}],
143143
"sections": [
144+
{"name": "Nidhogg (5x Drake)", "ref": "Monster Arena/Fiend Capture/Cavern of the Stolen Fayth/Fiends/Nidhogg (5x Drake)"},
145+
{"name": "Bandersnatch (3x Wolf)", "ref": "Monster Arena/Fiend Capture/Mt. Gagazet/Fiends/Bandersnatch (3x Wolf)"},
144146
{"name": "Bashura", "ref": "Monster Arena/Fiend Capture/Mt. Gagazet/Fiends/Bashura"},
145147
{"name": "Ahriman (4x Eye)", "ref": "Monster Arena/Fiend Capture/Mt. Gagazet/Fiends/Ahriman (4x Eye)"},
146148
{"name": "Dark Flan (3x Flan)", "ref": "Monster Arena/Fiend Capture/Mt. Gagazet/Fiends/Dark Flan (3x Flan)"},
@@ -156,6 +158,8 @@
156158
"name": "Monster Captures",
157159
"map_locations": [{ "map": "Gagazet Cave", "x": 770, "y": 510, "shape": "diamond"}],
158160
"sections": [
161+
{"name": "Nidhogg", "ref": "Monster Arena/Fiend Capture/Cavern of the Stolen Fayth/Captures Required for Logic/Nidhogg"},
162+
{"name": "Bandersnatch", "ref": "Monster Arena/Fiend Capture/Mt. Gagazet/Captures Required for Logic/Bandersnatch"},
159163
{"name": "Bashura", "ref": "Monster Arena/Fiend Capture/Mt. Gagazet/Captures Required for Logic/Bashura"},
160164
{"name": "Ahriman", "ref": "Monster Arena/Fiend Capture/Mt. Gagazet/Captures Required for Logic/Ahriman"},
161165
{"name": "Dark Flan", "ref": "Monster Arena/Fiend Capture/Mt. Gagazet/Captures Required for Logic/Dark Flan"},

‎scripts/autotracking/archipelago.lua‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,9 @@ function onClear(slot_data)
200200
end
201201
end
202202

203+
-- reset non-mapped items
204+
205+
203206
PLAYER_ID = Archipelago.PlayerNumber or -1
204207
TEAM_NUMBER = Archipelago.TeamNumber or 0
205208
SLOT_DATA = slot_data

‎versions.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
{
22
"versions": [
3+
{
4+
"package_version": "0.3.3",
5+
"download_url": "https://github.com/Andrewki44/FFX-Poptracker/releases/download/v0.3.3/FFX.zip",
6+
"sha256": "c0c52902d70a266ad6d1738fd8080dd20121fe1d72edeaee1460a47074ca300e",
7+
"changelog": [
8+
" - Moved Ahriman to pre-Omnis Sin",
9+
" - Fixed Snow Flan & Funguar access rules in Moonflow",
10+
" - Updated Macalania Agency Clasko chest to require Wendigo instead of Crawler",
11+
" - Added Bandersnatch & Nidhogg to Gagazet Caves captures",
12+
" - Fixed Gagazet captures access to be post Biran & Yenke"
13+
]
14+
},
315
{
416
"package_version": "0.3.2",
517
"download_url": "https://github.com/Andrewki44/FFX-Poptracker/releases/download/v0.3.2/FFX.zip",

0 commit comments

Comments
 (0)