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

Jump to bottom

Minecraft updates #29

Merged
merged 29 commits into from
Jul 23, 2021
Merged

Minecraft updates #29

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
bc2ea29
Implement excluded locations
espeon65536 Jul 14, 2021
f2fe516
Update Minecraft to use exclusion_rules for its exclusion pools
espeon65536 Jul 14, 2021
a0d9809
Flag the enchanted books as advancement so they don't go on excluded …
espeon65536 Jul 14, 2021
9295d12
update playerSettings for exclusion
espeon65536 Jul 14, 2021
56dc442
new items: 32 Arrows, Saddle, structure compasses for overworld struc…
espeon65536 Jul 15, 2021
476a6d4
move structure linking to create_regions instead of generate_basic
espeon65536 Jul 15, 2021
c276eb9
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago i…
espeon65536 Jul 15, 2021
0717dbc
Update Minecraft to use LogicMixin
espeon65536 Jul 15, 2021
060d6c8
add separate can_exclude property, so non-progression items can be ma…
espeon65536 Jul 15, 2021
cf69ee9
separate fill step for nonadvancement nonexcluded items
espeon65536 Jul 15, 2021
38f0bf2
Merge branch 'minecraft' into main
espeon65536 Jul 16, 2021
2a67dcf
made Saddle not a progression item, but also nonexcluded
espeon65536 Jul 16, 2021
8912ce8
fix missing player arg
espeon65536 Jul 16, 2021
1706e34
remove higher xp amounts from pool, leaving only 50 XP
espeon65536 Jul 16, 2021
774f77a
fix new Minecraft item IDs
espeon65536 Jul 16, 2021
36b513f
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago i…
espeon65536 Jul 17, 2021
75d28df
added shulker box item for starting inventory
espeon65536 Jul 20, 2021
dbabadb
increment client and data version
espeon65536 Jul 20, 2021
2c87986
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago i…
espeon65536 Jul 20, 2021
7ed4fe4
change client_version to int instead of tuple
espeon65536 Jul 20, 2021
9611a3f
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago i…
espeon65536 Jul 21, 2021
85be7ae
make saddle a progression item
espeon65536 Jul 21, 2021
fba201d
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago i…
espeon65536 Jul 22, 2021
1f0ce2d
added structure compass option and appropriate logic for all compasses
espeon65536 Jul 22, 2021
942b6bd
Update playerSettings.yaml with MC options
espeon65536 Jul 22, 2021
f561f0b
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago i…
espeon65536 Jul 22, 2021
955ee04
update minecraft tests
espeon65536 Jul 23, 2021
c89d630
update exclusion procedure for clarity
espeon65536 Jul 23, 2021
d7fbcda
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago i…
espeon65536 Jul 23, 2021
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
Prev Previous commit
Next Next commit
update minecraft tests
  • Loading branch information
@espeon65536
espeon65536 committed Jul 23, 2021
commit 955ee04845e718d2e9208186b4d855aba9fd85e1
20 changes: 11 additions & 9 deletions test/minecraft/TestAdvancements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,12 @@ def test_42015(self):
["This Boat Has Legs", False, [], ['Progressive Weapons']],
["This Boat Has Legs", False, [], ['Progressive Armor', 'Shield']],
["This Boat Has Legs", False, [], ['Fishing Rod']],
["This Boat Has Legs", False, [], ['Saddle']],
["This Boat Has Legs", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']],
["This Boat Has Legs", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Bucket', 'Fishing Rod']],
["This Boat Has Legs", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']],
["This Boat Has Legs", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Bucket', 'Fishing Rod']],
["This Boat Has Legs", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']],
["This Boat Has Legs", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Bucket', 'Fishing Rod']],
["This Boat Has Legs", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']],
["This Boat Has Legs", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Bucket', 'Fishing Rod']],
["This Boat Has Legs", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']],
])

def test_42016(self):
Expand Down Expand Up @@ -1099,13 +1100,14 @@ def test_42088(self):
["When Pigs Fly", False, [], ['Progressive Weapons']],
["When Pigs Fly", False, [], ['Progressive Armor', 'Shield']],
["When Pigs Fly", False, [], ['Fishing Rod']],
["When Pigs Fly", False, [], ['Saddle']],
["When Pigs Fly", False, ['Progressive Weapons'], ['Flint and Steel', 'Progressive Weapons', 'Progressive Weapons']],
["When Pigs Fly", False, ['Progressive Tools', 'Progressive Tools', 'Progressive Weapons'], ['Bucket', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons']],
["When Pigs Fly", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']],
["When Pigs Fly", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']],
["When Pigs Fly", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Fishing Rod']],
["When Pigs Fly", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Fishing Rod']],
["When Pigs Fly", True, ['Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Ingot Crafting', 'Progressive Tools', 'Fishing Rod']],
["When Pigs Fly", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']],
["When Pigs Fly", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']],
["When Pigs Fly", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Fishing Rod']],
["When Pigs Fly", True, ['Saddle', 'Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Fishing Rod']],
["When Pigs Fly", True, ['Saddle', 'Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Ingot Crafting', 'Progressive Tools', 'Fishing Rod']],
])

def test_42089(self):
Expand Down
1 change: 1 addition & 0 deletions test/minecraft/TestMinecraft.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def setUp(self):
setattr(self.world, "shuffle_structures", {1: Toggle(False)})
setattr(self.world, "combat_difficulty", {1: CombatDifficulty(1)}) # normal
setattr(self.world, "bee_traps", {1: Toggle(False)})
setattr(self.world, "structure_compasses", {1: Toggle(False)})
AutoWorld.call_single(self.world, "create_regions", 1)
AutoWorld.call_single(self.world, "generate_basic", 1)
AutoWorld.call_single(self.world, "set_rules", 1)
Expand Down