Skip to content

Buff the Incenses in the Incense Crucible #83

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

Merged
serenibyss merged 3 commits into from
May 9, 2025
Merged

Buff the Incenses in the Incense Crucible #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c522c01
Change Incense recipes to make them available earlier
srdr2k3 May 9, 2025
825f28d
Buff incenses
srdr2k3 May 9, 2025
97cd95d
Buff Soul Fray
srdr2k3 May 9, 2025
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
2 changes: 1 addition & 1 deletion src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
public class PlayerSacrificeHandler {

public static float scalingOfSacrifice = 0.001f;
public static int soulFrayDuration = 400;
public static int soulFrayDuration = 240;
public static Potion soulFrayId;

public static float getPlayerIncense(EntityPlayer player) {
Expand Down
24 changes: 14 additions & 10 deletions src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ public static void registerIncenseRecipes() {
ItemStack quartzStack = new ItemStack(Items.quartz, 1, WILDCARD);
ItemStack blazePowderStack = new ItemStack(Items.blaze_powder);
ItemStack netherwartStack = new ItemStack(Items.nether_wart);

ItemStack blankSlateStack = new ItemStack(ModItems.blankSlate);
ItemStack reinforcedSlateStack = new ItemStack(ModItems.reinforcedSlate);
ItemStack fracturedBoneStack = new ItemStack(ModItems.baseAlchemyItems, 1, 5);

ItemStack woodashStack = new ItemStack(ModItems.itemIncense, 1, 0);
Expand All @@ -156,7 +159,7 @@ public static void registerIncenseRecipes() {
new ItemStack(Items.redstone),
leavesStack,
leavesStack,
new ItemStack(ModItems.apprenticeBloodOrb)));
new ItemStack(ModItems.weakBloodOrb)));
GameRegistry.addRecipe(
new ShapelessBloodOrbRecipe(
new ItemStack(ModItems.itemIncense, 1, 2),
Expand All @@ -168,7 +171,7 @@ public static void registerIncenseRecipes() {
glowstoneStack,
stringStack,
stringStack,
new ItemStack(ModItems.magicianBloodOrb)));
new ItemStack(ModItems.apprenticeBloodOrb)));
GameRegistry.addRecipe(
new ShapelessBloodOrbRecipe(
new ItemStack(ModItems.itemIncense, 1, 3),
Expand All @@ -178,7 +181,8 @@ public static void registerIncenseRecipes() {
soulSandStack,
gunpowderStack,
fermentedEyeStack,
new ItemStack(ModItems.masterBloodOrb)));
blankSlateStack,
new ItemStack(ModItems.apprenticeBloodOrb)));
GameRegistry.addRecipe(
new ShapelessBloodOrbRecipe(
new ItemStack(ModItems.itemIncense, 1, 4),
Expand All @@ -189,17 +193,17 @@ public static void registerIncenseRecipes() {
netherwartStack,
blazePowderStack,
fracturedBoneStack,
goldNuggetStack,
new ItemStack(ModItems.archmageBloodOrb)));
reinforcedSlateStack,
new ItemStack(ModItems.masterBloodOrb)));
}

public enum EnumIncense {

WOODASH(0, 200, 1.0f, 1000, 0.937f, 0.898f, 0.820f),
RED(200, 600, 1.5f, 1000, 1.0f, 0, 0),
BLUE(600, 1200, 3.0f, 1000, 0, 0, 1.0f),
GREEN(1200, 2000, 4.0f, 1000, 0, 1.0f, 0),
PURPLE(2000, 3000, 5.0f, 1000, 1.0f, 0, 1.0f);
WOODASH(0, 400, 1.0f, 2000, 0.937f, 0.898f, 0.820f),
RED(400, 800, 1.5f, 2000, 1.0f, 0, 0),
BLUE(800, 1500, 3.0f, 2000, 0, 0, 1.0f),
GREEN(1500, 2400, 4.0f, 2000, 0, 1.0f, 0),
PURPLE(2400, 3500, 5.0f, 2000, 1.0f, 0, 1.0f);

public final int minValue;
public final int maxValue;
Expand Down