From e5ff4292411b1fb147628ce0f80878e6b8cd4e7e Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 12 Sep 2020 15:32:35 -0400 Subject: [PATCH] ??? --- .../src/mindustry/android/AndroidRhinoContext.java | 5 +++++ core/src/mindustry/content/Blocks.java | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/android/src/mindustry/android/AndroidRhinoContext.java b/android/src/mindustry/android/AndroidRhinoContext.java index c4468ecead..d3e80c7427 100644 --- a/android/src/mindustry/android/AndroidRhinoContext.java +++ b/android/src/mindustry/android/AndroidRhinoContext.java @@ -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; diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index e83256e1b3..3298961b11 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -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; }};