diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 54b40ffb7..bf322d439 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -5,9 +5,11 @@ itemGroup.tabNuke=NTM Bomben und Ausrüstung itemGroup.tabMachine=NTM Vorlagen achievement.sacrifice=Sororizid -achievement.sacrifice.desc=Überlebe den Flammentod. +achievement.sacrifice.desc=Sterbe im Feuer, aber irgendwie auch nicht. achievement.impossible=Vollkommen unmöglich achievement.impossible.desc=Du kannst diese Errungenschaft nicht bekommen. +achievement.tasteofblood=Der Geschmack von Blut +achievement.tasteofblood.desc=ist nicht Teil des Testprotokolls. potion.hbm_taint=Verdorben diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 30a836004..25ccf16ac 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -8,6 +8,8 @@ achievement.sacrifice=Sororicide achievement.sacrifice.desc=Face the fire and live. achievement.impossible=Literally impossible achievement.impossible.desc=You can't get this achievement. +achievement.tasteofblood=The Taste of Blood +achievement.tasteofblood.desc=is not part of any testing protocol. potion.hbm_taint=Tainted @@ -176,7 +178,7 @@ item.fleija_core.name=F.L.E.I.J.A. Uranium 235 Charge item.solinium_igniter.name=SOL Pulse Igniter item.solinium_propellant.name=SOL Compression Charge -item.solinium_core.name=Semistable Solinium Core +item.solinium_core.name=Semi-Stable Solinium Core container.nukeGadget=The Gadget container.nukeBoy=Little Boy diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index 027943a23..89108d493 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -91,5 +91,9 @@ "alarm.hatch": {"category": "record", "sounds": [{"name": "alarm/lpfhaiwg", "stream": false}]}, "alarm.razortrainHorn": {"category": "record", "sounds": [{"name": "alarm/razortrainHorn", "stream": false}]}, "alarm.sweepSiren": {"category": "record", "sounds": [{"name": "alarm/sweepSiren", "stream": false}]}, - "alarm.trainHorn": {"category": "record", "sounds": [{"name": "alarm/trainHorn", "stream": false}]} + "alarm.trainHorn": {"category": "record", "sounds": [{"name": "alarm/trainHorn", "stream": false}]}, + "alarm.blastDoorAlarm": {"category": "record", "sounds": [{"name": "alarm/blastDoorAlarm", "stream": false}]}, + "alarm.klaxon": {"category": "record", "sounds": [{"name": "alarm/klaxon", "stream": false}]}, + "alarm.striderSiren": {"category": "record", "sounds": [{"name": "alarm/striderSiren", "stream": false}]}, + "alarm.regularSiren": {"category": "record", "sounds": [{"name": "alarm/regularSiren", "stream": false}]} } diff --git a/assets/hbm/sounds/alarm/blastDoorAlarm.ogg b/assets/hbm/sounds/alarm/blastDoorAlarm.ogg new file mode 100644 index 000000000..311baebbf Binary files /dev/null and b/assets/hbm/sounds/alarm/blastDoorAlarm.ogg differ diff --git a/assets/hbm/sounds/alarm/klaxon.ogg b/assets/hbm/sounds/alarm/klaxon.ogg new file mode 100644 index 000000000..4956dd8b5 Binary files /dev/null and b/assets/hbm/sounds/alarm/klaxon.ogg differ diff --git a/assets/hbm/sounds/alarm/regularSiren.ogg b/assets/hbm/sounds/alarm/regularSiren.ogg new file mode 100644 index 000000000..2d72bef38 Binary files /dev/null and b/assets/hbm/sounds/alarm/regularSiren.ogg differ diff --git a/assets/hbm/sounds/alarm/striderSiren.ogg b/assets/hbm/sounds/alarm/striderSiren.ogg new file mode 100644 index 000000000..383734090 Binary files /dev/null and b/assets/hbm/sounds/alarm/striderSiren.ogg differ diff --git a/assets/hbm/textures/gui/celprime_cmd.png b/assets/hbm/textures/gui/celprime_cmd.png new file mode 100644 index 000000000..c998a016b Binary files /dev/null and b/assets/hbm/textures/gui/celprime_cmd.png differ diff --git a/assets/hbm/textures/gui/celprime_cmd_alt.png b/assets/hbm/textures/gui/celprime_cmd_alt.png new file mode 100644 index 000000000..7acf0bd22 Binary files /dev/null and b/assets/hbm/textures/gui/celprime_cmd_alt.png differ diff --git a/assets/hbm/textures/gui/celprime_cmd_alt_thirdslot.png b/assets/hbm/textures/gui/celprime_cmd_alt_thirdslot.png new file mode 100644 index 000000000..4b99022e7 Binary files /dev/null and b/assets/hbm/textures/gui/celprime_cmd_alt_thirdslot.png differ diff --git a/assets/hbm/textures/gui/celprime_cmd_thirdslot.png b/assets/hbm/textures/gui/celprime_cmd_thirdslot.png new file mode 100644 index 000000000..21801f6a4 Binary files /dev/null and b/assets/hbm/textures/gui/celprime_cmd_thirdslot.png differ diff --git a/assets/hbm/textures/items/capacitor.png b/assets/hbm/textures/items/capacitor.png index d301355f1..fbe101a7a 100644 Binary files a/assets/hbm/textures/items/capacitor.png and b/assets/hbm/textures/items/capacitor.png differ diff --git a/com/hbm/items/tool/ItemCassette.java b/com/hbm/items/tool/ItemCassette.java index a43deef2c..f081de206 100644 --- a/com/hbm/items/tool/ItemCassette.java +++ b/com/hbm/items/tool/ItemCassette.java @@ -28,11 +28,15 @@ public class ItemCassette extends Item { HATCH( "Hatch Siren", new ResourceLocation("hbm:alarm.hatch"), SoundType.LOOP, 3358839, 250), ATUOPILOT( "Autopilot Disconnected", new ResourceLocation("hbm:alarm.autopilot"), SoundType.LOOP, 11908533, 50), AMS_SIREN( "AMS Siren", new ResourceLocation("hbm:alarm.amsSiren"), SoundType.LOOP, 15055698, 50), + BLAST_DOOR( "Blast Door Alarm", new ResourceLocation("hbm:alarm.blastDoorAlarm"), SoundType.LOOP, 11665408, 50), APC_LOOP( "APC Siren", new ResourceLocation("hbm:alarm.apcLoop"), SoundType.LOOP, 3565216, 50), + KLAXON( "Klaxon", new ResourceLocation("hbm:alarm.klaxon"), SoundType.LOOP, 8421504, 50), + SIREN( "Standard Siren", new ResourceLocation("hbm:alarm.regularSiren"), SoundType.LOOP, 6684672, 100), BANK_ALARM( "Bank Alarm", new ResourceLocation("hbm:alarm.bankAlarm"), SoundType.LOOP, 3572962, 100), BEEP_SIREN( "Beep Siren", new ResourceLocation("hbm:alarm.beepSiren"), SoundType.LOOP, 13882323, 100), CONTAINER_ALARM( "Container Alarm", new ResourceLocation("hbm:alarm.containerAlarm"), SoundType.LOOP, 14727839, 100), SWEEP_SIREN( "Sweep Siren", new ResourceLocation("hbm:alarm.sweepSiren"), SoundType.LOOP, 15592026, 500), + STRIDER_SIREN( "Missile Silo Siren", new ResourceLocation("hbm:alarm.striderSiren"), SoundType.LOOP, 11250586, 500), APC_PASS( "APC Pass", new ResourceLocation("hbm:alarm.apcPass"), SoundType.PASS, 3422163, 50), RAZORTRAIN( "Razortrain Horn", new ResourceLocation("hbm:alarm.razortrainHorn"), SoundType.SOUND, 7819501, 250); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 90ff46ed4..6d133525c 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -372,8 +372,10 @@ public class MainRegistry public static Achievement achRadiation; public static Achievement achSchrabidium; public static Achievement achEuphemium; + public static Achievement achSacrifice; public static Achievement achImpossible; + public static Achievement achTOB; public static boolean enableDebugMode = true; public static boolean enableMycelium = false; @@ -876,10 +878,12 @@ public class MainRegistry }));*/ achSacrifice = new Achievement("achievement.sacrifice", "sacrifice", 0, 0, ModItems.burnt_bark, null).initIndependentStat().setSpecial().registerStat(); achImpossible = new Achievement("achievement.impossible", "impossible", 2, 0, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat(); + achTOB = new Achievement("achievement.tasteofblood", "tasteofblood", 0, 2, new ItemStack(ModItems.fluid_icon, 1, FluidType.ASCHRAB.getID()), null).initIndependentStat().setSpecial().registerStat(); AchievementPage.registerAchievementPage(new AchievementPage("NTM Achievements", new Achievement[]{ achSacrifice, - achImpossible + achImpossible, + achTOB })); OreDictionary.registerOre("ingotUranium", ModItems.ingot_uranium);