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

Duo range buff + graphite ammo buff

Browse Source
This commit is contained in:
Anuken
2025-04-05 12:59:26 -04:00
parent 9647b4fff6
commit 8771504cbe
8 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3075,17 +3075,26 @@ public class Blocks{
Items.graphite, new BasicBulletType(3.5f, 18){{
width = 9f;
height = 12f;
reloadMultiplier = 0.6f;
ammoMultiplier = 4;
lifetime = 60f;
rangeChange = 16f;
hitColor = backColor = trailColor = Color.valueOf("858a9b");
frontColor = Color.valueOf("dae1ee");
}},
Items.silicon, new BasicBulletType(3f, 12){{
width = 7f;
height = 9f;
homingPower = 0.1f;
homingPower = 0.2f;
reloadMultiplier = 1.5f;
ammoMultiplier = 5;
lifetime = 60f;
trailLength = 5;
trailWidth = 1.5f;
hitColor = backColor = trailColor = Color.valueOf("707594");
frontColor = Color.valueOf("999ba0");
}}
);
@@ -3107,7 +3116,7 @@ public class Blocks{
recoil = 0.5f;
shootY = 3f;
reload = 20f;
range = 110;
range = 160;
shootCone = 15f;
ammoUseEffect = Fx.casing1;
health = 250;
@@ -3116,7 +3125,7 @@ public class Blocks{
coolant = consumeCoolant(0.1f);
researchCostMultiplier = 0.05f;
limitRange();
limitRange(5f);
}};
scatter = new ItemTurret("scatter"){{

11
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -1203,10 +1203,13 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
block.drawOverlay(x, y, rotation);
}
public void drawItemSelection(UnlockableContent selection){
if(selection != null && Core.settings.getBool("displayselection", true)){
TextureRegion region = selection.fullIcon;
Draw.rect(region, x, y + block.size * tilesize / 2f + 4, 8f * region.ratio(), 8f);
public void drawItemSelection(@Nullable UnlockableContent selection){
if(selection != null){
float dx = x - block.size * tilesize/2f, dy = y + block.size * tilesize/2f, s = iconSmall / 4f;
Draw.mixcol(Color.darkGray, 1f);
Draw.rect(selection.fullIcon, dx, dy - 1, s, s);
Draw.reset();
Draw.rect(selection.fullIcon, dx, dy, s, s);
}
}

3
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -400,7 +400,7 @@ public class SettingsMenuDialog extends BaseDialog{
graphics.sliderPref("unitlaseropacity", 100, 0, 100, 5, s -> s + "%");
graphics.sliderPref("bridgeopacity", 100, 0, 100, 5, s -> s + "%");
graphics.sliderPref("maxmagnificationmultiplierpercent", 100, 100, 200, 25, s -> {
if(ui.settings != null){
Core.settings.put("maxzoomingamemultiplier", (float)s / 100.0f);
@@ -468,7 +468,6 @@ public class SettingsMenuDialog extends BaseDialog{
graphics.checkPref("drawlight", true);
graphics.checkPref("destroyedblocks", true);
graphics.checkPref("blockstatus", false);
graphics.checkPref("displayselection", true);
graphics.checkPref("playerchat", true);
if(!mobile){
graphics.checkPref("coreitems", true);

9
core/src/mindustry/world/blocks/campaign/LandingPad.java
View File

@@ -341,14 +341,7 @@ public class LandingPad extends Block{
@Override
public void drawSelect(){
if(config != null){
float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f;
Draw.mixcol(Color.darkGray, 1f);
Draw.rect(config.fullIcon, dx, dy - 1, s, s);
Draw.reset();
Draw.rect(config.fullIcon, dx, dy, s, s);
}
drawItemSelection(config);
}
@Override

9
core/src/mindustry/world/blocks/payloads/PayloadRouter.java
View File

@@ -1,6 +1,5 @@
package mindustry.world.blocks.payloads;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.scene.ui.layout.*;
@@ -158,13 +157,7 @@ public class PayloadRouter extends PayloadConveyor{
@Override
public void drawSelect(){
if(sorted != null){
float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f;
Draw.mixcol(Color.darkGray, 1f);
Draw.rect(sorted.fullIcon, dx, dy - 1, s, s);
Draw.reset();
Draw.rect(sorted.fullIcon, dx, dy, s, s);
}
drawItemSelection(sorted);
}
@Override

10
core/src/mindustry/world/blocks/production/BeamDrill.java
View File

@@ -231,13 +231,7 @@ public class BeamDrill extends Block{
@Override
public void drawSelect(){
if(lastItem != null){
float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f;
Draw.mixcol(Color.darkGray, 1f);
Draw.rect(lastItem.fullIcon, dx, dy - 1, s, s);
Draw.reset();
Draw.rect(lastItem.fullIcon, dx, dy, s, s);
}
drawItemSelection(lastItem);
}
@Override
@@ -247,7 +241,7 @@ public class BeamDrill extends Block{
if(lasers[0] == null) updateLasers();
warmup = Mathf.approachDelta(warmup, Mathf.num(efficiency > 0), 1f / 60f);
updateFacing();
float multiplier = Mathf.lerp(1f, optionalBoostIntensity, optionalEfficiency);

8
core/src/mindustry/world/blocks/production/Drill.java
View File

@@ -261,13 +261,7 @@ public class Drill extends Block{
@Override
public void drawSelect(){
if(dominantItem != null){
float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f;
Draw.mixcol(Color.darkGray, 1f);
Draw.rect(dominantItem.fullIcon, dx, dy - 1, s, s);
Draw.reset();
Draw.rect(dominantItem.fullIcon, dx, dy, s, s);
}
drawItemSelection(dominantItem);
}
@Override