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

relay satellite achievement, new takeoff sound, info panel for AMS base

Browse Source
This commit is contained in:
HbmMods 2018-05-13 13:05:08 +02:00
parent cd3f2d191e
commit a8eb038b65
9 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,8 @@ achievement.c20_5=Kapitel [ZWANZIG KOMMA FÜNF]
achievement.c20_5.desc=???
achievement.space=Die finale Grenz-ach vergiss es
achievement.space.desc=Scheitere in jeder möglichen Weise und verschwende 90 Millionen Dollar an Forschungsgeldern.
achievement.FOEQ=Pegasi und Raketensilos
achievement.FOEQ.desc=Sende ein Relais in den Mars-...ich meine Duna-Orbit.
potion.hbm_taint=Verdorben
potion.hbm_taint_boost=Verdorbenes Herz

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

@ -27,6 +27,8 @@ achievement.c20_5=Chapter [TWENTY POINT FIVE]
achievement.c20_5.desc=???
achievement.space=The Final Front-ah forget it
achievement.space.desc=Fail in every way possible and waste funds worth 90 million dollars.
achievement.FOEQ=Pegasi and Missile Silos
achievement.FOEQ.desc=Send a relay into martian...I mean dunaian orbit.
potion.hbm_taint=Tainted
potion.hbm_taint_boost=Tainted Heart

1
assets/hbm/sounds.json
View File

@ -79,6 +79,7 @@
"entity.chopperMineLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperMineLoop", "stream": false}]},
"entity.chopperCrashingLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperCrashingLoop", "stream": true}]},
"entity.oldExplosion": {"category": "ambient", "sounds": [{"name": "entity/oldExplosion", "stream": false}]},
"entity.rocketTakeoff": {"category": "player", "sounds": [{"name": "entity/rocketTakeoff", "stream": false}]},
"potatos.random": {"category": "player", "sounds": ["potatos/randResponse0", "potatos/randResponse1", "potatos/randResponse2", "potatos/randResponse3", "potatos/randResponse4", "potatos/randResponse5", "potatos/randResponse6", "potatos/randResponse7"]},

BIN
assets/hbm/sounds/entity/rocketTakeoff.ogg Normal file
View File

Binary file not shown.

2
com/hbm/blocks/bomb/LaunchPad.java
View File

@ -433,7 +433,7 @@ public class LaunchPad extends BlockContainer implements IBomb {
entity.power -= 75000;
entity.slots[0] = null;
p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F);
p_149695_1_.playSoundEffect(x, y, z, "hbm:entity.rocketTakeoff", 100.0F, 1.0F);
}
if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_anti_ballistic && entity.power >= 75000)

5
com/hbm/entity/missile/EntityCarrier.java
View File

@ -121,6 +121,11 @@ public class EntityCarrier extends EntityThrowable {
((EntityPlayer)p).triggerAchievement(MainRegistry.achSpace);
}
if(payload.getItem() == ModItems.sat_foeq) {
for(Object p : worldObj.playerEntities)
((EntityPlayer)p).triggerAchievement(MainRegistry.achFOEQ);
}
if(payload.getItem() instanceof ItemSatChip) {
SatelliteSavedData data = (SatelliteSavedData)worldObj.perWorldStorage.loadData(SatelliteSavedData.class, "satellites");
if(data == null) {

10
com/hbm/inventory/gui/GUIAMSBase.java
View File

@ -36,6 +36,13 @@ public class GUIAMSBase extends GuiInfoContainer {
this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 44, guiTop + 124 - 106, 7, 106, new String[] { "Restriction Field:", base.field + "%" });
this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 53, guiTop + 124 - 106, 7, 106, new String[] { "Efficiency:", base.efficiency + "%" });
this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 125, guiTop + 124 - 106, 7, 106, new String[] { "Heat:", base.heat + "/" + TileEntityAMSBase.maxHeat });
if(!base.hasResonators()) {
String[] text = new String[] { "Error: Three satellite ID-chips linked",
"to xenium resonators are required",
"for this machine to work!" };
this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text);
}
}
@Override
@ -79,6 +86,9 @@ public class GUIAMSBase extends GuiInfoContainer {
drawTexturedModalRect(guiLeft + 61, guiTop + 44, 176, 106, 54, 54);
}
if(!base.hasResonators())
this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 6);
Minecraft.getMinecraft().getTextureManager().bindTexture(base.tanks[0].getSheet());
base.tanks[0].renderTank(this, guiLeft + 26, guiTop + 70, base.tanks[0].getTankType().textureX() * FluidTank.x, base.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52);

2
com/hbm/items/ModItems.java
View File

@ -2417,7 +2417,7 @@ public class ModItems {
void_anim = new Item().setUnlocalizedName("void_anim").setTextureName(RefStrings.MODID + ":void_anim");
mysteryshovel = new ItemMS().setUnlocalizedName("mysteryshovel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cursed_shovel");
memory = new ItemBattery(Long.MAX_VALUE / 100L, 10000000, 10000000).setUnlocalizedName("memory").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mo8_anim");
memory = new ItemBattery(Long.MAX_VALUE / 100L, 100000, 100000).setUnlocalizedName("memory").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mo8_anim");
FluidContainerRegistry.registerFluidContainer(new FluidStack(ModBlocks.mud_fluid, 1000), new ItemStack(ModItems.bucket_mud));
FluidContainerRegistry.registerFluidContainer(new FluidStack(ModBlocks.acid_fluid, 1000), new ItemStack(ModItems.bucket_acid));

5
com/hbm/main/MainRegistry.java
View File

@ -411,6 +411,7 @@ public class MainRegistry
public static Achievement achC44;
public static Achievement achC20_5;
public static Achievement achSpace;
public static Achievement achFOEQ;
public static boolean enableDebugMode = true;
public static boolean enableMycelium = false;
@ -938,6 +939,7 @@ public class MainRegistry
achC44 = new Achievement("achievement.c44", "c44", 2, -2, ModItems.gun_revolver_pip, null).initIndependentStat().setSpecial().registerStat();
achC20_5 = new Achievement("achievement.c20_5", "c20_5", 4, -2, ModItems.gun_dampfmaschine, null).initIndependentStat().setSpecial().registerStat();
achSpace = new Achievement("achievement.space", "space", 4, 0, ModItems.missile_carrier, null).initIndependentStat().setSpecial().registerStat();
achFOEQ = new Achievement("achievement.FOEQ", "FOEQ", 4, 2, ModItems.sat_foeq, null).initIndependentStat().setSpecial().registerStat();
AchievementPage.registerAchievementPage(new AchievementPage("Nuclear Tech", new Achievement[]{
achSacrifice,
@ -948,7 +950,8 @@ public class MainRegistry
achPotato,
achC44,
achC20_5,
achSpace
achSpace,
achFOEQ
}));
OreDictionary.registerOre("ingotUranium", ModItems.ingot_uranium);