Internal loadout system / Starting drills / Bugfixes

This commit is contained in:
Anuken
2019-02-23 22:31:38 -05:00
parent b6c5f202e4
commit 1ed4e9f5bb
15 changed files with 194 additions and 57 deletions

View File

@@ -1,20 +0,0 @@
package io.anuke.mindustry.game;
import io.anuke.mindustry.type.ContentType;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
public abstract class Loadout extends Content{
public final Block core;
Loadout(Block core){
this.core = core;
}
public abstract void setup(Tile tile);
@Override
public ContentType getContentType(){
return ContentType.loadout;
}
}

View File

@@ -33,7 +33,7 @@ public class Stats{
score += (float)((wavesLasted - zone.conditionWave) / zone.launchPeriod + 1) * 1.5f;
}
int capacity = zone.generator.coreBlock.itemCapacity;
int capacity = zone.loadout.core().itemCapacity;
//weigh used fractions of
float frac = 0f;