mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-22 20:48:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor lightning visual change / Hid PvP mode on web

Browse Source
This commit is contained in:
Anuken 2018-10-16 17:46:44 -04:00
parent 789d200c24
commit c318f05cfd
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/content/Mechs.java
View File

@ -96,7 +96,7 @@ public class Mechs implements ContentList{
Effects.shake(1f, 1f, player);
Effects.effect(UnitFx.landShock, player);
for(int i = 0; i < 8; i++){
Timers.run(Mathf.random(8f), () -> Lightning.create(player.getTeam(), player.getTeam().color, 17f, player.x, player.y, Mathf.random(360f), 14));
Timers.run(Mathf.random(8f), () -> Lightning.create(player.getTeam(), Palette.lancerLaser, 17f, player.x, player.y, Mathf.random(360f), 14));
}
}
}

2
core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
View File

@ -48,7 +48,7 @@ public class CustomGameDialog extends FloatingDialog{
modes.marginBottom(5);
for(GameMode mode : GameMode.values()){
if(mode.hidden) continue;
if(mode.hidden || (mode.isPvp && gwt)) continue;
modes.addButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode)
.update(b -> b.setChecked(state.mode == mode)).group(group).size(140f, 54f).padBottom(-5);

3
core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java
View File

@ -3,6 +3,7 @@ package io.anuke.mindustry.world.blocks.defense;
import io.anuke.mindustry.entities.Unit;
import io.anuke.mindustry.entities.effect.Lightning;
import io.anuke.mindustry.graphics.Layer;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.graphics.Draw;
@ -46,7 +47,7 @@ public class ShockMine extends Block{
public void unitOn(Tile tile, Unit unit){
if(unit.getTeam() != tile.getTeam() && tile.entity.timer.get(timerDamage, cooldown)){
for(int i = 0; i < tendrils; i++){
Lightning.create(tile.getTeam(), tile.getTeam().color, damage, tile.drawx(), tile.drawy(), Mathf.random(360f), length);
Lightning.create(tile.getTeam(), Palette.lancerLaser, damage, tile.drawx(), tile.drawy(), Mathf.random(360f), length);
}
tile.entity.damage(tileDamage);
}