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

Added ores to editor

Browse Source
This commit is contained in:
Anuken
2018-01-09 20:53:30 -05:00
parent d58aab499c
commit 9542f74c14
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/io/anuke/mindustry/entities/effect/DamageArea.java
View File

@@ -4,7 +4,6 @@ import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.enemies.Enemy;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Effects.Effect; import io.anuke.ucore.core.Effects.Effect;
@@ -75,18 +74,17 @@ public class DamageArea{
} }
public static void damage(boolean enemies, float x, float y, float radius, int damage){ public static void damage(boolean enemies, float x, float y, float radius, int damage){
Consumer<SolidEntity> cons = entity -> {
if(enemies){ DestructibleEntity enemy = (DestructibleEntity)entity;
Entities.getNearby(Vars.control.enemyGroup, x, y, radius*2, entity->{ if(enemy.distanceTo(x, y) > radius || (entity instanceof Player && ((Player)entity).isAndroid)){
if(entity instanceof Enemy){
Enemy enemy = (Enemy)entity;
if(enemy.distanceTo(x, y) > radius){
return; return;
} }
int amount = calculateDamage(x, y, enemy.x, enemy.y, radius, damage); int amount = calculateDamage(x, y, enemy.x, enemy.y, radius, damage);
enemy.damage(amount); enemy.damage(amount);
} };
});
if(enemies){
Entities.getNearby(Vars.control.enemyGroup, x, y, radius*2, cons);
}else{ }else{
int trad = (int)(radius / Vars.tilesize); int trad = (int)(radius / Vars.tilesize);
for(int dx = -trad; dx <= trad; dx ++){ for(int dx = -trad; dx <= trad; dx ++){
@@ -99,11 +97,7 @@ public class DamageArea{
} }
} }
if(!Vars.android && Vars.player.distanceTo(x, y) < radius){ Entities.getNearby(Vars.control.playerGroup, x, y, radius*2, cons);
Player player = Vars.player;
int amount = calculateDamage(x, y, player.x, player.y, radius, damage);
player.damage(amount);
}
} }
} }

6
core/src/io/anuke/mindustry/world/ColorMapper.java
View File

@@ -30,7 +30,11 @@ public class ColorMapper{
"f7feff", pair(Blocks.snow, Blocks.snowblock), "f7feff", pair(Blocks.snow, Blocks.snowblock),
"6e501e", pair(Blocks.dirt), "6e501e", pair(Blocks.dirt),
"ed5334", pair(Blocks.lava), "ed5334", pair(Blocks.lava),
"292929", pair(Blocks.oil) "292929", pair(Blocks.oil),
"c3a490", pair(Blocks.iron),
"161616", pair(Blocks.coal),
"6277bc", pair(Blocks.titanium),
"83bc58", pair(Blocks.uranium)
); );
public static BlockPair get(int color){ public static BlockPair get(int color){