Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Apollo Perry committed 2015-11-27 00:14:50 +00:00
commit 3c5120cfbd
10 files changed
+27 -14

No files matched your search

+4 -4
View File
@@ -1,9 +1,9 @@
#
#Wed Nov 25 22:02:37 GMT 2015
#Thu Nov 26 22:01:32 GMT 2015
version=r1.7
dir_output=../Build Output/Botania/
mc_version=1.7.10
forge_version=10.13.2.1291
dir_repo=./
build_number=237
forge_version=10.13.2.1291
mc_version=1.7.10
build_number=238
mod_name=Botania
@@ -35,7 +35,7 @@ public class SubTileArcaneRose extends SubTileGenerating {
for(EntityPlayer player : players)
if(ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) {
ExperienceHelper.drainPlayerXP(player, 1);
mana += 24;
mana += 50;
return;
}
}
@@ -52,7 +52,7 @@ public class SubTileArcaneRose extends SubTileGenerating {
@Override
public int getMaxMana() {
return 1200;
return 6000;
}
@Override
@@ -51,7 +51,7 @@ public class SubTileSpectrolus extends SubTileGenerating {
if(stack != null && stack.getItem() == wool) {
int meta = stack.getItemDamage();
if(meta == nextColor) {
mana = Math.min(getMaxMana(), mana + 200);
mana = Math.min(getMaxMana(), mana + 300);
nextColor = nextColor == 15 ? 0 : nextColor + 1;
sync();
@@ -69,7 +69,7 @@ public class SubTileSpectrolus extends SubTileGenerating {
@Override
public int getMaxMana() {
return 4000;
return 8000;
}
@Override
@@ -56,7 +56,7 @@ public class ModBrews {
nightVision = new BrewMod(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new PotionEffect(Potion.nightVision.id, 9600, 0));
absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffect(Potion.field_76444_x.id, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable();
overload = new BrewMod(LibBrewNames.OVERLOAD, 0x232323, 12000, new PotionEffect(Potion.damageBoost.id, 1800, 3), new PotionEffect(Potion.moveSpeed.id, 1800, 2), new PotionEffect(Potion.weakness.id, 2400, 2), new PotionEffect(Potion.hunger.id, 200, 2));
overload = new BrewMod(LibBrewNames.OVERLOAD, 0x232323, 12000, new PotionEffect(Potion.damageBoost.id, 1800, 3), new PotionEffect(Potion.moveSpeed.id, 1800, 2), new PotionEffect(Potion.weakness.id, 3600, 2), new PotionEffect(Potion.hunger.id, 200, 2));
soulCross = new BrewModPotion(LibBrewNames.SOUL_CROSS, 10000, new PotionEffect(ModPotions.soulCross.id, 1800, 0));
featherfeet = new BrewModPotion(LibBrewNames.FEATHER_FEET, 7000, new PotionEffect(ModPotions.featherfeet.id, 1800, 0));
emptiness = new BrewModPotion(LibBrewNames.EMPTINESS, 30000, new PotionEffect(ModPotions.emptiness.id, 7200, 0));
@@ -184,6 +184,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
}
par1ItemStack.stackSize--;
if(par3World.isRemote)
return true;
EntityDoppleganger e = new EntityDoppleganger(par3World);
e.setPosition(par4 + 0.5, par5 + 3, par6 + 0.5);
e.setInvulTime(SPAWN_TICKS);
@@ -373,7 +377,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
crit = p.fallDistance > 0.0F && !p.onGround && !p.isOnLadder() && !p.isInWater() && !p.isPotionActive(Potion.blindness) && p.ridingEntity == null;
}
int cap = crit ? 50 : 35;
int cap = crit ? 60 : 40;
return super.attackEntityFrom(par1DamageSource, Math.min(cap, dmg) * (isHardMode() ? 0.6F : 1F));
}
return false;
@@ -35,7 +35,7 @@ public class LensDamage extends Lens {
if(mana >= 16) {
burst.setMana(mana - 16);
if(!burst.isFake() && !entity.worldObj.isRemote)
living.attackEntityFrom(DamageSource.magic, 4);
living.attackEntityFrom(DamageSource.magic, 8);
break;
}
}
@@ -54,7 +54,7 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem {
public void onUsingTick(ItemStack stack, EntityPlayer player, int count) {
super.onUsingTick(stack, player, count);
if(ManaItemHandler.requestManaExact(stack, player, 1000, true)) {
if(ManaItemHandler.requestManaExact(stack, player, 500, true)) {
if(count % 5 == 0)
player.getFoodStats().addStats(1, 1F);
+1 -1
View File
@@ -1 +1 @@
r1.7-236
r1.7-237
+8
View File
@@ -1,3 +1,11 @@
r1.7 237
*Fixed the Gaia Guardian spawning on the client side when it shouldn't.
*The Brew of Overload has a larger Weakness period now.
*The Damage Lens now deals more damage.
*The Fruit of Grisaia uses less mana now.
*The Gaia Guardian's damage cap now is higher to accommodate for Overload Brews. HP remains the same.
*The Rosa Arcana now produces and holds more mana.
*The Spectrolus now produces and holds more mana.
r1.7 236
*Added Chisel stone support to the Rod of the Terra Firma.
*Added floating flower variants to all the new pasture seed types.
+2 -1
View File
@@ -233,4 +233,5 @@ r1.7-232=1.7.10
r1.7-233=1.7.10
r1.7-234=1.7.10
r1.7-235=1.7.10
r1.7-236=1.7.10
r1.7-236=1.7.10
r1.7-237=1.7.10