Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
HellFirePvP committed 2015-11-10 22:07:07 +01:00
commit 2db112f686
3 files changed
+17 -7

No files matched your search

@@ -15,9 +15,9 @@ import java.util.Random;
* Created by HellFirePvP @ 30.10.2015 20:08
*/
public class UtilsFX {
private static final Color[] runeColors_red = new Color[] { new Color(0xB60707), new Color(0xEE3782), new Color(0xF37B20), new Color(0xFF6722), new Color(0xFF6D30), new Color(0xFF0000) };
private static final Color[] runeColors_green = new Color[] { new Color(0x005629), new Color(0x0E9C00), new Color(0x000000), new Color(0x00FF00), new Color(0x004C3E)};
private static final Color[] RUNE_COLORS_RED = new Color[] { new Color(0xB60707), new Color(0xEE3782), new Color(0xF37B20), new Color(0xFF6722), new Color(0xFF6D30), new Color(0xFF0000) };
private static final Color[] RUNE_COLORS_GREEN = new Color[] { new Color(0x015629), new Color(0x0E9C00), new Color(0x010000), new Color(0x01FF00), new Color(0x014C3E)};
private static final Color[] RUNE_COLORS_BLUE = new Color[] { new Color(0x060956), new Color(0x012578), new Color(0x0C1556), new Color(0x0100FF), new Color(0x01018C)};
public static void doRuneEffects(World world, int x, int y, int z, byte colorFlag) {
if(world.isRemote) {
@@ -34,9 +34,9 @@ public class UtilsFX {
private static Color evaluateRandomColor(Random rand, byte colorFlag) {
Color[] possibleColors;
if(colorFlag == 1) {
possibleColors = runeColors_green;
possibleColors = RUNE_COLORS_BLUE;
} else {
possibleColors = runeColors_red;
possibleColors = RUNE_COLORS_RED;
}
return possibleColors[rand.nextInt(possibleColors.length)];
}
@@ -163,12 +163,12 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont
}
if(worldObj.rand.nextBoolean()) {
Vec3 rel = getRelPillarLoc(worldObj.rand.nextInt(4));
PacketTCNodeBolt bolt = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, (float) (xCoord + 0.5F + rel.xCoord), (float) (yCoord + 2.5F + rel.yCoord), (float) (zCoord + 0.5F + rel.zCoord), 3, false);
PacketTCNodeBolt bolt = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, (float) (xCoord + 0.5F + rel.xCoord), (float) (yCoord + 2.5F + rel.yCoord), (float) (zCoord + 0.5F + rel.zCoord), 2, false);
PacketHandler.INSTANCE.sendToAllAround(bolt, getTargetPoint(32));
}
if(worldObj.rand.nextInt(4) == 0) {
Vec3 relPed = getRelPedestalLoc(worldObj.rand.nextInt(4));
PacketTCNodeBolt bolt = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, (float) (xCoord + 0.5F + relPed.xCoord), (float) (yCoord + 2.5F + relPed.yCoord), (float) (zCoord + 0.5F + relPed.zCoord), 3, false);
PacketTCNodeBolt bolt = new PacketTCNodeBolt(xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, (float) (xCoord + 0.5F + relPed.xCoord), (float) (yCoord + 2.5F + relPed.yCoord), (float) (zCoord + 0.5F + relPed.zCoord), 2, false);
PacketHandler.INSTANCE.sendToAllAround(bolt, getTargetPoint(32));
}
} else {
@@ -21,6 +21,16 @@ public class PacketTCNodeBolt implements IMessage, IMessageHandler<PacketTCNodeB
private float x, y, z;
private float targetX, targetY, targetZ;
/**
* 0: purple
* 1: yellow
* 2: dark blue
* 3: green
* 4: red
* 5: dark purple
* 6: blue
*/
private int type;
private boolean mightGetLong;