upstream/BloodMagic
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/BloodMagic.git synced 2026-11-13 16:54:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "try to add Tier 3 but cant"

Browse Source 
This reverts commit 968986e669.
This commit is contained in:
Dream-Master committed 2016-06-27 09:30:35 +02:00
1 parent 968986e669
commit 5e18793e5e
8 files changed
+6 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.properties
+2 -2
View File
@@ -1,5 +1,5 @@
#
#Sun Jun 26 19:00:33 CEST 2016
#Sun Jun 26 11:10:11 CEST 2016
mod_name=BloodMagic
forge_version=10.13.4.1492-1.7.10
ccc_version=1.0.7.47
@@ -11,5 +11,5 @@ guideapi_version=1.0.1-20
mod_version=1.3.3
minetweaker_version=Dev-1.7.10-3.0.9B
chisel_version=2.9.2.8
build_number=25
build_number=23
mc_version=1.7.10
src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
-11
View File
@@ -318,37 +318,26 @@ public class AlchemicalWizardry
public static int energyBlastDamage = 12;
public static int energyBlastSecondTierDamage = 12;
public static int energyBlastThirdTierDamage = 12;
public static int energyBlastLPPerShot = 150;
public static int energyBlastSecondTierLPPerShot = 150;
public static int energyBlastThirdTierLPPerShot = 150;
public static int energyBlastMaxDelay = 15;
public static int energyBlastMaxDelayAfterActivation = 100;
public static int energyBlastSecondTierMaxDelay = 15;
public static int energyBlastSecondTierMaxDelayAfterActivation = 100;
public static int energyBlastThirdTierMaxDelay = 15;
public static int energyBlastThirdTierMaxDelayAfterActivation = 100;
public static int energyBlastLPPerActivation = 50;
public static int energyBlastSecondTierLPPerActivation = 50;
public static int energyBlastThirdTierLPPerActivation = 50;
public static int energyBazookaDamage = 12;
public static int energyBazookaSecondTierDamage = 12;
public static int energyBazookaThirdTierDamage = 12;
public static int energyBazookaSecondaryDamage = 15;
public static int energyBazookaSecondTierSecondaryDamage = 15;
public static int energyBazookaThirdTierSecondaryDamage = 15;
public static int energyBazookaLPPerShot = 20000;
public static int energyBazookaSecondTierLPPerShot = 20000;
public static int energyBazookaThirdTierLPPerShot = 20000;
public static int energyBazookaMaxDelay = 150;
public static int energyBazookaMaxDelayAfterActivation = 100;
public static int energyBazookaSecondTierMaxDelay = 150;
public static int energyBazookaSecondTierMaxDelayAfterActivation = 100;
public static int energyBazookaThirdTierMaxDelay = 150;
public static int energyBazookaThirdTierMaxDelayAfterActivation = 100;
public static int energyBazookaLPPerActivation = 50;
public static int energyBazookaSecondTierLPPerActivation = 50;
public static int energyBazookaThirdTierLPPerActivation = 50;
public static List<Class> wellBlacklist;
src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java
-12
View File
@@ -291,38 +291,26 @@ public class BloodMagicConfiguration
AlchemicalWizardry.energyBlastDamage = config.get("energy items", "Energy Blast damage", AlchemicalWizardry.energyBlastDamage).getInt(AlchemicalWizardry.energyBlastDamage);
AlchemicalWizardry.energyBlastSecondTierDamage = config.get("energy items", "Energy Blast Tier II damage", AlchemicalWizardry.energyBlastSecondTierDamage).getInt(AlchemicalWizardry.energyBlastSecondTierDamage);
AlchemicalWizardry.energyBlastThirdTierDamage = config.get("energy items", "Energy Blast Tier III damage", AlchemicalWizardry.energyBlastThirdTierDamage).getInt(AlchemicalWizardry.energyBlastThirdTierDamage);
AlchemicalWizardry.energyBlastLPPerShot = config.get("energy items", "Energy Blast LP per shot", AlchemicalWizardry.energyBlastLPPerShot).getInt(AlchemicalWizardry.energyBlastLPPerShot);
AlchemicalWizardry.energyBlastSecondTierLPPerShot = config.get("energy items", "Energy Blast Tier II LP per shot", AlchemicalWizardry.energyBlastSecondTierLPPerShot).getInt(AlchemicalWizardry.energyBlastSecondTierLPPerShot);
AlchemicalWizardry.energyBlastThirdTierLPPerShot = config.get("energy items", "Energy Blast Tier III LP per shot", AlchemicalWizardry.energyBlastThirdTierLPPerShot).getInt(AlchemicalWizardry.energyBlastThirdTierLPPerShot);
AlchemicalWizardry.energyBlastMaxDelay = config.get("energy items", "Energy Blast maximum delay", AlchemicalWizardry.energyBlastMaxDelay).getInt(AlchemicalWizardry.energyBlastMaxDelay);
AlchemicalWizardry.energyBlastMaxDelayAfterActivation = config.get("energy items", "Energy Blast maximum delay after (re-)activation", AlchemicalWizardry.energyBlastMaxDelayAfterActivation).getInt(AlchemicalWizardry.energyBlastMaxDelayAfterActivation);
AlchemicalWizardry.energyBlastSecondTierMaxDelay = config.get("energy items", "Energy Blast Tier II maximum delay", AlchemicalWizardry.energyBlastSecondTierMaxDelay).getInt(AlchemicalWizardry.energyBlastSecondTierMaxDelay);
AlchemicalWizardry.energyBlastSecondTierMaxDelayAfterActivation = config.get("energy items", "Energy Blast Tier II maximum delay after (re-)activation", AlchemicalWizardry.energyBlastSecondTierMaxDelayAfterActivation).getInt(AlchemicalWizardry.energyBlastSecondTierMaxDelayAfterActivation);
AlchemicalWizardry.energyBlastThirdTierMaxDelay = config.get("energy items", "Energy Blast Tier III maximum delay", AlchemicalWizardry.energyBlastThirdTierMaxDelay).getInt(AlchemicalWizardry.energyBlastThirdTierMaxDelay);
AlchemicalWizardry.energyBlastThirdTierMaxDelayAfterActivation = config.get("energy items", "Energy Blast Tier III maximum delay after (re-)activation", AlchemicalWizardry.energyBlastThirdTierMaxDelayAfterActivation).getInt(AlchemicalWizardry.energyBlastThirdTierMaxDelayAfterActivation);
AlchemicalWizardry.energyBlastLPPerActivation = config.get("energy items", "Energy Blast LP per activation", AlchemicalWizardry.energyBlastLPPerActivation).getInt(AlchemicalWizardry.energyBlastLPPerActivation);
AlchemicalWizardry.energyBlastSecondTierLPPerActivation = config.get("energy items", "Energy Blast Tier II LP per activation", AlchemicalWizardry.energyBlastSecondTierLPPerActivation).getInt(AlchemicalWizardry.energyBlastSecondTierLPPerActivation);
AlchemicalWizardry.energyBlastThirdTierLPPerActivation = config.get("energy items", "Energy Blast Tier III LP per activation", AlchemicalWizardry.energyBlastThirdTierLPPerActivation).getInt(AlchemicalWizardry.energyBlastThirdTierLPPerActivation);
AlchemicalWizardry.energyBazookaDamage = config.get("energy items", "Energy Bazooka damage", AlchemicalWizardry.energyBazookaDamage).getInt(AlchemicalWizardry.energyBazookaDamage);
AlchemicalWizardry.energyBazookaSecondaryDamage = config.get("energy items", "Energy Bazooka secondary damage", AlchemicalWizardry.energyBazookaSecondaryDamage).getInt(AlchemicalWizardry.energyBazookaSecondaryDamage);
AlchemicalWizardry.energyBazookaSecondTierDamage = config.get("energy items", "Energy Bazooka Tier II damage", AlchemicalWizardry.energyBazookaSecondTierDamage).getInt(AlchemicalWizardry.energyBazookaSecondTierDamage);
AlchemicalWizardry.energyBazookaSecondTierSecondaryDamage = config.get("energy items", "Energy Bazooka Tier II secondary damage", AlchemicalWizardry.energyBazookaSecondTierSecondaryDamage).getInt(AlchemicalWizardry.energyBazookaSecondTierSecondaryDamage);
AlchemicalWizardry.energyBazookaThirdTierDamage = config.get("energy items", "Energy Bazooka Tier III damage", AlchemicalWizardry.energyBazookaThirdTierDamage).getInt(AlchemicalWizardry.energyBazookaThirdTierDamage);
AlchemicalWizardry.energyBazookaThirdTierSecondaryDamage = config.get("energy items", "Energy Bazooka Tier III secondary damage", AlchemicalWizardry.energyBazookaThirdTierSecondaryDamage).getInt(AlchemicalWizardry.energyBazookaThirdTierSecondaryDamage);
AlchemicalWizardry.energyBazookaLPPerShot = config.get("energy items", "Energy Bazooka LP per shot", AlchemicalWizardry.energyBazookaLPPerShot).getInt(AlchemicalWizardry.energyBazookaLPPerShot);
AlchemicalWizardry.energyBazookaSecondTierLPPerShot = config.get("energy items", "Energy Bazooka Tier II LP per shot", AlchemicalWizardry.energyBazookaSecondTierLPPerShot).getInt(AlchemicalWizardry.energyBazookaSecondTierLPPerShot);
AlchemicalWizardry.energyBazookaThirdTierLPPerShot = config.get("energy items", "Energy Bazooka Tier III LP per shot", AlchemicalWizardry.energyBazookaThirdTierLPPerShot).getInt(AlchemicalWizardry.energyBazookaThirdTierLPPerShot);
AlchemicalWizardry.energyBazookaMaxDelay = config.get("energy items", "Energy Bazooka maximum delay", AlchemicalWizardry.energyBazookaMaxDelay).getInt(AlchemicalWizardry.energyBazookaMaxDelay);
AlchemicalWizardry.energyBazookaMaxDelayAfterActivation = config.get("energy items", "Energy Bazooka maximum delay after (re-)activation", AlchemicalWizardry.energyBazookaMaxDelayAfterActivation).getInt(AlchemicalWizardry.energyBazookaMaxDelayAfterActivation);
AlchemicalWizardry.energyBazookaSecondTierMaxDelay = config.get("energy items", "Energy Bazooka Tier II maximum delay", AlchemicalWizardry.energyBazookaSecondTierMaxDelay).getInt(AlchemicalWizardry.energyBazookaSecondTierMaxDelay);
AlchemicalWizardry.energyBazookaSecondTierMaxDelayAfterActivation = config.get("energy items", "Energy Bazooka Tier II maximum delay after (re-)activation", AlchemicalWizardry.energyBazookaSecondTierMaxDelayAfterActivation).getInt(AlchemicalWizardry.energyBazookaSecondTierMaxDelayAfterActivation);
AlchemicalWizardry.energyBazookaThirdTierMaxDelay = config.get("energy items", "Energy Bazooka Tier III maximum delay", AlchemicalWizardry.energyBazookaThirdTierMaxDelay).getInt(AlchemicalWizardry.energyBazookaThirdTierMaxDelay);
AlchemicalWizardry.energyBazookaThirdTierMaxDelayAfterActivation = config.get("energy items", "Energy Bazooka Tier III maximum delay after (re-)activation", AlchemicalWizardry.energyBazookaThirdTierMaxDelayAfterActivation).getInt(AlchemicalWizardry.energyBazookaThirdTierMaxDelayAfterActivation);
AlchemicalWizardry.energyBazookaLPPerActivation = config.get("energy items", "Energy Bazooka LP per activation", AlchemicalWizardry.energyBazookaLPPerActivation).getInt(AlchemicalWizardry.energyBazookaLPPerActivation);
AlchemicalWizardry.energyBazookaSecondTierLPPerActivation = config.get("energy items", "Energy Bazooka Tier II LP per activation", AlchemicalWizardry.energyBazookaSecondTierLPPerActivation).getInt(AlchemicalWizardry.energyBazookaSecondTierLPPerActivation);
AlchemicalWizardry.energyBazookaThirdTierLPPerActivation = config.get("energy items", "Energy Bazooka Tier III LP per activation", AlchemicalWizardry.energyBazookaThirdTierLPPerActivation).getInt(AlchemicalWizardry.energyBazookaThirdTierLPPerActivation);
Side side = FMLCommonHandler.instance().getSide();
if (side == Side.CLIENT)
src/main/java/WayofTime/alchemicalWizardry/ModItems.java
+1 -6
View File
@@ -66,7 +66,6 @@ public class ModItems
public static Item magicianBloodOrb;
public static Item energyBlaster;
public static Item energyBlasterSecondTier;
public static Item energyBlasterThirdTier;
public static Item energySword;
public static Item lavaCrystal;
public static Item waterSigil;
@@ -151,7 +150,6 @@ public class ModItems
public static Item itemKeyOfDiablo;
public static Item energyBazooka;
public static Item energyBazookaSecondTier;
public static Item energyBazookaThirdTier;
public static Item itemBloodLightSigil;
public static Item itemComplexSpellCrystal;
public static Item itemBloodFrame;
@@ -217,7 +215,6 @@ public class ModItems
transcendentBloodOrb = new TranscendentBloodOrb(30000000).setUnlocalizedName("transcendentBloodOrb");
energyBlaster = new EnergyBlast(1).setUnlocalizedName("energyBlast");
energyBlasterSecondTier = new EnergyBlast(2).setUnlocalizedName("energyBlastSecondTier");
energyBlasterThirdTier = new EnergyBlast(3).setUnlocalizedName("energyBlastThirdTier");
energySword = new EnergySword().setUnlocalizedName("energySword");
lavaCrystal = new LavaCrystal().setUnlocalizedName("lavaCrystal");
waterSigil = new SigilWater().setUnlocalizedName("waterSigil");
@@ -289,7 +286,6 @@ public class ModItems
itemKeyOfDiablo = new ItemDiabloKey().setUnlocalizedName("itemDiabloKey");
energyBazooka = new EnergyBazooka(1).setUnlocalizedName("energyBazooka");
energyBazookaSecondTier = new EnergyBazooka(2).setUnlocalizedName("energyBazookaSecondTier");
energyBazookaThirdTier = new EnergyBazooka(3).setUnlocalizedName("energyBazookaThirdTier");
itemBloodLightSigil = new SigilBloodLight().setUnlocalizedName("bloodLightSigil");
itemComplexSpellCrystal = new ItemComplexSpellCrystal().setUnlocalizedName("itemComplexSpellCrystal");
bucketLife = new LifeBucket(ModBlocks.blockLifeEssence).setUnlocalizedName("bucketLife").setContainerItem(Items.bucket).setCreativeTab(CreativeTabs.tabMisc);
@@ -350,7 +346,7 @@ public class ModItems
GameRegistry.registerItem(ModItems.magicianBloodOrb, "magicianBloodOrb");
GameRegistry.registerItem(ModItems.energyBlaster, "energyBlaster");
GameRegistry.registerItem(ModItems.energyBlasterSecondTier, "energyBlasterSecondTier");
GameRegistry.registerItem(ModItems.energyBlasterThirdTier, "energyBlasterThirdTier");
GameRegistry.registerItem(ModItems.energySword, "energySword");
GameRegistry.registerItem(ModItems.lavaCrystal, "lavaCrystal");
GameRegistry.registerItem(ModItems.waterSigil, "waterSigil");
@@ -426,7 +422,6 @@ public class ModItems
GameRegistry.registerItem(ModItems.itemKeyOfDiablo, "itemKeyOfDiablo");
GameRegistry.registerItem(ModItems.energyBazooka, "energyBazooka");
GameRegistry.registerItem(ModItems.energyBazookaSecondTier, "energyBazookaSecondTier");
GameRegistry.registerItem(ModItems.energyBazookaThirdTier, "energyBazookaThirdTier");
GameRegistry.registerItem(ModItems.itemBloodLightSigil, "itemBloodLightSigil");
GameRegistry.registerItem(ModItems.itemComplexSpellCrystal, "itemComplexSpellCrystal");
GameRegistry.registerItem(ModItems.itemSigilOfSupression, "sigilOfSupression");
src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java
+2 -11
View File
@@ -23,8 +23,6 @@ public class EnergyBazooka extends EnergyItems
@SideOnly(Side.CLIENT)
private IIcon activeIconTier2;
@SideOnly(Side.CLIENT)
private IIcon activeIconTier3;
@SideOnly(Side.CLIENT)
private IIcon passiveIcon;
private int tier;
private int damage;
@@ -39,8 +37,6 @@ public class EnergyBazooka extends EnergyItems
this.tier = tier;
this.setEnergyUsed(tier == 1 ? AlchemicalWizardry.energyBazookaLPPerShot : AlchemicalWizardry.energyBazookaSecondTierLPPerShot);
this.damage = tier == 1 ? AlchemicalWizardry.energyBazookaDamage : AlchemicalWizardry.energyBazookaSecondTierDamage;
this.setEnergyUsed(tier == 2 ? AlchemicalWizardry.energyBazookaSecondTierLPPerShot : AlchemicalWizardry.energyBazookaThirdTierLPPerShot);
this.damage = tier == 2 ? AlchemicalWizardry.energyBazookaSecondTierDamage : AlchemicalWizardry.energyBazookaThirdTierDamage;
}
@Override
@@ -49,8 +45,7 @@ public class EnergyBazooka extends EnergyItems
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:EnergyBazooka_activated");
this.activeIcon = iconRegister.registerIcon("AlchemicalWizardry:EnergyBazooka_activated");
this.activeIconTier2 = iconRegister.registerIcon("AlchemicalWizardry:EnergyBazooka2_activated");
this.activeIconTier3 = iconRegister.registerIcon("AlchemicalWizardry:EnergyBazooka3_activated");
this.activeIconTier2 = iconRegister.registerIcon("AlchemicalWizardry:EnergyBazooka_activated");
this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem");
}
@@ -67,10 +62,8 @@ public class EnergyBazooka extends EnergyItems
if (tag.getBoolean("isActive"))
{
return tier == 1 ? this.activeIcon : this.activeIconTier2;
}
else
else
{
return this.passiveIcon;
}
@@ -81,7 +74,6 @@ public class EnergyBazooka extends EnergyItems
{
final int maxDelay = tier == 1 ? AlchemicalWizardry.energyBazookaMaxDelay : AlchemicalWizardry.energyBazookaSecondTierMaxDelay;
if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
{
this.setActivated(par1ItemStack, !getActivated(par1ItemStack));
@@ -172,7 +164,6 @@ public class EnergyBazooka extends EnergyItems
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
{
par3List.add(StatCollector.translateToLocal("tooltip.energybazooka.desc"));
par3List.add(StatCollector.translateToLocal("tooltip.alchemy.damage") + " " + damage);
if (!(par1ItemStack.getTagCompound() == null))
{
src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java
+1 -3
View File
@@ -22,8 +22,6 @@ public class EnergyBlast extends EnergyItems
@SideOnly(Side.CLIENT)
private IIcon activeIconTier2;
@SideOnly(Side.CLIENT)
private IIcon activeIconTier3;
@SideOnly(Side.CLIENT)
private IIcon passiveIcon;
private int tier;
private int damage;
@@ -47,7 +45,7 @@ public class EnergyBlast extends EnergyItems
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:EnergyBlaster_activated");
this.activeIcon = iconRegister.registerIcon("AlchemicalWizardry:EnergyBlaster_activated");
this.activeIconTier2 = iconRegister.registerIcon("AlchemicalWizardry:EnergyBlaster2_activated");
this.activeIconTier2 = iconRegister.registerIcon("AlchemicalWizardry:EnergyBlaster_activated");
this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem");
}
src/main/resources/assets/alchemicalwizardry/textures/items/EnergyBazooka2_activated.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.0 KiB

src/main/resources/assets/alchemicalwizardry/textures/items/EnergyBlaster2_activated.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.0 KiB