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

Updates for new uCore version

Browse Source
This commit is contained in:
Anuken
2018-04-05 22:30:25 -04:00
parent 53ca2d0755
commit 5172ae781f
15 changed files with 220 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/io/anuke/mindustry/entities/BulletType.java
View File

@@ -168,8 +168,8 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void draw(Bullet b) {
Draw.color(Color.LIGHT_GRAY, Color.GRAY, b.ifract());
Lines.stroke(2f - b.ifract());
Draw.color(Color.LIGHT_GRAY, Color.GRAY, b.fout());
Lines.stroke(2f - b.fout());
Lines.lineAngleCenter(b.x, b.y, b.angle(), 2f);
Draw.reset();
}
@@ -325,7 +325,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void draw(Bullet b){
Draw.color(Color.WHITE, lightOrange, b.fract()/2f + 0.25f);
Draw.color(Color.WHITE, lightOrange, b.fin()/2f + 0.25f);
Lines.stroke(1.5f);
Lines.lineAngle(b.x, b.y, b.angle(), 3f);
Draw.reset();
@@ -337,7 +337,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void draw(Bullet b) {
float size = 3f - b.ifract()*1f;
float size = 3f - b.fout()*1f;
Draw.color(Color.PURPLE, Color.WHITE, 0.8f);
Lines.stroke(1f);
@@ -356,8 +356,8 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
Draw.color(lightOrange, Color.WHITE, 0.4f);
Lines.poly(b.x, b.y, 3, 1.6f, b.angle());
Lines.stroke(1f);
Draw.color(Color.WHITE, lightOrange, b.ifract()/2f);
Draw.alpha(b.ifract());
Draw.color(Color.WHITE, lightOrange, b.fout()/2f);
Draw.alpha(b.fout());
Lines.spikes(b.x, b.y, 1.5f, 2f, 6);
Draw.reset();
}
@@ -408,9 +408,9 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void draw(Bullet b) {
Draw.color(Color.WHITE, Color.ORANGE, b.ifract());
Draw.color(Color.WHITE, Color.ORANGE, b.fout());
Lines.stroke(2f);
Lines.lineAngleCenter(b.x, b.y, b.angle(), b.fract()*5f);
Lines.lineAngleCenter(b.x, b.y, b.angle(), b.fin()*5f);
Draw.reset();
}
@@ -436,9 +436,9 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void draw(Bullet b) {
Draw.color(Color.WHITE, Color.ORANGE, b.ifract());
Draw.color(Color.WHITE, Color.ORANGE, b.fout());
Lines.stroke(1f);
Lines.lineAngleCenter(b.x, b.y, b.angle(), b.fract()*4f);
Lines.lineAngleCenter(b.x, b.y, b.angle(), b.fin()*4f);
Draw.reset();
}
},
@@ -454,7 +454,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
public void draw(Bullet b) {
float f = b.fract()*1.5f;
float f = b.fin()*1.5f;
Draw.color(beam);
Draw.rect("circle", b.x, b.y, 6f*f, 6f*f);

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

@@ -60,7 +60,7 @@ public class Player extends SyncEntity{
}
@Override
public void damage(int amount){
public void damage(float amount){
if(debug || isAndroid) return;
health -= amount;

6
core/src/io/anuke/mindustry/entities/effect/EMP.java
View File

@@ -77,7 +77,7 @@ public class EMP extends TimedEntity{
drawLine(target.worldx(), target.worldy());
float rad = 5f*fract();
float rad = 5f*fin();
Draw.rect("circle", target.worldx(), target.worldy(), rad, rad);
}
@@ -86,7 +86,7 @@ public class EMP extends TimedEntity{
drawLine(x + tr.x, y + tr.y);
}
Lines.stroke(fract()*2f);
Lines.stroke(fin()*2f);
Lines.poly(x, y, 34, radius * tilesize);
Draw.reset();
@@ -114,7 +114,7 @@ public class EMP extends TimedEntity{
}
private void drawLaser(float x, float y, float x2, float y2){
Lines.stroke(fract() * 2f);
Lines.stroke(fin() * 2f);
Lines.line(x, y, x2, y2);
}
}

2
core/src/io/anuke/mindustry/entities/enemies/Enemy.java
View File

@@ -72,7 +72,7 @@ public class Enemy extends SyncEntity {
}
@Override
public void damage(int amount){
public void damage(float amount){
super.damage(amount);
hitTime = EnemyType.hitDuration;
}