mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-28 07:22:21 -08:00
Code Issues Projects Releases Wiki Activity

Toxopid cannon rotation limit

Browse source
This commit is contained in:
Anuken 2022-01-15 20:45:07 -05:00
parent e14dd00019
commit f91619e5da
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/src/mindustry/content/UnitTypes.java
View file

@ -907,6 +907,8 @@ public class UnitTypes{
rotate = true;
shadow = 30f;
rotationLimit = 80f;
bullet = new ArtilleryBulletType(3f, 50){{
hitEffect = Fx.sapExplosion;
knockback = 0.8f;
@ -2529,7 +2531,7 @@ public class UnitTypes{
y = 5 / 4f;
rotate = true;
rotateSpeed = 2f;
reload = 60f;
reload = 70f;
layerOffset = -0.001f;
recoil = 1f;
rotationLimit = 60f;
@ -2541,18 +2543,23 @@ public class UnitTypes{
}};
unitSpawned = new MissileUnitType("quell-missile"){{
speed = 4f;
speed = 3.8f;
maxRange = 80f;
outlineColor = Pal.darkOutline;
health = 45;
weapons.add(new Weapon(){{
shootCone = 360f;
mirror = false;
reload = 1f;
shootOnDeath = true;
bullet = new BulletType(){{
rangeOverride = 20f;
despawnEffect = Fx.blastExplosion;
shootEffect = Fx.massiveExplosion;
killShooter = true;
//TODO status?
splashDamageRadius = 60f;
splashDamage = 230f;
splashDamageRadius = 40f;
splashDamage = 120f;
}};
}});
}};

2
core/src/mindustry/mod/ContentParser.java
View file

@ -253,7 +253,7 @@ public class ContentParser{
if(locate(ContentType.block, name) != null){
if(value.has("type")){
Log.warn("Warning: '" + name + "' re-declares a type. This will be interpreted as a new block. If you wish to override a vanilla block, omit the 'type' section, as vanilla block `type`s cannot be changed.");
Log.warn("Warning: '" + currentMod.name + "-" + name + "' re-declares a type. This will be interpreted as a new block. If you wish to override a vanilla block, omit the 'type' section, as vanilla block `type`s cannot be changed.");
block = make(resolve(value.getString("type", ""), Block.class), mod + "-" + name);
}else{
block = locate(ContentType.block, name);