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

Large-scale bugfix: fixed #76, as well as many other timer bugs

Browse Source
This commit is contained in:
Anuken
2018-02-11 16:10:23 -05:00
parent ef4a7a8fea
commit a248891a94
15 changed files with 325 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/entities/Bullet.java
+2
View File
@@ -5,10 +5,12 @@ import io.anuke.ucore.entities.BulletEntity;
import io.anuke.ucore.entities.Entity;
import io.anuke.ucore.entities.SolidEntity;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timer;
import static io.anuke.mindustry.Vars.*;
public class Bullet extends BulletEntity{
public Timer timer = new Timer(3);
public Bullet(BulletType type, Entity owner, float x, float y, float angle){
super(type, owner, angle);
core/src/io/anuke/mindustry/entities/BulletType.java
+7 -7
View File
@@ -52,7 +52,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void update(Bullet b){
if(Timers.get(b, "smoke", 4)){
if(b.timer.get(0, 4)){
Effects.effect(Fx.railsmoke, b.x, b.y);
}
}
@@ -73,7 +73,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void update(Bullet b){
if(Timers.get(b, "smoke", 2)){
if(b.timer.get(0, 2)){
Effects.effect(Fx.empspark, b.x + Mathf.range(2), b.y + Mathf.range(2));
}
}
@@ -107,7 +107,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void update(Bullet b){
if(Timers.get(b, "smoke", 7)){
if(b.timer.get(0, 7)){
Effects.effect(Fx.smoke, b.x + Mathf.range(2), b.y + Mathf.range(2));
}
}
@@ -132,7 +132,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void update(Bullet b){
if(Timers.get(b, "smoke", 7)){
if(b.timer.get(0, 7)){
Effects.effect(Fx.smoke, b.x + Mathf.range(2), b.y + Mathf.range(2));
}
}
@@ -187,7 +187,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void update(Bullet b){
if(Timers.get(b, "smoke", 4)){
if(b.timer.get(0, 4)){
Effects.effect(Fx.smoke, b.x + Mathf.range(2), b.y + Mathf.range(2));
}
}
@@ -218,7 +218,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void update(Bullet b){
if(Timers.get(b, "smoke", 4)){
if(b.timer.get(0, 4)){
Effects.effect(Fx.smoke, b.x + Mathf.range(2), b.y + Mathf.range(2));
}
}
@@ -391,7 +391,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void update(Bullet b){
if(Timers.get(b, "smoke", 4)){
if(b.timer.get(0, 4)){
Effects.effect(Fx.chainsmoke, b.x, b.y);
}
}
core/src/io/anuke/mindustry/entities/Player.java
+12 -5
View File
@@ -16,6 +16,7 @@ import io.anuke.ucore.entities.SolidEntity;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timer;
import io.anuke.ucore.util.Translator;
import java.nio.ByteBuffer;
@@ -26,6 +27,11 @@ public class Player extends SyncEntity{
static final float speed = 1.1f;
static final float dashSpeed = 1.8f;
static final int timerDash = 0;
static final int timerShootLeft = 1;
static final int timerShootRight = 2;
static final int timerRegen = 20;
public String name = "name";
public boolean isAndroid;
public Color color = new Color();
@@ -40,6 +46,7 @@ public class Player extends SyncEntity{
public int clientid;
public boolean isLocal = false;
public Timer timer = new Timer(4);
private Vector2 movement = new Vector2();
private Translator tr = new Translator();
@@ -168,7 +175,7 @@ public class Player extends SyncEntity{
float speed = dashing ? (debug ? Player.dashSpeed * 5f : Player.dashSpeed) : Player.speed;
if(health < maxhealth && Timers.get(this, "regen", 20))
if(health < maxhealth && timer.get(timerRegen, 20 ))
health ++;
health = Mathf.clamp(health, -1, maxhealth);
@@ -191,7 +198,7 @@ public class Player extends SyncEntity{
weaponRight.update(player, false);
}
if(dashing && Timers.get(this, "dashfx", 3) && movement.len() > 0){
if(dashing && timer.get(timerDash, 3) && movement.len() > 0){
Effects.effect(Fx.dashsmoke, x + Angles.trnsx(angle + 180f, 3f), y + Angles.trnsy(angle + 180f, 3f));
}
@@ -255,7 +262,7 @@ public class Player extends SyncEntity{
@Override
public void write(ByteBuffer data) {
if(Net.client()) {
if(Net.client() || isLocal) {
data.putFloat(x);
data.putFloat(y);
}else{
@@ -290,11 +297,11 @@ public class Player extends SyncEntity{
float tx = x + Angles.trnsx(angle + 180f, 3f);
float ty = y + Angles.trnsy(angle + 180f, 3f);
if(isAndroid && i.target.dst(i.last) > 2f && Timers.get(this, "dashfx", 2)){
if(isAndroid && i.target.dst(i.last) > 2f && timer.get(timerDash, 1)){
Effects.effect(Fx.dashsmoke, tx, ty);
}
if(dashing && !dead && Timers.get(this, "dashfx", 3) && i.target.dst(i.last) > 1f){
if(dashing && !dead && timer.get(timerDash, 3) && i.target.dst(i.last) > 1f){
Effects.effect(Fx.dashsmoke, tx, ty);
}
}