mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-10-26 09:13:28 +03:00
Fixed OpenGL vertex arrays / Fixed bullet shrink crop
This commit is contained in:
parent
9ac75df34e
commit
3dd17474c5
@ -9,6 +9,7 @@ corvus=24
|
||||
elude=45
|
||||
flare=3
|
||||
gamma=31
|
||||
latum=46
|
||||
mace=4
|
||||
manifold=36
|
||||
mega=5
|
||||
@ -39,7 +40,6 @@ pulsar=19
|
||||
quad=23
|
||||
quasar=32
|
||||
risso=20
|
||||
scuttler=35
|
||||
spiroct=21
|
||||
stell=43
|
||||
timed=38
|
||||
|
1
annotations/src/main/resources/revisions/latum/0.json
Normal file
1
annotations/src/main/resources/revisions/latum/0.json
Normal file
@ -0,0 +1 @@
|
||||
{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}
|
@ -5,5 +5,6 @@
|
||||
maxWidth: 4096,
|
||||
maxHeight: 4096,
|
||||
fast: true,
|
||||
stripWhitespaceCenter: true
|
||||
stripWhitespaceCenter: true,
|
||||
ignoredWhitespaceStrings: ["effects/"]
|
||||
}
|
||||
|
@ -397,7 +397,6 @@
|
||||
63303=fissile-matter|item-fissile-matter-ui
|
||||
63302=dormant-cyst|item-dormant-cyst-ui
|
||||
63301=neoplasm|liquid-neoplasm-ui
|
||||
63300=scuttler|unit-scuttler-ui
|
||||
63297=plasma-bore|block-plasma-bore-ui
|
||||
63296=steam-vent|block-steam-vent-ui
|
||||
63295=pressure-turbine|block-pressure-turbine-ui
|
||||
@ -558,3 +557,4 @@
|
||||
63127=elude|unit-elude-ui
|
||||
63126=refabricator|block-refabricator-ui
|
||||
63125=prime-refabricator|block-prime-refabricator-ui
|
||||
63124=latum|unit-latum-ui
|
||||
|
Binary file not shown.
@ -89,7 +89,7 @@ public class UnitTypes{
|
||||
|
||||
//region neoplasm
|
||||
|
||||
public static @EntityDef({Unitc.class, Crawlc.class}) UnitType scuttler;
|
||||
public static @EntityDef({Unitc.class, Crawlc.class}) UnitType latum;
|
||||
|
||||
//endregion
|
||||
|
||||
@ -3909,9 +3909,9 @@ public class UnitTypes{
|
||||
//region erekir - neoplasm
|
||||
|
||||
if(false)
|
||||
scuttler = new NeoplasmUnitType("scuttler"){{
|
||||
latum = new NeoplasmUnitType("latum"){{
|
||||
health = 20000;
|
||||
armor = 17;
|
||||
armor = 12;
|
||||
hitSize = 48f;
|
||||
omniMovement = false;
|
||||
rotateSpeed = 1.7f;
|
||||
@ -3919,7 +3919,10 @@ public class UnitTypes{
|
||||
drawCell = false;
|
||||
segments = 4;
|
||||
drawBody = false;
|
||||
hidden = true;
|
||||
crushDamage = 2f;
|
||||
aiController = HugAI::new;
|
||||
targetAir = false;
|
||||
|
||||
segmentScl = 4f;
|
||||
segmentPhase = 5f;
|
||||
|
@ -1462,7 +1462,7 @@ public class UnitType extends UnlockableContent{
|
||||
if(healFlash){
|
||||
Tmp.c1.set(Color.white).lerp(healColor, Mathf.clamp(unit.healTime - unit.hitTime));
|
||||
}
|
||||
Draw.mixcol(Tmp.c1, Math.max(unit.hitTime, Mathf.clamp(unit.healTime)));
|
||||
Draw.mixcol(Tmp.c1, Math.max(unit.hitTime, !healFlash ? 0f : Mathf.clamp(unit.healTime)));
|
||||
|
||||
if(unit.drownTime > 0 && unit.lastDrownFloor != null){
|
||||
Draw.mixcol(Tmp.c1.set(unit.lastDrownFloor.mapColor).mul(0.83f), unit.drownTime * 0.9f);
|
||||
|
@ -4,6 +4,7 @@ import mindustry.content.*;
|
||||
import mindustry.entities.abilities.*;
|
||||
import mindustry.graphics.*;
|
||||
import mindustry.type.*;
|
||||
import mindustry.world.meta.*;
|
||||
|
||||
/** This is just a preset. Contains no new behavior. */
|
||||
public class NeoplasmUnitType extends UnitType{
|
||||
@ -13,10 +14,11 @@ public class NeoplasmUnitType extends UnitType{
|
||||
|
||||
outlineColor = Pal.neoplasmOutline;
|
||||
immunities.addAll(StatusEffects.burning, StatusEffects.melting);
|
||||
envDisabled = Env.none;
|
||||
|
||||
abilities.add(new RegenAbility(){{
|
||||
//fully regen in 30 seconds
|
||||
percentAmount = 1f / (30f * 60f) * 100f;
|
||||
//fully regen in 70 seconds
|
||||
percentAmount = 1f / (70f * 60f) * 100f;
|
||||
}});
|
||||
|
||||
abilities.add(new LiquidExplodeAbility(){{
|
||||
@ -29,7 +31,9 @@ public class NeoplasmUnitType extends UnitType{
|
||||
}});
|
||||
|
||||
//green flashing is unnecessary since they always regen
|
||||
healFlash = false;
|
||||
healFlash = true;
|
||||
|
||||
healColor = Pal.neoplasm1;
|
||||
|
||||
//TODO
|
||||
//- liquid regen ability
|
||||
|
@ -25,4 +25,4 @@ org.gradle.caching=true
|
||||
#used for slow jitpack builds; TODO see if this actually works
|
||||
org.gradle.internal.http.socketTimeout=100000
|
||||
org.gradle.internal.http.connectionTimeout=100000
|
||||
archash=b851f88b09
|
||||
archash=a8632d7bf2
|
||||
|
@ -572,6 +572,7 @@ public class Generators{
|
||||
//draw each extra segment on top before it is saved as outline
|
||||
if(sample instanceof Crawlc){
|
||||
for(int i = 0; i < type.segments; i++){
|
||||
//replace(type.segmentRegions[i], outline.get(get(type.segmentRegions[i])));
|
||||
save(outline.get(get(type.segmentRegions[i])), type.name + "-segment-outline" + i);
|
||||
|
||||
if(i > 0){
|
||||
@ -584,7 +585,7 @@ public class Generators{
|
||||
//outline is currently never needed, although it could theoretically be necessary
|
||||
if(type.needsBodyOutline()){
|
||||
save(image, type.name + "-outline");
|
||||
}else{
|
||||
}else if(type.segments == 0){
|
||||
replace(type.name, type.segments > 0 ? get(type.segmentRegions[0]) : outline.get(get(type.region)));
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user