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-07-08 09:29:36 -04:00
parent 64ab8328b8 6f2033a455
commit a0c5ed3761
47 changed files with 178 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -801,12 +801,12 @@ public class Blocks implements ContentList{
}};
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.plastanium, 40, Items.titanium, 100, Items.silicon, 150, Items.thorium, 80));
results = with(
Items.sand, 4,
Items.graphite, 2,
Items.titanium, 2,
Items.thorium, 1
Items.thorium, 2
);
hasPower = true;
craftTime = 15f;

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

@@ -120,7 +120,7 @@ public class UnitTypes implements ContentList{
hitSize = 13f;
rotateSpeed = 3f;
targetAir = false;
health = 820;
health = 900;
armor = 9f;
mechFrontSway = 0.55f;
@@ -133,15 +133,15 @@ public class UnitTypes implements ContentList{
shake = 2f;
ejectEffect = Fx.casing2;
shootSound = Sounds.artillery;
bullet = new ArtilleryBulletType(2f, 8, "shell"){{
bullet = new ArtilleryBulletType(2f, 20, "shell"){{
hitEffect = Fx.blastExplosion;
knockback = 0.8f;
lifetime = 120f;
width = height = 14f;
collides = true;
collidesTiles = true;
splashDamageRadius = 30f;
splashDamage = 60f;
splashDamageRadius = 35f;
splashDamage = 80f;
backColor = Pal.bulletYellowBack;
frontColor = Pal.bulletYellow;
}};
@@ -2155,6 +2155,7 @@ public class UnitTypes implements ContentList{
bullet = new EmpBulletType(){{
float rad = 100f;
scaleVelocity = true;
lightOpacity = 0.7f;
unitDamageScl = 0.8f;
healPercent = 20f;