mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-11 18:39:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

Campaign bugfixes / Balancing

Browse Source
This commit is contained in:
Anuken 2020-11-26 18:53:20 -05:00
parent 6b3919e8f7
commit dae46ceb6d
5 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/overgrowth.msav
View File

Binary file not shown.

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

@ -37,7 +37,7 @@ public class Bullets implements ContentList{
waterShot, cryoShot, slagShot, oilShot, heavyWaterShot, heavyCryoShot, heavySlagShot, heavyOilShot,
//environment, misc.
damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt, healBullet, healBulletBig;
damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt;
@Override
public void load(){
@ -374,20 +374,6 @@ public class Bullets implements ContentList{
knockback = 0.7f;
}};
healBullet = new LaserBoltBulletType(5.2f, 13){{
healPercent = 3f;
collidesTeam = true;
backColor = Pal.heal;
frontColor = Color.white;
}};
healBulletBig = new LaserBoltBulletType(5.2f, 15){{
healPercent = 5.5f;
collidesTeam = true;
backColor = Pal.heal;
frontColor = Color.white;
}};
fireball = new BulletType(1f, 4){
{
pierce = true;

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

@ -292,6 +292,7 @@ public class UnitTypes implements ContentList{
shootSound = Sounds.lasershoot;
bullet = new LaserBoltBulletType(5.2f, 14){{
lifetime = 37f;
healPercent = 5f;
collidesTeam = true;
backColor = Pal.heal;
@ -311,7 +312,7 @@ public class UnitTypes implements ContentList{
mineTier = 2;
mineSpeed = 5f;
commandLimit = 8;
commandLimit = 9;
abilities.add(new ShieldRegenFieldAbility(20f, 40f, 60f * 5, 60f));
ammoType = AmmoTypes.power;
@ -975,7 +976,7 @@ public class UnitTypes implements ContentList{
zenith = new UnitType("zenith"){{
health = 700;
speed = 1.7f;
speed = 1.8f;
accel = 0.04f;
drag = 0.016f;
flying = true;
@ -997,7 +998,7 @@ public class UnitTypes implements ContentList{
velocityRnd = 0.2f;
shootSound = Sounds.missile;
bullet = new MissileBulletType(3f, 12){{
bullet = new MissileBulletType(3f, 14){{
width = 8f;
height = 8f;
shrinkY = 0f;
@ -1005,7 +1006,7 @@ public class UnitTypes implements ContentList{
homingRange = 60f;
keepVelocity = false;
splashDamageRadius = 25f;
splashDamage = 10f;
splashDamage = 14f;
lifetime = 60f;
trailColor = Pal.unitBack;
backColor = Pal.unitBack;
@ -1264,6 +1265,7 @@ public class UnitTypes implements ContentList{
engineSize = 3f;
payloadCapacity = (2 * 2) * tilePayload;
buildSpeed = 2.6f;
isCounted = false;
ammoType = AmmoTypes.power;
@ -1274,7 +1276,13 @@ public class UnitTypes implements ContentList{
x = 8f;
y = -6f;
rotate = true;
bullet = Bullets.healBulletBig;
bullet = new LaserBoltBulletType(5.2f, 10){{
lifetime = 35f;
healPercent = 5.5f;
collidesTeam = true;
backColor = Pal.heal;
frontColor = Color.white;
}};
}},
new Weapon("heal-weapon-mount"){{
shootSound = Sounds.lasershoot;
@ -1282,7 +1290,13 @@ public class UnitTypes implements ContentList{
x = 4f;
y = 5f;
rotate = true;
bullet = Bullets.healBullet;
bullet = new LaserBoltBulletType(5.2f, 8){{
lifetime = 35f;
healPercent = 3f;
collidesTeam = true;
backColor = Pal.heal;
frontColor = Color.white;
}};
}});
}};

4
core/src/mindustry/entities/comp/FlyingComp.java
View File

@ -46,8 +46,8 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
}
void wobble(){
x += Mathf.sin(Time.time() + id() * 99, 25f, 0.05f) * Time.delta * elevation;
y += Mathf.cos(Time.time() + id() * 99, 25f, 0.05f) * Time.delta * elevation;
x += Mathf.sin(Time.time() + (id() % 10) * 12, 25f, 0.05f) * Time.delta * elevation;
y += Mathf.cos(Time.time() + (id() % 10) * 12, 25f, 0.05f) * Time.delta * elevation;
}
void moveAt(Vec2 vector, float acceleration){

6
core/src/mindustry/entities/comp/UnitComp.java
View File

@ -399,7 +399,9 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
public void destroy(){
float explosiveness = 2f + item().explosiveness * stack().amount / 3f;
float flammability = item().flammability * stack().amount / 3f;
Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, bounds() / 2f, Pal.darkFlame, state.rules.damageExplosions);
if(!spawnedByCore){
Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, bounds() / 2f, Pal.darkFlame, state.rules.damageExplosions);
}
float shake = hitSize / 3f;
@ -415,7 +417,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
}
//if this unit crash landed (was flying), damage stuff in a radius
if(type.flying){
if(type.flying && !spawnedByCore){
Damage.damage(team,x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f, true, false, true);
}