mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-19 03:03:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken 2020-07-08 19:16:01 -04:00
parent c15aec641a
commit b0f69263c7
9 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
annotations/src/main/resources/revisions/Bullet/1.json Normal file
View File

@ -0,0 +1 @@
{version:1,fields:[{name:collided,type:arc.struct.IntSeq,size:-1},{name:damage,type:float,size:4},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:owner,type:Entityc,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:type,type:mindustry.entities.bullet.BulletType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/Bullet/2.json Normal file
View File

@ -0,0 +1 @@
{version:2,fields:[{name:collided,type:arc.struct.IntSeq,size:-1},{name:damage,type:float,size:4},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:owner,type:mindustry.gen.Entityc,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:type,type:mindustry.entities.bullet.BulletType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/EffectState/1.json Normal file
View File

@ -0,0 +1 @@
{version:1,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/EffectState/2.json Normal file
View File

@ -0,0 +1 @@
{version:2,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:mindustry.gen.Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

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

@ -1862,8 +1862,9 @@ public class Blocks implements ContentList{
consumes.power(4f); consumes.power(4f);
}}; }};
//TODO remove
launchPadLarge = new LaunchPad("launch-pad-large"){{ launchPadLarge = new LaunchPad("launch-pad-large"){{
requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.titanium, 200, Items.silicon, 150, Items.lead, 250, Items.plastanium, 75)); //requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.titanium, 200, Items.silicon, 150, Items.lead, 250, Items.plastanium, 75));
size = 4; size = 4;
itemCapacity = 300; itemCapacity = 300;
launchTime = 60f * 35; launchTime = 60f * 35;

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

@ -538,7 +538,7 @@ public class UnitTypes implements ContentList{
mineTier = 1; mineTier = 1;
buildSpeed = 0.5f; buildSpeed = 0.5f;
drag = 0.05f; drag = 0.05f;
speed = 2.4f; speed = 2.6f;
rotateSpeed = 15f; rotateSpeed = 15f;
accel = 0.1f; accel = 0.1f;
range = 70f; range = 70f;
@ -573,7 +573,7 @@ public class UnitTypes implements ContentList{
mineTier = 1; mineTier = 1;
buildSpeed = 0.5f; buildSpeed = 0.5f;
drag = 0.05f; drag = 0.05f;
speed = 2.4f; speed = 2.9f;
rotateSpeed = 15f; rotateSpeed = 15f;
accel = 0.1f; accel = 0.1f;
range = 70f; range = 70f;
@ -608,7 +608,7 @@ public class UnitTypes implements ContentList{
mineTier = 1; mineTier = 1;
buildSpeed = 0.5f; buildSpeed = 0.5f;
drag = 0.05f; drag = 0.05f;
speed = 2.4f; speed = 3.4f;
rotateSpeed = 15f; rotateSpeed = 15f;
accel = 0.1f; accel = 0.1f;
range = 70f; range = 70f;

2
core/src/mindustry/type/Sector.java
View File

@ -149,7 +149,7 @@ public class Sector{
//TODO this should be stored in a more efficient structure, and be updated each turn //TODO this should be stored in a more efficient structure, and be updated each turn
public Seq<ItemStack> getRecievedItems(){ public Seq<ItemStack> getRecievedItems(){
return Core.settings.getJson(key("recieved-items"),Seq.class, ItemStack.class, Seq::new); return Core.settings.getJson(key("recieved-items"), Seq.class, ItemStack.class, Seq::new);
} }
public void setRecievedItems(Seq<ItemStack> stacks){ public void setRecievedItems(Seq<ItemStack> stacks){

4
core/src/mindustry/ui/Styles.java
View File

@ -194,8 +194,8 @@ public class Styles{
down = flatDown; down = flatDown;
up = none; up = none;
over = flatOver; over = flatOver;
disabled = black8; disabled = none;
imageDisabledColor = Color.lightGray; imageDisabledColor = Color.gray;
imageUpColor = Color.white; imageUpColor = Color.white;
}}; }};
clearPartial2i = new ImageButtonStyle(){{ clearPartial2i = new ImageButtonStyle(){{

24
core/src/mindustry/world/blocks/campaign/LaunchPad.java
View File

@ -7,7 +7,6 @@ import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.entities.*; import mindustry.entities.*;
@ -19,6 +18,8 @@ import mindustry.ui.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
import static mindustry.Vars.*;
public class LaunchPad extends Block{ public class LaunchPad extends Block{
public final int timerLaunch = timers++; public final int timerLaunch = timers++;
/** Time inbetween launches. */ /** Time inbetween launches. */
@ -54,7 +55,7 @@ public class LaunchPad extends Block{
public void draw(){ public void draw(){
super.draw(); super.draw();
if(!Vars.state.isCampaign()) return; if(!state.isCampaign()) return;
if(lightRegion.found()){ if(lightRegion.found()){
Draw.color(lightColor); Draw.color(lightColor);
@ -91,7 +92,7 @@ public class LaunchPad extends Block{
@Override @Override
public void updateTile(){ public void updateTile(){
if(!Vars.state.isCampaign()) return; if(!state.isCampaign()) return;
//launch when full and base conditions are met //launch when full and base conditions are met
if(items.total() >= itemCapacity && efficiency() >= 1f && timer(timerLaunch, launchTime / timeScale)){ if(items.total() >= itemCapacity && efficiency() >= 1f && timer(timerLaunch, launchTime / timeScale)){
@ -175,12 +176,23 @@ public class LaunchPad extends Block{
public void remove(){ public void remove(){
//actually launch the items upon removal //actually launch the items upon removal
if(team() == Vars.state.rules.defaultTeam){ if(team() == state.rules.defaultTeam && state.secinfo.origin != null){
Seq<ItemStack> dest = state.secinfo.origin.getRecievedItems();
for(ItemStack stack : stacks){ for(ItemStack stack : stacks){
//TODO where do the items go? ItemStack sto = dest.find(i -> i.item == stack.item);
//Vars.data.addItem(stack.item, stack.amount); if(sto != null){
sto.amount += stack.amount;
}else{
dest.add(stack);
}
//update export
state.secinfo.handleItemExport(stack);
Events.fire(new LaunchItemEvent(stack)); Events.fire(new LaunchItemEvent(stack));
} }
state.secinfo.origin.setRecievedItems(dest);
} }
} }
} }