LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.3.4: updated how the mage's staff names itself

Browse Source
This commit is contained in:
Evan Debenham 2016-01-27 00:31:28 -05:00 committed by Evan Debenham
parent d9d6e45d04
commit 9115ea7652
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java
View File

@ -84,7 +84,7 @@ public class MagesStaff extends MeleeWeapon {
this.wand = wand;
wand.maxCharges = Math.min(wand.maxCharges + 1, 10);
wand.curCharges = wand.maxCharges;
name = wand.name().replace(Messages.get(this, "wand"), Messages.get(this, "staff"));
name = Messages.get(wand, "staff_name");
}
@Override
@ -178,7 +178,7 @@ public class MagesStaff extends MeleeWeapon {
wand.cursed = false;
wand.charge(owner);
name = wand.name().replace(Messages.get(this, "wand"), Messages.get(this, "staff"));
name = Messages.get(wand, "staff_name");
updateQuickslot();
@ -256,7 +256,7 @@ public class MagesStaff extends MeleeWeapon {
wand = (Wand) bundle.get(WAND);
if (wand != null) {
wand.maxCharges = Math.min(wand.maxCharges + 1, 10);
name = wand.name().replace(Messages.get(this, "wand"), Messages.get(this, "staff"));
name = Messages.get(wand, "staff_name");
}
}
@ -266,18 +266,18 @@ public class MagesStaff extends MeleeWeapon {
if (item != null) {
if (!item.isIdentified()) {
GLog.w(Messages.get(this, "id_first"));
GLog.w(Messages.get(MagesStaff.class, "id_first"));
return;
} else if (item.cursed){
GLog.w(Messages.get(this, "cursed"));
GLog.w(Messages.get(MagesStaff.class, "cursed"));
return;
}
GameScene.show(
new WndOptions("",
Messages.get(this, "warning"),
Messages.get(this, "yes"),
Messages.get(this, "no")) {
Messages.get(MagesStaff.class, "warning"),
Messages.get(MagesStaff.class, "yes"),
Messages.get(MagesStaff.class, "no")) {
@Override
protected void onSelect(int index) {
if (index == 0) {

13
src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
View File

@ -603,35 +603,44 @@ items.wands.wand.curse_discover=This %s is cursed!
items.wands.wand.prompt=Choose a location to zap
items.wands.wandofblastwave.name=wand of blast wave
items.wands.wandofblastwave.staff_name=staff of blast wave
items.wands.wandofblastwave.ondeath=You killed yourself with your own Wand of Blast Wave...
items.wands.wandofblastwave.desc=This wand is made of a sort of marbled stone, with gold trim and a round black gem at the tip. It feels very weighty in your hand.\n\nThis wand shoots a bolt which violently detonates at a target location. The force of this blast is strong enough to send most enemies flying.
items.wands.wandofcorruption.name=wand of corruption
items.wands.wandofcorruption.staff_name=staff
items.wands.wandofcorruption.already_corrupted=That character is already corrupted.
items.wands.wandofcorruption.boss=Bosses are immune to corruption.
items.wands.wandofcorruption.fail=The corrupting power was not strong enough, nothing happens.
items.wands.wandofcorruption.desc=This wand radiates dark energy, if that weren't already obvious from the small decorative skull shaped onto its tip.\n\nThis wand will release a blast of corrupting energy, attempting to bend enemies to your will. Full health enemies are much harder to corrupt than weakened ones.\n\nThis wand uses at least one charge per cast, but will often use more in an attempt to overpower more healthy enemies.
items.wands.wandofdisintegration.name=wand of disintegration
items.wands.wandofdisintegration.staff_name=staff of disintegration
items.wands.wandofdisintegration.desc=This wand is made from a solid smooth chunk of obsidian, with a deep purple light running up its side, ending at the tip. It glows with destructive energy, waiting to shoot forward.\n\nThis wand shoots a beam that pierces any obstacle, and will go farther the more it is upgraded.\n\nThis wand deals bonus damage the more enemies and terrain it penetrates.
items.wands.wandoffireblast.name=wand of fireblast
items.wands.wandoffireblast.staff_name=staff of fireblast
items.wands.wandoffireblast.desc=This wand is made from red-lacquered wood with golden leaf used liberally to make it look quite regal. It crackles and hisses at the tip, eager to unleash its powerful magic.\n\nThis wand produces a blast of fire when used, extending out into a cone shape. As this wand is upgraded it will consume more charges, the effect becomes significantly more powerful the more charges are consumed.
items.wands.wandoffrost.name=wand of frost
items.wands.wandoffrost.staff_name=staff of frost
items.wands.wandoffrost.desc=This wand seems to be made out of some kind of magical ice. It grows brighter towards its rounded tip. It feels very cold when held, but somehow your hand stays warm.\n\nThis wand shoots blasts of icy energy toward your foes, dealing significant damage and chilling, which reduces speed. The effect seems stronger in water. Chilled and frozen enemies take less damage from this wand, as they are already cold.
items.wands.wandoflightning.name=wand of lightning
items.wands.wandoflightning.staff_name=staff of lightning
items.wands.wandoflightning.ondeath=You killed yourself with your own Wand of Lightning...
items.wands.wandoflightning.desc=This wand is made out of solid metal, making it surprisingly heavy. Two prongs curve together at the tip, and electricity arcs between them.\n\nThis wand sends powerful lightning arcing through whatever it is shot at. This electricity can bounce between many nearby foes, and is more powerful in water. If you're too close, you may get shocked as well.
items.wands.wandofmagicmissile.name=wand of magic missile
items.wands.wandofmagicmissile.staff_name=staff of magic missile
items.wands.wandofmagicmissile.desc=This fairly plain wand launches missiles of pure magical energy, dealing moderate damage to a target.\n\nWhile not as strong as other wands, it makes up for it somewhat with more available charges.
items.wands.wandofprismaticlight.name=wand of prismatic light
items.wands.wandofprismaticlight.staff_name=staff of prismatic light
items.wands.wandofprismaticlight.desc=This wand is made of a solid piece of translucent crystal, like a long chunk of smooth glass.\n\nThis wand shoots rays of light which damage and blind enemies and cut through the darkness of the dungeon, revealing hidden areas and traps. Demonic and undead foes will burn in the bright light of the wand, taking significant bonus damage.
items.wands.wandofregrowth.name=wand of regrowth
items.wands.wandofregrowth.staff_name=staff of regrowth
items.wands.wandofregrowth.desc=This wand is made from a thin shaft of expertly carved wood. Somehow it is still alive and vibrant, bright green like a young tree's core.\n\nWhen used, this wand will consume all its charges to blast magical regrowth energy outward in a cone. This magic will cause grass, roots, and rare plants to spring to life.\n\n"When life ceases new life always begins to grow... The eternal cycle always remains!"
items.wands.wandofregrowth$dewcatcher.name=Dewcatcher
items.wands.wandofregrowth$dewcatcher.desc=Dewcatchers camouflage as grass to avoid attention, but their bulges of collected dew give them away.
@ -639,11 +648,13 @@ items.wands.wandofregrowth$seedpod.name=Seed Pod
items.wands.wandofregrowth$seedpod.desc=Seed Pods look pretty, but the seeds they carry are actually stolen from other plants they kill with their roots.
items.wands.wandoftransfusion.name=wand of transfusion
items.wands.wandoftransfusion.staff_name=staff of transfusion
items.wands.wandoftransfusion.ondeath=You killed yourself with your own Wand of Transfusion...
items.wands.wandoftransfusion.charged=Your staff is charged with the life energy of your enemy!
items.wands.wandoftransfusion.desc=A fairly plainly shaped wand, it stands out due to its magenta hue and pitch black gem at the tip.\n\nThis wand will take some of your life energy and blast it at a target. This effect is very versatile: allies will be healed, enemies will be temporarily charmed, and hostile undead will take considerable damage.\n\nThe life drain is significant though, using this wand will deal damage to you in addition to consuming charges.
items.wands.wandofvenom.name=wand of venom
items.wands.wandofvenom.staff_name=staff of venom
items.wands.wandofvenom.desc=This wand has a purple body which opens to a brilliant green gem.\n\nThis wand shoots a bolt which explodes into a cloud of vile venomous gas at a targeted location. Anything caught inside this cloud will take continual damage, increasing with time.
@ -696,8 +707,6 @@ items.weapon.melee.mace.desc=The iron head of this weapon inflicts substantial d
items.weapon.melee.magesstaff.name=mage's staff
items.weapon.melee.magesstaff.ac_imbue=IMBUE
items.weapon.melee.magesstaff.ac_zap=ZAP
items.weapon.melee.magesstaff.wand=wand
items.weapon.melee.magesstaff.staff=staff
items.weapon.melee.magesstaff.prompt=Select a wand to consume
items.weapon.melee.magesstaff.imbue=You imbue your staff with the %s.
items.weapon.melee.magesstaff.conflict=The conflicting magics erase the enchantment on your staff.