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:
	core/src/mindustry/mod/ClassMap.java
This commit is contained in:
Anuken
2021-07-04 09:52:57 -04:00
parent 0d280ea77f 178cb12f85
commit ebf0c71db6
34 changed files with 168 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2147,25 +2147,25 @@ public class Blocks implements ContentList{
}};
repairPoint = new RepairPoint("repair-point"){{
requirements(Category.units, with(Items.lead, 25, Items.copper, 25, Items.silicon, 20));
repairSpeed = 0.5f;
repairRadius = 65f;
requirements(Category.units, with(Items.lead, 30, Items.copper, 30, Items.silicon, 20));
repairSpeed = 0.45f;
repairRadius = 60f;
beamWidth = 0.73f;
powerUse = 1f;
pulseRadius = 5f;
}};
repairTurret = new RepairPoint("repair-turret"){{
requirements(Category.units, with(Items.silicon, 90, Items.thorium, 80, Items.plastanium, 80));
requirements(Category.units, with(Items.silicon, 90, Items.thorium, 80, Items.plastanium, 60));
size = 2;
length = 6f;
repairSpeed = 3.25f;
repairRadius = 140f;
repairSpeed = 3f;
repairRadius = 145f;
powerUse = 5f;
beamWidth = 1.1f;
pulseRadius = 6.1f;
coolantUse = 0.16f;
coolantMultiplier = 1.5f;
coolantMultiplier = 1.6f;
acceptCoolant = true;
}};

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

@@ -87,7 +87,7 @@ public class UnitTypes implements ContentList{
mace = new UnitType("mace"){{
speed = 0.45f;
hitSize = 10f;
health = 530;
health = 540;
armor = 4f;
immunities.add(StatusEffects.burning);
@@ -96,7 +96,7 @@ public class UnitTypes implements ContentList{
top = false;
shootSound = Sounds.flame;
shootY = 2f;
reload = 12f;
reload = 11f;
recoil = 1f;
ejectEffect = Fx.none;
bullet = new BulletType(4.1f, 32f){{
@@ -1125,10 +1125,10 @@ public class UnitTypes implements ContentList{
BulletType fragBullet = new FlakBulletType(4f, 5){{
shootEffect = Fx.shootBig;
ammoMultiplier = 4f;
splashDamage = 50f;
splashDamage = 60f;
splashDamageRadius = 25f;
collidesGround = true;
lifetime = 38f;
lifetime = 47f;
status = StatusEffects.blasted;
statusDuration = 60f;
@@ -1148,12 +1148,12 @@ public class UnitTypes implements ContentList{
rotate = true;
bullet = new LaserBulletType(){{
damage = 100f;
damage = 110f;
sideAngle = 20f;
sideWidth = 1.5f;
sideLength = 80f;
width = 25f;
length = 200f;
length = 230f;
shootEffect = Fx.shockwave;
colors = new Color[]{Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.white};
}};