Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-11-13 07:15:28 +03:00
Code Issues Projects Releases Wiki Activity

Large overdrive projector

Browse Source
This commit is contained in:
Anuken 2020-06-03 17:23:45 -04:00
parent 6fff4ad8a1
commit 45c2cd7ac3
5 changed files with 653 additions and 627 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1260
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 836 KiB

After

Width:  |  Height:  |  Size: 834 KiB

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 129 KiB

16
core/src/mindustry/content/Blocks.java
View File

@ -53,7 +53,7 @@ public class Blocks implements ContentList{
//defense
copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mender, mendProjector, overdriveProjector, forceProjector, shockMine,
phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mender, mendProjector, overdriveProjector, largeOverdriveProjector, forceProjector, shockMine,
scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet
//transport
@ -894,6 +894,18 @@ public class Blocks implements ContentList{
consumes.item(Items.phasefabric).boost();
}};
//TODO better name
largeOverdriveProjector = new OverdriveProjector("large-overdrive-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 130, Items.silicon, 130, Items.plastanium, 80, Items.surgealloy, 120));
consumes.power(10f);
size = 3;
range = 180f;
speedBoost = 1.5f;
speedBoostPhase = 1f;
useTime = 250f;
consumes.item(Items.phasefabric).boost();
}};
forceProjector = new ForceProjector("force-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 100, Items.titanium, 75, Items.silicon, 125));
size = 3;
@ -1678,7 +1690,7 @@ public class Blocks implements ContentList{
requirements(Category.turret, ItemStack.with(Items.silicon, 80, Items.thorium, 80, Items.surgealloy, 50));
hasPower = true;
consumes.power(1.1f);
consumes.power(2f);
size = 2;
shootLength = 5f;
bulletDamage = 12f;

4
core/src/mindustry/world/blocks/defense/OverdriveProjector.java
View File

@ -105,8 +105,8 @@ public class OverdriveProjector extends Block{
Draw.alpha(heat * Mathf.absin(Time.time(), 10f, 1f) * 0.5f);
Draw.rect(topRegion, x, y);
Draw.alpha(1f);
Lines.stroke((2f * f + 0.2f) * heat);
Lines.square(x, y, (1f - f) * 8f);
Lines.stroke((2f * f + 0.1f) * heat);
Lines.square(x, y, Math.min(1f + (1f - f) * size * tilesize / 2f, size * tilesize/2f));
Draw.reset();
}