Skip to content

Commit

Permalink
Rebalance potion spilling
Browse files Browse the repository at this point in the history
Now get slightly more use out of potions with slurping/spilling/etc.
  • Loading branch information
KnightMiner committed Feb 3, 2023
1 parent cc01a78 commit c59da4d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"fluid": {
"name": "create:potion",
"amount": 125
"amount": 50
},
"effects": [
{
Expand All @@ -20,7 +20,7 @@
},
{
"type": "tconstruct:potion_fluid",
"scale": 1.0,
"scale": 0.75,
"predicate": "{Bottle:\"LINGERING\"}"
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"fluid": {
"tag": "forge:potion",
"amount": 125
"amount": 50
},
"effects": [
{
"type": "tconstruct:potion_fluid",
"scale": 0.5
"scale": 0.25
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,9 @@ protected void addFluids() {
burningFluid("metal_expensive", TinkerTags.Fluids.EXPENSIVE_METAL_SPILLING, FluidValues.NUGGET, 3f, 7);

// potion fluid compat
// standard potion is 250 mb, but we want a smaller number. For the effects, we really want to divide into 4 pieces
addFluid("potion_fluid", TinkerTags.Fluids.POTION, FluidValues.BOTTLE / 2).addEffect(new PotionFluidEffect(0.5f, TagPredicate.ANY));
// standard potion is 250 mb, but we want a smaller number. divide into 5 pieces at 25% a piece (so healing is 1 health), means you gain 25% per potion
int bottleSip = FluidValues.BOTTLE / 5;
addFluid("potion_fluid", TinkerTags.Fluids.POTION, bottleSip).addEffect(new PotionFluidEffect(0.25f, TagPredicate.ANY));

// create has three types of bottles stored on their fluid, react to it to boost
Function<String,TagPredicate> createBottle = value -> {
Expand All @@ -168,11 +169,11 @@ protected void addFluids() {
return new TagPredicate(compound);
};
String create = "create";
addFluid("potion_create", FluidNameIngredient.of(new ResourceLocation(create, "potion"), FluidAttributes.BUCKET_VOLUME / 8))
addFluid("potion_create", FluidNameIngredient.of(new ResourceLocation(create, "potion"), bottleSip))
.condition(new ModLoadedCondition(create))
.addEffect(new PotionFluidEffect(0.25f, createBottle.apply("REGULAR")))
.addEffect(new PotionFluidEffect(0.5f, createBottle.apply("SPLASH")))
.addEffect(new PotionFluidEffect(1f, createBottle.apply("LINGERING")));
.addEffect(new PotionFluidEffect(0.75f, createBottle.apply("LINGERING")));

}

Expand Down

0 comments on commit c59da4d

Please sign in to comment.