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

Unit naming / Fixed #2209

Browse Source
This commit is contained in:
Anuken
2020-07-04 23:53:22 -04:00
parent 685275237a
commit add0d0cd86
29 changed files with 840 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1268,6 +1268,7 @@ public class Blocks implements ContentList{
requirements(Category.effect, BuildVisibility.hidden, with(Items.copper, 1000, Items.lead, 1000));
alwaysUnlocked = true;
unitType = UnitTypes.alpha;
health = 1100;
itemCapacity = 4000;
size = 3;
@@ -1276,6 +1277,7 @@ public class Blocks implements ContentList{
coreFoundation = new CoreBlock("core-foundation"){{
requirements(Category.effect, with(Items.copper, 3000, Items.lead, 3000, Items.silicon, 2000));
unitType = UnitTypes.beta;
health = 2000;
itemCapacity = 9000;
size = 4;
@@ -1284,6 +1286,7 @@ public class Blocks implements ContentList{
coreNucleus = new CoreBlock("core-nucleus"){{
requirements(Category.effect, with(Items.copper, 1000, Items.lead, 1000));
unitType = UnitTypes.gamma;
health = 4000;
itemCapacity = 13000;
size = 5;
@@ -1678,7 +1681,7 @@ public class Blocks implements ContentList{
plans = new UnitPlan[]{
new UnitPlan(UnitTypes.dagger, 200f, with(Items.silicon, 10, Items.lead, 10)),
new UnitPlan(UnitTypes.crawler, 200f, with(Items.silicon, 10, Items.blastCompound, 5)),
new UnitPlan(UnitTypes.tau, 200f, with(Items.silicon, 20, Items.lead, 10)),
new UnitPlan(UnitTypes.nova, 200f, with(Items.silicon, 20, Items.lead, 10)),
};
size = 3;
consumes.power(1.2f);
@@ -1688,7 +1691,7 @@ public class Blocks implements ContentList{
requirements(Category.units, with(Items.copper, 30, Items.lead, 70));
plans = new UnitPlan[]{
new UnitPlan(UnitTypes.wraith, 200f, with(Items.silicon, 10)),
new UnitPlan(UnitTypes.spirit, 200f, with(Items.silicon, 10)),
new UnitPlan(UnitTypes.mono, 200f, with(Items.silicon, 10)),
new UnitPlan(UnitTypes.phantom, 200f, with(Items.silicon, 10)),
};
size = 3;
@@ -1698,7 +1701,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.vanguard, 200f, with(Items.silicon, 10)),
new UnitPlan(UnitTypes.risse, 200f, with(Items.silicon, 10)),
};
size = 3;
requiresWater = true;
@@ -1715,10 +1718,11 @@ public class Blocks implements ContentList{
constructTime = 60f * 5f;
upgrades = new UnitType[][]{
{UnitTypes.tau, UnitTypes.oculon},
{UnitTypes.nova, UnitTypes.quasar},
{UnitTypes.dagger, UnitTypes.mace},
{UnitTypes.crawler, UnitTypes.eruptor},
{UnitTypes.wraith, UnitTypes.ghoul},
{UnitTypes.mono, UnitTypes.poly},
};
}};
@@ -1734,6 +1738,7 @@ public class Blocks implements ContentList{
upgrades = new UnitType[][]{
{UnitTypes.ghoul, UnitTypes.revenant},
{UnitTypes.mace, UnitTypes.fortress},
{UnitTypes.poly, UnitTypes.mega},
};
}};

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

@@ -16,10 +16,10 @@ public class UnitTypes implements ContentList{
public static @EntityDef({Unitc.class, Mechc.class}) UnitType mace, dagger, crawler, fortress, siegeArray, eradicator;
//ground + builder
public static @EntityDef({Unitc.class, Mechc.class, Builderc.class}) UnitType tau;
public static @EntityDef({Unitc.class, Mechc.class, Builderc.class}) UnitType nova;
//ground + builder + miner + commander
public static @EntityDef({Unitc.class, Mechc.class, Builderc.class, Minerc.class, Commanderc.class}) UnitType oculon;
public static @EntityDef({Unitc.class, Mechc.class, Builderc.class, Minerc.class, Commanderc.class}) UnitType quasar;
//legs
public static @EntityDef({Unitc.class, Legsc.class}) UnitType cix, eruptor;
@@ -28,20 +28,22 @@ public class UnitTypes implements ContentList{
public static @EntityDef({Unitc.class}) UnitType wraith, reaper, ghoul, revenant, lich;
//air + building
public static @EntityDef({Unitc.class, Builderc.class}) UnitType spirit;
public static @EntityDef({Unitc.class, Builderc.class}) UnitType mono;
//air + building + mining
public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType poly;
//air + building + mining + payload
public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType mega;
//air + mining
public static @EntityDef({Unitc.class, Minerc.class}) UnitType phantom;
//air + building + mining
//TODO implement other starter drones
public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Trailc.class}) UnitType alpha, beta, gamma;
//air + building + mining + payload
public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType trident;
//water
public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType vanguard;
public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risse, minke, bryde;
//special block unit type
public static @EntityDef({Unitc.class, BlockUnitc.class}) UnitType block;
@@ -93,7 +95,7 @@ public class UnitTypes implements ContentList{
}});
}};
tau = new UnitType("tau"){{
nova = new UnitType("nova"){{
itemCapacity = 60;
canBoost = true;
boostMultiplier = 1.5f;
@@ -114,7 +116,7 @@ public class UnitTypes implements ContentList{
}});
}};
oculon = new UnitType("oculon"){{
quasar = new UnitType("quasar"){{
mineTier = 1;
hitsize = 9f;
boostMultiplier = 2f;
@@ -388,7 +390,7 @@ public class UnitTypes implements ContentList{
}});
}};
vanguard = new UnitType("vanguard"){{
risse = new UnitType("risse"){{
speed = 1.3f;
drag = 0.1f;
hitsize = 8f;
@@ -403,23 +405,33 @@ public class UnitTypes implements ContentList{
}});
}};
spirit = new UnitType("spirit"){{
flying = true;
drag = 0.05f;
accel = 0.2f;
speed = 2f;
range = 50f;
health = 100;
engineSize = 1.8f;
engineOffset = 5.7f;
weapons.add(new Weapon(){{
y = 1.5f;
reload = 40f;
x = 0.5f;
ejectEffect = Fx.none;
recoil = 2f;
bullet = Bullets.healBulletBig;
shootSound = Sounds.pew;
minke = new UnitType("minke"){{
speed = 1.3f;
drag = 0.1f;
hitsize = 8f;
health = 130;
immunities = ObjectSet.with(StatusEffects.wet);
weapons.add(new Weapon("mount-weapon"){{
reload = 10f;
x = 1.25f;
rotate = true;
ejectEffect = Fx.shellEjectSmall;
bullet = Bullets.standardCopper;
}});
}};
bryde = new UnitType("bryde"){{
speed = 1.3f;
drag = 0.1f;
hitsize = 8f;
health = 130;
immunities = ObjectSet.with(StatusEffects.wet);
weapons.add(new Weapon("mount-weapon"){{
reload = 10f;
x = 1.25f;
rotate = true;
ejectEffect = Fx.shellEjectSmall;
bullet = Bullets.standardCopper;
}});
}};
@@ -458,7 +470,97 @@ public class UnitTypes implements ContentList{
}});
}};
phantom = new UnitType("phantom"){{
beta = new UnitType("beta"){{
//TODO maybe these should be changed
defaultController = BuilderAI::new;
isCounted = false;
flying = true;
mineSpeed = 2f;
mineTier = 1;
buildSpeed = 0.5f;
drag = 0.05f;
speed = 2.4f;
rotateSpeed = 15f;
accel = 0.1f;
range = 70f;
itemCapacity = 30;
health = 80f;
engineOffset = 6f;
hitsize = 8f;
weapons.add(new Weapon("small-basic-weapon"){{
reload = 15f;
x = 2.75f;
y = 1f;
bullet = new BasicBulletType(2.5f, 9){{
width = 7f;
height = 9f;
lifetime = 60f;
shootEffect = Fx.shootSmall;
smokeEffect = Fx.shootSmallSmoke;
tileDamageMultiplier = 0.1f;
}};
}});
}};
gamma = new UnitType("gamma"){{
//TODO maybe these should be changed
defaultController = BuilderAI::new;
isCounted = false;
flying = true;
mineSpeed = 2f;
mineTier = 1;
buildSpeed = 0.5f;
drag = 0.05f;
speed = 2.4f;
rotateSpeed = 15f;
accel = 0.1f;
range = 70f;
itemCapacity = 30;
health = 80f;
engineOffset = 6f;
hitsize = 8f;
weapons.add(new Weapon("small-basic-weapon"){{
reload = 15f;
x = 2.75f;
y = 1f;
bullet = new BasicBulletType(2.5f, 9){{
width = 7f;
height = 9f;
lifetime = 60f;
shootEffect = Fx.shootSmall;
smokeEffect = Fx.shootSmallSmoke;
tileDamageMultiplier = 0.1f;
}};
}});
}};
mono = new UnitType("mono"){{
flying = true;
drag = 0.05f;
accel = 0.2f;
speed = 2f;
range = 50f;
health = 100;
engineSize = 1.8f;
engineOffset = 5.7f;
weapons.add(new Weapon(){{
y = 1.5f;
reload = 40f;
x = 0.5f;
ejectEffect = Fx.none;
recoil = 2f;
bullet = Bullets.healBulletBig;
shootSound = Sounds.pew;
}});
}};
poly = new UnitType("poly"){{
defaultController = BuilderAI::new;
flying = true;
@@ -474,7 +576,7 @@ public class UnitTypes implements ContentList{
hitsize = 8f;
}};
trident = new UnitType("trident"){{
mega = new UnitType("mega"){{
health = 500;
speed = 2f;
@@ -484,7 +586,7 @@ public class UnitTypes implements ContentList{
flying = true;
engineOffset = 10.5f;
rotateShooting = false;
hitsize = 14f;
hitsize = 15f;
engineSize = 3f;
weapons.add(