mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-24 05:21:15 -08:00
Code Issues Projects Releases Wiki Activity

???

Browse source
This commit is contained in:
Anuken 2020-09-12 15:32:35 -04:00
parent b58b6c7361
commit e5ff429241
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
android/src/mindustry/android/AndroidRhinoContext.java
View file

@ -41,6 +41,11 @@ public class AndroidRhinoContext{
public Object getDynamicSecurityDomain(Object o){
return null;
}
@Override
public Object callWithDomain(Object o, Context context, Callable callable, Scriptable scriptable, Scriptable scriptable1, Object[] objects){
return null;
}
});
AndroidContextFactory factory;

11
core/src/mindustry/content/Blocks.java
View file

@ -1511,11 +1511,10 @@ public class Blocks implements ContentList{
size = 2;
force = 4.5f;
scaledForce = 5.5f;
range = 170f;
range = 110f;
damage = 0.1f;
health = 160 * size * size;
rotateSpeed = 10;
range = 85f;
consumes.powerCond(3f, (TractorBeamBuild e) -> e.target != null);
}};
@ -1564,15 +1563,15 @@ public class Blocks implements ContentList{
}};
segment = new PointDefenseTurret("segment"){{
requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 25));
requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 40));
range = 125f;
range = 140f;
hasPower = true;
consumes.power(3f);
size = 2;
shootLength = 5f;
bulletDamage = 18f;
reloadTime = 11f;
bulletDamage = 25f;
reloadTime = 10f;
health = 190 * size * size;
}};