xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Alt stinger rocket texture, ammo canister fix, CIWS typo fixed

Browse Source
This commit is contained in:
HbmMods 2018-02-26 22:20:52 +01:00
parent b0bc10ad44
commit 9ba3a3c63b
8 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/hbm/lang/de_DE.lang
View File

@ -197,7 +197,7 @@ tile.turret_rocket.name=Raketengeschütz
tile.turret_flamer.name=Flammenwerfergeschütz
tile.turret_tau.name=Tauonengeschütz
tile.turret_spitfire.name=Geschütz für das ich noch keinen Namen habe [WIP]
tile.turret_cwis.name=Phalanx Mk-15 CWIS
tile.turret_cwis.name=Phalanx Mk-15 CIWS
tile.machine_radar.name=Raketenradar
container.radar=Raketenradar

2
assets/hbm/lang/en_US.lang
View File

@ -208,7 +208,7 @@ tile.turret_rocket.name=Rocket Turret
tile.turret_flamer.name=Flamethrower Turret
tile.turret_tau.name=Tauon Turret
tile.turret_spitfire.name=Turret I have no name for right now [WIP]
tile.turret_cwis.name=Phalanx Mk-15 CWIS
tile.turret_cwis.name=Phalanx Mk-15 CIWS
tile.machine_radar.name=Missile Radar
container.radar=Missile Radar

BIN
assets/hbm/textures/models/ModelSRocket.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 487 B

After

Width:  |  Height:  |  Size: 482 B

BIN
assets/hbm/textures/models/ModelSVTRocket.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 584 B

5
com/hbm/entity/projectile/EntityRocketHoming.java
View File

@ -582,7 +582,10 @@ public class EntityRocketHoming extends Entity implements IProjectile
lockonTicks++;
if(lockonTicks == 5 && !hasBeeped) {
worldObj.playSoundAtEntity(this, "hbm:weapon.stingerLockOn", 10F, 1F);
if(this.getIsCritical())
worldObj.playSoundAtEntity(this, "hbm:weapon.stingerLockOn", 10F, 0.75F);
else
worldObj.playSoundAtEntity(this, "hbm:weapon.stingerLockOn", 10F, 1F);
hasBeeped = true;
}

9
com/hbm/items/weapon/GunStinger.java
View File

@ -61,7 +61,11 @@ public class GunStinger extends Item {
}
p_77615_1_.damageItem(1, p_77615_3_);
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.rpgShoot", 1.0F, 0.25F);
if(this == ModItems.gun_stinger)
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.rpgShoot", 1.0F, 1.0F);
if(this == ModItems.gun_skystinger)
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.rpgShoot", 1.0F, 0.5F);
p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_stinger_ammo);
@ -86,12 +90,15 @@ public class GunStinger extends Item {
entityarrow1.motionX += p_77615_2_.rand.nextGaussian() * 0.2;
entityarrow1.motionY += p_77615_2_.rand.nextGaussian() * 0.2;
entityarrow1.motionZ += p_77615_2_.rand.nextGaussian() * 0.2;
entityarrow.setIsCritical(true);
entityarrow1.setIsCritical(true);
p_77615_2_.spawnEntityInWorld(entityarrow);
p_77615_2_.spawnEntityInWorld(entityarrow1);
} else {
EntityRocketHoming entityarrow = new EntityRocketHoming(p_77615_2_, p_77615_3_, 2.0F);
entityarrow.homingMod = 8;
entityarrow.homingRadius *= 50;
entityarrow.setIsCritical(true);
p_77615_2_.spawnEntityInWorld(entityarrow);
}
}

2
com/hbm/items/weapon/ItemClip.java
View File

@ -282,6 +282,8 @@ public class ItemClip extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 3));
if(player.inventory.hasItem(ModItems.gun_stinger))
player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 2));
if(player.inventory.hasItem(ModItems.gun_skystinger))
player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 2));
if(player.inventory.hasItem(ModItems.gun_fatman))
player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_fatman_ammo, 2));
if(player.inventory.hasItem(ModItems.gun_mirv))

16
com/hbm/render/entity/RenderSRocket.java
View File

@ -3,6 +3,7 @@ package com.hbm.render.entity;
import org.lwjgl.opengl.GL11;
import com.hbm.entity.projectile.EntityBullet;
import com.hbm.entity.projectile.EntityRocketHoming;
import com.hbm.lib.RefStrings;
import com.hbm.render.model.ModelBullet;
import com.hbm.render.model.ModelSRocket;
@ -19,8 +20,7 @@ public class RenderSRocket extends Render {
missile = new ModelSRocket();
}
@Override
public void doRender(Entity rocket, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
public void doRender(EntityRocketHoming rocket, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
float p_76986_9_) {
GL11.glPushMatrix();
GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_);
@ -30,11 +30,19 @@ public class RenderSRocket extends Render {
0.0F, 0.0F, 1.0F);
GL11.glScalef(1.5F, 1.5F, 1.5F);
bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelSRocket.png"));
if(rocket.getIsCritical())
bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelSVTRocket.png"));
else
bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelSRocket.png"));
missile.renderAll(0.0625F);
GL11.glPopMatrix();
}
@Override
public void doRender(Entity rocket, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
float p_76986_9_) {
doRender((EntityRocketHoming)rocket, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
@Override
protected ResourceLocation getEntityTexture(Entity p_110775_1_) {