Skip to content

Commit

Permalink
Bf,,, :pleading:
Browse files Browse the repository at this point in the history
  • Loading branch information
SammySemicolon committed Apr 8, 2024
1 parent be75d77 commit 1663cf3
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 9 deletions.
3 changes: 2 additions & 1 deletion src/generated/resources/assets/malum/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -1106,8 +1106,8 @@
"malum.gui.curio.effect.extend_positive_effect": "Extends Positive Effects",
"malum.gui.curio.effect.friendly_enemies": "Reduces Enemy Aggression",
"malum.gui.curio.effect.full_health_fake_collection": "Striking Full Health Targets Triggers Spirit Collection Effects",
"malum.gui.curio.effect.gluttony": "Eating Rotten Foods Extends Gluttony",
"malum.gui.curio.effect.gluttony_magic_proficiency": "Gluttony Exchanges Hunger for Magic Proficiency",
"malum.gui.curio.effect.growing_gluttony": "Eating Rotten Foods Extends Gluttony",
"malum.gui.curio.effect.haste": "Increased Mining Speed",
"malum.gui.curio.effect.hunger_drain": "Actively Drains Hunger",
"malum.gui.curio.effect.low_health_speed": "Speed at Low Health",
Expand Down Expand Up @@ -1287,6 +1287,7 @@
"malum.subtitle.ritual_evolves": "Ritual evolves",
"malum.subtitle.ritual_forms": "Ritual forms",
"malum.subtitle.rotten_trinket_equipped": "Rotten trinket equipped",
"malum.subtitle.rune_trinket_equipped": "Rune trinket equipped",
"malum.subtitle.runewood_break": "Block broken",
"malum.subtitle.runewood_button_click_off": "Runewood button click off",
"malum.subtitle.runewood_button_click_on": "Runewood button click on",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ public EntrySelectorPage(EntryChoice<T>... entries) {

public EntrySelectorPage(List<EntryChoice<T>> entries) {
super(null);
boolean isWide = entries.size() > 4;
for (int i = 0; i < entries.size(); i++) {
var entry = entries.get(i);
int xOffset = i % 2 == 1 ? 88 : 24;
int yOffset = 12 + (i / 2) * 40;
int xOffset = isWide ? (i % 2 == 1 ? 88 : 24) : 66;
int yOffset = 12 + (isWide ? i / 2 : i) * 40;
bookObjectHandler.add(new SelectableEntryObject<>(xOffset, yOffset, entry));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public CurioGluttonousBrooch(Properties builder) {

@Override
public void addExtraTooltipLines(Consumer<Component> consumer) {
consumer.accept(negativeEffect("malum.gui.curio.effect.gluttonous_brooch"));
consumer.accept(negativeEffect("hunger_drain"));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public CurioNarrowNecklace(Properties builder) {

@Override
public void addExtraTooltipLines(Consumer<Component> consumer) {
consumer.accept(negativeEffect("malum.gui.curio.effect.necklace_of_the_narrow_edge"));
consumer.accept(negativeEffect("no_sweep"));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public CurioVoraciousRing(Properties builder) {
@Override
public void addExtraTooltipLines(Consumer<Component> consumer) {
consumer.accept(positiveEffect("eat_rotten"));
consumer.accept(positiveEffect("growing_gluttony"));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ public ColorParticleDataBuilder createBloomColorData(float coefficientMultiplier

public Rarity getItemRarity() {
if (itemRarity == null) {
TextColor textColor = TextColor.fromRgb(ColorHelper.brighter(primaryColor, 1, 0.85f).getRGB());
// TextColor textColor = TextColor.fromRgb(INVERT_COLOR);
// TextColor textColor = TextColor.fromRgb(ColorHelper.brighter(primaryColor, 1, 0.85f).getRGB());
TextColor textColor = TextColor.fromRgb(INVERT_COLOR);
itemRarity = Rarity.create("malum$" + identifier, (style) -> style.withColor(textColor));
}
return itemRarity;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/sammy/malum/data/MalumLang.java
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ protected void addTranslations() {
add("malum.gui.curio.effect.spirits_add_health", "Spirit Collection Grants Extra Hearts");
add("malum.gui.curio.effect.hunger_drain", "Actively Drains Hunger");
add("malum.gui.curio.effect.eat_rotten", "Rotten Foods are Tastier");
add("malum.gui.curio.effect.gluttony", "Eating Rotten Foods Extends Gluttony");
add("malum.gui.curio.effect.growing_gluttony", "Eating Rotten Foods Extends Gluttony");
add("malum.gui.curio.effect.explosion_drops_collected", "Automatic Collection of Explosion Drops");
add("malum.gui.curio.effect.bigger_explosions", "Improves Explosions");
add("malum.gui.curio.effect.better_conduit_power", "Conduit Power Provides Numerous Benefits");
Expand All @@ -211,7 +211,6 @@ protected void addTranslations() {
add("malum.gui.curio.effect.scythe_counterattack", "Powerful Scythe Counterattack When Struck");
add("malum.gui.curio.effect.full_health_fake_collection", "Striking Full Health Targets Triggers Spirit Collection Effects");
add("malum.gui.curio.effect.soul_ward_physical_absorption", "Soul Ward Absorbs Physical Damage Equally to Magic Damage");

add("malum.gui.curio.effect.spirits_gluttony", "Spirit Collection Generates Gluttony");
add("malum.gui.curio.effect.gluttony_magic_proficiency", "Gluttony Exchanges Hunger for Magic Proficiency");
add("malum.gui.curio.effect.enchanted_explosions", "Explosions are Enchanted with %s");
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/malum/textures/item/blighted_gunk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1663cf3

Please sign in to comment.