tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Small laser refinements:

Browse source 
* Allow slightly larger render size.
* Stop breaking blocks *just* at the end of the laser.
* Reduce default range to 64 blocks.
This commit is contained in:
Ben Spiers 2014-09-15 03:49:47 +01:00
parent 944e288f89
commit 4ada1ff8b7
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/client/entity/EntityLaser.java
View file

@ -28,7 +28,7 @@ public class EntityLaser extends EntityFX
particleGreen = 0; particleGreen = 0;
particleBlue = 0; particleBlue = 0;
particleAlpha = 0.1F; particleAlpha = 0.1F;
particleScale = (float) Math.min(energy / 50000, 0.5); particleScale = (float) Math.min(energy / 50000, 0.6);
length = end.distance(start); length = end.distance(start);
direction = dir; direction = dir;
} }

2
src/main/java/mekanism/common/CommonProxy.java
View file

@ -241,7 +241,7 @@ public class CommonProxy
general.TO_TE = general.TO_BC*10; general.TO_TE = general.TO_BC*10;
general.FROM_TE = general.FROM_BC/10; general.FROM_TE = general.FROM_BC/10;
general.laserRange = Mekanism.configuration.get("general", "LaserRange", 100).getInt(100); general.laserRange = Mekanism.configuration.get("general", "LaserRange", 64).getInt(64);
general.laserEnergyNeededPerHardness = Mekanism.configuration.get("general", "LaserDiggingEnergy", 100000).getInt(100000); general.laserEnergyNeededPerHardness = Mekanism.configuration.get("general", "LaserDiggingEnergy", 100000).getInt(100000);
usage.enrichmentChamberUsage = Mekanism.configuration.get("usage", "EnrichmentChamberUsage", 50D).getDouble(50D); usage.enrichmentChamberUsage = Mekanism.configuration.get("usage", "EnrichmentChamberUsage", 50D).getDouble(50D);

4
src/main/java/mekanism/common/LaserManager.java
View file

@ -25,7 +25,7 @@ public class LaserManager
public static MovingObjectPosition fireLaser(Pos3D from, ForgeDirection direction, double energy, World world) public static MovingObjectPosition fireLaser(Pos3D from, ForgeDirection direction, double energy, World world)
{ {
Pos3D to = from.clone().translate(direction, general.laserRange); Pos3D to = from.clone().translate(direction, general.laserRange - 0.002);
MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(from.xPos, from.yPos, from.zPos), Vec3.createVectorHelper(to.xPos, to.yPos, to.zPos)); MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(from.xPos, from.yPos, from.zPos), Vec3.createVectorHelper(to.xPos, to.yPos, to.zPos));
@ -80,7 +80,7 @@ public class LaserManager
public static void fireLaserClient(Pos3D from, ForgeDirection direction, double energy, World world) public static void fireLaserClient(Pos3D from, ForgeDirection direction, double energy, World world)
{ {
Pos3D to = from.clone().translate(direction, general.laserRange); Pos3D to = from.clone().translate(direction, general.laserRange - 0.002);
MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(from.xPos, from.yPos, from.zPos), Vec3.createVectorHelper(to.xPos, to.yPos, to.zPos)); MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(from.xPos, from.yPos, from.zPos), Vec3.createVectorHelper(to.xPos, to.yPos, to.zPos));
if(mop != null) if(mop != null)