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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	gradle.properties
This commit is contained in:
Anuken
2021-06-28 18:57:27 -04:00
parent d54b7dc396 f6f1ddb826
commit 3ea3df5c73
86 changed files with 1926 additions and 1025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ public class Blocks implements ContentList{
cellSynthesisChamber,
//sandbox
powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadVoid, payloadSource, illuminator,
powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator,
//defense
copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
@@ -1178,17 +1178,17 @@ public class Blocks implements ContentList{
//special transport blocks
duct = new Duct("duct"){{
requirements(Category.distribution, with(Items.graphite, 5, Items.metaglass, 2));
requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 5, Items.metaglass, 2));
speed = 4f;
}};
ductRouter = new DuctRouter("duct-router"){{
requirements(Category.distribution, with(Items.graphite, 10, Items.metaglass, 4));
requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 10, Items.metaglass, 4));
speed = 4f;
}};
ductBridge = new DuctBridge("duct-bridge"){{
requirements(Category.distribution, with(Items.graphite, 20, Items.metaglass, 8));
requirements(Category.distribution, BuildVisibility.debugOnly, with(Items.graphite, 20, Items.metaglass, 8));
speed = 4f;
}};
@@ -1757,13 +1757,13 @@ public class Blocks implements ContentList{
shots = 4;
burstSpacing = 5;
inaccuracy = 10f;
range = 210f;
range = 215f;
xRand = 6f;
size = 2;
health = 300 * size * size;
shootSound = Sounds.missile;
limitRange(2f);
limitRange(5f);
}};
salvo = new ItemTurret("salvo"){{
@@ -1778,7 +1778,7 @@ public class Blocks implements ContentList{
size = 2;
range = 190f;
reloadTime = 34f;
reloadTime = 31f;
restitution = 0.03f;
ammoEjectBack = 3f;
cooldown = 0.03f;
@@ -2147,7 +2147,7 @@ public class Blocks implements ContentList{
}};
repairPoint = new RepairPoint("repair-point"){{
requirements(Category.units, with(Items.lead, 20, Items.copper, 20, Items.silicon, 15));
requirements(Category.units, with(Items.lead, 25, Items.copper, 25, Items.silicon, 20));
repairSpeed = 0.5f;
repairRadius = 65f;
beamWidth = 0.73f;
@@ -2156,16 +2156,16 @@ public class Blocks implements ContentList{
}};
repairTurret = new RepairPoint("repair-turret"){{
requirements(Category.units, with(Items.silicon, 70, Items.thorium, 60, Items.plastanium, 60));
requirements(Category.units, with(Items.silicon, 90, Items.thorium, 80, Items.plastanium, 80));
size = 2;
length = 6f;
repairSpeed = 4f;
repairSpeed = 3.25f;
repairRadius = 140f;
powerUse = 5f;
beamWidth = 1.1f;
pulseRadius = 6.1f;
coolantUse = 0.15f;
coolantMultiplier = 1.7f;
coolantUse = 0.16f;
coolantMultiplier = 1.5f;
acceptCoolant = true;
}};
@@ -2266,12 +2266,12 @@ public class Blocks implements ContentList{
alwaysUnlocked = true;
}};
payloadVoid = new PayloadVoid("payload-void"){{
payloadSource = new PayloadSource("payload-source"){{
requirements(Category.units, BuildVisibility.sandboxOnly, with());
size = 5;
}};
payloadSource = new PayloadSource("payload-source"){{
payloadVoid = new PayloadVoid("payload-void"){{
requirements(Category.units, BuildVisibility.sandboxOnly, with());
size = 5;
}};

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

@@ -257,7 +257,6 @@ public class Bullets implements ContentList{
width = 8f;
height = 8f;
shrinkY = 0f;
drag = -0.01f;
splashDamageRadius = 30f;
splashDamage = 30f * 1.5f;
ammoMultiplier = 5f;
@@ -274,7 +273,6 @@ public class Bullets implements ContentList{
width = 7f;
height = 8f;
shrinkY = 0f;
drag = -0.01f;
homingPower = 0.08f;
splashDamageRadius = 20f;
splashDamage = 20f * 1.5f;
@@ -288,7 +286,6 @@ public class Bullets implements ContentList{
width = 8f;
height = 8f;
shrinkY = 0f;
drag = -0.01f;
splashDamageRadius = 25f;
splashDamage = 25f * 1.4f;
hitEffect = Fx.blastExplosion;

2
core/src/mindustry/content/Fx.java
View File

@@ -854,7 +854,7 @@ public class Fx{
fireRemove = new Effect(70f, e -> {
if(Fire.regions[0] == null) return;
alpha(e.fout());
rect(Fire.regions[((int)(e.rotation + e.fin() * Fire.frames)) % Fire.frames], e.x, e.y);
rect(Fire.regions[((int)(e.rotation + e.fin() * Fire.frames)) % Fire.frames], e.x + Mathf.randomSeedRange((int)e.y, 2), e.y + Mathf.randomSeedRange((int)e.x, 2));
Drawf.light(e.x, e.y, 50f + Mathf.absin(5f, 5f), Pal.lightFlame, 0.6f * e.fout());
}),

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

@@ -572,7 +572,7 @@ public class UnitTypes implements ContentList{
speed = 1f;
splashDamageRadius = 60f;
instantDisappear = true;
splashDamage = 88f;
splashDamage = 90f;
killShooter = true;
hittable = false;
collidesAir = true;
@@ -581,7 +581,7 @@ public class UnitTypes implements ContentList{
}};
atrax = new UnitType("atrax"){{
speed = 0.5f;
speed = 0.54f;
drag = 0.4f;
hitSize = 13f;
rotateSpeed = 3f;
@@ -621,7 +621,7 @@ public class UnitTypes implements ContentList{
}};
spiroct = new UnitType("spiroct"){{
speed = 0.45f;
speed = 0.48f;
drag = 0.4f;
hitSize = 15f;
rotateSpeed = 3f;
@@ -2113,7 +2113,7 @@ public class UnitTypes implements ContentList{
bullet = new ContinuousLaserBulletType(){{
maxRange = 90f;
damage = 26f;
damage = 27f;
length = 95f;
hitEffect = Fx.hitMeltHeal;
drawSize = 200f;
@@ -2144,7 +2144,7 @@ public class UnitTypes implements ContentList{
x = 70f/4f;
y = -26f/4f;
reload = 70f;
reload = 65f;
shake = 3f;
rotateSpeed = 2f;
shadow = 30f;
@@ -2161,7 +2161,7 @@ public class UnitTypes implements ContentList{
timeIncrease = 3f;
timeDuration = 60f * 20f;
powerDamageScl = 3f;
damage = 50;
damage = 60;
hitColor = lightColor = Pal.heal;
lightRadius = 70f;
clipSize = 250f;
@@ -2177,7 +2177,7 @@ public class UnitTypes implements ContentList{
trailWidth = 6f;
trailColor = Pal.heal;
trailInterval = 3f;
splashDamage = 60f;
splashDamage = 70f;
splashDamageRadius = rad;
hitShake = 4f;
trailRotation = true;