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

risse -> risso

Browse Source
This commit is contained in:
Anuken
2020-07-24 13:27:15 -04:00
parent 8db4f88ecc
commit 58c39e14d6
45 changed files with 609 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1711,7 +1711,7 @@ public class Blocks implements ContentList{
navalFactory = new UnitFactory("naval-factory"){{
requirements(Category.units, with(Items.copper, 30, Items.lead, 70));
plans = new UnitPlan[]{
new UnitPlan(UnitTypes.risse, 60f * 30f, with(Items.silicon, 20, Items.metaglass, 25)),
new UnitPlan(UnitTypes.risso, 60f * 30f, with(Items.silicon, 20, Items.metaglass, 25)),
};
size = 3;
requiresWater = true;
@@ -1733,7 +1733,7 @@ public class Blocks implements ContentList{
{UnitTypes.crawler, UnitTypes.atrax},
{UnitTypes.flare, UnitTypes.horizon},
{UnitTypes.mono, UnitTypes.poly},
{UnitTypes.risse, UnitTypes.minke},
{UnitTypes.risso, UnitTypes.minke},
};
}};

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

@@ -45,7 +45,7 @@ public class UnitTypes implements ContentList{
public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Trailc.class}) UnitType alpha, beta, gamma;
//water
public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risse, minke, bryde;
public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risso, minke, bryde;
//special block unit type
public static @EntityDef({Unitc.class, BlockUnitc.class}) UnitType block;
@@ -674,7 +674,7 @@ public class UnitTypes implements ContentList{
//endregion
//region naval attack
risse = new UnitType("risse"){{
risso = new UnitType("risso"){{
speed = 1.1f;
drag = 0.13f;
hitsize = 9f;

4
core/src/mindustry/world/blocks/distribution/StackConveyor.java
View File

@@ -187,8 +187,8 @@ public class StackConveyor extends Block implements Autotiler{
}else{ //transfer
if(state != stateLoad || (items.total() >= getMaximumAccepted(lastItem))){
if(front() != null
&& front().team() == team()
&& front().block() instanceof StackConveyor){
&& front().team == team
&& front().block instanceof StackConveyor){
StackConveyorEntity e = (StackConveyorEntity)front();
// sleep if its occupied