Skip to content
Permalink
Browse files

Re-implemented Nauticomorph with phosphorescence lighting effects and…

… animations.
  • Loading branch information...
Ri5ux Ri5ux
Ri5ux authored and Ri5ux committed Jul 20, 2019
1 parent 1c737a7 commit 4bc18f30e25b312a990fe3b527342fc3749c76b5
@@ -33,7 +33,7 @@
import org.avp.entities.living.species.species223ode.EntityDeacon;
import org.avp.entities.living.species.species223ode.EntityDeaconAdult;
import org.avp.entities.living.species.species223ode.EntityTrilobite;
import org.avp.entities.living.species.xenomorphs.EntityAqua;
import org.avp.entities.living.species.xenomorphs.EntityNauticomorph;
import org.avp.entities.living.species.xenomorphs.EntityBatXeno;
import org.avp.entities.living.species.xenomorphs.EntityBoiler;
import org.avp.entities.living.species.xenomorphs.EntityChestburster;
@@ -229,7 +229,7 @@
livingEntities.add(EntityEntryBuilder.create().entity(EntityChestburster.class).id("Chestbuster", entityId++).name("Chestbuster").tracker(250, 4, true).build());
livingEntities.add(EntityEntryBuilder.create().entity(EntityOvamorph.class).id("Ovamorph", entityId++).name("Ovamorph").tracker(250, 4, true).build());
livingEntities.add(EntityEntryBuilder.create().entity(EntityRoyalFacehugger.class).id("RoyalFacehugger", entityId++).name("RoyalFacehugger").tracker(250, 4, true).build());
livingEntities.add(EntityEntryBuilder.create().entity(EntityAqua.class).id("AquaAlien", entityId++).name("AquaAlien").tracker(250, 4, true).build());
livingEntities.add(EntityEntryBuilder.create().entity(EntityNauticomorph.class).id("AquaAlien", entityId++).name("AquaAlien").tracker(250, 4, true).build());
livingEntities.add(EntityEntryBuilder.create().entity(EntityPredalien.class).id("Predalien", entityId++).name("Predalien").tracker(250, 4, true).build());
livingEntities.add(EntityEntryBuilder.create().entity(EntityCombatSynthetic.class).id("CombatSynthetic", entityId++).name("CombatSynthetic").tracker(250, 4, true).build());
livingEntities.add(EntityEntryBuilder.create().entity(EntityDeacon.class).id("Deacon", entityId++).name("Deacon").tracker(250, 4, true).build());
@@ -341,7 +341,7 @@ private void registerSpawns()

if (AliensVsPredator.settings().shouldEvolvedXenomorphsSpawn())
{
EntityRegistry.addSpawn(EntityAqua.class, 5, 1, 2, EnumCreatureType.MONSTER, array(aquaAlienSpawns));
EntityRegistry.addSpawn(EntityNauticomorph.class, 5, 1, 2, EnumCreatureType.MONSTER, array(aquaAlienSpawns));
EntityRegistry.addSpawn(EntityDrone.class, 50, 1, 3, EnumCreatureType.MONSTER, array(alienSpawns));
EntityRegistry.addSpawn(EntityWarrior.class, 20, 1, 3, EnumCreatureType.MONSTER, array(alienSpawns));
EntityRegistry.addSpawn(EntityPraetorian.class, 5, 1, 2, EnumCreatureType.MONSTER, array(alienSpawns));
@@ -10,7 +10,7 @@
import org.avp.entities.living.species.species223ode.EntityDeacon;
import org.avp.entities.living.species.species223ode.EntityDeaconAdult;
import org.avp.entities.living.species.species223ode.EntityTrilobite;
import org.avp.entities.living.species.xenomorphs.EntityAqua;
import org.avp.entities.living.species.xenomorphs.EntityNauticomorph;
import org.avp.entities.living.species.xenomorphs.EntityBatXeno;
import org.avp.entities.living.species.xenomorphs.EntityBoiler;
import org.avp.entities.living.species.xenomorphs.EntityChestburster;
@@ -230,7 +230,7 @@
public static final Item rackModule8 = new ItemNetworkRackModule8().setCreativeTab(Tab.MAIN).setRegistryName("rackmodule8");
public static final Item sporepod = new ItemSporePod().setCreativeTab(Tab.ENTITIES).setRegistryName("sporepod");
public static final Item summonerDrone = new ItemEntitySummoner(EntityDrone.class).setCreativeTab(Tab.ENTITIES).setRegistryName("summon.drone");
public static final Item summonerAqua = new ItemEntitySummoner(EntityAqua.class).setCreativeTab(Tab.ENTITIES).setRegistryName("summon.aqua");
public static final Item summonerAqua = new ItemEntitySummoner(EntityNauticomorph.class).setCreativeTab(Tab.ENTITIES).setRegistryName("summon.aqua");
public static final Item summonerWarrior = new ItemEntitySummoner(EntityWarrior.class).setCreativeTab(Tab.ENTITIES).setRegistryName("summon.warrior");
public static final Item summonerCrusher = new ItemEntitySummoner(EntityCrusher.class).setCreativeTab(Tab.ENTITIES).setRegistryName("summon.crusher");
public static final Item summonerSpitter = new ItemEntitySummoner(EntitySpitter.class).setCreativeTab(Tab.ENTITIES).setRegistryName("summon.spitter");
@@ -30,7 +30,7 @@
import org.avp.client.render.entities.RenderSupplyChute;
import org.avp.client.render.entities.RenderWristbracer;
import org.avp.client.render.entities.living.RenderAethon;
import org.avp.client.render.entities.living.RenderAqua;
import org.avp.client.render.entities.living.RenderNauticomorph;
import org.avp.client.render.entities.living.RenderBabyhead;
import org.avp.client.render.entities.living.RenderBatXenomorph;
import org.avp.client.render.entities.living.RenderBelugaburster;
@@ -205,7 +205,7 @@
import org.avp.entities.living.species.species223ode.EntityDeacon;
import org.avp.entities.living.species.species223ode.EntityDeaconAdult;
import org.avp.entities.living.species.species223ode.EntityTrilobite;
import org.avp.entities.living.species.xenomorphs.EntityAqua;
import org.avp.entities.living.species.xenomorphs.EntityNauticomorph;
import org.avp.entities.living.species.xenomorphs.EntityBatXeno;
import org.avp.entities.living.species.xenomorphs.EntityBoiler;
import org.avp.entities.living.species.xenomorphs.EntityChestburster;
@@ -373,7 +373,7 @@ private void registerLivingEntityRenderers()
Renderers.registerRenderer(EntityRunnerDrone.class, RenderRunnerDrone.class);
Renderers.registerRenderer(EntityRunnerWarrior.class, RenderRunnerWarrior.class);
Renderers.registerRenderer(EntityCrusher.class, RenderCrusher.class);
Renderers.registerRenderer(EntityAqua.class, RenderAqua.class);
Renderers.registerRenderer(EntityNauticomorph.class, RenderNauticomorph.class);
Renderers.registerRenderer(EntityPredalien.class, RenderPredalien.class);
Renderers.registerRenderer(EntitySpitter.class, RenderSpitter.class);
Renderers.registerRenderer(EntityMarine.class, RenderMarine.class);
@@ -527,7 +527,7 @@ private void registerItemRenderers()
Renderers.registerItemRenderer(ItemHandler.summonerMarine, (new RenderItemSummoner(AliensVsPredator.resources().models().MARINE)).setScale(10F).setY(3F));
Renderers.registerItemRenderer(ItemHandler.summonerYautjaWarrior, (new RenderItemSummoner(AliensVsPredator.resources().models().YAUTJA_WARRIOR)).setScale(7.5F).setY(8F));
Renderers.registerItemRenderer(ItemHandler.summonerPredalien, (new RenderItemSummoner(AliensVsPredator.resources().models().PREDALIEN)).setScale(8F).setY(6F));
Renderers.registerItemRenderer(ItemHandler.summonerAqua, (new RenderItemSummoner(AliensVsPredator.resources().models().AQUA_XENOMORPH)).setScale(7.5F).setY(8F));
Renderers.registerItemRenderer(ItemHandler.summonerAqua, (new RenderItemSummoner(AliensVsPredator.resources().models().NAUTICOMORPH_XENOMORPH)).setScale(7.5F).setY(8F));
Renderers.registerItemRenderer(ItemHandler.summonerCombatSynthetic, (new RenderItemSummoner(AliensVsPredator.resources().models().COMBAT_SYNTHETIC)).setScale(16F).setY(-12F));
Renderers.registerItemRenderer(ItemHandler.summonerHammerpede, (new RenderItemSummoner(AliensVsPredator.resources().models().HAMMERPEDE)).setScale(10.5F).setX(3F));
Renderers.registerItemRenderer(ItemHandler.summonerTrilobite, (new RenderItemSummoner(AliensVsPredator.resources().models().TRILOBITE)).setScale(8F).setY(4F));
@@ -7,7 +7,7 @@
import org.avp.client.model.entities.ModelSporePod;
import org.avp.client.model.entities.ModelSupplyChute;
import org.avp.client.model.entities.living.ModelAethon;
import org.avp.client.model.entities.living.ModelAqua;
import org.avp.client.model.entities.living.ModelNauticomorph;
import org.avp.client.model.entities.living.ModelBabyhead;
import org.avp.client.model.entities.living.ModelBatXenomorph;
import org.avp.client.model.entities.living.ModelBelugaburster;
@@ -203,8 +203,8 @@ public Models models()
public final MapModelTexture<ModelDeaconShark> DEACON_SHARK = new MapModelTexture(new ModelDeaconShark(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/deacon_shark.png"));
public final MapModelTexture<ModelDeacon> DEACON = new MapModelTexture(new ModelDeacon(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/deacon.png"));
public final MapModelTexture<ModelDeaconAdult> DEACON_ADULT = new MapModelTexture(new ModelDeaconAdult(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/deacon_adult.png"));
public final MapModelTexture<ModelAqua> AQUA_XENOMORPH = new MapModelTexture(new ModelAqua(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/aqua.png"));
public final MapModelTexture<ModelAqua> AQUA_XENOMORPH_MASK = new MapModelTexture(new ModelAqua(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/aqua_glow.png"));
public final MapModelTexture<ModelNauticomorph> NAUTICOMORPH_XENOMORPH = new MapModelTexture(new ModelNauticomorph(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/nauticomorph.png"));
public final MapModelTexture<ModelNauticomorph> NAUTICOMORPH_XENOMORPH_MASK = new MapModelTexture(new ModelNauticomorph(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/nauticomorph_glow.png"));
public final MapModelTexture<ModelMatriarch> MATRIARCH = new MapModelTexture(new ModelMatriarch(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/matriarch.png"));
public final MapModelTexture<ModelMatriarch> MATRIARCH_MASK = new MapModelTexture(new ModelMatriarch(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/matriarch_mask.png"));
public final MapModelTexture<ModelYautja> YAUTJA_WARRIOR = new MapModelTexture(new ModelYautja(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/yautja.png"));

0 comments on commit 4bc18f3

Please sign in to comment.
You can’t perform that action at this time.