mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-21 21:38:29 +03:00
Fixed minGameVersion / Crawler command / New rules
This commit is contained in:
parent
c5cb2d8683
commit
2260e6824c
@ -837,6 +837,8 @@ rules.title.unit = Units
|
|||||||
rules.title.experimental = Experimental
|
rules.title.experimental = Experimental
|
||||||
rules.title.environment = Environment
|
rules.title.environment = Environment
|
||||||
rules.lighting = Lighting
|
rules.lighting = Lighting
|
||||||
|
rules.fire = Fire
|
||||||
|
rules.explosions = Block/Unit Explosion Damage
|
||||||
rules.ambientlight = Ambient Light
|
rules.ambientlight = Ambient Light
|
||||||
rules.solarpowermultiplier = Solar Power Multiplier
|
rules.solarpowermultiplier = Solar Power Multiplier
|
||||||
|
|
||||||
|
@ -3,8 +3,10 @@ package mindustry.ai.types;
|
|||||||
import mindustry.*;
|
import mindustry.*;
|
||||||
import mindustry.ai.*;
|
import mindustry.ai.*;
|
||||||
import mindustry.entities.*;
|
import mindustry.entities.*;
|
||||||
|
import mindustry.entities.units.*;
|
||||||
import mindustry.gen.*;
|
import mindustry.gen.*;
|
||||||
import mindustry.world.*;
|
import mindustry.world.*;
|
||||||
|
import mindustry.world.meta.*;
|
||||||
|
|
||||||
public class SuicideAI extends GroundAI{
|
public class SuicideAI extends GroundAI{
|
||||||
static boolean blockedByBlock;
|
static boolean blockedByBlock;
|
||||||
@ -58,7 +60,13 @@ public class SuicideAI extends GroundAI{
|
|||||||
}
|
}
|
||||||
|
|
||||||
}else{
|
}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);
|
moveTo(Pathfinder.fieldCore);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1725,7 +1725,7 @@ public class Blocks implements ContentList{
|
|||||||
navalFactory = new UnitFactory("naval-factory"){{
|
navalFactory = new UnitFactory("naval-factory"){{
|
||||||
requirements(Category.units, with(Items.copper, 150, Items.lead, 130, Items.metaglass, 120));
|
requirements(Category.units, with(Items.copper, 150, Items.lead, 130, Items.metaglass, 120));
|
||||||
plans = new UnitPlan[]{
|
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;
|
size = 3;
|
||||||
requiresWater = true;
|
requiresWater = true;
|
||||||
|
@ -740,8 +740,6 @@ public class Mods implements Loadable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int getMinMinor(){
|
public int getMinMinor(){
|
||||||
int minor = 0;
|
|
||||||
|
|
||||||
String ver = meta.minGameVersion == null ? "0" : meta.minGameVersion;
|
String ver = meta.minGameVersion == null ? "0" : meta.minGameVersion;
|
||||||
|
|
||||||
if(ver.contains(".")){
|
if(ver.contains(".")){
|
||||||
@ -751,7 +749,7 @@ public class Mods implements Loadable{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return Strings.parseInt(ver, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -163,6 +163,8 @@ public class CustomRulesDialog extends BaseDialog{
|
|||||||
number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));
|
number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));
|
||||||
|
|
||||||
title("@rules.title.environment");
|
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);
|
check("@rules.lighting", b -> rules.lighting = b, () -> rules.lighting);
|
||||||
|
|
||||||
main.button(b -> {
|
main.button(b -> {
|
||||||
|
@ -73,7 +73,7 @@ public class RepairPoint extends Block{
|
|||||||
Draw.rect(region, x, y, rotation - 90);
|
Draw.rect(region, x, y, rotation - 90);
|
||||||
|
|
||||||
if(target != null && Angles.angleDist(angleTo(target), rotation) < 30f){
|
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 ang = angleTo(target);
|
||||||
float len = 5f;
|
float len = 5f;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user