upstream/ForbiddenMagic
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ForbiddenMagic.git synced 2026-11-11 07:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing fractional vis costs

Browse Source 
Should address #50
This commit is contained in:
Jeremy Diamond committed 2015-02-25 20:38:39 -08:00
1 parent 4e110ddd01
commit b4bf64ebd0
5 files changed
+41 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/fox/spiteful/forbidden/items/wands/BloodStaffUpdate.java
+7 -5
View File
@@ -27,17 +27,19 @@ public class BloodStaffUpdate implements IWandRodOnUpdate {
int cost;
if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("alchemical"))
cost = 900;
cost = 9;
else
cost = 1000;
cost = 10;
for(int x = 0;x < primals.length;x++)
{
if(((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]) < ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack))
int deficit = ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack) - ((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]);
if(deficit > 0)
{
deficit = Math.min(deficit, 100);
if(player.capabilities.isCreativeMode)
((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
else if(SoulNetworkHandler.syphonFromNetwork(itemstack, cost) > 0)
else if(SoulNetworkHandler.syphonFromNetwork(itemstack, cost * deficit) > 0)
((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
else if(syphonHealth(player))
{
src/main/java/fox/spiteful/forbidden/items/wands/BloodWandUpdate.java
+6 -4
View File
@@ -23,17 +23,19 @@ public class BloodWandUpdate implements IWandRodOnUpdate {
int cost;
if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("alchemical"))
cost = 900;
cost = 9;
else
cost = 1000;
cost = 10;
for(int x = 0;x < primals.length;x++)
{
if(((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]) < ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack))
int deficit = ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack) - ((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]);
if(deficit > 0)
{
deficit = Math.min(deficit, 100);
if(player.capabilities.isCreativeMode)
((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
else if(SoulNetworkHandler.syphonFromNetwork(itemstack, cost) > 0)
else if(SoulNetworkHandler.syphonFromNetwork(itemstack, cost * deficit) > 0)
((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
else if(syphonHealth(player))
{
src/main/java/fox/spiteful/forbidden/items/wands/ManaStaffUpdate.java
+13 -9
View File
@@ -1,11 +1,14 @@
package fox.spiteful.forbidden.items.wands;
import am2.api.ArsMagicaApi;
import am2.api.IExtendedProperties;
import fox.spiteful.forbidden.Config;
import fox.spiteful.forbidden.compat.Compat;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;
public class ManaStaffUpdate implements IWandRodOnUpdate {
@@ -16,30 +19,31 @@ public class ManaStaffUpdate implements IWandRodOnUpdate {
{
if(player.ticksExisted % 40 == 0){
//TODO: Readd ArsMagica Support
try
{
/* IExtendedProperties prop = ArsMagicaApi.instance.getExtendedProperties(player);
IExtendedProperties prop = ArsMagicaApi.instance.getExtendedProperties(player);
float cost;
if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("vinteum"))
cost = 50.0F;
cost = 0.5F;
else
cost = 100.0F;
cost = 1.0F;
if(prop == null || prop.getCurrentMana() <= 0)
return;
for(int x = 0;x < primals.length;x++){
if(((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]) < ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack)) {
if(prop.getCurrentMana() > cost)
{
prop.setCurrentMana(prop.getCurrentMana() - cost);
int deficit = ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack) - ((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]);
if(deficit > 0) {
deficit = Math.min(deficit, 100);
if(prop.getCurrentMana() > cost * deficit)
{
prop.setCurrentMana(prop.getCurrentMana() - cost * deficit);
((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
}
}
}*/
}
}
catch(Throwable e){}
}
src/main/java/fox/spiteful/forbidden/items/wands/ManaWandUpdate.java
+7 -5
View File
@@ -26,19 +26,21 @@ public class ManaWandUpdate implements IWandRodOnUpdate {
float cost;
if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("vinteum"))
cost = 80.0F;
cost = 0.8F;
else
cost = 140.0F;
cost = 1.4F;
if(prop == null || prop.getCurrentMana() <= 0)
return;
for(int x = 0;x < primals.length;x++){
if(((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]) < ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack)) {
if(prop.getCurrentMana() > cost)
int deficit = ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack) - ((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]);
if(deficit > 0) {
deficit = Math.min(deficit, 100);
if(prop.getCurrentMana() > cost * deficit)
{
prop.setCurrentMana(prop.getCurrentMana() - cost);
prop.setCurrentMana(prop.getCurrentMana() - cost * deficit);
((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
}
}
src/main/java/fox/spiteful/forbidden/items/wands/YandereWandUpdate.java
+8 -4
View File
@@ -1,8 +1,10 @@
package fox.spiteful.forbidden.items.wands;
import fox.spiteful.forbidden.Config;
import fox.spiteful.forbidden.LogHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import org.apache.logging.log4j.Level;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;
@@ -23,15 +25,17 @@ public class YandereWandUpdate implements IWandRodOnUpdate {
int cost;
if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("manasteel")
||((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("elementium"))
cost = 900;
cost = 9;
else
cost = 1100;
cost = 11;
for(int x = 0;x < primals.length;x++)
{
if(((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]) < ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack))
int deficit = ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack) - ((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]);
if(deficit > 0)
{
if(ManaItemHandler.requestManaExact(itemstack, player, cost, true))
deficit = Math.min(deficit, 100);
if(ManaItemHandler.requestManaExact(itemstack, player, cost * deficit, true))
((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
}
}