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

nothing again

Browse Source
This commit is contained in:
Anuken
2018-10-11 23:14:59 -04:00
parent 48b7ceac06
commit 08cc87affb
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
annotations/src/io/anuke/annotations/RemoteMethodAnnotationProcessor.java
View File

@@ -74,7 +74,6 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
if(round == 1){ if(round == 1){
//get serializers //get serializers
serializers = new IOFinder().findSerializers(roundEnv); serializers = new IOFinder().findSerializers(roundEnv);
//last method ID used //last method ID used
int lastMethodID = 0; int lastMethodID = 0;
//find all elements with the Remote annotation //find all elements with the Remote annotation

9
core/src/io/anuke/mindustry/entities/Player.java
View File

@@ -244,7 +244,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
@Override @Override
public String toString(){ public String toString(){
return "Player{" + id + ", mech=" + mech.name + ", local=" + isLocal + ", " + x + ", " + y + "}\n"; return "Player{" + id + ", mech=" + mech.name + ", local=" + isLocal + ", " + x + ", " + y + "}";
} }
@Override @Override
@@ -570,8 +570,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
movement.y += ya * speed; movement.y += ya * speed;
movement.x += xa * speed; movement.x += xa * speed;
Vector2 vec = Graphics.world(Vars.control.input(playerIndex).getMouseX(), Vector2 vec = Graphics.world(control.input(playerIndex).getMouseX(), control.input(playerIndex).getMouseY());
Vars.control.input(playerIndex).getMouseY());
pointerX = vec.x; pointerX = vec.x;
pointerY = vec.y; pointerY = vec.y;
updateShooting(); updateShooting();
@@ -691,8 +690,8 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
} }
}else if(isShooting()){ }else if(isShooting()){
Vector2 vec = Graphics.world(Vars.control.input(playerIndex).getMouseX(), Vector2 vec = Graphics.world(control.input(playerIndex).getMouseX(),
Vars.control.input(playerIndex).getMouseY()); control.input(playerIndex).getMouseY());
pointerX = vec.x; pointerX = vec.x;
pointerY = vec.y; pointerY = vec.y;

3
core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
View File

@@ -71,9 +71,6 @@ public class FortressGenerator{
Array<Block> wallsLarge = find(b -> b instanceof Wall && !(b instanceof Door) && b.size == 2); Array<Block> wallsLarge = find(b -> b instanceof Wall && !(b instanceof Door) && b.size == 2);
Block wall = walls.get((int)(difficultyScl * walls.size)); Block wall = walls.get((int)(difficultyScl * walls.size));
Block wallLarge = wallsLarge.get((int)(difficultyScl * walls.size));
Drill drill = (Drill) drills.get((int)(difficultyScl * drills.size));
Drill powerDrill = (Drill) powerDrills.get((int)(difficultyScl * powerDrills.size));
Turret powerTurret = (Turret) powerTurrets.get((int)(difficultyScl * powerTurrets.size)); Turret powerTurret = (Turret) powerTurrets.get((int)(difficultyScl * powerTurrets.size));
Turret bigTurret = (Turret) turrets.get(Mathf.clamp((int)((difficultyScl+0.2f+gen.random.range(0.2f)) * turrets.size), 0, turrets.size-1)); Turret bigTurret = (Turret) turrets.get(Mathf.clamp((int)((difficultyScl+0.2f+gen.random.range(0.2f)) * turrets.size), 0, turrets.size-1));