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

Broke 90% of all code

Browse Source
This commit is contained in:
Anuken
2018-01-27 14:43:35 -05:00
parent 93cd497c8d
commit 78c8dc4902
36 changed files with 582 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/entities/Bullet.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class Bullet extends BulletEntity{
@Override
public Bullet add(){
return super.add(Vars.control.bulletGroup);
return super.add(Vars.bulletGroup);
}
}
core/src/io/anuke/mindustry/entities/Player.java
+4 -4
View File
@@ -54,7 +54,7 @@ public class Player extends SyncEntity{
public boolean collides(SolidEntity other){
if(other instanceof Bullet){
Bullet b = (Bullet)other;
if(!Vars.control.isFriendlyFire() && b.owner instanceof Player){
if(!Vars.logic.friendlyFire && b.owner instanceof Player){
return false;
}
}
@@ -91,7 +91,7 @@ public class Player extends SyncEntity{
set(-9999, -9999);
Timers.run(respawnduration, () -> {
heal();
set(Vars.control.getCore().worldx(), Vars.control.getCore().worldy());
set(logic.getSpawnX(), logic.getSpawnY());
});
}
@@ -159,8 +159,8 @@ public class Player extends SyncEntity{
vector.y += ya*speed;
vector.x += xa*speed;
boolean shooting = !Inputs.keyDown("dash") && Inputs.keyDown("shoot") && control.getInput().recipe == null
&& !ui.hasMouse() && !control.getInput().onConfigurable();
boolean shooting = !Inputs.keyDown("dash") && Inputs.keyDown("shoot") && control.input().recipe == null
&& !ui.hasMouse() && !control.input().onConfigurable();
if(shooting){
weaponLeft.update(player, true);
core/src/io/anuke/mindustry/entities/enemies/Enemy.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class Enemy extends SyncEntity {
@Override
public Enemy add(){
return add(Vars.control.enemyGroup);
return add(Vars.enemyGroup);
}
@Override
core/src/io/anuke/mindustry/entities/enemies/EnemyType.java
+14 -14
View File
@@ -21,7 +21,7 @@ import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Strings;
import io.anuke.ucore.util.Tmp;
import static io.anuke.mindustry.Vars.world;
import static io.anuke.mindustry.Vars.*;
public class EnemyType {
@@ -80,11 +80,11 @@ public class EnemyType {
Graphics.flush();
if(Vars.showPaths){
if(showPaths){
Draw.tscl(0.25f);
Draw.text((int)enemy.idletime + "\n" + Strings.toFixed(enemy.totalMove.x, 2) + ", "
+ Strings.toFixed(enemy.totalMove.x, 2), enemy.x, enemy.y);
Draw.tscl(Vars.fontscale);
Draw.tscl(fontscale);
}
Shaders.outline.lighten = 0f;
@@ -134,8 +134,8 @@ public class EnemyType {
enemy.angle = Mathf.slerp(enemy.angle, enemy.angleTo(enemy.target), turretrotatespeed * Timers.delta());
}
enemy.x = Mathf.clamp(enemy.x, 0, Vars.world.width() * Vars.tilesize);
enemy.y = Mathf.clamp(enemy.y, 0, Vars.world.height() * Vars.tilesize);
enemy.x = Mathf.clamp(enemy.x, 0, world.width() * tilesize);
enemy.y = Mathf.clamp(enemy.y, 0, world.height() * tilesize);
}
public void move(Enemy enemy){
@@ -147,7 +147,7 @@ public class EnemyType {
return;
}
Tile core = Vars.control.getCore();
Tile core = world.getCore();
if(enemy.idletime > maxIdleLife){
enemy.onDeath();
@@ -161,7 +161,7 @@ public class EnemyType {
vec = Tmp.v1.setZero();
if(targetCore) enemy.target = core.entity;
}else{
vec = Vars.world.pathfinder().find(enemy);
vec = world.pathfinder().find(enemy);
vec.sub(enemy.x, enemy.y).limit(speed);
}
@@ -171,7 +171,7 @@ public class EnemyType {
float attractRange = avoidRange + 7f;
float avoidSpeed = this.speed/2.7f;
Entities.getNearby(Vars.control.enemyGroup, enemy.x, enemy.y, range, en -> {
Entities.getNearby(enemyGroup, enemy.x, enemy.y, range, en -> {
Enemy other = (Enemy)en;
if(other == enemy) return;
float dst = other.distanceTo(enemy);
@@ -202,14 +202,14 @@ public class EnemyType {
}
if(enemy.timer.get(timerTarget, 15) && !nearCore){
enemy.target = Vars.world.findTileTarget(enemy.x, enemy.y, null, range, false);
enemy.target = world.findTileTarget(enemy.x, enemy.y, null, range, false);
//no tile found
if(enemy.target == null){
enemy.target = Entities.getClosest(Vars.control.playerGroup, enemy.x, enemy.y, range, e -> !((Player)e).isAndroid);
enemy.target = Entities.getClosest(playerGroup, enemy.x, enemy.y, range, e -> !((Player)e).isAndroid);
}
}else if(nearCore){
enemy.target = Vars.control.getCore().entity;
enemy.target = world.getCore().entity;
}
if(enemy.target != null && bullet != null){
@@ -220,7 +220,7 @@ public class EnemyType {
public void updateShooting(Enemy enemy){
float reload = this.reload / Math.max(enemy.tier / 1.5f, 1f);
if(enemy.timer.get(timerReload, reload * Vars.multiplier)){
if(enemy.timer.get(timerReload, reload * multiplier)){
shoot(enemy);
}
}
@@ -234,7 +234,7 @@ public class EnemyType {
public void onDeath(Enemy enemy){
if(Net.active() && Net.server()){
Vars.netServer.handleEnemyDeath(enemy);
netServer.handleEnemyDeath(enemy);
}
Effects.effect(Fx.explosion, enemy);
@@ -249,7 +249,7 @@ public class EnemyType {
if(enemy.spawner != null){
enemy.spawner.spawned --;
}else{
Vars.control.enemyDeath();
Vars.control.enemyDeath(); //TODO
}
}
}
core/src/io/anuke/mindustry/entities/enemies/types/FortressType.java
+2 -2
View File
@@ -30,8 +30,8 @@ public class FortressType extends EnemyType {
@Override
public void move(Enemy enemy){
if(enemy.distanceTo(Vars.control.getCore().worldx(),
Vars.control.getCore().worldy()) <= 90f){
if(enemy.distanceTo(Vars.world.getCore().worldx(),
Vars.world.getCore().worldy()) <= 90f){
if(Timers.get(this, "spawn", spawnTime) && enemy.spawned < maxSpawn){
Angles.translation(enemy.angle, 20f);