Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Organized FX

Browse Source
This commit is contained in:
Anuken
2018-03-31 15:30:06 -04:00
parent dd0ad495f7
commit eab226f04d
40 changed files with 652 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/io/anuke/mindustry/content/Weapons.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.content;
import io.anuke.mindustry.entities.BulletType;
import io.anuke.mindustry.graphics.Fx;
import io.anuke.mindustry.graphics.fx.BulletFx;
import io.anuke.mindustry.resource.Weapon;
public class Weapons {
@@ -9,20 +9,20 @@ public class Weapons {
blaster = new Weapon("blaster", 12, BulletType.shot) {
{
effect = Fx.laserShoot;
effect = BulletFx.laserShoot;
length = 2f;
}
},
triblaster = new Weapon("triblaster", 16, BulletType.spread) {
{
shots = 3;
effect = Fx.spreadShoot;
effect = BulletFx.spreadShoot;
roundrobin = true;
}
},
clustergun = new Weapon("clustergun", 26f, BulletType.cluster) {
{
effect = Fx.clusterShoot;
effect = BulletFx.clusterShoot;
inaccuracy = 17f;
roundrobin = true;
shots = 2;
@@ -31,7 +31,7 @@ public class Weapons {
},
beam = new Weapon("beam", 30f, BulletType.beamlaser) {
{
effect = Fx.beamShoot;
effect = BulletFx.beamShoot;
inaccuracy = 0;
roundrobin = true;
shake = 2f;
@@ -39,7 +39,7 @@ public class Weapons {
},
vulcan = new Weapon("vulcan", 5, BulletType.vulcan) {
{
effect = Fx.vulcanShoot;
effect = BulletFx.vulcanShoot;
inaccuracy = 5;
roundrobin = true;
shake = 1f;
@@ -49,7 +49,7 @@ public class Weapons {
shockgun = new Weapon("shockgun", 36, BulletType.shockshell) {
{
shootsound = "bigshot";
effect = Fx.shockShoot;
effect = BulletFx.shockShoot;
shake = 2f;
roundrobin = true;
shots = 7;

20
core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
View File

@@ -3,7 +3,7 @@ package io.anuke.mindustry.content.blocks;
import com.badlogic.gdx.graphics.Color;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.graphics.Fx;
import io.anuke.mindustry.graphics.fx.BlockFx;
import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.resource.ItemStack;
import io.anuke.mindustry.world.Block;
@@ -32,7 +32,7 @@ public class CraftingBlocks {
siliconsmelter = new PowerSmelter("siliconsmelter") {{
health = 90;
craftEffect = Fx.smeltsmoke;
craftEffect = BlockFx.smeltsmoke;
inputs = new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.sand, 2)};
result = Items.silicon;
powerUse = 0.05f;
@@ -44,7 +44,7 @@ public class CraftingBlocks {
poweralloysmelter = new PowerSmelter("poweralloysmelter") {{
health = 90;
craftEffect = Fx.smeltsmoke;
craftEffect = BlockFx.smeltsmoke;
inputs = new ItemStack[]{new ItemStack(Items.titanium, 4), new ItemStack(Items.thorium, 4)};
result = Items.densealloy;
powerUse = 0.3f;
@@ -54,7 +54,7 @@ public class CraftingBlocks {
powersmelter = new PowerSmelter("powersmelter") {{
health = 90;
craftEffect = Fx.smeltsmoke;
craftEffect = BlockFx.smeltsmoke;
inputs = new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.iron, 1)};
result = Items.steel;
powerUse = 0.1f;
@@ -140,8 +140,8 @@ public class CraftingBlocks {
size = 2;
health = 320;
hasPower = hasLiquids = true;
craftEffect = Fx.formsmoke;
updateEffect = Fx.plasticburn;
craftEffect = BlockFx.formsmoke;
updateEffect = BlockFx.plasticburn;
}},
biomatterCompressor = new Compressor("biomattercompressor") {{
@@ -163,9 +163,9 @@ public class CraftingBlocks {
powerUse = 0.2f;
output = Items.sand;
health = 80;
craftEffect = Fx.pulverize;
craftEffect = BlockFx.pulverize;
craftTime = 60f;
updateEffect = Fx.pulverizeSmall;
updateEffect = BlockFx.pulverizeSmall;
hasInventory = hasPower = true;
}},
@@ -176,7 +176,7 @@ public class CraftingBlocks {
liquidCapacity = 56f;
output = Items.coal;
health = 80;
craftEffect = Fx.purifyoil;
craftEffect = BlockFx.purifyoil;
hasInventory = hasLiquids = hasPower = true;
}},
@@ -187,7 +187,7 @@ public class CraftingBlocks {
craftTime = 12;
output = Items.stone;
health = 80;
craftEffect = Fx.purifystone;
craftEffect = BlockFx.purifystone;
}},
weaponFactory = new WeaponFactory("weaponfactory") {{

6
core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.blocks;
import io.anuke.mindustry.graphics.Fx;
import io.anuke.mindustry.graphics.fx.BlockFx;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.types.Wall;
import io.anuke.mindustry.world.blocks.types.defense.*;
@@ -58,8 +58,8 @@ public class DefenseBlocks {
}},
largedoor = new Door("door-large") {{
openfx = Fx.dooropenlarge;
closefx = Fx.doorcloselarge;
openfx = BlockFx.dooropenlarge;
closefx = BlockFx.doorcloselarge;
health = 90 * 4 * wallHealthMultiplier;
size = 2;
}};

4
core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.blocks;
import io.anuke.mindustry.graphics.Fx;
import io.anuke.mindustry.graphics.fx.BlockFx;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.types.defense.RepairTurret;
import io.anuke.mindustry.world.blocks.types.defense.ShieldBlock;
@@ -20,7 +20,7 @@ public class PowerBlocks {
maxLiquidGenerate = 0.5f;
powerPerLiquid = 0.08f;
powerCapacity = 40f;
generateEffect = Fx.redgeneratespark;
generateEffect = BlockFx.redgeneratespark;
}},
combustiongenerator = new LiquidBurnerGenerator("combustiongenerator") {{

16
core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java
View File

@@ -3,7 +3,7 @@ package io.anuke.mindustry.content.blocks;
import com.badlogic.gdx.graphics.Color;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.graphics.Fx;
import io.anuke.mindustry.graphics.fx.BlockFx;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.types.production.Cultivator;
import io.anuke.mindustry.world.blocks.types.production.Drill;
@@ -39,8 +39,8 @@ public class ProductionBlocks {
powerUse = 0.2f;
hasPower = true;
tier = 5;
updateEffect = Fx.pulverizeMedium;
drillEffect = Fx.mineBig;
updateEffect = BlockFx.pulverizeMedium;
drillEffect = BlockFx.mineBig;
}},
nucleardrill = new Drill("nucleardrill") {{
@@ -50,9 +50,9 @@ public class ProductionBlocks {
drawRim = true;
hasPower = true;
tier = 5;
updateEffect = Fx.pulverizeRed;
updateEffect = BlockFx.pulverizeRed;
updateEffectChance = 0.03f;
drillEffect = Fx.mineHuge;
drillEffect = BlockFx.mineHuge;
rotateSpeed = 6f;
warmupSpeed = 0.01f;
}},
@@ -70,9 +70,9 @@ public class ProductionBlocks {
tier = 5;
rotateSpeed = 9f;
drawRim = true;
updateEffect = Fx.pulverizeRedder;
updateEffect = BlockFx.pulverizeRedder;
updateEffectChance = 0.04f;
drillEffect = Fx.mineHuge;
drillEffect = BlockFx.mineHuge;
warmupSpeed = 0.005f;
}},
@@ -88,7 +88,7 @@ public class ProductionBlocks {
oilextractor = new Fracker("oilextractor") {{
result = Liquids.oil;
inputLiquid = Liquids.water;
updateEffect = Fx.pulverize;
updateEffect = BlockFx.pulverize;
updateEffectChance = 0.05f;
inputLiquidUse = 0.3f;
powerUse = 0.6f;

14
core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java
View File

@@ -5,7 +5,7 @@ import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.entities.BulletType;
import io.anuke.mindustry.entities.effect.TeslaOrb;
import io.anuke.mindustry.graphics.Fx;
import io.anuke.mindustry.graphics.fx.BulletFx;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.types.defense.LaserTurret;
@@ -68,7 +68,7 @@ public class WeaponBlocks{
bullet = BulletType.sniper;
ammo = Items.steel;
health = 70;
shootEffect = Fx.railshot;
shootEffect = BulletFx.railshot;
}
},
@@ -84,7 +84,7 @@ public class WeaponBlocks{
ammo = Items.coal;
ammoMultiplier = 5;
health = 110;
shootEffect = Fx.mortarshot;
shootEffect = BulletFx.mortarshot;
shootShake = 2f;
size = 2;
}
@@ -161,7 +161,7 @@ public class WeaponBlocks{
shootCone = 9f;
ammoMultiplier = 8;
shots = 2;
shootEffect = Fx.chainshot;
shootEffect = BulletFx.chainshot;
}
@Override
@@ -194,7 +194,7 @@ public class WeaponBlocks{
size = 3;
rotatespeed = 0.07f;
shootCone = 9f;
shootEffect = Fx.titanshot;
shootEffect = BulletFx.titanshot;
shootShake = 3f;
}
},
@@ -211,7 +211,7 @@ public class WeaponBlocks{
size = 3;
rotatespeed = 0.07f;
shootCone = 9f;
shootEffect = Fx.titanshot;
shootEffect = BulletFx.titanshot;
shootShake = 3f;
}
},
@@ -227,7 +227,7 @@ public class WeaponBlocks{
size = 2;
rotatespeed = 0.07f;
shootCone = 9f;
shootEffect = Fx.titanshot;
shootEffect = BulletFx.titanshot;
shootShake = 3f;
}
};