Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-21 21:38:29 +03:00
Code Issues Projects Releases Wiki Activity

Fixed minGameVersion / Crawler command / New rules

Browse Source
This commit is contained in:
Anuken 2020-09-09 22:17:26 -04:00
parent c5cb2d8683
commit 2260e6824c
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@ -837,6 +837,8 @@ rules.title.unit = Units
rules.title.experimental = Experimental
rules.title.environment = Environment
rules.lighting = Lighting
rules.fire = Fire
rules.explosions = Block/Unit Explosion Damage
rules.ambientlight = Ambient Light
rules.solarpowermultiplier = Solar Power Multiplier

10
core/src/mindustry/ai/types/SuicideAI.java
View File

@ -3,8 +3,10 @@ package mindustry.ai.types;
import mindustry.*;
import mindustry.ai.*;
import mindustry.entities.*;
import mindustry.entities.units.*;
import mindustry.gen.*;
import mindustry.world.*;
import mindustry.world.meta.*;
public class SuicideAI extends GroundAI{
static boolean blockedByBlock;
@ -58,7 +60,13 @@ public class SuicideAI extends GroundAI{
}
}else{
if(core != null){
if(command() == UnitCommand.rally){
Teamc target = targetFlag(unit.x, unit.y, BlockFlag.rally, false);
if(target != null && !unit.within(target, 70f)){
moveTo(Pathfinder.fieldRally);
}
}else if(command() == UnitCommand.attack && core != null){
moveTo(Pathfinder.fieldCore);
}

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

@ -1725,7 +1725,7 @@ public class Blocks implements ContentList{
navalFactory = new UnitFactory("naval-factory"){{
requirements(Category.units, with(Items.copper, 150, Items.lead, 130, Items.metaglass, 120));
plans = new UnitPlan[]{
new UnitPlan(UnitTypes.risso, 60f * 30f, with(Items.silicon, 20, Items.metaglass, 25)),
new UnitPlan(UnitTypes.risso, 60f * 45f, with(Items.silicon, 20, Items.metaglass, 35)),
};
size = 3;
requiresWater = true;

4
core/src/mindustry/mod/Mods.java
View File

@ -740,8 +740,6 @@ public class Mods implements Loadable{
}
public int getMinMinor(){
int minor = 0;
String ver = meta.minGameVersion == null ? "0" : meta.minGameVersion;
if(ver.contains(".")){
@ -751,7 +749,7 @@ public class Mods implements Loadable{
}
}
return 0;
return Strings.parseInt(ver, 0);
}
@Override

2
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@ -163,6 +163,8 @@ public class CustomRulesDialog extends BaseDialog{
number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));
title("@rules.title.environment");
check("@rules.explosions", b -> rules.damageExplosions = b, () -> rules.damageExplosions);
check("@rules.fire", b -> rules.fire = b, () -> rules.fire);
check("@rules.lighting", b -> rules.lighting = b, () -> rules.lighting);
main.button(b -> {

2
core/src/mindustry/world/blocks/units/RepairPoint.java
View File

@ -73,7 +73,7 @@ public class RepairPoint extends Block{
Draw.rect(region, x, y, rotation - 90);
if(target != null && Angles.angleDist(angleTo(target), rotation) < 30f){
Draw.z(Layer.power);
Draw.z(Layer.flyingUnit + 1); //above all units
float ang = angleTo(target);
float len = 5f;