Burst drill stat fix

This commit is contained in:
Anuken
2022-04-21 11:06:42 -04:00
parent 34ba60d526
commit e5f8eb3a30
6 changed files with 38 additions and 9 deletions

View File

@@ -3695,7 +3695,7 @@ public class Blocks{
trailWidth = 2.1f; trailWidth = 2.1f;
trailLength = 10; trailLength = 10;
hitEffect = despawnEffect = Fx.hitBulletColor; hitEffect = despawnEffect = Fx.hitBulletColor;
buildingDamageMultiplier = 0.4f; buildingDamageMultiplier = 0.3f;
}}, }},
Items.tungsten, new BasicBulletType(8f, 185){{ Items.tungsten, new BasicBulletType(8f, 185){{
width = 13f; width = 13f;
@@ -3714,7 +3714,7 @@ public class Blocks{
trailLength = 11; trailLength = 11;
hitEffect = despawnEffect = Fx.hitBulletColor; hitEffect = despawnEffect = Fx.hitBulletColor;
rangeChange = 40f; rangeChange = 40f;
buildingDamageMultiplier = 0.4f; buildingDamageMultiplier = 0.3f;
}} }}
); );
@@ -3792,7 +3792,7 @@ public class Blocks{
length = r; length = r;
knockback = 1f; knockback = 1f;
pierceCap = 3; pierceCap = 3;
buildingDamageMultiplier = 0.5f; buildingDamageMultiplier = 0.3f;
colors = new Color[]{Color.valueOf("eb7abe").a(0.55f), Color.valueOf("e189f5").a(0.7f), Color.valueOf("907ef7").a(0.8f), Color.valueOf("91a4ff"), Color.white}; colors = new Color[]{Color.valueOf("eb7abe").a(0.55f), Color.valueOf("e189f5").a(0.7f), Color.valueOf("907ef7").a(0.8f), Color.valueOf("91a4ff"), Color.white};
}}, }},
@@ -3802,7 +3802,7 @@ public class Blocks{
length = r + rangeChange; length = r + rangeChange;
knockback = 2f; knockback = 2f;
pierceCap = 4; pierceCap = 4;
buildingDamageMultiplier = 0.5f; buildingDamageMultiplier = 0.3f;
colors = new Color[]{Color.valueOf("465ab8").a(0.55f), Color.valueOf("66a6d2").a(0.7f), Color.valueOf("89e8b6").a(0.8f), Color.valueOf("cafcbe"), Color.white}; colors = new Color[]{Color.valueOf("465ab8").a(0.55f), Color.valueOf("66a6d2").a(0.7f), Color.valueOf("89e8b6").a(0.8f), Color.valueOf("cafcbe"), Color.white};
flareColor = Color.valueOf("89e8b6"); flareColor = Color.valueOf("89e8b6");
@@ -3850,7 +3850,7 @@ public class Blocks{
trailInterp = v -> Math.max(Mathf.slope(v), 0.8f); trailInterp = v -> Math.max(Mathf.slope(v), 0.8f);
shrinkX = 0.2f; shrinkX = 0.2f;
shrinkY = 0.1f; shrinkY = 0.1f;
buildingDamageMultiplier = 0.25f; buildingDamageMultiplier = 0.3f;
}} }}
); );

View File

@@ -61,7 +61,7 @@ public class SectorGenerateDialog extends BaseDialog{
cont.field(sector + "", text -> { cont.field(sector + "", text -> {
sector = Strings.parseInt(text); sector = Strings.parseInt(text);
}).width(200f).valid(text -> planet.sectors.size > Strings.parseInt(text, 99999)); }).width(200f).valid(text -> planet.sectors.size > Strings.parseInt(text, 99999) && Strings.parseInt(text, 9999) >= 0);
cont.row(); cont.row();

View File

@@ -240,8 +240,16 @@ public class Mods implements Loadable{
entries[i] = new Seq<>(); entries[i] = new Seq<>();
} }
ObjectMap<Texture, PageType> pageTypes = ObjectMap.of(
Core.atlas.find("white").texture, PageType.main,
Core.atlas.find("stone1").texture, PageType.environment,
Core.atlas.find("clear-editor").texture, PageType.editor,
Core.atlas.find("whiteui").texture, PageType.ui,
Core.atlas.find("rubble-1-0").texture, PageType.rubble
);
for(AtlasRegion region : Core.atlas.getRegions()){ for(AtlasRegion region : Core.atlas.getRegions()){
PageType type = getPage(region); PageType type = pageTypes.get(region.texture, PageType.main);
if(!packer.has(type, region.name)){ if(!packer.has(type, region.name)){
entries[type.ordinal()].add(new RegionEntry(region.name, Core.atlas.getPixmap(region), region.splits, region.pads)); entries[type.ordinal()].add(new RegionEntry(region.name, Core.atlas.getPixmap(region), region.splits, region.pads));

View File

@@ -0,0 +1,21 @@
package mindustry.world.blocks.defense;
import mindustry.gen.*;
import mindustry.world.*;
public class ShieldBreaker extends Block{
public ShieldBreaker(String name){
super(name);
solid = update = true;
}
public class ShieldBreakerBuild extends Building{
@Override
public void updateTile(){
}
}
}

View File

@@ -65,7 +65,7 @@ public class BurstDrill extends Drill{
timeDrilled += speedCurve.apply(progress / drillTime) * speed; timeDrilled += speedCurve.apply(progress / drillTime) * speed;
lastDrillSpeed = 1f / drillTime * speed; lastDrillSpeed = 1f / drillTime * speed * size * size;
progress += delta() * speed; progress += delta() * speed;
}else{ }else{
warmup = Mathf.approachDelta(warmup, 0f, 0.01f); warmup = Mathf.approachDelta(warmup, 0f, 0.01f);

View File

@@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=e4b6af5949 archash=6daca211b7