launch pad textures, silo launch pad

This commit is contained in:
Bob 2024-02-14 21:29:08 +01:00
parent 786ced191b
commit ca2505dad0
16 changed files with 309 additions and 49 deletions

View File

@ -68,6 +68,7 @@
* Balefire spread is now limited to prevent densely vegetated biomes from lagging to hell
* The bricked furnace now makes charcoal twice as fast
* Combination ovens no longer need two welded copper plates and instead only cast plates, therefore no longer being post-arc welder. This should make it more affordable and useful in the initial earlygame where things like automatic wood farms are most important.
* Any water-like extinguishing fluid shot from the chemical thrower can now wash away fallout layers
## Fixed
* Fixed dupe caused by shift-clicking ashes out of the bricked furnace

View File

@ -2160,7 +2160,7 @@ public class ModBlocks {
tesla = new MachineTesla(Material.iron).setBlockName("tesla").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":tesla");
launch_pad = new LaunchPad(Material.iron).setBlockName("launch_pad").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":launch_pad");
launch_pad_large = new LaunchPadLarge(Material.iron).setBlockName("launch_pad_large").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":concrete_smooth");
launch_pad_large = new LaunchPadLarge(Material.iron).setBlockName("launch_pad_large").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
machine_radar = new MachineRadar(Material.iron).setBlockName("machine_radar").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":machine_radar");
machine_radar_large = new MachineRadarLarge(Material.iron).setBlockName("machine_radar_large").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
radar_screen = new MachineRadarScreen(Material.iron).setBlockName("radar_screen").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":block_steel");

View File

@ -25,6 +25,11 @@ public abstract class EntityMissileTier1 extends EntityMissileBaseNT {
return list;
}
@Override
protected float getContrailScale() {
return 0.5F;
}
public static class EntityMissileGeneric extends EntityMissileTier1 {
public EntityMissileGeneric(World world) { super(world); }
public EntityMissileGeneric(World world, float x, float y, float z, int a, int b) { super(world, x, y, z, a, b); }

View File

@ -453,6 +453,18 @@ public class EntityChemical extends EntityThrowableNT {
if(core instanceof IRepairable) {
((IRepairable) core).tryExtinguish(worldObj, x, y, z, fext);
}
if(fext == EnumExtinguishType.WATER && style == ChemicalStyle.LIQUID) {
for(int i = -2; i <= 2; i++) {
for(int j = 0; j <= 1; j++) {
for(int k = -2; k <= 2; k++) {
if(worldObj.getBlock(x + i, y + j, z + k) == ModBlocks.fallout) {
worldObj.setBlock(x + i, y + j, z + k, Blocks.air);
}
}
}
}
}
}
Block block = worldObj.getBlock(x, y, z);

View File

@ -1087,7 +1087,7 @@ public class ResourceManager {
public static final IModelCustom soyuz_launcher_support = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_support.obj"), false).asDisplayList();
//Missile Parts
public static final IModelCustom missile_pad = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missilePad.obj"));
public static final IModelCustom missile_pad = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/weapons/launch_pad_silo.obj"));
public static final IModelCustom missile_erector = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/launch_pad_erector.obj")).asDisplayList();
public static final IModelCustom missile_assembly = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_assembly.obj"));
public static final IModelCustom strut = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/strut.obj"));
@ -1288,7 +1288,7 @@ public class ResourceManager {
public static final ResourceLocation soyuz_launcher_support_tex = new ResourceLocation(RefStrings.MODID, "textures/models/soyuz_launcher/launcher_support.png");
//Missile Parts
public static final ResourceLocation missile_pad_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missilePad.png");
public static final ResourceLocation missile_pad_tex = new ResourceLocation(RefStrings.MODID, "textures/models/launchpad/silo.png");
public static final ResourceLocation missile_erector_tex = new ResourceLocation(RefStrings.MODID, "textures/models/launchpad/pad.png");
public static final ResourceLocation missile_erector_micro_tex = new ResourceLocation(RefStrings.MODID, "textures/models/launchpad/erector_micro.png");
public static final ResourceLocation missile_erector_v2_tex = new ResourceLocation(RefStrings.MODID, "textures/models/launchpad/erector_v2.png");

View File

@ -340,6 +340,7 @@ public class TileMappings {
put(TileEntitySpacer.class, "tileentity_fraction_spacer");
put(TileEntityMachineCatalyticCracker.class, "tileentity_catalytic_cracker");
put(TileEntityMachineCatalyticReformer.class, "tileentity_catalytic_reformer");
put(TileEntityMachineHydrotreater.class, "tileentity_hydrotreater");
put(TileEntityMachineCoker.class, "tileentity_coker");
put(TileEntityChimneyBrick.class, "tileentity_chimney_brick");
put(TileEntityChimneyIndustrial.class, "tileentity_chimney_industrial");

View File

@ -144,6 +144,13 @@ public abstract class TileEntityLaunchPadBase extends TileEntityMachineBase impl
this.power = Library.chargeTEFromItems(slots, 2, power, maxPower);
tanks[0].loadTank(3, 4, slots);
tanks[1].loadTank(5, 6, slots);
if(this.isMissileValid()) {
if(slots[0].getItem() instanceof ItemMissile) {
ItemMissile missile = (ItemMissile) slots[0].getItem();
setFuel(missile);
}
}
this.networkPackNT(250);
}

View File

@ -1,6 +1,5 @@
package com.hbm.tileentity.bomb;
import com.hbm.inventory.fluid.Fluids;
import com.hbm.items.weapon.ItemMissile;
import com.hbm.items.weapon.ItemMissile.MissileFormFactor;
import com.hbm.main.MainRegistry;
@ -60,7 +59,6 @@ public class TileEntityLaunchPadLarge extends TileEntityLaunchPadBase implements
if(slots[0].getItem() instanceof ItemMissile) {
ItemMissile missile = (ItemMissile) slots[0].getItem();
this.formFactor = missile.formFactor.ordinal();
setFuel(missile);
if(missile.formFactor == MissileFormFactor.ATLAS || missile.formFactor == MissileFormFactor.HUGE) {
erectorSpeed /= 2F;
@ -185,36 +183,15 @@ public class TileEntityLaunchPadLarge extends TileEntityLaunchPadBase implements
}
}
if(this.erected && this.hasFuel() && this.tanks[1].getTankType() == Fluids.OXYGEN) {
//maybe too much?
/*if(this.formFactor == MissileFormFactor.ATLAS.ordinal() && worldObj.getTotalWorldTime() % 4 == 0) {
ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - 10);
ForgeDirection rot = dir.getRotation(ForgeDirection.DOWN);
NBTTagCompound data = new NBTTagCompound();
data.setString("type", "tower");
data.setFloat("lift", -5F);
data.setFloat("base", 0.25F);
data.setFloat("max", 0.5F);
data.setInteger("life", 30 + worldObj.rand.nextInt(10));
data.setDouble("posX", xCoord + 0.5 - (dir.offsetX + rot.offsetX) * 0.5);
data.setDouble("posZ", zCoord + 0.5 - (dir.offsetZ + rot.offsetZ) * 0.5);
data.setDouble("posY", yCoord + 14.625);
data.setBoolean("noWind", true);
data.setFloat("alphaMod", 0.01F);
data.setFloat("strafe", 0.05F);
for(int i = 0; i < 3; i++) MainRegistry.proxy.effectNT(data);
}*/
if(this.erected && (this.formFactor == MissileFormFactor.HUGE.ordinal() || this.formFactor == MissileFormFactor.ATLAS.ordinal()) && this.tanks[1].getFill() > 0) {
NBTTagCompound data = new NBTTagCompound();
data.setString("type", "tower");
data.setFloat("lift", 0F);
data.setFloat("base", 0.5F);
data.setFloat("max", 2F);
data.setInteger("life", 60 + worldObj.rand.nextInt(30));
data.setDouble("posX", xCoord + 0.5);
data.setDouble("posZ", zCoord + 0.5);
data.setInteger("life", 70 + worldObj.rand.nextInt(30));
data.setDouble("posX", xCoord + 0.5 + worldObj.rand.nextGaussian() * 0.5);
data.setDouble("posZ", zCoord + 0.5 + worldObj.rand.nextGaussian() * 0.5);
data.setDouble("posY", yCoord + 2);
data.setBoolean("noWind", true);
data.setFloat("alphaMod", 2F);

View File

@ -346,7 +346,7 @@ container.heaterOven=Heizofen
container.hydrotreater=Hydrotreater
container.iGenerator=Industrieller Generator
container.keyForge=Schlossertisch
container.launchPad=Raketenabschussrampe
container.launchPad=Startrampe
container.launchTable=Große Startrampe
container.leadBox=Sicherheitsbehälter
container.machineArcWelder=Lichtbogenschweißer
@ -4072,7 +4072,8 @@ tile.lamp_tritium_green_off.name=Grüne Tritiumlampe
tile.lamp_tritium_green_on.name=Grüne Tritiumlampe
tile.lantern.name=Laterne
tile.lantern_behemoth.name=Alte Laterne
tile.launch_pad.name=Raketenabschussrampe
tile.launch_pad.name=Silo-Startrampe
tile.launch_pad_large.name=Startrampe
tile.launch_table.name=Große Startrampe
tile.leaves_layer.name=Totes Laub
tile.lox_barrel.name=LOX-Fass

View File

@ -705,7 +705,7 @@ container.heaterOven=Heating Oven
container.hydrotreater=Hydrotreater
container.iGenerator=Industrial Generator
container.keyForge=Locksmith Table
container.launchPad=Missile Launch Pad
container.launchPad=Launch Pad
container.launchTable=Large Launch Pad
container.leadBox=Containment Box
container.machineArcWelder=Arc Welder
@ -5077,7 +5077,8 @@ tile.lantern_behemoth.name=Old Lantern
tile.spotlight_incandescent.name=Cage Lamp
tile.spotlight_fluoro.name=Fluorescent Light
tile.spotlight_halogen.name=Halogen Floodlight
tile.launch_pad.name=Missile Launch Pad
tile.launch_pad.name=Silo Launch Pad
tile.launch_pad_large.name=Launch Pad
tile.launch_table.name=Large Launch Pad
tile.leaves_layer.name=Fallen Leaves
tile.lox_barrel.name=LOX Barrel

View File

@ -14124,30 +14124,30 @@ vt 0.975000 0.539474
vt 0.925000 0.750000
vt 1.000000 0.539474
vt 0.975000 0.750000
vt 0.925000 0.776316
vt 0.900000 0.776316
vt 0.900000 0.763158
vt 0.975000 0.776316
vt 1.000000 0.763158
vt 1.000000 0.776316
vt 0.925000 0.750000
vt 0.975000 0.776316
vt 0.900000 0.763158
vt 0.900000 0.750000
vt 0.925000 0.776316
vt 0.900000 0.776316
vt 1.000000 0.763158
vt 0.975000 0.750000
vt 1.000000 0.750000
vt 1.000000 0.763158
vt 0.975000 0.539474
vt 1.000000 0.526316
vt 1.000000 0.539474
vt 0.900000 0.763158
vt 0.900000 0.750000
vt 0.925000 0.750000
vt 0.900000 0.526316
vt 0.925000 0.539474
vt 0.900000 0.539474
vt 0.900000 0.526316
vt 0.975000 0.986842
vt 1.000000 0.986842
vt 1.000000 1.000000
vt 0.925000 0.986842
vt 1.000000 0.526316
vt 1.000000 0.539474
vt 0.975000 0.539474
vt 0.900000 1.000000
vt 0.900000 0.986842
vt 0.925000 0.986842
vt 1.000000 1.000000
vt 0.975000 0.986842
vt 1.000000 0.986842
vt 1.000000 0.776316
vt 0.975000 0.986842
vt 0.975000 0.776316

View File

@ -0,0 +1,255 @@
# Blender v2.79 (sub 0) OBJ File: 'launch_pad_silo.blend'
# www.blender.org
o Plane
v -1.500000 1.000000 1.500000
v 1.500000 1.000000 1.500000
v -1.500000 1.000000 -1.500000
v 1.500000 1.000000 -1.500000
v -0.500000 1.000000 0.500000
v 0.500000 1.000000 0.500000
v -0.500000 1.000000 -0.500000
v 0.500000 1.000000 -0.500000
v 0.500000 0.000000 -0.500000
v 1.500000 0.000000 -0.500000
v 0.500000 0.000000 -1.500000
v 1.500000 0.000000 -1.500000
v 0.500000 0.000000 1.500000
v 1.500000 0.000000 1.500000
v 0.500000 0.000000 0.500000
v 1.500000 0.000000 0.500000
v -1.500000 0.000000 -0.500000
v -0.500000 0.000000 -0.500000
v -1.500000 0.000000 -1.500000
v -0.500000 0.000000 -1.500000
v -1.500000 0.000000 1.500000
v -0.500000 0.000000 1.500000
v -1.500000 0.000000 0.500000
v -0.500000 0.000000 0.500000
v 0.500000 0.500000 -1.500000
v 0.500000 0.500000 -0.500000
v 1.500000 0.500000 -0.500000
v 0.500000 0.500000 0.500000
v 0.500000 0.500000 1.500000
v 1.500000 0.500000 0.500000
v -1.500000 0.500000 -0.500000
v -0.500000 0.500000 -0.500000
v -0.500000 0.500000 -1.500000
v -0.500000 0.500000 1.500000
v -0.500000 0.500000 0.500000
v -1.500000 0.500000 0.500000
v -0.500000 1.000000 0.500000
v 0.500000 1.000000 0.500000
v -0.500000 1.000000 -0.500000
v 0.500000 1.000000 -0.500000
v -0.500000 1.000000 0.500000
v 0.500000 1.000000 0.500000
v -0.500000 1.000000 -0.500000
v 0.500000 1.000000 -0.500000
vt 0.250000 0.750000
vt 0.750000 1.000000
vt -0.000000 1.000000
vt 0.250000 0.500000
vt -0.000000 0.250000
vt 0.500000 0.750000
vt 0.750000 0.250000
vt 0.500000 0.500000
vt 0.250000 0.250000
vt 0.500000 0.125000
vt 0.500000 0.250000
vt 0.250000 0.125000
vt 0.500000 0.250000
vt 0.250000 0.250000
vt 0.250000 0.125000
vt 0.500000 0.250000
vt 0.250000 0.250000
vt 0.250000 0.250000
vt 0.500000 0.125000
vt 0.500000 0.250000
vt 1.000000 -0.000000
vt 0.750000 0.250000
vt 0.750000 -0.000000
vt 1.000000 -0.000000
vt 0.750000 0.250000
vt 0.750000 -0.000000
vt 1.000000 -0.000000
vt 0.750000 0.250000
vt 0.750000 -0.000000
vt 1.000000 -0.000000
vt 0.750000 0.250000
vt 0.750000 -0.000000
vt 1.000000 0.625000
vt 0.750000 0.500000
vt 1.000000 0.500000
vt 1.000000 0.625000
vt 0.750000 0.500000
vt 1.000000 0.500000
vt 0.750000 0.250000
vt 1.000000 0.500000
vt 0.750000 0.500000
vt 1.000000 0.500000
vt 0.750000 0.250000
vt 1.000000 0.250000
vt 1.000000 0.500000
vt 0.750000 0.250000
vt 1.000000 0.250000
vt 0.750000 0.250000
vt 1.000000 0.500000
vt 0.750000 0.500000
vt 1.000000 0.625000
vt 0.750000 0.500000
vt 1.000000 0.500000
vt 1.000000 0.625000
vt 0.750000 0.500000
vt 1.000000 0.500000
vt 1.000000 0.625000
vt 0.750000 0.500000
vt 1.000000 0.500000
vt 1.000000 0.625000
vt 0.750000 0.500000
vt 1.000000 0.500000
vt -0.000000 -0.000000
vt 0.250000 0.125000
vt 1.000000 0.625000
vt 0.750000 0.500000
vt 1.000000 0.500000
vt 1.000000 0.625000
vt 0.750000 0.500000
vt 1.000000 0.500000
vt 0.750000 0.000000
vt 0.500000 0.125000
vt 0.500000 0.000000
vt 0.250000 0.125000
vt 0.750000 0.250000
vt 0.000000 0.250000
vt 0.000000 0.000000
vt 0.250000 0.000000
vt 0.500000 0.125000
vt 0.500000 0.000000
vt 0.000000 0.250000
vt 0.750000 0.250000
vt 0.250000 0.125000
vt 0.000000 0.000000
vt 0.250000 0.000000
vt 0.750000 0.000000
vt 0.500000 0.125000
vt 0.500000 0.000000
vt 0.000000 0.250000
vt 0.750000 0.250000
vt 0.250000 0.125000
vt 0.000000 0.000000
vt 0.250000 0.000000
vt 0.500000 0.125000
vt 0.750000 -0.000000
vt 0.250000 0.750000
vt 0.500000 0.500000
vt 0.500000 0.750000
vt 0.500000 0.500000
vt 0.250000 0.750000
vt 0.500000 0.750000
vt 0.250000 0.125000
vt 0.500000 0.125000
vt 0.500000 0.125000
vt 0.250000 0.125000
vt 1.000000 0.250000
vt 1.000000 0.250000
vt 1.000000 0.250000
vt 1.000000 0.250000
vt 0.750000 0.625000
vt 0.750000 0.625000
vt 1.000000 0.250000
vt 0.750000 0.500000
vt 0.750000 0.500000
vt 1.000000 0.250000
vt 0.750000 0.625000
vt 0.750000 0.625000
vt 0.750000 0.625000
vt 0.750000 0.625000
vt 0.250000 -0.000000
vt 0.750000 0.625000
vt 0.750000 0.625000
vt 0.500000 -0.000000
vt 0.250000 0.500000
vt 0.250000 0.500000
vn 0.0000 1.0000 0.0000
vn -1.0000 0.0000 0.0000
vn 0.0000 0.0000 1.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn 0.0000 -1.0000 0.0000
s off
f 5/1/1 3/2/1 1/3/1
f 6/4/1 1/3/1 2/5/1
f 7/6/1 4/7/1 3/2/1
f 8/8/1 2/5/1 4/7/1
f 8/9/2 28/10/2 6/11/2
f 32/12/3 8/13/3 7/14/3
f 35/15/4 7/16/4 5/17/4
f 6/18/5 35/19/5 5/20/5
f 11/21/6 10/22/6 9/23/6
f 15/24/6 14/25/6 13/26/6
f 19/27/6 18/28/6 17/29/6
f 23/30/6 22/31/6 21/32/6
f 29/33/2 15/34/2 13/35/2
f 33/36/4 18/37/4 20/38/4
f 27/39/6 28/40/6 26/41/6
f 26/42/6 33/43/6 25/44/6
f 32/45/6 36/46/6 31/47/6
f 29/48/6 35/49/6 28/50/6
f 35/51/4 22/52/4 24/53/4
f 28/54/5 16/55/5 15/56/5
f 26/57/2 11/58/2 9/59/2
f 36/60/5 24/61/5 23/62/5
f 14/63/4 30/64/4 2/5/4
f 27/65/3 9/66/3 10/67/3
f 30/64/4 4/7/4 2/5/4
f 32/68/3 17/69/3 18/70/3
f 14/71/3 29/72/3 13/73/3
f 34/74/3 2/75/3 1/76/3
f 34/74/3 21/77/3 22/78/3
f 21/32/2 36/79/2 23/80/2
f 3/81/2 36/79/2 1/82/2
f 31/83/2 19/84/2 17/85/2
f 19/86/5 33/87/5 20/88/5
f 4/89/5 33/87/5 3/90/5
f 25/91/5 12/92/5 11/93/5
f 27/94/4 12/95/4 4/7/4
f 37/96/1 40/97/1 39/98/1
f 44/99/6 41/100/6 43/101/6
f 5/1/1 7/6/1 3/2/1
f 6/4/1 5/1/1 1/3/1
f 7/6/1 8/8/1 4/7/1
f 8/8/1 6/4/1 2/5/1
f 8/9/2 26/102/2 28/10/2
f 32/12/3 26/103/3 8/13/3
f 35/15/4 32/104/4 7/16/4
f 6/18/5 28/105/5 35/19/5
f 11/21/6 12/106/6 10/22/6
f 15/24/6 16/107/6 14/25/6
f 19/27/6 20/108/6 18/28/6
f 23/30/6 24/109/6 22/31/6
f 29/33/2 28/110/2 15/34/2
f 33/36/4 32/111/4 18/37/4
f 27/39/6 30/112/6 28/40/6
f 26/42/6 32/113/6 33/43/6
f 32/45/6 35/114/6 36/46/6
f 29/48/6 34/115/6 35/49/6
f 35/51/4 34/116/4 22/52/4
f 28/54/5 30/117/5 16/55/5
f 26/57/2 25/118/2 11/58/2
f 36/60/5 35/119/5 24/61/5
f 14/63/4 16/120/4 30/64/4
f 27/65/3 26/121/3 9/66/3
f 30/64/4 27/94/4 4/7/4
f 32/68/3 31/122/3 17/69/3
f 14/71/3 2/75/3 29/72/3
f 34/74/3 29/72/3 2/75/3
f 34/74/3 1/76/3 21/77/3
f 21/32/2 1/82/2 36/79/2
f 3/81/2 31/83/2 36/79/2
f 31/83/2 3/81/2 19/84/2
f 19/86/5 3/90/5 33/87/5
f 4/89/5 25/91/5 33/87/5
f 25/91/5 4/89/5 12/92/5
f 27/94/4 10/123/4 12/95/4
f 37/96/1 38/124/1 40/97/1
f 44/99/6 42/125/6 41/100/6

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB