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

Misc balance / Fixed unobtainable achievement

Browse Source
This commit is contained in:
Anuken
2022-10-25 21:54:28 -04:00
parent ac32b0a1e0
commit ac44ef5b96
7 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/Blocks.java
View File

@@ -4296,7 +4296,7 @@ public class Blocks{
pierceCap = 2; pierceCap = 2;
fragOnHit = false; fragOnHit = false;
speed = 5f; speed = 5f;
damage = 170f; damage = 180f;
lifetime = 80f; lifetime = 80f;
width = height = 16f; width = height = 16f;
backColor = Pal.surge; backColor = Pal.surge;
@@ -4398,10 +4398,10 @@ public class Blocks{
lustre = new ContinuousTurret("lustre"){{ lustre = new ContinuousTurret("lustre"){{
requirements(Category.turret, with(Items.silicon, 250, Items.graphite, 200, Items.oxide, 50, Items.carbide, 90)); requirements(Category.turret, with(Items.silicon, 250, Items.graphite, 200, Items.oxide, 50, Items.carbide, 90));
range = 130f; range = 140f;
shootType = new PointLaserBulletType(){{ shootType = new PointLaserBulletType(){{
damage = 180f; damage = 190f;
buildingDamageMultiplier = 0.3f; buildingDamageMultiplier = 0.3f;
hitColor = Color.valueOf("fda981"); hitColor = Color.valueOf("fda981");
}}; }};

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

@@ -2509,7 +2509,7 @@ public class UnitTypes{
weapons.add(new Weapon("locus-weapon"){{ weapons.add(new Weapon("locus-weapon"){{
shootSound = Sounds.bolt; shootSound = Sounds.bolt;
layerOffset = 0.0001f; layerOffset = 0.0001f;
reload = 12f; reload = 14f;
shootY = 10f; shootY = 10f;
recoil = 1f; recoil = 1f;
rotate = true; rotate = true;
@@ -2587,7 +2587,7 @@ public class UnitTypes{
weapons.add(new Weapon("precept-weapon"){{ weapons.add(new Weapon("precept-weapon"){{
shootSound = Sounds.dullExplosion; shootSound = Sounds.dullExplosion;
layerOffset = 0.0001f; layerOffset = 0.0001f;
reload = 85f; reload = 80f;
shootY = 16f; shootY = 16f;
recoil = 3f; recoil = 3f;
rotate = true; rotate = true;
@@ -2598,7 +2598,7 @@ public class UnitTypes{
y = -1f; y = -1f;
heatColor = Color.valueOf("f9350f"); heatColor = Color.valueOf("f9350f");
cooldownTime = 30f; cooldownTime = 30f;
bullet = new BasicBulletType(7f, 110){{ bullet = new BasicBulletType(7f, 120){{
sprite = "missile-large"; sprite = "missile-large";
width = 7.5f; width = 7.5f;
height = 13f; height = 13f;
@@ -3527,7 +3527,7 @@ public class UnitTypes{
shadowElevation = 0.1f; shadowElevation = 0.1f;
drag = 0.07f; drag = 0.07f;
speed = 2f; speed = 1.8f;
rotateSpeed = 5f; rotateSpeed = 5f;
accel = 0.09f; accel = 0.09f;

1
core/src/mindustry/game/EventType.java
View File

@@ -38,6 +38,7 @@ public class EventType{
socketConfigChanged, socketConfigChanged,
update, update,
unitCommandChange, unitCommandChange,
unitCommandAttack,
importMod, importMod,
draw, draw,
drawOver, drawOver,

4
core/src/mindustry/input/InputHandler.java
View File

@@ -827,6 +827,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
ids[i] = selectedUnits.get(i).id; ids[i] = selectedUnits.get(i).id;
} }
if(attack != null){
Events.fire(Trigger.unitCommandAttack);
}
Call.commandUnits(player, ids, attack instanceof Building b ? b : null, attack instanceof Unit u ? u : null, target); Call.commandUnits(player, ids, attack instanceof Building b ? b : null, attack instanceof Unit u ? u : null, target);
} }

2
core/src/mindustry/service/Achievement.java
View File

@@ -36,7 +36,7 @@ public enum Achievement{
obtainTitanium, obtainTitanium,
suicideBomb, suicideBomb,
buildGroundFactory, buildGroundFactory,
issueAttackCommand, issueAttackCommand, //TODO change desc
active100Units(SStat.maxUnitActive, 100), active100Units(SStat.maxUnitActive, 100),
build1000Units(SStat.unitsBuilt, 1000), build1000Units(SStat.unitsBuilt, 1000),
buildAllUnits(SStat.unitTypesBuilt, 30), buildAllUnits(SStat.unitTypesBuilt, 30),

6
core/src/mindustry/service/GameService.java
View File

@@ -113,6 +113,12 @@ public class GameService{
captureAllSectors.complete(); captureAllSectors.complete();
} }
Events.run(Trigger.unitCommandAttack, () -> {
if(campaign()){
issueAttackCommand.complete();
}
});
Events.on(UnitDestroyEvent.class, e -> { Events.on(UnitDestroyEvent.class, e -> {
if(campaign()){ if(campaign()){
if(e.unit.team != Vars.player.team()){ if(e.unit.team != Vars.player.team()){