- Balancing Nr3

This commit is contained in:
HellFirePvP committed 2015-12-20 14:41:17 +01:00
1 parent 9f8657ffb9
commit 7dbb7e44e6
3 files changed
+6 -3

No files matched your search

@@ -3,10 +3,12 @@ package makeo.gadomancy.common.aura;
import makeo.gadomancy.common.Gadomancy;
import makeo.gadomancy.common.network.PacketHandler;
import makeo.gadomancy.common.network.packets.PacketTCNotificationText;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.StatCollector;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.research.ResearchItem;
import thaumcraft.common.Thaumcraft;
import thaumcraft.common.lib.research.ResearchManager;
@@ -30,6 +32,7 @@ public class AuraResearchManager {
if(!AuraEffectHandler.registeredEffects.containsKey(aspect)) return;
if(!ResearchManager.isResearchComplete(player.getCommandSenderName(), Gadomancy.MODID.toUpperCase() + ".AURA_EFFECTS")) return;
if(!Thaumcraft.proxy.getPlayerKnowledge().hasDiscoveredAspect(player.getCommandSenderName(), aspect)) return;
String res = String.format(TC_AURA_RESEARCH_STR, aspect.getTag());
if(ResearchManager.isResearchComplete(player.getCommandSenderName(), res)) return;
@@ -279,10 +279,10 @@ public class RegisteredResearches {
.setPages(new ResearchPage("gadomancy.research_page.AURA_PYLON.1"), new ResearchPage(RegisteredRecipes.recipeAuraPylon), new ResearchPage(RegisteredRecipes.recipeAuraPylonPeak), new ResearchPage(RegisteredRecipes.multiblockAuraPylon)).registerResearchItem();
researchAuraEffects = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".AURA_EFFECTS", Gadomancy.MODID,
new AspectList().add(Aspect.AURA, 10).add(Aspect.MIND, 8).add(Aspect.MAGIC, 4).add(Aspect.MECHANISM, 8),
new AspectList().add(Aspect.AURA, 6).add(Aspect.MIND, 8).add(Aspect.MAGIC, 4).add(Aspect.ORDER, 4),
1, 10, 2,
new ResourceLocation("thaumcraft", "textures/misc/r_aspects.png"))
.setConcealed().setRound()
.setConcealed().setSecondary()
.setParents(researchAuraPylon.key)
.setPages(new ResearchPage("gadomancy.research_page.AURA_EFFECTS.1")).registerResearchItem();
@@ -33,7 +33,7 @@ public class RandomizedAspectList extends AspectList {
}
private void checkRandomization() {
if((System.currentTimeMillis() - lastRandomization) > 1000) {
if((System.currentTimeMillis() - lastRandomization) > 500) {
super.aspects.clear();
for(Aspect a : aspectMap.keySet()) {
if(a == null) continue;