Fixed food poisoning probabilities being reversed - cooked had a higher chance of poisoning rather than lower

This commit is contained in:
Sollace 2024-05-16 22:21:20 +01:00
parent f2a4a5f114
commit 59bdba6437
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB

View file

@ -57,7 +57,7 @@ public class FoodGroupsGenerator {
FoodComponents.COOKED_BEEF, FoodComponents.BEEF, exporter); FoodComponents.COOKED_BEEF, FoodComponents.BEEF, exporter);
exporter.accept(Unicopia.id("foraging/blinding"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_BLINDING).food(4, 0.2F).ailment(CompoundAffliction.of( exporter.accept(Unicopia.id("foraging/blinding"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_BLINDING).food(4, 0.2F).ailment(CompoundAffliction.of(
new StatusEffectAffliction(StatusEffects.BLINDNESS, Range.of(30), Range.of(0), 50), new StatusEffectAffliction(StatusEffects.BLINDNESS, Range.of(30), Range.of(0), 10),
new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 12) new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 12)
))); )));
exporter.accept(Unicopia.id("foraging/dangerous"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_DANGEROUS).food(3, 0.3F).ailment(new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(250), Range.of(2), 4))); exporter.accept(Unicopia.id("foraging/dangerous"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_DANGEROUS).food(3, 0.3F).ailment(new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(250), Range.of(2), 4)));
@ -69,24 +69,24 @@ public class FoodGroupsGenerator {
new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(200), Range.of(2), 0) new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(200), Range.of(2), 0)
))); )));
exporter.accept(Unicopia.id("foraging/prickly"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_PRICKLY).food(0, 1.5F).ailment(CompoundAffliction.of( exporter.accept(Unicopia.id("foraging/prickly"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_PRICKLY).food(0, 1.5F).ailment(CompoundAffliction.of(
new StatusEffectAffliction(StatusEffects.INSTANT_DAMAGE, Range.of(1), Range.of(0), 30) new StatusEffectAffliction(StatusEffects.INSTANT_DAMAGE, Range.of(1), Range.of(0), 12)
))); )));
exporter.accept(Unicopia.id("foraging/glowing"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_GLOWING).food(1, 1.6F).ailment(CompoundAffliction.of( exporter.accept(Unicopia.id("foraging/glowing"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_GLOWING).food(1, 1.6F).ailment(CompoundAffliction.of(
new StatusEffectAffliction(StatusEffects.GLOWING, Range.of(30), Range.of(0), 30), new StatusEffectAffliction(StatusEffects.GLOWING, Range.of(30), Range.of(0), 0),
new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 0) new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 30)
))); )));
exporter.accept(Unicopia.id("foraging/risky"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_RISKY).food(9, 1.1F).ailment(new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 80))); exporter.accept(Unicopia.id("foraging/risky"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_RISKY).food(9, 1.1F).ailment(new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 80)));
exporter.accept(Unicopia.id("foraging/severely_nauseating"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_SEVERE_NAUSEATING).food(3, 0.9F).ailment(CompoundAffliction.of( exporter.accept(Unicopia.id("foraging/severely_nauseating"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_SEVERE_NAUSEATING).food(3, 0.9F).ailment(CompoundAffliction.of(
new StatusEffectAffliction(StatusEffects.WEAKNESS, Range.of(200), Range.of(1), 0), new StatusEffectAffliction(StatusEffects.WEAKNESS, Range.of(200), Range.of(1), 0),
new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 80) new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 7)
))); )));
exporter.accept(Unicopia.id("foraging/severely_prickly"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_SEVERE_PRICKLY).food(2, 0.9F).ailment(CompoundAffliction.of( exporter.accept(Unicopia.id("foraging/severely_prickly"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_SEVERE_PRICKLY).food(2, 0.9F).ailment(CompoundAffliction.of(
new StatusEffectAffliction(StatusEffects.INSTANT_DAMAGE, Range.of(1), Range.of(0), 0), new StatusEffectAffliction(StatusEffects.INSTANT_DAMAGE, Range.of(1), Range.of(0), 0),
new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 80) new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 50)
))); )));
exporter.accept(Unicopia.id("foraging/strengthening"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_STRENGHENING).food(4, 0.2F).ailment(CompoundAffliction.of( exporter.accept(Unicopia.id("foraging/strengthening"), new FoodGroupEffects.Builder().tag(UTags.Items.FORAGE_STRENGHENING).food(4, 0.2F).ailment(CompoundAffliction.of(
new StatusEffectAffliction(StatusEffects.STRENGTH, Range.of(1300), Range.of(0), 0), new StatusEffectAffliction(StatusEffects.STRENGTH, Range.of(1300), Range.of(0), 0),
new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 70) new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 30)
))); )));
} }
@ -94,14 +94,15 @@ public class FoodGroupsGenerator {
TagKey<Item> cookedTag, TagKey<Item> rawTag, TagKey<Item> rottenTag, TagKey<Item> cookedTag, TagKey<Item> rawTag, TagKey<Item> rottenTag,
FoodComponent cooked, FoodComponent raw, FoodComponent rotten, FoodComponent cooked, FoodComponent raw, FoodComponent rotten,
BiConsumer<Identifier, FoodGroupEffects.Builder> exporter) { BiConsumer<Identifier, FoodGroupEffects.Builder> exporter) {
exporter.accept(Unicopia.id(name + "/cooked"), new FoodGroupEffects.Builder().tag(cookedTag).food(cooked).ailment(new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 25))); exporter.accept(Unicopia.id(name + "/cooked"), new FoodGroupEffects.Builder().tag(cookedTag).food(cooked).ailment(
new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(10, 100), Range.of(1, 2), 120)));
exporter.accept(Unicopia.id(name + "/raw"), new FoodGroupEffects.Builder().tag(rawTag).food(raw).ailment(CompoundAffliction.of( exporter.accept(Unicopia.id(name + "/raw"), new FoodGroupEffects.Builder().tag(rawTag).food(raw).ailment(CompoundAffliction.of(
new StatusEffectAffliction(StatusEffects.POISON, Range.of(45), Range.of(2), 80), new StatusEffectAffliction(StatusEffects.POISON, Range.of(25, 50), Range.of(1, 2), 30),
new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 65) new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(90, 100), Range.of(1, 2), 25)
))); )));
exporter.accept(Unicopia.id(name + "/rotten"), new FoodGroupEffects.Builder().tag(rottenTag).food(rotten).ailment(CompoundAffliction.of( exporter.accept(Unicopia.id(name + "/rotten"), new FoodGroupEffects.Builder().tag(rottenTag).food(rotten).ailment(CompoundAffliction.of(
new StatusEffectAffliction(StatusEffects.POISON, Range.of(45), Range.of(2), 80), new StatusEffectAffliction(StatusEffects.POISON, Range.of(45, 70), Range.of(1, 2), 8),
new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(100), Range.of(2), 95) new StatusEffectAffliction(UEffects.FOOD_POISONING, Range.of(20, 130), Range.of(1, 2), 5)
))); )));
} }