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.

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

Add Nullscape support to End Fishing #1055

Merged
merged 5 commits into from
Oct 15, 2024

Conversation

catter1
Copy link
Contributor

@catter1 catter1 commented Sep 26, 2024

Currently, End Fishing only supports the Vanilla biomes. This PR adds support for Nullscape biomes - meaning loot can be gained by fishing in Nullscape's biomes. This is also important, since Nullscape prevents a couple of vanilla end biomes from generating.

History

This was previously discussed over a year ago, but it was not easily possible due to how End Fishing is set up. Now that it is possible to reference biome tags in loot tables, this idea is possible (and can be expanded to other custom end biomes if needed in the future).

Implementation

Three new biome tags were made, following the gm4_end_fishing:nullscape/[biome] schema. These tags reference the respective Nullscape biome, setting required to false. Then the loot tables reference the tags as they would any other vanilla end biome.

Nullscape Biome Loot

  • Shadowlands - Copies the End Midlands loot distribution, since End Midlands does not generate in Nullscape
  • Void Barrens - Copies the End Barrens loot distribution, since End Barrens does not generate in Nullscape
  • Crystal Peaks - Has the default loot distribution, except:
    • Valuables - Obsidian is replaced with Crying Obsidian, and added an extra Amethyst Block entry
    • Scattered Treasure - Made Captain's Wings slightly more common (since it's a mountain biome)

Note

While working on the loot tables, I noticed that Captain's Wings (elytra) was an inline definition in the scattered_treasure loot table. Instead of making a new PR for it, I just moved it to gm4_end_fishing:items/captains_wings (just like ravaged_wings already is) in bb4c0aa. This can be reverted if for some reason it is not wanted.

@misode misode added the feature-update An additional feature has been added to a module label Sep 26, 2024
Copy link
Member

@misode misode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested this in-game, but the changes look good!

@misode
Copy link
Member

misode commented Oct 15, 2024

I tested this in-game with Nullscape and can confirm it works. I made some additional commits to cleanup and simplify the loot tables, but they should be equivalent.

@misode misode merged commit 31484f1 into Gamemode4Dev:master Oct 15, 2024
2 checks passed
github-actions bot pushed a commit that referenced this pull request Oct 15, 2024
* Add Nullscape biome support to End Fishing

* Move Captain's Wings to separate loot table

* Compact biome conditions by using grouping tags

* Order loot table fields consistenly

* Optimize end city treasure loot tables by putting functions on pool

---------

Co-authored-by: Misode <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature-update An additional feature has been added to a module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants