Skip to content

Commit

Permalink
- Adds subtitle localization finally
Browse files Browse the repository at this point in the history
- Fixes the Intelligent Apparatus codex entry and the fact it needs a heated tool to provide the exp bonus
  • Loading branch information
DaedalusGame committed Sep 1, 2018
1 parent 64bd317 commit 8375da9
Show file tree
Hide file tree
Showing 3 changed files with 115 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,20 @@

public class ModifierIntelligentApparatus extends ModifierBase {

public ModifierIntelligentApparatus() {
super(EnumType.ARMOR,"intelligent_apparatus",4.0,true);
MinecraftForge.EVENT_BUS.register(this);
}

@SubscribeEvent
public void onXPDrop(LivingExperienceDropEvent event){
if (event.getAttackingPlayer() != null){
EntityPlayer player = event.getAttackingPlayer();
ItemStack s = player.getHeldItemMainhand();
if (!s.isEmpty()){
if (ItemModUtil.hasHeat(s)){
int level = ItemModUtil.getArmorModifierLevel(player, EmbersAPI.INTELLIGENT_APPARATUS);
if (level > 0 && EmberInventoryUtil.getEmberTotal(player) >= cost){
EmberInventoryUtil.removeEmber(player, cost);
event.setDroppedExperience(event.getDroppedExperience()*(level+1));
}
}
}
}
}
public ModifierIntelligentApparatus() {
super(EnumType.ARMOR, "intelligent_apparatus", 4.0, true);
MinecraftForge.EVENT_BUS.register(this);
}

@SubscribeEvent
public void onXPDrop(LivingExperienceDropEvent event) {
if (event.getAttackingPlayer() != null) {
EntityPlayer player = event.getAttackingPlayer();
int level = ItemModUtil.getArmorModifierLevel(player, EmbersAPI.INTELLIGENT_APPARATUS);
if (level > 0 && EmberInventoryUtil.getEmberTotal(player) >= cost) {
EmberInventoryUtil.removeEmber(player, cost);
event.setDroppedExperience(event.getDroppedExperience() * (level + 1));
}
}
}
}
53 changes: 52 additions & 1 deletion src/main/resources/assets/embers/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ embers.research.smithing.eldritch_insignia.desc=While the Eldritch Insignia augm

embers.research.smithing.intelligent_apparatus=Intelligent Apparatus
embers.research.smithing.intelligent_apparatus.title=Fallen Wisdom
embers.research.smithing.intelligent_apparatus.desc=The Intelligent Apparatus is a simple tool and weapon augment that boosts experience obtained from creatures from dealts done using such an augmented weapon. The amount of additional experience dropped increases with modifier level.
embers.research.smithing.intelligent_apparatus.desc=The Intelligent Apparatus is a simple armor augment that boosts experience obtained from creatures slain by the wearer of such augmented armor. The amount of additional experience dropped increases with modifier level.

embers.research.smithing.resonating_bell=Resonating Bell
embers.research.smithing.resonating_bell.title=Vibrations
Expand All @@ -625,3 +625,54 @@ embers.commands.fill.failed=Missing ember data at chunk [%d, %d] (at x %d, z %d)
embers.commands.fill.added=Added %d to the ember level (now %d) in the chunk [%d, %d] (at x %d, z %d)
embers.commands.fill.set=Added the ember level to %d in the chunk [%d, %d] (at x %d, z %d)
embers.commands.fill.query=Ember level is %d in the chunk [%d, %d] (at x %d, z %d)

subtitles.block.alchemy.fail=Energetic Alchemy fails...
subtitles.block.alchemy.success=Energetic Alchemy succeeds!
subtitles.block.alchemy.start=Energetic Alchemy begins
subtitles.block.beam_cannon.fire=Beam Cannon fires
subtitles.block.beam_cannon.hit=Beam impacts
subtitles.block.activator.plume=Ember Activator releases Ember
subtitles.block.boiler.plume=Pressure Refinery releases Ember
subtitles.block.ignem_reactor.plume=Ignem Reactor releases Ember
subtitles.block.stamp.down=Stamp slams down
subtitles.block.stamp.up=Stamp recedes
subtitles.block.bore.start=Ember Bore rumbles to life
subtitles.block.bore.stop=Ember Bore sighs and stops
subtitles.block.catalytic_plug.start=Catalytic Plug begins injecting catalyst
subtitles.block.catalytic_plug.stop=Catalytic Plug is empty
subtitles.block.metal_seed.ping=Metal Seed splits off pieces
subtitles.block.inferno_forge.fail=Reforging fails...
subtitles.block.inferno_forge.success=Reforging succeeds!
subtitles.block.inferno_forge.start=Inferno Forge begins forging
subtitles.block.inferno_forge.open=Inferno Forge opens
subtitles.block.inferno_forge.close=Inferno Forge closes
subtitles.block.steam_engine.start_steam=Steam Engine spins up
subtitles.block.steam_engine.start_burn=Steam Engine begins burning fuel
subtitles.block.steam_engine.stop=Steam Engine rattles and stops
subtitles.block.mini_boiler.rupture=Mini Boiler ruptures violently
subtitles.block.pump.slow=Mechanical Pump grinds its balls on sandpaper
subtitles.block.pump.mid=Mechanical Pump pumps
subtitles.block.pump.fast=Mechanical Pump pumps at incredibly fast speeds
subtitles.ember_transfer.emit.small=Ember packet emitted
subtitles.ember_transfer.emit.big=Big Ember packet emitted
subtitles.ember_transfer.receive.small=Ember packet received
subtitles.ember_transfer.receive.big=Big Ember packet received
subtitles.ember_transfer.relay=Ember packet relayed
subtitles.fireball.small.fire=Fireball is released
subtitles.fireball.small.hit=Fireball impacts
subtitles.fireball.big.fire=Big fireball is unleashed
subtitles.fireball.big.hit=Big fireball impacts
subtitles.blazing_ray.fire=Blazing Ray fires
subtitles.blazing_ray.empty=Blazing Ray clicks
subtitles.heated.level_up=Item levels up
subtitles.cinder_staff.charge=Cinder Staff charges
subtitles.cinder_staff.fail=Cinder Staff fizzles
subtitles.cinder_jet.boost=Cinder Jet boosts
subtitles.resonating_bell.ring=Resonating Bell rings
subtitles.inflictor_gem.absorb=Inflictor Gem absorbs damage
subtitles.metallurgic_dust.convert=Metallurgic Dust transmutes ore
subtitles.metallurgic_dust.fail=Metallurgic Dust transmutes ore to worthless material
subtitles.ancient_golem.death=Ancient Golem is destroyed
subtitles.ancient_golem.hurt=Ancient Golem is hit
subtitles.ancient_golem.punch=Ancient Golem punches
subtitles.ancient_golem.step=Ancient Golem walks
Loading

0 comments on commit 8375da9

Please sign in to comment.