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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-03-02 09:28:42 -05:00
parent e992be1bfb 7e216d198e
commit 19eb6334b7
5 changed files with 75 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -647,10 +647,10 @@ public class Blocks implements ContentList{
separator = new Separator("separator"){{ separator = new Separator("separator"){{
requirements(Category.crafting, with(Items.copper, 30, Items.titanium, 25)); requirements(Category.crafting, with(Items.copper, 30, Items.titanium, 25));
results = with( results = with(
Items.copper, 5, Items.copper, 5,
Items.lead, 3, Items.lead, 3,
Items.graphite, 2, Items.graphite, 2,
Items.titanium, 2 Items.titanium, 2
); );
hasPower = true; hasPower = true;
craftTime = 35f; craftTime = 35f;
@@ -663,10 +663,10 @@ public class Blocks implements ContentList{
disassembler = new Separator("disassembler"){{ disassembler = new Separator("disassembler"){{
requirements(Category.crafting, with(Items.graphite, 140, Items.titanium, 100, Items.silicon, 150, Items.surgeAlloy, 70)); requirements(Category.crafting, with(Items.graphite, 140, Items.titanium, 100, Items.silicon, 150, Items.surgeAlloy, 70));
results = with( results = with(
Items.sand, 4, Items.sand, 4,
Items.graphite, 2, Items.graphite, 2,
Items.titanium, 2, Items.titanium, 2,
Items.thorium, 1 Items.thorium, 1
); );
hasPower = true; hasPower = true;
craftTime = 15f; craftTime = 15f;
@@ -1394,10 +1394,10 @@ public class Blocks implements ContentList{
duo = new ItemTurret("duo"){{ duo = new ItemTurret("duo"){{
requirements(Category.turret, with(Items.copper, 35), true); requirements(Category.turret, with(Items.copper, 35), true);
ammo( ammo(
Items.copper, Bullets.standardCopper, Items.copper, Bullets.standardCopper,
Items.graphite, Bullets.standardDense, Items.graphite, Bullets.standardDense,
Items.pyratite, Bullets.standardIncendiary, Items.pyratite, Bullets.standardIncendiary,
Items.silicon, Bullets.standardHoming Items.silicon, Bullets.standardHoming
); );
spread = 4f; spread = 4f;
@@ -1416,9 +1416,9 @@ public class Blocks implements ContentList{
scatter = new ItemTurret("scatter"){{ scatter = new ItemTurret("scatter"){{
requirements(Category.turret, with(Items.copper, 85, Items.lead, 45)); requirements(Category.turret, with(Items.copper, 85, Items.lead, 45));
ammo( ammo(
Items.scrap, Bullets.flakScrap, Items.scrap, Bullets.flakScrap,
Items.lead, Bullets.flakLead, Items.lead, Bullets.flakLead,
Items.metaglass, Bullets.flakGlass Items.metaglass, Bullets.flakGlass
); );
reloadTime = 18f; reloadTime = 18f;
range = 160f; range = 160f;
@@ -1439,8 +1439,8 @@ public class Blocks implements ContentList{
scorch = new ItemTurret("scorch"){{ scorch = new ItemTurret("scorch"){{
requirements(Category.turret, with(Items.copper, 25, Items.graphite, 22)); requirements(Category.turret, with(Items.copper, 25, Items.graphite, 22));
ammo( ammo(
Items.coal, Bullets.basicFlame, Items.coal, Bullets.basicFlame,
Items.pyratite, Bullets.pyraFlame Items.pyratite, Bullets.pyraFlame
); );
recoilAmount = 0f; recoilAmount = 0f;
reloadTime = 6f; reloadTime = 6f;
@@ -1456,9 +1456,9 @@ public class Blocks implements ContentList{
hail = new ItemTurret("hail"){{ hail = new ItemTurret("hail"){{
requirements(Category.turret, with(Items.copper, 40, Items.graphite, 17)); requirements(Category.turret, with(Items.copper, 40, Items.graphite, 17));
ammo( ammo(
Items.graphite, Bullets.artilleryDense, Items.graphite, Bullets.artilleryDense,
Items.silicon, Bullets.artilleryHoming, Items.silicon, Bullets.artilleryHoming,
Items.pyratite, Bullets.artilleryIncendiary Items.pyratite, Bullets.artilleryIncendiary
); );
targetAir = false; targetAir = false;
reloadTime = 60f; reloadTime = 60f;
@@ -1473,10 +1473,10 @@ public class Blocks implements ContentList{
wave = new LiquidTurret("wave"){{ wave = new LiquidTurret("wave"){{
requirements(Category.turret, with(Items.metaglass, 45, Items.lead, 75)); requirements(Category.turret, with(Items.metaglass, 45, Items.lead, 75));
ammo( ammo(
Liquids.water, Bullets.waterShot, Liquids.water, Bullets.waterShot,
Liquids.slag, Bullets.slagShot, Liquids.slag, Bullets.slagShot,
Liquids.cryofluid, Bullets.cryoShot, Liquids.cryofluid, Bullets.cryoShot,
Liquids.oil, Bullets.oilShot Liquids.oil, Bullets.oilShot
); );
size = 2; size = 2;
recoilAmount = 0f; recoilAmount = 0f;
@@ -1562,9 +1562,9 @@ public class Blocks implements ContentList{
swarmer = new ItemTurret("swarmer"){{ swarmer = new ItemTurret("swarmer"){{
requirements(Category.turret, with(Items.graphite, 35, Items.titanium, 35, Items.plastanium, 45, Items.silicon, 30)); requirements(Category.turret, with(Items.graphite, 35, Items.titanium, 35, Items.plastanium, 45, Items.silicon, 30));
ammo( ammo(
Items.blastCompound, Bullets.missileExplosive, Items.blastCompound, Bullets.missileExplosive,
Items.pyratite, Bullets.missileIncendiary, Items.pyratite, Bullets.missileIncendiary,
Items.surgeAlloy, Bullets.missileSurge Items.surgeAlloy, Bullets.missileSurge
); );
reloadTime = 30f; reloadTime = 30f;
shots = 4; shots = 4;
@@ -1580,11 +1580,11 @@ public class Blocks implements ContentList{
salvo = new ItemTurret("salvo"){{ salvo = new ItemTurret("salvo"){{
requirements(Category.turret, with(Items.copper, 100, Items.graphite, 90, Items.titanium, 60)); requirements(Category.turret, with(Items.copper, 100, Items.graphite, 90, Items.titanium, 60));
ammo( ammo(
Items.copper, Bullets.standardCopper, Items.copper, Bullets.standardCopper,
Items.graphite, Bullets.standardDense, Items.graphite, Bullets.standardDense,
Items.pyratite, Bullets.standardIncendiary, Items.pyratite, Bullets.standardIncendiary,
Items.silicon, Bullets.standardHoming, Items.silicon, Bullets.standardHoming,
Items.thorium, Bullets.standardThorium Items.thorium, Bullets.standardThorium
); );
size = 2; size = 2;
@@ -1624,7 +1624,6 @@ public class Blocks implements ContentList{
Liquids.oil, Bullets.heavyOilShot Liquids.oil, Bullets.heavyOilShot
); );
size = 3; size = 3;
recoilAmount = 0f;
reloadTime = 2f; reloadTime = 2f;
shots = 2; shots = 2;
velocityInaccuracy = 0.1f; velocityInaccuracy = 0.1f;
@@ -1658,31 +1657,31 @@ public class Blocks implements ContentList{
float brange = range + 10f; float brange = range + 10f;
ammo( ammo(
Items.titanium, new ShrapnelBulletType(){{ Items.titanium, new ShrapnelBulletType(){{
length = brange; length = brange;
damage = 66f; damage = 66f;
ammoMultiplier = 4f; ammoMultiplier = 4f;
width = 17f; width = 17f;
reloadMultiplier = 1.3f; reloadMultiplier = 1.3f;
}}, }},
Items.thorium, new ShrapnelBulletType(){{ Items.thorium, new ShrapnelBulletType(){{
length = brange; length = brange;
damage = 105f; damage = 105f;
ammoMultiplier = 5f; ammoMultiplier = 5f;
toColor = Pal.thoriumPink; toColor = Pal.thoriumPink;
shootEffect = smokeEffect = Fx.thoriumShoot; shootEffect = smokeEffect = Fx.thoriumShoot;
}} }}
); );
}}; }};
ripple = new ItemTurret("ripple"){{ ripple = new ItemTurret("ripple"){{
requirements(Category.turret, with(Items.copper, 150, Items.graphite, 135, Items.titanium, 60)); requirements(Category.turret, with(Items.copper, 150, Items.graphite, 135, Items.titanium, 60));
ammo( ammo(
Items.graphite, Bullets.artilleryDense, Items.graphite, Bullets.artilleryDense,
Items.silicon, Bullets.artilleryHoming, Items.silicon, Bullets.artilleryHoming,
Items.pyratite, Bullets.artilleryIncendiary, Items.pyratite, Bullets.artilleryIncendiary,
Items.blastCompound, Bullets.artilleryExplosive, Items.blastCompound, Bullets.artilleryExplosive,
Items.plastanium, Bullets.artilleryPlastic Items.plastanium, Bullets.artilleryPlastic
); );
targetAir = false; targetAir = false;
@@ -1708,10 +1707,10 @@ public class Blocks implements ContentList{
cyclone = new ItemTurret("cyclone"){{ cyclone = new ItemTurret("cyclone"){{
requirements(Category.turret, with(Items.copper, 200, Items.titanium, 125, Items.plastanium, 80)); requirements(Category.turret, with(Items.copper, 200, Items.titanium, 125, Items.plastanium, 80));
ammo( ammo(
Items.metaglass, Bullets.fragGlass, Items.metaglass, Bullets.fragGlass,
Items.blastCompound, Bullets.fragExplosive, Items.blastCompound, Bullets.fragExplosive,
Items.plastanium, Bullets.fragPlastic, Items.plastanium, Bullets.fragPlastic,
Items.surgeAlloy, Bullets.fragSurge Items.surgeAlloy, Bullets.fragSurge
); );
xRand = 4f; xRand = 4f;
reloadTime = 8f; reloadTime = 8f;
@@ -1731,19 +1730,19 @@ public class Blocks implements ContentList{
requirements(Category.turret, with(Items.copper, 1000, Items.metaglass, 600, Items.surgeAlloy, 300, Items.plastanium, 200, Items.silicon, 600)); requirements(Category.turret, with(Items.copper, 1000, Items.metaglass, 600, Items.surgeAlloy, 300, Items.plastanium, 200, Items.silicon, 600));
ammo( ammo(
Items.surgeAlloy, new PointBulletType(){{ Items.surgeAlloy, new PointBulletType(){{
shootEffect = Fx.instShoot; shootEffect = Fx.instShoot;
hitEffect = Fx.instHit; hitEffect = Fx.instHit;
smokeEffect = Fx.smokeCloud; smokeEffect = Fx.smokeCloud;
trailEffect = Fx.instTrail; trailEffect = Fx.instTrail;
despawnEffect = Fx.instBomb; despawnEffect = Fx.instBomb;
trailSpacing = 20f; trailSpacing = 20f;
damage = 1350; damage = 1350;
buildingDamageMultiplier = 0.3f; buildingDamageMultiplier = 0.3f;
speed = brange; speed = brange;
hitShake = 6f; hitShake = 6f;
ammoMultiplier = 1f; ammoMultiplier = 1f;
}} }}
); );
maxAmmo = 40; maxAmmo = 40;
@@ -1772,9 +1771,9 @@ public class Blocks implements ContentList{
spectre = new ItemTurret("spectre"){{ spectre = new ItemTurret("spectre"){{
requirements(Category.turret, with(Items.copper, 900, Items.graphite, 300, Items.surgeAlloy, 250, Items.plastanium, 175, Items.thorium, 250)); requirements(Category.turret, with(Items.copper, 900, Items.graphite, 300, Items.surgeAlloy, 250, Items.plastanium, 175, Items.thorium, 250));
ammo( ammo(
Items.graphite, Bullets.standardDenseBig, Items.graphite, Bullets.standardDenseBig,
Items.pyratite, Bullets.standardIncendiaryBig, Items.pyratite, Bullets.standardIncendiaryBig,
Items.thorium, Bullets.standardThoriumBig Items.thorium, Bullets.standardThoriumBig
); );
reloadTime = 6f; reloadTime = 6f;
coolantMultiplier = 0.5f; coolantMultiplier = 0.5f;

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

@@ -322,9 +322,8 @@ public class UnitTypes implements ContentList{
x = 5f; x = 5f;
shake = 2.2f; shake = 2.2f;
y = 0.5f; y = 0.5f;
shootY = 5f;
shootY = 2.5f; shootY = 2.5f;
reload = 38f; reload = 38f;
shots = 3; shots = 3;
inaccuracy = 35; inaccuracy = 35;
@@ -359,7 +358,6 @@ public class UnitTypes implements ContentList{
quasar = new UnitType("quasar"){{ quasar = new UnitType("quasar"){{
mineTier = 3; mineTier = 3;
hitSize = 12f;
boostMultiplier = 2f; boostMultiplier = 2f;
health = 650f; health = 650f;
buildSpeed = 1.7f; buildSpeed = 1.7f;
@@ -471,7 +469,6 @@ public class UnitTypes implements ContentList{
}}; }};
corvus = new UnitType("corvus"){{ corvus = new UnitType("corvus"){{
mineTier = 1;
hitSize = 29f; hitSize = 29f;
health = 18000f; health = 18000f;
armor = 9f; armor = 9f;

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

@@ -1142,7 +1142,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
/** Returns whether or not a hand cursor should be shown over this block. */ /** Returns whether or not a hand cursor should be shown over this block. */
public Cursor getCursor(){ public Cursor getCursor(){
return block.configurable && team == player.team() ? SystemCursor.hand : SystemCursor.arrow; return block.configurable && interactable(player.team()) ? SystemCursor.hand : SystemCursor.arrow;
} }
/** /**

2
core/src/mindustry/world/blocks/ConstructBlock.java
View File

@@ -172,7 +172,7 @@ public class ConstructBlock extends Block{
@Override @Override
public Cursor getCursor(){ public Cursor getCursor(){
return SystemCursor.hand; return interactable(player.team()) ? SystemCursor.hand : SystemCursor.arrow;
} }
@Override @Override

2
core/src/mindustry/world/blocks/defense/Door.java
View File

@@ -126,7 +126,7 @@ public class Door extends Wall{
@Override @Override
public Cursor getCursor(){ public Cursor getCursor(){
return SystemCursor.hand; return interactable(player.team()) ? SystemCursor.hand : SystemCursor.arrow;
} }
@Override @Override