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

merge healbullets with bullettype

Browse Source
This commit is contained in:
Leonwang4234
2020-10-05 11:49:12 -07:00
parent dda77dad4c
commit e17f28b636
6 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/mindustry/content/Bullets.java
View File

@@ -379,12 +379,18 @@ public class Bullets implements ContentList{
JsonIO.copy(damageLightning, damageLightningGround);
damageLightningGround.collidesAir = false;
healBullet = new HealBulletType(5.2f, 13){{
healBullet = new LaserBoltBulletType(5.2f, 13){{
healPercent = 3f;
collidesTeam = true;
backColor = Pal.heal;
frontColor = Color.white;
}};
healBulletBig = new HealBulletType(5.2f, 15){{
healBulletBig = new LaserBoltBulletType(5.2f, 15){{
healPercent = 5.5f;
collidesTeam = true;
backColor = Pal.heal;
frontColor = Color.white;
}};
fireball = new BulletType(1f, 4){

5
core/src/mindustry/content/UnitTypes.java
View File

@@ -1191,6 +1191,10 @@ public class UnitTypes implements ContentList{
smokeEffect = Fx.hitLaser;
frontColor = Color.white;
healPercent = 5.5f;
collidesTeam = true;
backColor = Pal.heal;
frontColor = Color.white;
backColor = Pal.heal;
trailColor = Pal.heal;
}};
@@ -1292,6 +1296,7 @@ public class UnitTypes implements ContentList{
speed = 0.001f;
collides = false;
healPercent = 10f;
splashDamage = 240f;
splashDamageRadius = 115f;
}};