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

Updated uCore references

Browse Source
This commit is contained in:
Anuken
2017-09-11 19:42:41 -04:00
parent 4c860a0315
commit 6861939f78
21 changed files with 48 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/entities/Player.java
-1
View File
@@ -11,7 +11,6 @@ import io.anuke.mindustry.resource.Recipe;
import io.anuke.ucore.core.*;
import io.anuke.ucore.entities.DestructibleEntity;
import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Timers;
public class Player extends DestructibleEntity{
public Weapon weapon;
core/src/io/anuke/mindustry/entities/enemies/Enemy.java
+4 -5
View File
@@ -11,9 +11,8 @@ import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.entities.*;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timers;
public class Enemy extends DestructibleEntity{
protected float speed = 0.3f;
@@ -123,11 +122,11 @@ public class Enemy extends DestructibleEntity{
move();
xvelocity = (x - lastx) / Mathf.delta();
yvelocity = (y - lasty) / Mathf.delta();
xvelocity = (x - lastx) / Timers.delta();
yvelocity = (y - lasty) / Timers.delta();
if(target == null){
direction.add(xvelocity * Mathf.delta(), yvelocity * Mathf.delta());
direction.add(xvelocity * Timers.delta(), yvelocity * Timers.delta());
direction.limit(speed*rotatespeed);
}else{
float angle = angleTo(target);
core/src/io/anuke/mindustry/entities/enemies/TestEnemy.java
+2 -3
View File
@@ -1,7 +1,6 @@
package io.anuke.mindustry.entities.enemies;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Timers;
import io.anuke.ucore.core.Timers;
public class TestEnemy extends Enemy{
boolean dir = false;
@@ -17,6 +16,6 @@ public class TestEnemy extends Enemy{
dir = !dir;
}
move(dir ? -0.3f * Mathf.delta() : 0.3f * Mathf.delta(), 0);
move(dir ? -0.3f * Timers.delta() : 0.3f * Timers.delta(), 0);
}
}