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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-09-02 18:27:02 -04:00
parent 439c9c5599
commit ed02eadb76
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1561,13 +1561,13 @@ public class Blocks implements ContentList{
segment = new PointDefenseTurret("segment"){{ 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, 25));
range = 95f; range = 100f;
hasPower = true; hasPower = true;
consumes.power(3f); consumes.power(3f);
size = 2; size = 2;
shootLength = 5f; shootLength = 5f;
bulletDamage = 16f; bulletDamage = 16f;
reloadTime = 20f; reloadTime = 15f;
health = 190 * size * size; health = 190 * size * size;
}}; }};

10
core/src/mindustry/content/UnitTypes.java
View File

@@ -381,7 +381,7 @@ public class UnitTypes implements ContentList{
health = 8000; health = 8000;
armor = 6f; armor = 6f;
rotateSpeed = 2.9f; rotateSpeed = 2.7f;
legCount = 6; legCount = 6;
legMoveSpace = 1f; legMoveSpace = 1f;
@@ -391,7 +391,7 @@ public class UnitTypes implements ContentList{
legBaseOffset = 10f; legBaseOffset = 10f;
landShake = 1f; landShake = 1f;
legSpeed = 0.1f; legSpeed = 0.1f;
legLengthScl = 1f; legLengthScl = 0.96f;
rippleScale = 2f; rippleScale = 2f;
legSpeed = 0.2f; legSpeed = 0.2f;
@@ -479,7 +479,7 @@ public class UnitTypes implements ContentList{
health = 23000; health = 23000;
armor = 14f; armor = 14f;
rotateSpeed = 2.2f; rotateSpeed = 1.9f;
legCount = 8; legCount = 8;
legMoveSpace = 0.8f; legMoveSpace = 0.8f;
@@ -602,6 +602,8 @@ public class UnitTypes implements ContentList{
faceTarget = false; faceTarget = false;
engineOffset = 5.5f; engineOffset = 5.5f;
range = 140f; range = 140f;
crashDamageMultiplier = 4f;
weapons.add(new Weapon(){{ weapons.add(new Weapon(){{
y = 0f; y = 0f;
x = 2f; x = 2f;
@@ -855,6 +857,7 @@ public class UnitTypes implements ContentList{
engineOffset = 5.7f; engineOffset = 5.7f;
itemCapacity = 30; itemCapacity = 30;
range = 50f; range = 50f;
isCounted = false;
mineTier = 1; mineTier = 1;
mineSpeed = 2.5f; mineSpeed = 2.5f;
@@ -875,6 +878,7 @@ public class UnitTypes implements ContentList{
engineOffset = 6.5f; engineOffset = 6.5f;
hitsize = 8f; hitsize = 8f;
lowAltitude = true; lowAltitude = true;
isCounted = false;
mineTier = 2; mineTier = 2;
mineSpeed = 3.5f; mineSpeed = 3.5f;

2
core/src/mindustry/entities/comp/LegsComp.java
View File

@@ -33,7 +33,7 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
@Override @Override
public void update(){ public void update(){
if(Mathf.dst(deltaX(), deltaY()) > 0.001f){ if(Mathf.dst(deltaX(), deltaY()) > 0.001f){
baseRotation = Mathf.slerpDelta(baseRotation, Mathf.angle(deltaX(), deltaY()), 0.1f); baseRotation = Angles.moveToward(baseRotation, Mathf.angle(deltaX(), deltaY()), type.rotateSpeed);
} }
float rot = baseRotation; float rot = baseRotation;

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

@@ -163,7 +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");
number("@rules.solarpowermultiplier", f -> rules.solarPowerMultiplier = f, () -> rules.solarPowerMultiplier); //various multipliers should be handled elsewhere
//number("@rules.solarpowermultiplier", f -> rules.solarPowerMultiplier = f, () -> rules.solarPowerMultiplier);
check("@rules.lighting", b -> rules.lighting = b, () -> rules.lighting); check("@rules.lighting", b -> rules.lighting = b, () -> rules.lighting);
main.button(b -> { main.button(b -> {