mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
it's incredible how easy it is
This commit is contained in:
Bob
parent
3376792c41
commit
128c147b69
@ -507,9 +507,9 @@ public class BulletConfigSyncingUtil {
|
||||
|
||||
configSet.put(NUKE_AMAT, GunFatmanFactory.getBalefireConfig());
|
||||
|
||||
configSet.put(TWR_RAY, GunEnergyFactory.getSingConfig());
|
||||
configSet.put(HLR_NORMAL, GunEnergyFactory.getHLRPrecisionConfig());
|
||||
configSet.put(HLR_ALT, GunEnergyFactory.getHLRScatterConfig());
|
||||
//configSet.put(TWR_RAY, GunEnergyFactory.getSingConfig());
|
||||
//configSet.put(HLR_NORMAL, GunEnergyFactory.getHLRPrecisionConfig());
|
||||
//configSet.put(HLR_ALT, GunEnergyFactory.getHLRScatterConfig());
|
||||
|
||||
configSet.put(ZOMG_BOLT, GunEnergyFactory.getZOMGBoltConfig());
|
||||
configSet.put(DET_BOLT, GunDetonatorFactory.getLaserConfig());
|
||||
|
||||
@ -581,13 +581,14 @@ public class AnvilRecipes {
|
||||
|
||||
for(Object[] objs : recs) {
|
||||
|
||||
ComparableStack ammoIn = new ComparableStack((ItemStack) objs[0]);
|
||||
ItemStack out = (ItemStack) objs[2];
|
||||
|
||||
if(objs[1] instanceof Item) {
|
||||
constructionRecipes.add(new AnvilConstructionRecipe(new AStack[] { new ComparableStack((Item)objs[0], (int)objs[3]), new ComparableStack((Item)objs[1], 1) },
|
||||
new AnvilOutput(new ItemStack((Item)objs[2], (int)objs[3]))).setTier((int)objs[4]));
|
||||
constructionRecipes.add(new AnvilConstructionRecipe(new AStack[] { ammoIn, new ComparableStack((Item)objs[1], 1) }, new AnvilOutput(out)).setTier((int)objs[3]));
|
||||
|
||||
} else if(objs[1] instanceof String) {
|
||||
constructionRecipes.add(new AnvilConstructionRecipe(new AStack[] { new ComparableStack((Item)objs[0], (int)objs[3]), new OreDictStack((String)objs[1], 1) },
|
||||
new AnvilOutput(new ItemStack((Item)objs[2], (int)objs[3]))).setTier((int)objs[4]));
|
||||
constructionRecipes.add(new AnvilConstructionRecipe(new AStack[] { ammoIn, new OreDictStack((String)objs[1], 1) }, new AnvilOutput(out)).setTier((int)objs[3]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3,12 +3,8 @@ package com.hbm.items.weapon;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
|
||||
import com.hbm.handler.BulletConfiguration;
|
||||
import com.hbm.handler.indexing.AmmoIndex;
|
||||
import com.hbm.handler.indexing.AmmoIndex.AmmoTrait;
|
||||
import com.hbm.items.ItemAmmoEnums.AmmoRocket;
|
||||
import com.hbm.items.ItemAmmoEnums.IAmmoItemEnum;
|
||||
import com.hbm.items.ItemEnumMulti;
|
||||
@ -18,10 +14,13 @@ import com.hbm.main.MainRegistry;
|
||||
import com.hbm.util.EnumUtil;
|
||||
import com.hbm.util.I18nUtil;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
public class ItemAmmo extends ItemEnumMulti {
|
||||
|
||||
@ -133,8 +132,8 @@ public class ItemAmmo extends ItemEnumMulti {
|
||||
list.add(player.worldObj.rand.nextInt(3) < 2 ? EnumChatFormatting.RED + "COVER YOURSELF IN OIL" : EnumChatFormatting.RED + "" + EnumChatFormatting.OBFUSCATED + "COVER YOURSELF IN OIL");
|
||||
}
|
||||
|
||||
final IAmmoItemEnum item = (IAmmoItemEnum) EnumUtil.grabEnumSafely(theEnum, stack.getItemDamage());
|
||||
final Set<AmmoItemTrait> ammoTraits = item.getTraits();
|
||||
IAmmoItemEnum item = (IAmmoItemEnum) EnumUtil.grabEnumSafely(theEnum, stack.getItemDamage());
|
||||
Set<AmmoItemTrait> ammoTraits = item.getTraits();
|
||||
|
||||
if(ammoTraits.size() > 0) {
|
||||
|
||||
@ -152,6 +151,23 @@ public class ItemAmmo extends ItemEnumMulti {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IIconRegister reg) {
|
||||
Enum[] enums = theEnum.getEnumConstants();
|
||||
this.icons = new IIcon[enums.length];
|
||||
|
||||
for(int i = 0; i < icons.length; i++) {
|
||||
IAmmoItemEnum num = (IAmmoItemEnum) enums[i];
|
||||
this.icons[i] = reg.registerIcon(RefStrings.MODID + ":" + num.getInternalName());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack stack) {
|
||||
IAmmoItemEnum num = EnumUtil.grabEnumSafely(theEnum, stack.getItemDamage());
|
||||
return "item." + num.getInternalName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemEnumMulti setUnlocalizedName(String uloc) {
|
||||
|
||||
@ -9,32 +9,22 @@ import com.hbm.entity.projectile.EntityBulletBase;
|
||||
import com.hbm.handler.BulletConfigSyncingUtil;
|
||||
import com.hbm.handler.BulletConfiguration;
|
||||
import com.hbm.handler.GunConfiguration;
|
||||
import com.hbm.handler.HbmKeybinds;
|
||||
import com.hbm.interfaces.IHoldableWeapon;
|
||||
import com.hbm.items.machine.ItemBattery;
|
||||
import com.hbm.items.weapon.ItemGunBase;
|
||||
import com.hbm.main.MainRegistry;
|
||||
import com.hbm.packet.AuxParticlePacketNT;
|
||||
import com.hbm.packet.GunAnimationPacket;
|
||||
import com.hbm.packet.GunButtonPacket;
|
||||
import com.hbm.packet.PacketDispatcher;
|
||||
import com.hbm.packet.PlayerInformPacket;
|
||||
import com.hbm.render.anim.HbmAnimations.AnimType;
|
||||
import com.hbm.render.util.RenderScreenOverlay;
|
||||
import com.hbm.render.util.RenderScreenOverlay.Crosshair;
|
||||
import com.hbm.util.BobMathUtil;
|
||||
import com.hbm.util.ChatBuilder;
|
||||
import com.hbm.util.I18nUtil;
|
||||
|
||||
import api.hbm.energy.IBatteryItem;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.client.settings.GameSettings;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.Item;
|
||||
@ -56,28 +46,11 @@ public class ItemEnergyGunBase extends ItemGunBase implements IBatteryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
|
||||
list.add("Energy Stored: " + BobMathUtil.getShortNumber(getCharge(stack)) + "/" + BobMathUtil.getShortNumber(mainConfig.maxCharge) + "HE");
|
||||
list.add("Charge rate: " + BobMathUtil.getShortNumber(mainConfig.chargeRate) + "HE/t");
|
||||
|
||||
BulletConfiguration config = getConfig(stack);
|
||||
|
||||
list.add("");
|
||||
list.add("Mode: " + I18nUtil.resolveKey(config.modeName));
|
||||
list.add("Mode info:");
|
||||
list.add("Average damage: " + ((float)(config.dmgMax + config.dmgMin) / 2F));
|
||||
list.add("Firing Rate: " + BobMathUtil.roundDecimal((1F / (((float)config.firingRate) / 20F)), 2) + " rounds per second");
|
||||
list.add("Power Consumption per Shot: " + BobMathUtil.getShortNumber(config.dischargePerShot) + "HE");
|
||||
|
||||
list.add("");
|
||||
list.add("Name: " + mainConfig.name);
|
||||
list.add("Manufacturer: " + mainConfig.manufacturer);
|
||||
|
||||
if(!mainConfig.comment.isEmpty()) {
|
||||
list.add("");
|
||||
for(String s : mainConfig.comment)
|
||||
list.add(EnumChatFormatting.ITALIC + s);
|
||||
}
|
||||
addAdditionalInformation(stack, list);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -17,6 +17,8 @@ import com.hbm.inventory.fluid.Fluids;
|
||||
import static com.hbm.inventory.OreDictManager.*;
|
||||
|
||||
import com.hbm.items.ModItems;
|
||||
import com.hbm.items.ItemAmmoEnums.Ammo50BMG;
|
||||
import com.hbm.items.ItemAmmoEnums.Ammo5mm;
|
||||
import com.hbm.items.ItemEnums.EnumLegendaryType;
|
||||
import com.hbm.items.ItemEnums.EnumPlantType;
|
||||
import com.hbm.items.ItemGenericPart.EnumPartType;
|
||||
@ -229,7 +231,7 @@ public class CraftingManager {
|
||||
|
||||
ItemStack infinity = new ItemStack(Items.enchanted_book);
|
||||
EnchantmentUtil.addEnchantment(infinity, Enchantment.infinity, 1);
|
||||
addRecipeAuto(infinity, new Object[] { "SBS", "BDB", "SBS", 'S', ModItems.ammo_50bmg_star, 'B', ModItems.ammo_5mm_star, 'D', ModItems.powder_magic });
|
||||
addRecipeAuto(infinity, new Object[] { "SBS", "BDB", "SBS", 'S', ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.STAR), 'B', ModItems.ammo_5mm.stackFromEnum(Ammo5mm.STAR), 'D', ModItems.powder_magic });
|
||||
ItemStack unbreaking = new ItemStack(Items.enchanted_book);
|
||||
EnchantmentUtil.addEnchantment(unbreaking, Enchantment.unbreaking, 3);
|
||||
addRecipeAuto(unbreaking, new Object[] { "SBS", "BDB", "SBS", 'S', BIGMT.ingot(), 'B', ModItems.plate_armor_lunar, 'D', ModItems.powder_magic });
|
||||
|
||||
@ -21,29 +21,6 @@ public class ResourceManager {
|
||||
////Obj TEs
|
||||
|
||||
//Turrets
|
||||
public static final IModelCustom turret_heavy_base = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_heavy_base.obj"));
|
||||
public static final IModelCustom turret_heavy_rotor = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_heavy_rotor.obj"));
|
||||
|
||||
public static final IModelCustom turret_spitfire_base = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_spitfire_base.obj"));
|
||||
public static final IModelCustom turret_spitfire_rotor = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_spitfire_rotor.obj"));
|
||||
|
||||
public static final IModelCustom turret_cwis_base = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/cwis_base.obj"));
|
||||
public static final IModelCustom turret_cwis_rotor = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/cwis_rotor.obj"));
|
||||
|
||||
public static final IModelCustom turret_cheapo_base = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_cheapo_base.obj"));
|
||||
public static final IModelCustom turret_cheapo_rotor = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_cheapo_rotor.obj"));
|
||||
|
||||
public static final IModelCustom turret_heavy_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_heavy_gun.obj"));
|
||||
public static final IModelCustom turret_rocket_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_rocket_gun.obj"));
|
||||
public static final IModelCustom turret_light_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_light_gun.obj"));
|
||||
public static final IModelCustom turret_flamer_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_flamer_gun.obj"));
|
||||
public static final IModelCustom turret_tau_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_tau_gun.obj"));
|
||||
public static final IModelCustom turret_spitfire_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_spitfire_gun.obj"));
|
||||
public static final IModelCustom turret_cwis_head = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/cwis_head.obj"));
|
||||
public static final IModelCustom turret_cwis_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/cwis_gun.obj"));
|
||||
public static final IModelCustom turret_cheapo_head = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_cheapo_head.obj"));
|
||||
public static final IModelCustom turret_cheapo_gun = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turret_cheapo_gun.obj"));
|
||||
|
||||
public static final IModelCustom turret_chekhov = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/turrets/turret_chekhov.obj"));
|
||||
public static final IModelCustom turret_jeremy = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/turrets/turret_jeremy.obj"));
|
||||
public static final IModelCustom turret_tauon = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/turrets/turret_tauon.obj"));
|
||||
@ -339,28 +316,7 @@ public class ResourceManager {
|
||||
|
||||
public static final ResourceLocation universal = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png");
|
||||
public static final ResourceLocation universal_bright = new ResourceLocation(RefStrings.MODID, "textures/models/turbofan_blades.png");
|
||||
|
||||
public static final ResourceLocation turret_heavy_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_heavy_base.png");
|
||||
|
||||
public static final ResourceLocation turret_heavy_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_heavy_rotor.png");
|
||||
public static final ResourceLocation turret_heavy_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_heavy_gun.png");
|
||||
public static final ResourceLocation turret_light_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_light_rotor.png");
|
||||
public static final ResourceLocation turret_light_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_light_gun.png");
|
||||
public static final ResourceLocation turret_rocket_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_rocket_rotor.png");
|
||||
public static final ResourceLocation turret_rocket_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_rocket_gun.png");
|
||||
public static final ResourceLocation turret_flamer_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_flamer_rotor.png");
|
||||
public static final ResourceLocation turret_flamer_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_flamer_gun.png");
|
||||
public static final ResourceLocation turret_tau_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_tau_rotor.png");
|
||||
public static final ResourceLocation turret_tau_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_tau_gun.png");
|
||||
public static final ResourceLocation turret_ciws_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/cwis_base.png");
|
||||
public static final ResourceLocation turret_ciws_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/cwis_rotor.png");
|
||||
public static final ResourceLocation turret_ciws_head_tex = new ResourceLocation(RefStrings.MODID, "textures/models/cwis_head.png");
|
||||
public static final ResourceLocation turret_ciws_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/cwis_gun.png");
|
||||
public static final ResourceLocation turret_cheapo_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_cheapo_base.png");
|
||||
public static final ResourceLocation turret_cheapo_rotor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_cheapo_rotor.png");
|
||||
public static final ResourceLocation turret_cheapo_head_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_cheapo_head.png");
|
||||
public static final ResourceLocation turret_cheapo_gun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turret_cheapo_gun.png");
|
||||
|
||||
public static final ResourceLocation turret_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turrets/base.png");
|
||||
public static final ResourceLocation turret_base_friendly_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turrets/base_friendly.png");
|
||||
public static final ResourceLocation turret_carriage_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turrets/carriage.png");
|
||||
|
||||
@ -8,8 +8,8 @@ import com.hbm.items.weapon.ItemGunBase;
|
||||
import com.hbm.main.ResourceManager;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
public class ItemRenderFireExt implements IItemRenderer {
|
||||
@ -43,14 +43,14 @@ public class ItemRenderFireExt implements IItemRenderer {
|
||||
|
||||
int magType = ItemGunBase.getMagType(item);
|
||||
int config = ((ItemGunBase)ModItems.gun_fireext).mainConfig.config.get(magType);
|
||||
Item ammo = BulletConfigSyncingUtil.pullConfig(config).ammo;
|
||||
|
||||
if(ammo == ModItems.ammo_fireext_foam)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.fireext_foam_tex);
|
||||
else if(ammo == ModItems.ammo_fireext_sand)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.fireext_sand_tex);
|
||||
else
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.fireext_tex);
|
||||
int ammo = BulletConfigSyncingUtil.pullConfig(config).ammo.meta;
|
||||
ResourceLocation tex;
|
||||
switch (ammo) {
|
||||
case 0: tex = ResourceManager.fireext_foam_tex; break;
|
||||
case 1: tex = ResourceManager.fireext_sand_tex; break;
|
||||
default: tex = ResourceManager.fireext_tex; break;
|
||||
}
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(tex);
|
||||
|
||||
switch(type) {
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@ import com.hbm.entity.projectile.EntityBulletBase;
|
||||
import com.hbm.handler.BulletConfigSyncingUtil;
|
||||
import com.hbm.handler.BulletConfiguration;
|
||||
import com.hbm.interfaces.IControlReceiver;
|
||||
import com.hbm.inventory.RecipesCommon.ComparableStack;
|
||||
import com.hbm.items.ModItems;
|
||||
import com.hbm.items.machine.ItemTurretBiometry;
|
||||
import com.hbm.lib.Library;
|
||||
@ -31,7 +32,6 @@ import net.minecraft.entity.item.EntityMinecart;
|
||||
import net.minecraft.entity.monster.IMob;
|
||||
import net.minecraft.entity.passive.IAnimals;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.potion.Potion;
|
||||
@ -315,7 +315,7 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple
|
||||
|
||||
BulletConfiguration conf = BulletConfigSyncingUtil.pullConfig(c);
|
||||
|
||||
if(conf.ammo == slots[i].getItem())
|
||||
if(conf.ammo != null && conf.ammo.matchesRecipe(slots[i], true))
|
||||
return conf;
|
||||
}
|
||||
}
|
||||
@ -338,11 +338,11 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple
|
||||
worldObj.spawnEntityInWorld(proj);
|
||||
}
|
||||
|
||||
public void conusmeAmmo(Item ammo) {
|
||||
public void conusmeAmmo(ComparableStack ammo) {
|
||||
|
||||
for(int i = 1; i < 10; i++) {
|
||||
|
||||
if(slots[i] != null && slots[i].getItem() == ammo) {
|
||||
if(slots[i] != null && ammo.matchesRecipe(slots[i], true)) {
|
||||
|
||||
this.decrStackSize(i, 1);
|
||||
return;
|
||||
@ -756,7 +756,7 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple
|
||||
BulletConfiguration config = BulletConfigSyncingUtil.pullConfig(i);
|
||||
|
||||
if(config != null && config.ammo != null) {
|
||||
ammoStacks.add(new ItemStack(config.ammo));
|
||||
ammoStacks.add(config.ammo.toStack());
|
||||
}
|
||||
}
|
||||
|
||||
@ -781,10 +781,12 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple
|
||||
return this.isOn;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPower(long i) {
|
||||
this.power = i;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public long getPower() {
|
||||
return this.power;
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.entity.projectile.EntityArtilleryRocket;
|
||||
import com.hbm.inventory.RecipesCommon.ComparableStack;
|
||||
import com.hbm.inventory.container.ContainerTurretBase;
|
||||
import com.hbm.inventory.gui.GUITurretHIMARS;
|
||||
import com.hbm.items.ModItems;
|
||||
@ -198,7 +199,7 @@ public class TileEntityTurretHIMARS extends TileEntityTurretBaseArtillery implem
|
||||
HIMARSRocket type = ItemAmmoHIMARS.itemTypes[available];
|
||||
this.typeLoaded = available;
|
||||
this.ammo = type.amount;
|
||||
this.conusmeAmmo(ModItems.ammo_himars);
|
||||
this.conusmeAmmo(new ComparableStack(ModItems.ammo_himars, 1, available));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,6 +6,8 @@ import java.util.List;
|
||||
import com.hbm.entity.projectile.EntityBulletBase;
|
||||
import com.hbm.handler.BulletConfigSyncingUtil;
|
||||
import com.hbm.handler.BulletConfiguration;
|
||||
import com.hbm.inventory.RecipesCommon.ComparableStack;
|
||||
import com.hbm.items.ItemAmmoEnums.AmmoRocket;
|
||||
import com.hbm.items.ModItems;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@ -128,7 +130,7 @@ public class TileEntityTurretRichard extends TileEntityTurretBaseNT {
|
||||
this.worldObj.playSoundEffect(xCoord, yCoord, zCoord, "hbm:turret.richard_fire", 2.0F, 1.0F);
|
||||
this.loaded--;
|
||||
|
||||
if(conf.ammo == ModItems.ammo_rocket_nuclear)
|
||||
if(conf.ammo.equals(new ComparableStack(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.NUCLEAR))))
|
||||
timer = -50;
|
||||
|
||||
} else {
|
||||
|
||||
@ -5,6 +5,7 @@ import java.util.Random;
|
||||
import com.hbm.blocks.ModBlocks;
|
||||
import com.hbm.blocks.generic.BlockLoot.TileEntityLoot;
|
||||
import com.hbm.items.ModItems;
|
||||
import com.hbm.items.ItemAmmoEnums.AmmoFatman;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@ -27,7 +28,7 @@ public class LootGenerator {
|
||||
if(loot != null && loot.items.isEmpty()) {
|
||||
|
||||
if(world.rand.nextInt(5) == 0)
|
||||
loot.addItem(new ItemStack(ModItems.ammo_nuke_low), -0.25, 0, -0.125);
|
||||
loot.addItem(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.LOW), -0.25, 0, -0.125);
|
||||
else
|
||||
loot.addItem(new ItemStack(ModItems.ammo_rocket), -0.25, 0, -0.25);
|
||||
|
||||
@ -122,8 +123,8 @@ public class LootGenerator {
|
||||
|
||||
if(world.rand.nextBoolean() || memes) {
|
||||
int type = world.rand.nextInt(11);
|
||||
Item nuke = memes ? ModItems.ammo_nuke_pumpkin : type == 0 ? ModItems.ammo_nuke : type <= 5 ? ModItems.ammo_nuke_low : ModItems.ammo_nuke_safe;
|
||||
loot.addItem(new ItemStack(nuke), -0.375 + i * 0.25, 0, -0.375 + j * 0.25);
|
||||
AmmoFatman nuke = memes ? AmmoFatman.PUMPKIN : type == 0 ? AmmoFatman.STOCK : type <= 5 ? AmmoFatman.LOW : AmmoFatman.SAFE;
|
||||
loot.addItem(ModItems.ammo_nuke.stackFromEnum(nuke), -0.375 + i * 0.25, 0, -0.375 + j * 0.25);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1759,7 +1759,7 @@ item.gun_moist_nugget.name=Mosin-Nagant
|
||||
item.gun_mp.name=Maschinengewehr des Pazifisten
|
||||
item.gun_mp40.name=Maschinenpistole
|
||||
item.gun_mp40_ammo.name=SMG-Patrone (LEGACY)
|
||||
item.gun_mp_ammo.name=Kleine treibmittellose MG-Patrone
|
||||
item.gun_pm_ammo.name=Kleine treibmittellose MG-Patrone
|
||||
item.gun_mymy.name=Nietes
|
||||
item.gun_osipr.name=Standartausrüstung für Sicherheitskräfte
|
||||
item.gun_osipr_ammo.name=Dunkler Energiepuls-Plug
|
||||
|
||||
@ -793,12 +793,6 @@ death.attack.tau=%1$s was riddeled by %2$s using negatively charged tauons.
|
||||
death.attack.tauBlast=%1$s charged the XVL1456 for too long and was blown into pieces.
|
||||
death.attack.teleporter=%1$s was teleported into nothingness.
|
||||
|
||||
desc.item.pileRod=§eUse on drilled graphite to insert$§eUse screwdriver to extract$
|
||||
desc.item.rtgDecay=Decays to: %s
|
||||
desc.item.rtgHeat=Power Level: %s
|
||||
desc.item.wasteCooling=Cool in a Spent Fuel Pool Drum
|
||||
desc.item.zirnoxBreedingRod=§2[ZIRNOX Breeding Rod]$§ePlace next to fuel rods to breed$§eLasts %d ticks
|
||||
desc.item.zirnoxRod=§a[ZIRNOX Fuel Rod]$§eGenerates %1$d heat per tick$§eLasts %2$d ticks
|
||||
desc.gui.assembler.warning=§cError:§r This machine requires an assembly template!
|
||||
desc.gui.chemplant.warning=§cError:§r This machine requires an chemistry template!
|
||||
desc.gui.gasCent.enrichment=§2Enrichment§r$Uranium enrichment requires cascades.$Two-centrifuge cascades will give$uranium fuel, four-centrifuge cascades$will give total separation.
|
||||
@ -825,6 +819,131 @@ desc.gui.zirnox.coolant=§3Coolant§r$CO2 transfers heat from the core to the wa
|
||||
desc.gui.zirnox.pressure=§6Pressure§r$Pressure can be reduced by venting CO2.$However, too low a pressure, and cooling$efficiency and steam production will be reduced.$Look out for meltdowns!
|
||||
desc.gui.zirnox.warning1=§cError:§r Water is required for$the reactor to function properly!
|
||||
desc.gui.zirnox.warning2=§cError:§r CO2 is required for$the reactor to function properly!
|
||||
desc.item.ammo.con_accuracy2=- Highly decreased accuracy
|
||||
desc.item.ammo.con_damage=- Highly decreased damage
|
||||
desc.item.ammo.con_heavy_wear=- Highly increased wear
|
||||
desc.item.ammo.con_ling_fire=- No lingering fire
|
||||
desc.item.ammo.con_nn=- Not even a nuke
|
||||
desc.item.ammo.con_no_damage=- No damage
|
||||
desc.item.ammo.con_no_explode1=- Non-explosive
|
||||
desc.item.ammo.con_no_explode2=- No block damage
|
||||
desc.item.ammo.con_no_explode3=- No splash damage
|
||||
desc.item.ammo.con_no_fire=- Not incendiary
|
||||
desc.item.ammo.con_no_mirv=- Not recommended for the Proto MIRV
|
||||
desc.item.ammo.con_penetration=- Not penetrating
|
||||
desc.item.ammo.con_radius=- Decreased blast radius
|
||||
desc.item.ammo.con_range2=- Highly decreased range
|
||||
desc.item.ammo.con_sing_projectile=- Single projectile
|
||||
desc.item.ammo.con_speed=- Decreased projectile speed
|
||||
desc.item.ammo.con_super_wear=- Very highly increased wear
|
||||
desc.item.ammo.con_wear=- Increased wear
|
||||
desc.item.ammo.neu_40mm=* It's a 40mm grenade that we squeezed to fit the barrel!
|
||||
desc.item.ammo.neu_blank=* It's a blank
|
||||
desc.item.ammo.neu_boat=* Boat
|
||||
desc.item.ammo.neu_boxcar=* Boxcar
|
||||
desc.item.ammo.neu_building=* Building
|
||||
desc.item.ammo.neu_chlorophyte=* Chlorophyte
|
||||
desc.item.ammo.neu_eraser=* For removing big mistakes
|
||||
desc.item.ammo.neu_fun=* Fun for the whole family!
|
||||
desc.item.ammo.neu_heavy_metal=* Heavy Metal
|
||||
desc.item.ammo.neu_homing=* Homing
|
||||
desc.item.ammo.neu_jolt=* Jolt
|
||||
desc.item.ammo.neu_less_bouncy=* Less bouncy
|
||||
desc.item.ammo.neu_maskman_flechette=* Fires a tracer which summons a storm of DU-flechettes
|
||||
desc.item.ammo.neu_maskman_meteorite=* Fires a high-damage round that summons a small meteorite
|
||||
desc.item.ammo.neu_more_bouncy=* Extra bouncy
|
||||
desc.item.ammo.neu_no_bounce=* Not bouncy
|
||||
desc.item.ammo.neu_no_con=* No drawbacks lole
|
||||
desc.item.ammo.neu_starmetal=* Starmetal
|
||||
desc.item.ammo.neu_tracer=* Tracer
|
||||
desc.item.ammo.neu_uhh=* Uhhh
|
||||
desc.item.ammo.neu_warcrime1=* Technically a warcrime
|
||||
desc.item.ammo.neu_warcrime2=* Twice the warcrime in a single round!
|
||||
desc.item.ammo.pro_accurate1=+ Increased accuracy
|
||||
desc.item.ammo.pro_accurate2=+ Near-perfect accuracy
|
||||
desc.item.ammo.pro_balefire=+ Balefire
|
||||
desc.item.ammo.pro_bomb_count=+ Increased bomb count
|
||||
desc.item.ammo.pro_caustic=+ Caustic
|
||||
desc.item.ammo.pro_chainsaw=+ Chainsaw
|
||||
desc.item.ammo.pro_chlorine=+ Chlorine gas
|
||||
desc.item.ammo.pro_damage=+ Increased damage
|
||||
desc.item.ammo.pro_damage_slight=+ Above average damage
|
||||
desc.item.ammo.pro_emp=+ EMP
|
||||
desc.item.ammo.pro_explosive=+ Explosive
|
||||
desc.item.ammo.pro_fallout=+ Fallout
|
||||
desc.item.ammo.pro_fit_357=+ Fits every .357 model
|
||||
desc.item.ammo.pro_flames=+ Increased flame count
|
||||
desc.item.ammo.pro_gravity=+ Decreased gravity
|
||||
desc.item.ammo.pro_heavy_damage=+ Highly increased damage
|
||||
desc.item.ammo.pro_incendiary=+ Incendiary
|
||||
desc.item.ammo.pro_lunatic=+ Lunatic
|
||||
desc.item.ammo.pro_marauder=+ Instantly removes annoying and unbalanced enemies
|
||||
desc.item.ammo.pro_mining=+ Explosion drops all blocks
|
||||
desc.item.ammo.pro_no_gravity=+ Not affected by gravity
|
||||
desc.item.ammo.pro_nuclear=+ Nuclear
|
||||
desc.item.ammo.pro_penetration=+ Penetrating
|
||||
desc.item.ammo.pro_phosphorus=+ Induces phosphorus burns
|
||||
desc.item.ammo.pro_phosphorus_splash=+ Phosphorus splash
|
||||
desc.item.ammo.pro_poison_gas=+ Poison splash
|
||||
desc.item.ammo.pro_radius=+ Increased blast radius
|
||||
desc.item.ammo.pro_radius_high=+ Highly increased blast radius
|
||||
desc.item.ammo.pro_range=+ Increased range
|
||||
desc.item.ammo.pro_rocket=+ Rocket
|
||||
desc.item.ammo.pro_rocket_propelled=+ Rocket Propelled
|
||||
desc.item.ammo.pro_shrapnel=+ Shrapnel
|
||||
desc.item.ammo.pro_speed=+ Increased projectile speed
|
||||
desc.item.ammo.pro_stunning=+ Stunning
|
||||
desc.item.ammo.pro_toxic=+ Toxic
|
||||
desc.item.ammo.pro_wear=+ Decreased wear
|
||||
desc.item.ammo.pro_withering=+ Withering
|
||||
desc.item.armorMod.display=to display installed armor mods
|
||||
desc.item.battery.charge=Charge: %s / %sHE
|
||||
desc.item.battery.chargePerc=Charge: %s%%
|
||||
desc.item.battery.chargeRate=Charge rate: %sHE/tick
|
||||
desc.item.battery.dischargeRate=Discharge rate: %sHE/tick
|
||||
desc.item.durability=Durability: %s
|
||||
desc.item.grenade.fuse=Fuse: %s
|
||||
desc.item.grenade.fuseImpact=Impact
|
||||
desc.item.grenade.fuseInstant=Instant
|
||||
desc.item.gun.ammo=Ammo %s
|
||||
desc.item.gun.ammoBelt=Belt
|
||||
desc.item.gun.ammoEnergy=Energy; %sHE per shot
|
||||
desc.item.gun.ammoEnergyAlt=%sHE per alt shot
|
||||
desc.item.gun.ammoMag=%s / %s
|
||||
desc.item.gun.ammoType=Ammo Type: %s
|
||||
desc.item.gun.ammoTypeAlt=Secondary Ammo: %s
|
||||
desc.item.gun.damage=Damage: %s - %s
|
||||
desc.item.gun.damageAlt=Damage: %s
|
||||
desc.item.gun.lore=to view in-depth lore
|
||||
desc.item.gun.loreFunc=to view in-depth functionality
|
||||
desc.item.gun.manufacturer=Manufacturer: %s
|
||||
desc.item.gun.name=Name: %s
|
||||
desc.item.gun.penetration=Armor Penetration Value: %s
|
||||
desc.item.kitArmor=Armor will be displaced by new set.
|
||||
desc.item.kitHaz=Armor will be displaced by hazmat suit.
|
||||
desc.item.kitPack=What a bargain!
|
||||
desc.item.kitPool=Please empty inventory before opening!
|
||||
desc.item.pileRod=§eUse on drilled graphite to insert$§eUse screwdriver to extract$
|
||||
desc.item.rtgDecay=Decays to: %s
|
||||
desc.item.rtgHeat=Power Level: %s
|
||||
desc.item.storage.capacity=Capacity %s%%s
|
||||
desc.item.storage.proscons=to view pros cons list
|
||||
desc.misc.357=.357 Magnum
|
||||
desc.misc.556=.223 Remington
|
||||
desc.misc.762=.308 Winchester
|
||||
desc.misc.func=§n-- Function --
|
||||
desc.misc.lanthanum="Lanthanum"
|
||||
desc.misc.lctrl=§8Hold <§e§oLCTRL§8§o> %s
|
||||
desc.misc.lore=§n-- Lore --
|
||||
desc.misc.lshift=§8Hold <§e§oLSHIFT§8§o> %s
|
||||
desc.misc.luna=§o20x155mm Lunatic
|
||||
desc.misc.meltPoint=Melting point: §c%s
|
||||
desc.misc.noPos=No position set!
|
||||
desc.misc.pos=Set pos to: %s, %s, %s
|
||||
desc.misc.posSet=Position set!
|
||||
desc.item.wasteCooling=Cool in a Spent Fuel Pool Drum
|
||||
desc.item.zirnoxBreedingRod=§2[ZIRNOX Breeding Rod]$§ePlace next to fuel rods to breed$§eLasts %d ticks
|
||||
desc.item.zirnoxRod=§a[ZIRNOX Fuel Rod]$§eGenerates %1$d heat per tick$§eLasts %2$d ticks
|
||||
|
||||
digamma.playerDigamma=Digamma exposure:
|
||||
digamma.playerHealth=Digamma influence:
|
||||
@ -871,6 +990,129 @@ geiger.playerRes=Player resistance:
|
||||
geiger.title=GEIGER COUNTER
|
||||
geiger.title.dosimeter=DOSIMETER
|
||||
|
||||
gun.make.ARMALITE=Armalite
|
||||
gun.make.AUTO_ORDINANCE=Auto-Ordnance Corporation
|
||||
gun.make.BAE=BAE Systems plc
|
||||
gun.make.BENELLI=Benelli Armi SpA
|
||||
gun.make.BLACK_MESA=Black Mesa Research Facility
|
||||
gun.make.CERIX=Cerix Magnus
|
||||
gun.make.COLT=Colt's Manufacturing Company
|
||||
gun.make.COMBINE=The Universal Union
|
||||
gun.make.CUBE=Cube 2: Sauerbraten
|
||||
gun.make.ENZINGER=Enzinger Union
|
||||
gun.make.EQUESTRIA=Equestria Missile Systems
|
||||
gun.make.FLIMFLAM=FlimFlam Industries
|
||||
gun.make.F_STRONG=Fort Strong
|
||||
gun.make.GLORIA=Gloria GmbH
|
||||
gun.make.HASBRO=Hasbro
|
||||
gun.make.H_AND_K=Heckler & Koch
|
||||
gun.make.H_AND_R=Harrington & Richardson
|
||||
gun.make.IF=Ironshod Firearms
|
||||
gun.make.IMI=Israel Military Industries
|
||||
gun.make.IMI_BIGMT=IMI / Big MT
|
||||
gun.make.LANGFORD=Langford Research Laboratories
|
||||
gun.make.LUNA=Lunar Defense Corp
|
||||
gun.make.MAGNUM_R_IMI=Magnum Research / Israel Military Industries
|
||||
gun.make.MANN=Open Mann Co.
|
||||
gun.make.MAXIM=Hiram Maxim
|
||||
gun.make.METRO=Metro Gunsmiths
|
||||
gun.make.MWT=MWT Prototype Labs
|
||||
gun.make.NAZI=Erfurter Maschinenfabrik Geipel
|
||||
gun.make.NONE=-
|
||||
gun.make.RAYTHEON=Raytheon Missile Systems
|
||||
gun.make.ROCKWELL=Rockwell International Corporation
|
||||
gun.make.ROCKWELL_U=Rockwell International Corporation?
|
||||
gun.make.RYAN=Ryan Industries
|
||||
gun.make.SAAB=Saab Bofors Dynamics
|
||||
gun.make.SACO=Saco Defense / US Ordnance
|
||||
gun.make.TULSKY=Tulsky Oruzheiny Zavod
|
||||
gun.make.UAC=Union Aerospace Corporation
|
||||
gun.make.UNKNOWN=???
|
||||
gun.make.WESTTEK=WestTek
|
||||
gun.make.WGW=Wilhelm-Gustloff-Werke
|
||||
gun.make.WINCHESTER=Winchester Repeating Arms Company
|
||||
gun.make.WINCHESTER_BIGMT=Winchester Repeating Arms Company / Big MT
|
||||
|
||||
gun.name.ar15_50=AR-15 .50 BMG Mod
|
||||
gun.name.baeAR=Britannian Standard Issue Assault Rifle
|
||||
gun.name.bel=Balefire Egg Launcher
|
||||
gun.name.benelli=Benelli M4 Super 90
|
||||
gun.name.benelliDrum=Benelli M4 Super 90 (Drum Magazine Modification)
|
||||
gun.name.bio=RI No. 2 Mark 1
|
||||
gun.name.bolter=Manticora Pattern Boltgun
|
||||
gun.name.cPython=Colt Python
|
||||
gun.name.cz53=CZ53 Personal Minigun
|
||||
gun.name.cz57=CZ57 Avenger Minigun
|
||||
gun.name.dart=Needle Gun
|
||||
gun.name.deagle=IMI Desert Eagle
|
||||
gun.name.emp=EMP Orb Projector
|
||||
gun.name.extinguisher=PROTEX Fire Exinguisher 6kg
|
||||
gun.name.ffiV=FFI Viper
|
||||
gun.name.ffiVInox=FFI Viper Inox
|
||||
gun.name.ffiVLead=FFI Viper Lead
|
||||
gun.name.ffiVN1=FFI Viper N1
|
||||
gun.name.ffiVN2=FFI Viper N2
|
||||
gun.name.ffiVUltra=FFI Viper Ultra
|
||||
gun.name.ffivBling=FFI Viper Bling
|
||||
gun.name.ffivSatur=FFI Viper D-25A
|
||||
gun.name.g36=Heckler & Koch Gewehr 36
|
||||
gun.name.gPistol=Granatpistole HK69
|
||||
gun.name.gustav=Carl Gustav Recoilless Rifle M1
|
||||
gun.name.ifHorseshoe=IF-18 Horseshoe
|
||||
gun.name.ifPit=IF-18 Horseshoe Bottomless Pit
|
||||
gun.name.ifScope=IF-18 Horseshoe Scoped
|
||||
gun.name.ifStorm=IF-18 Horseshoe Silver Storm
|
||||
gun.name.ifVanity=IF-18 Horseshoe Vanity
|
||||
gun.name.karl=M1 Karl-Gerät
|
||||
gun.name.ks23=KS-23
|
||||
gun.name.lacunae=Auntie Lacunae
|
||||
gun.name.lasetDet=Hopeville Laser Detonator
|
||||
gun.name.lunaAR=1986 Bishamonten type Assault Rifle
|
||||
gun.name.lunaGun=1978 Rāhula type Standard Issue Sidearm (Revision 2)
|
||||
gun.name.lunaHLR=1944 Chang'e type Light Machine Gun
|
||||
gun.name.lunaShotty=1978 Guan Yu type Scattergun (Revision 1)
|
||||
gun.name.lunaSMG=1956 Ānanda type Submachine Gun
|
||||
gun.name.lunaSniper=1915 Hou Yi type Anti-Material Rifle
|
||||
gun.name.lunaTWR=Time Warp Rifle
|
||||
gun.name.m2=Browning machine gun, cal. .50, M2, HB
|
||||
gun.name.m42=M-42 Tactical Nuclear Catapult
|
||||
gun.name.m42MIRV=M-42 Experimental MIRV
|
||||
gun.name.m60=Machine Gun, Caliber 7.62 mm, M60
|
||||
gun.name.maxim=Maxim gun
|
||||
gun.name.maximDouble=Double Maxim gun
|
||||
gun.name.mg42=Universal-Maschinengewehr Modell 42 - .50 Mod
|
||||
gun.name.mp40=Maschinenpistole 40
|
||||
gun.name.nerf=NERF blaster of unknown design
|
||||
gun.name.osipr=Overwatch Standard Issue Pulse Rifle
|
||||
gun.name.panz=Raketenpanzerbüchse 54
|
||||
gun.name.quadro=OpenQuadro Guided Man-Portable Missile Launcher
|
||||
gun.name.revolverCursed=Britannia Standard Issue Motorized Handgun
|
||||
gun.name.sauer=Sauer Shotgun
|
||||
gun.name.spas12=Franchi SPAS-12
|
||||
gun.name.spiw=H&R SPIW
|
||||
gun.name.stinger=FIM-92 Stinger man-portable air-defense system
|
||||
gun.name.stingerOneSky=The One Sky Stinger
|
||||
gun.name.supershotty=Double-Barreled Combat Shotgun
|
||||
gun.name.tau=XVL1456 Tau Cannon
|
||||
gun.name.tommy9=M1A1 Submachine Gun 9mm Mod
|
||||
gun.name.tommy=M1A1 Submachine Gun
|
||||
gun.name.topaz=Heavy Duty Flamer
|
||||
gun.name.uacCarbine=UAC-41 Carbine
|
||||
gun.name.uacDeagle=UAC-H54 "Martian Raptor" Automag
|
||||
gun.name.uacDMR=UAC-30 Designated Marksman Rifle
|
||||
gun.name.uacLMG=UAC-49 Light Machine Gun
|
||||
gun.name.uacPistol=UAC-B950 .45 Standard Issue Handgun
|
||||
gun.name.uacSMG=UAC-17 Compact Sub-Machine Gun
|
||||
gun.name.uboinik=Uboinik Revolving Shotgun
|
||||
gun.name.uzi=IMI Uzi
|
||||
gun.name.uziSatur=IMI Uzi D-25A
|
||||
gun.name.win1887=Winchester Model 1887
|
||||
gun.name.win1887Inox=Winchester Model 1887 Inox
|
||||
gun.name.win20Inox=Winchester Model 20 Inox
|
||||
gun.name.win20Poly=Winchester Model 20 Polymer
|
||||
gun.name.win20Satur=Winchester Model 20 D-25A
|
||||
gun.name.zomg=EMC101 Prismatic Negative Energy Cannon
|
||||
|
||||
hadron.analysis=Analyzing...
|
||||
hadron.buttonOn=Analysis Chamber (if present) is ON
|
||||
hadron.buttonOff=Analysis Chamber is OFF
|
||||
@ -2159,7 +2401,7 @@ item.gun_moist_nugget.name=Mosin-Nagant
|
||||
item.gun_mp.name=Pacifist's Machine Gun
|
||||
item.gun_mp40.name=Submachine Gun
|
||||
item.gun_mp40_ammo.name=Submachine Gun Round (LEGACY)
|
||||
item.gun_mp_ammo.name=Small Propellantless Machine Gun Round
|
||||
item.gun_pm_ammo.name=Small Propellantless Machine Gun Round
|
||||
item.gun_mymy.name=Nietes
|
||||
item.gun_osipr.name=Overwatch Standard Issue Pulse Rifle
|
||||
item.gun_osipr_ammo.name=Dark Energy Pulse Plug
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user