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

Titanium fuse ammo

Browse Source
This commit is contained in:
Anuken
2020-10-20 12:14:53 -04:00
parent 9a9b1d1a90
commit 82fe66b931
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1644,11 +1644,20 @@ public class Blocks implements ContentList{
float brange = range + 10f; float brange = range + 10f;
ammo(Items.thorium, new ShrapnelBulletType(){{ ammo(
Items.thorium, new ShrapnelBulletType(){{
length = brange; length = brange;
damage = 105f; damage = 105f;
ammoMultiplier = 6f; ammoMultiplier = 5f;
}}); }},
Items.titanium, new ShrapnelBulletType(){{
length = brange;
damage = 65f;
ammoMultiplier = 4f;
width = 17f;
reloadMultiplier = 1.3f;
}}
);
}}; }};
ripple = new ItemTurret("ripple"){{ ripple = new ItemTurret("ripple"){{

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

@@ -83,7 +83,7 @@ public class Weathers implements ContentList{
yspeed = 0.01f; yspeed = 0.01f;
attrs.set(Attribute.light, -0.3f); attrs.set(Attribute.light, -0.3f);
attrs.set(Attribute.water, 0.05f); attrs.set(Attribute.water, 0.05f);
opacityMultiplier = 0.45f; opacityMultiplier = 0.47f;
}}; }};
} }
} }

3
core/src/mindustry/logic/Controllable.java
View File

@@ -1,7 +1,10 @@
package mindustry.logic; package mindustry.logic;
import mindustry.game.*;
/** An object that can be controlled with logic. */ /** An object that can be controlled with logic. */
public interface Controllable{ public interface Controllable{
void control(LAccess type, double p1, double p2, double p3, double p4); void control(LAccess type, double p1, double p2, double p3, double p4);
void control(LAccess type, Object p1, double p2, double p3, double p4); void control(LAccess type, Object p1, double p2, double p3, double p4);
Team team();
} }

2
core/src/mindustry/logic/LExecutor.java
View File

@@ -510,7 +510,7 @@ public class LExecutor{
@Override @Override
public void run(LExecutor exec){ public void run(LExecutor exec){
Object obj = exec.obj(target); Object obj = exec.obj(target);
if(obj instanceof Controllable cont){ if(obj instanceof Controllable cont && cont.team() == exec.team){
if(type.isObj){ if(type.isObj){
cont.control(type, exec.obj(p1), exec.num(p2), exec.num(p3), exec.num(p4)); cont.control(type, exec.obj(p1), exec.num(p2), exec.num(p3), exec.num(p4));
}else{ }else{