Skip to content

Commit

Permalink
fix(balance): ⚖️Rebalance IC2 fruits and crops
Browse files Browse the repository at this point in the history
- Mostly all crops grows about x5 times faster
- Special crops like Meat Rose growth x50 times faster
- Metal fruits cannot be squeezed into metal anymore. Instead they should be thrown into [Seared Stone]
- [Oil Berry] and [Bobs-Yer-Uncle-Ranks Berry] output amount nerfed

https://i.imgur.com/UrLgd1g.png
  • Loading branch information
Krutoy242 committed May 27, 2024
1 parent cda6d3c commit 45a9b21
Show file tree
Hide file tree
Showing 21 changed files with 190 additions and 19 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
@@ -7,30 +7,6 @@
* ic2.api.crops.Crops
* ic2.api.crops.Crops$CropRegisterEvent
* ic2.core.IC2
- * ic2.core.crop.cropcard.CropBaseMetalCommon
- * ic2.core.crop.cropcard.CropBaseMetalUncommon
- * ic2.core.crop.cropcard.CropBaseMushroom
- * ic2.core.crop.cropcard.CropBaseSapling
- * ic2.core.crop.cropcard.CropBeetroot
- * ic2.core.crop.cropcard.CropCarrots
- * ic2.core.crop.cropcard.CropCocoa
- * ic2.core.crop.cropcard.CropCoffee
- * ic2.core.crop.cropcard.CropColorFlower
- * ic2.core.crop.cropcard.CropEating
- * ic2.core.crop.cropcard.CropFlax
- * ic2.core.crop.cropcard.CropHops
- * ic2.core.crop.cropcard.CropMelon
- * ic2.core.crop.cropcard.CropNetherWart
- * ic2.core.crop.cropcard.CropPotato
- * ic2.core.crop.cropcard.CropPumpkin
- * ic2.core.crop.cropcard.CropRedWheat
- * ic2.core.crop.cropcard.CropReed
- * ic2.core.crop.cropcard.CropStickreed
- * ic2.core.crop.cropcard.CropTerraWart
- * ic2.core.crop.cropcard.CropVenomilia
- * ic2.core.crop.cropcard.CropWeed
- * ic2.core.crop.cropcard.CropWheat
- * ic2.core.crop.cropcard.GenericCropCard
* ic2.core.init.MainConfig
* ic2.core.item.type.CropResItemType
* ic2.core.item.type.DustResourceType
@@ -220,21 +196,21 @@ extends Crops {
Crops.instance.registerCrop(cropJungleSapling);
Crops.instance.registerCrop(cropAcaciaSapling);
Crops.instance.registerCrop(cropDarkOakSapling);
- GenericCropCard.create((String)"blazereed").setDiscoveredBy("Mr. Brain").setProperties(new CropProperties(6, 0, 4, 1, 0, 0)).setAttributes(new String[]{"Fire", "Blaze", "Reed", "Sulfur"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151065_br)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151072_bj), ItemName.dust.getItemStack((Enum)DustResourceType.sulfur)}).setAfterHarvestSize(1).register();
- GenericCropCard.create((String)"bobs_yer_uncle_ranks_berries").setDiscoveredBy("GenerikB").setProperties(new CropProperties(11, 4, 0, 8, 2, 9)).setAttributes(new String[]{"Shiny", "Vine", "Emerald", "Berylium", "Crystal"}).setMaxSize(4).setDrops(ItemName.crop_res.getItemStack((Enum)CropResItemType.bobs_yer_uncle_ranks_berry)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151166_bC)}).setAfterHarvestSize(1).register();
- GenericCropCard.create((String)"corium").setDiscoveredBy("Gregorius Techneticies").setProperties(new CropProperties(6, 0, 2, 3, 1, 0)).setAttributes(new String[]{"Cow", "Silk", "Vine"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151116_aA)).setAfterHarvestSize(1).register();
- GenericCropCard.create((String)"corpse_plant").setDiscoveredBy("Mr. Kenny").setProperties(new CropProperties(5, 0, 2, 1, 0, 3)).setAttributes(new String[]{"Toxic", "Undead", "Vine", "Edible", "Rotten"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151078_bh)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151103_aS), new ItemStack(Items.field_151100_aR, 1, 15), new ItemStack(Items.field_151100_aR, 1, 15)}).setAfterHarvestSize(1).register();
- GenericCropCard.create((String)"creeper_weed").setDiscoveredBy("General Spaz").setProperties(new CropProperties(7, 3, 0, 5, 1, 3)).setAttributes(new String[]{"Creeper", "Vine", "Explosive", "Fire", "Sulfur", "Saltpeter", "Coal"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151016_H)).setAfterHarvestSize(1).register();
- GenericCropCard.create((String)"diareed").setDiscoveredBy("Diareed").setProperties(new CropProperties(12, 5, 0, 10, 2, 10)).setAttributes(new String[]{"Fire", "Shiny", "Reed", "Coal", "Diamond", "Crystal"}).setMaxSize(4).setDrops(ItemName.dust.getItemStack((Enum)DustResourceType.small_diamond)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151045_i)}).setAfterHarvestSize(1).register();
- GenericCropCard.create((String)"egg_plant").setDiscoveredBy("Link").setProperties(new CropProperties(6, 0, 4, 1, 0, 0)).setAttributes(new String[]{"Chicken", "Egg", "Edible", "Feather", "Flower", "Addictive"}).setMaxSize(3).setDrops(new ItemStack(Items.field_151110_aK)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151076_bf), new ItemStack(Items.field_151008_G), new ItemStack(Items.field_151008_G), new ItemStack(Items.field_151008_G)}).setGrowthSpeed(900).setAfterHarvestSize(2).register();
- GenericCropCard.create((String)"ender_blossom").setDiscoveredBy("RichardG").setProperties(new CropProperties(10, 5, 0, 2, 1, 6)).setAttributes(new String[]{"Ender", "Flower", "Shiny"}).setMaxSize(4).setDrops(ItemName.dust.getItemStack((Enum)DustResourceType.ender_pearl)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151079_bi), new ItemStack(Items.field_151079_bi), new ItemStack(Items.field_151061_bv)}).setAfterHarvestSize(1).register();
- GenericCropCard.create((String)"meat_rose").setDiscoveredBy("VintageBeef").setProperties(new CropProperties(7, 0, 4, 1, 3, 0)).setAttributes(new String[]{"Edible", "Flower", "Cow", "Chicken", "Pig", "Sheep"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151100_aR, 1, 9)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151082_bd), new ItemStack(Items.field_151147_al), new ItemStack(Items.field_151076_bf), new ItemStack(Items.field_179561_bm)}).setGrowthSpeed(1500).setAfterHarvestSize(1).register();
- GenericCropCard.create((String)"milk_wart").setDiscoveredBy("Mr. Brain").setProperties(new CropProperties(6, 0, 3, 0, 1, 0)).setAttributes(new String[]{"Edible", "Milk", "Cow"}).setMaxSize(3).setDrops(ItemName.crop_res.getItemStack((Enum)CropResItemType.milk_wart)).setGrowthSpeed(900).setAfterHarvestSize(1).addBaseSeed(ItemName.crop_res.getItemStack((Enum)CropResItemType.milk_wart)).register();
- GenericCropCard.create((String)"oil_berries").setDiscoveredBy("Spacetoad").setProperties(new CropProperties(9, 6, 1, 2, 1, 12)).setAttributes(new String[]{"Fire", "Dark", "Reed", "Rotten", "Coal", "Oil"}).setMaxSize(3).setDrops(ItemName.crop_res.getItemStack((Enum)CropResItemType.oil_berry)).setAfterHarvestSize(1).register();
- GenericCropCard.create((String)"slime_plant").setDiscoveredBy("Neowulf").setProperties(new CropProperties(6, 3, 0, 0, 0, 2)).setAttributes(new String[]{"Slime", "Bouncy", "Sticky", "Bush"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151123_aH)).setAfterHarvestSize(3).register();
- GenericCropCard.create((String)"spidernip").setDiscoveredBy("Mr. Kenny").setProperties(new CropProperties(4, 2, 1, 4, 1, 3)).setAttributes(new String[]{"Toxic", "Silk", "Spider", "Flower", "Ingredient", "Addictive"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151007_F)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151070_bp), new ItemStack(Blocks.field_150321_G)}).setGrowthSpeed(600).setAfterHarvestSize(1).register();
- GenericCropCard.create((String)"tearstalks").setDiscoveredBy("Neowulf").setProperties(new CropProperties(8, 1, 2, 0, 0, 0)).setAttributes(new String[]{"Healing", "Nether", "Ingredient", "Reed", "Ghast"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151073_bk)).setAfterHarvestSize(1).register();
- GenericCropCard.create((String)"withereed").setDiscoveredBy("CovertJaguar").setProperties(new CropProperties(8, 2, 0, 4, 1, 3)).setAttributes(new String[]{"Fire", "Undead", "Reed", "Coal", "Rotten", "Wither"}).setMaxSize(4).setDrops(ItemName.dust.getItemStack((Enum)DustResourceType.coal)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151044_h), new ItemStack(Items.field_151044_h)}).setAfterHarvestSize(1).register();
+ GenericCropCard.create("blazereed").setDiscoveredBy("Mr. Brain").setProperties(new CropProperties(6, 0, 4, 1, 0, 0)).setAttributes(new String[]{"Fire", "Blaze", "Reed", "Sulfur"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151065_br)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151072_bj), ItemName.dust.getItemStack((Enum)DustResourceType.sulfur)}).setAfterHarvestSize(1).register();
+ GenericCropCard.create("bobs_yer_uncle_ranks_berries").setDiscoveredBy("GenerikB").setProperties(new CropProperties(11, 4, 0, 8, 2, 9)).setAttributes(new String[]{"Shiny", "Vine", "Emerald", "Berylium", "Crystal"}).setMaxSize(4).setDrops(ItemName.crop_res.getItemStack((Enum)CropResItemType.bobs_yer_uncle_ranks_berry)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151166_bC)}).setAfterHarvestSize(1).register();
+ GenericCropCard.create("corium").setDiscoveredBy("Gregorius Techneticies").setProperties(new CropProperties(6, 0, 2, 3, 1, 0)).setAttributes(new String[]{"Cow", "Silk", "Vine"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151116_aA)).setAfterHarvestSize(1).register();
+ GenericCropCard.create("corpse_plant").setDiscoveredBy("Mr. Kenny").setProperties(new CropProperties(5, 0, 2, 1, 0, 3)).setAttributes(new String[]{"Toxic", "Undead", "Vine", "Edible", "Rotten"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151078_bh)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151103_aS), new ItemStack(Items.field_151100_aR, 1, 15), new ItemStack(Items.field_151100_aR, 1, 15)}).setAfterHarvestSize(1).setGrowthSpeed(150).register();
+ GenericCropCard.create("creeper_weed").setDiscoveredBy("General Spaz").setProperties(new CropProperties(7, 3, 0, 5, 1, 3)).setAttributes(new String[]{"Creeper", "Vine", "Explosive", "Fire", "Sulfur", "Saltpeter", "Coal"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151016_H)).setAfterHarvestSize(1).setGrowthSpeed(200).register();
+ GenericCropCard.create("diareed").setDiscoveredBy("Diareed").setProperties(new CropProperties(12, 5, 0, 10, 2, 10)).setAttributes(new String[]{"Fire", "Shiny", "Reed", "Coal", "Diamond", "Crystal"}).setMaxSize(4).setDrops(ItemName.dust.getItemStack((Enum)DustResourceType.small_diamond)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151045_i)}).setAfterHarvestSize(1).register();
+ GenericCropCard.create("egg_plant").setDiscoveredBy("Link").setProperties(new CropProperties(6, 0, 4, 1, 0, 0)).setAttributes(new String[]{"Chicken", "Egg", "Edible", "Feather", "Flower", "Addictive"}).setMaxSize(3).setDrops(new ItemStack(Items.field_151110_aK)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151076_bf), new ItemStack(Items.field_151008_G), new ItemStack(Items.field_151008_G), new ItemStack(Items.field_151008_G)}).setGrowthSpeed(100).setAfterHarvestSize(2).register();
+ GenericCropCard.create("ender_blossom").setDiscoveredBy("RichardG").setProperties(new CropProperties(10, 5, 0, 2, 1, 6)).setAttributes(new String[]{"Ender", "Flower", "Shiny"}).setMaxSize(4).setDrops(ItemName.dust.getItemStack((Enum)DustResourceType.ender_pearl)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151079_bi), new ItemStack(Items.field_151079_bi), new ItemStack(Items.field_151061_bv)}).setAfterHarvestSize(1).register();
+ GenericCropCard.create("meat_rose").setDiscoveredBy("VintageBeef").setProperties(new CropProperties(7, 0, 4, 1, 3, 0)).setAttributes(new String[]{"Edible", "Flower", "Cow", "Chicken", "Pig", "Sheep"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151100_aR, 1, 9)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151082_bd), new ItemStack(Items.field_151147_al), new ItemStack(Items.field_151076_bf), new ItemStack(Items.field_179561_bm)}).setGrowthSpeed(50).setAfterHarvestSize(1).register();
+ GenericCropCard.create("milk_wart").setDiscoveredBy("Mr. Brain").setProperties(new CropProperties(6, 0, 3, 0, 1, 0)).setAttributes(new String[]{"Edible", "Milk", "Cow"}).setMaxSize(3).setDrops(ItemName.crop_res.getItemStack((Enum)CropResItemType.milk_wart)).setGrowthSpeed(300).setAfterHarvestSize(1).addBaseSeed(ItemName.crop_res.getItemStack((Enum)CropResItemType.milk_wart)).register();
+ GenericCropCard.create("oil_berries").setDiscoveredBy("Spacetoad").setProperties(new CropProperties(9, 6, 1, 2, 1, 12)).setAttributes(new String[]{"Fire", "Dark", "Reed", "Rotten", "Coal", "Oil"}).setMaxSize(3).setDrops(ItemName.crop_res.getItemStack((Enum)CropResItemType.oil_berry)).setAfterHarvestSize(1).register();
+ GenericCropCard.create("slime_plant").setDiscoveredBy("Neowulf").setProperties(new CropProperties(6, 3, 0, 0, 0, 2)).setAttributes(new String[]{"Slime", "Bouncy", "Sticky", "Bush"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151123_aH)).setAfterHarvestSize(3).setGrowthSpeed(300).register();
+ GenericCropCard.create("spidernip").setDiscoveredBy("Mr. Kenny").setProperties(new CropProperties(4, 2, 1, 4, 1, 3)).setAttributes(new String[]{"Toxic", "Silk", "Spider", "Flower", "Ingredient", "Addictive"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151007_F)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151070_bp), new ItemStack(Blocks.field_150321_G)}).setGrowthSpeed(600).setAfterHarvestSize(1).setGrowthSpeed(300).register();
+ GenericCropCard.create("tearstalks").setDiscoveredBy("Neowulf").setProperties(new CropProperties(8, 1, 2, 0, 0, 0)).setAttributes(new String[]{"Healing", "Nether", "Ingredient", "Reed", "Ghast"}).setMaxSize(4).setDrops(new ItemStack(Items.field_151073_bk)).setAfterHarvestSize(1).register();
+ GenericCropCard.create("withereed").setDiscoveredBy("CovertJaguar").setProperties(new CropProperties(8, 2, 0, 4, 1, 3)).setAttributes(new String[]{"Fire", "Undead", "Reed", "Coal", "Rotten", "Wither"}).setMaxSize(4).setDrops(ItemName.dust.getItemStack((Enum)DustResourceType.coal)).setSpecialDrops(new ItemStack[]{new ItemStack(Items.field_151044_h), new ItemStack(Items.field_151044_h)}).setAfterHarvestSize(1).register();
}

public static void registerBaseSeeds() {
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@@ -103,7 +103,7 @@ extends IC2CropCard {

@Override
public int getGrowthDuration(ICropTile crop) {
- return crop.getCurrentSize() == 3 ? 2000 : 800;
+ return crop.getCurrentSize() == 3 ? 400 : 160;
}

@Override
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@@ -73,8 +73,8 @@ extends CropBaseMetalCommon {
@Override
public int getGrowthDuration(ICropTile crop) {
if (crop.getCurrentSize() == 4) {
- return 2200;
+ return 440;
}
- return 750;
+ return 150;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@@ -57,6 +57,6 @@ extends IC2CropCard {

@Override
public int getGrowthDuration(ICropTile crop) {
- return 200;
+ return 100;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@@ -70,9 +70,9 @@ extends IC2CropCard {
@Override
public int getGrowthDuration(ICropTile crop) {
if (crop.getCurrentSize() == 3) {
- return 900;
+ return 180;
}
- return 400;
+ return 80;
}

@Override
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@@ -83,8 +83,8 @@ extends IC2CropCard {
@Override
public int getGrowthDuration(ICropTile crop) {
if (crop.getCurrentSize() == 3) {
- return 600;
+ return 300;
}
- return 400;
+ return 200;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@@ -160,7 +160,7 @@ extends IC2CropCard {

@Override
public int getGrowthDuration(ICropTile crop) {
- float multiplier = 1.0f;
+ float multiplier = 0.2f;
BlockPos coords = crop.getPosition();
Biome biome = BiomeUtil.getBiome((World)crop.getWorldObj(), (BlockPos)coords);
if (BiomeDictionary.hasType((Biome)biome, (BiomeDictionary.Type)BiomeDictionary.Type.SWAMP) || BiomeDictionary.hasType((Biome)biome, (BiomeDictionary.Type)BiomeDictionary.Type.MOUNTAIN)) {
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@@ -41,7 +41,7 @@ extends IC2CropCard {

@Override
public int getGrowthDuration(ICropTile crop) {
- return 600;
+ return 100;
}

@Override
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@@ -90,7 +90,7 @@ extends IC2CropCard {

@Override
public int getGrowthDuration(ICropTile crop) {
- return 600;
+ return 200;
}

@Override
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@@ -92,9 +92,9 @@ extends IC2CropCard {
@Override
public int getGrowthDuration(ICropTile crop) {
if (crop.getCurrentSize() >= 3) {
- return 600;
+ return 150;
}
- return 400;
+ return 100;
}

@Override
Loading

0 comments on commit 45a9b21

Please sign in to comment.