konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.0.0: renamed & adjusted icons for some talents for better consistency

Browse Source
This commit is contained in:
Evan Debenham
2024-12-09 15:08:29 -05:00
parent d18e015a50
commit e7d352baab
6 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/assets/interfaces/talent_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

30
core/src/main/assets/messages/actors/actors.properties
View File

@@ -556,12 +556,12 @@ actors.hero.spells.clericspell.prompt=Choose a target
actors.hero.spells.clericspell.no_target=There is no target there.
actors.hero.spells.clericspell.charge_cost=Charge cost: %d
actors.hero.spells.detectcurse.name=detect curse
actors.hero.spells.detectcurse.prompt=choose an item
actors.hero.spells.detectcurse.cursed=You sense malevolent magic lurking within this item.
actors.hero.spells.detectcurse.uncursed=This item is free of malevolent magic.
actors.hero.spells.detectcurse.short_desc=identifies whether an item is cursed or not.
actors.hero.spells.detectcurse.desc=The Cleric focuses their senses on an item and determines whether it is cursed or not without having to equip it.
actors.hero.spells.holyintuition.name=holy intuition
actors.hero.spells.holyintuition.prompt=choose an item
actors.hero.spells.holyintuition.cursed=You sense malevolent magic lurking within this item.
actors.hero.spells.holyintuition.uncursed=This item is free of malevolent magic.
actors.hero.spells.holyintuition.short_desc=identifies whether an item is cursed or not.
actors.hero.spells.holyintuition.desc=The Cleric focuses their senses on an item and determines whether it is cursed or not without having to equip it.
actors.hero.spells.divinesense.name=divine sense
actors.hero.spells.divinesense.short_desc=Gain temporary mind vision in a wide range.
@@ -602,11 +602,11 @@ actors.hero.spells.radiance.name=radiance
actors.hero.spells.radiance.short_desc=Illuminates and briefly stuns visible enemies.
actors.hero.spells.radiance.desc=The Priest erupts in holy light, stunning all visible enemies for 2 turns and illuminating them as if they were hit by Guiding Light. Radiance will also cause the Priest to glow for 100 turns if the current floor is dark.
actors.hero.spells.recallglyph.name=recall glyph
actors.hero.spells.recallglyph.short_desc=Repeats a recently used stone or scroll.
actors.hero.spells.recallglyph.desc=The Cleric uses holy magic to replicate and re-cast the effect of a magical glyph found on a runestone or scroll they used in the last %s turns.\n\nRecall Glyph cannot be used to replicate scrolls of upgrade. This spell's charge cost varies based on which item was used recently: 2 for a runestone, 3 for a scroll, 4 for an exotic scroll. This charge cost is also doubled when replicating a scroll of transmutation, or alchemy items that must be crafted using transmutation or upgrade.
actors.hero.spells.recallglyph$usedglyphtracker.name=recently used glyph
actors.hero.spells.recallglyph$usedglyphtracker.desc=The Cleric has recently used an item that works with the recall glyph spell. The Cleric can cast the spell to repeat the item's effect.\n\nItem Used: %1$s.\n\nTurns Remaining: %2$s.
actors.hero.spells.recallinscription.name=recall inscription
actors.hero.spells.recallinscription.short_desc=Repeats a recently used runestone or scroll.
actors.hero.spells.recallinscription.desc=The Cleric uses holy magic to re-cast the effect of a magical rune found on a runestone or scroll they used in the last %s turns.\n\nRecall Inscription cannot be used to replicate scrolls of upgrade. This spell's charge cost varies based on which item was used recently: 2 for a runestone, 3 for a scroll, 4 for an exotic scroll. This charge cost is also doubled when replicating a scroll of transmutation, or alchemy items that must be crafted using transmutation or upgrade.
actors.hero.spells.recallinscription$useditemtracker.name=recently used rune
actors.hero.spells.recallinscription$useditemtracker.desc=The Cleric has recently used an item that works with the inscribed recall spell. The Cleric can cast the spell to repeat the item's effect.\n\nItem Used: %1$s.\n\nTurns Remaining: %2$s.
actors.hero.spells.shieldoflight.name=shield of light
actors.hero.spells.shieldoflight.short_desc=Grants temporary armor against a target.
@@ -1057,8 +1057,8 @@ actors.hero.talent.counter_ability.desc=_+1:_ If the Duelist uses a weapon abili
#cleric
actors.hero.talent.satiated_spells.title=Satiated Spells
actors.hero.talent.satiated_spells.desc=_+1:_ Eating food causes the Cleric to gain _3 shielding_ the next time they cast a spell.\n\n_+2:_ Eating food causes the Cleric to gain _5 shielding_ the next time they cast a spell.
actors.hero.talent.detect_curse.title=detect curse
actors.hero.talent.detect_curse.desc=_+1:_ The Cleric can cast _Detect Curse,_ a spell that reveals whether an item is cursed at the cost of _3 charges._\n\n_+2:_ The Cleric can cast _Detect Curse,_ a spell that reveals whether an item is cursed at the cost of _2 charges._
actors.hero.talent.holy_intuition.title=divine intuition
actors.hero.talent.holy_intuition.desc=_+1:_ The Cleric can cast _Holy Intuition,_ a spell that reveals whether an item is cursed at the cost of _3 charges._\n\n_+2:_ The Cleric can cast _Holy Intuition,_ a spell that reveals whether an item is cursed at the cost of _2 charges._
actors.hero.talent.searing_light.title=searing light
actors.hero.talent.searing_light.desc=_+1:_ Physical attacks on enemies illuminated by _Guiding Light_ deal _+3 damage._\n\n_+2:_ Physical attacks on enemies illuminated by _Guiding Light_ deal _+5 damage._
actors.hero.talent.shield_of_light.title=shield of light
@@ -1066,8 +1066,8 @@ actors.hero.talent.shield_of_light.desc=_+1:_ The Cleric can cast _Shield of Lig
actors.hero.talent.enlightening_meal.title=Enlightening Meal
actors.hero.talent.enlightening_meal.desc=_+1:_ Eating food takes the Cleric 1 turn and grants them _1 charge_ on their holy tome.\n\n_+2:_ Eating food takes the Cleric 1 turn and grants them _1.5 charges_ on their holy tome.
actors.hero.talent.recall_glyph.title=Recall Glyph
actors.hero.talent.recall_glyph.desc=_+1:_ The Cleric can cast _Recall Glyph,_ a spell that lets the Cleric repeat the effect of the last runestone or scroll they used within the last _10 turns._\n\n_+2:_ The Cleric can cast _Recall Glyph,_ a spell that lets the Cleric repeat the effect of the last runestone or scroll they used within the last _300 turns._\n\nRecall Glyph cannot be used with scrolls of upgrade. This spell's charge cost varies based on which item was used recently: 2 for a runestone, 3 for a scroll, 4 for an exotic scroll. This charge cost is also doubled when used with a scroll of transmutation, or alchemy items that must be crafted using transmutation or upgrade.
actors.hero.talent.recall_inscription.title=Recall Inscription
actors.hero.talent.recall_inscription.desc=_+1:_ The Cleric can cast _Recall Inscription,_ a spell that lets them repeat the effect of the last runestone or scroll they used within _10 turns._\n\n_+2:_ The Cleric can cast _Recall Inscription,_ a spell that lets them repeat the effect of the last runestone or scroll they used within _300 turns._\n\nRecall Inscription cannot be used with scrolls of upgrade. This spell's charge cost varies based on which item was used recently: 2 for a runestone, 3 for a scroll, 4 for an exotic scroll. This charge cost is also doubled when used with a scroll of transmutation, or alchemy items that must be crafted using transmutation or upgrade.
actors.hero.talent.sunray.title=Sunray
actors.hero.talent.sunray.desc=_+1:_ The Cleric can cast _Sunray,_ A spell that deals _2-8 damage_ and blinds the target for _4 turns,_ at the cost of 1 charge.\n\n_+2:_ The Cleric can cast _Sunray,_ A spell that deals _3-12 damage_ and blinds the target for _6 turns,_ at the cost of 1 charge.\n\nSunray can only blind each target once, but if the target is already blinded by Sunray then it paralyses instead. Sunray always deals maximum damage to demonic and undead foes.
actors.hero.talent.divine_sense.title=Divine Sense

22
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
View File

@@ -44,7 +44,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.WandEmpower;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.Ratmogrify;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.spells.GuidingLight;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.spells.RecallGlyph;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.spells.RecallInscription;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.FloatingText;
@@ -176,9 +176,9 @@ public enum Talent {
FEIGNED_RETREAT(151, 4), EXPOSE_WEAKNESS(152, 4), COUNTER_ABILITY(153, 4),
//Cleric T1
SATIATED_SPELLS(160), DETECT_CURSE(161), SEARING_LIGHT(162), SHIELD_OF_LIGHT(163),
SATIATED_SPELLS(160), HOLY_INTUITION(161), SEARING_LIGHT(162), SHIELD_OF_LIGHT(163),
//Cleric T2
ENLIGHTENING_MEAL(164), RECALL_GLYPH(165), SUNRAY(166), DIVINE_SENSE(167), BLESS(168),
ENLIGHTENING_MEAL(164), RECALL_INSCRIPTION(165), SUNRAY(166), DIVINE_SENSE(167), BLESS(168),
//Cleric T3
CLEANSE(169, 3), LIGHT_READING(170, 3),
//Priest T3
@@ -722,18 +722,18 @@ public enum Talent {
Sample.INSTANCE.play( Assets.Sounds.MELD );
}
if (hero.heroClass == HeroClass.CLERIC
&& hero.hasTalent(RECALL_GLYPH)
&& hero.hasTalent(RECALL_INSCRIPTION)
&& Scroll.class.isAssignableFrom(cls)
&& cls != ScrollOfUpgrade.class){
Buff.prolong(hero, RecallGlyph.UsedGlyphTracker.class, hero.pointsInTalent(RECALL_GLYPH) == 2 ? 300 : 10).item = cls;
Buff.prolong(hero, RecallInscription.UsedGlyphTracker.class, hero.pointsInTalent(RECALL_INSCRIPTION) == 2 ? 300 : 10).item = cls;
}
}
public static void onRunestoneUsed( Hero hero, int pos, Class<?extends Item> cls ){
if (hero.heroClass == HeroClass.CLERIC
&& hero.hasTalent(RECALL_GLYPH)
&& hero.hasTalent(RECALL_INSCRIPTION)
&& Runestone.class.isAssignableFrom(cls)){
Buff.prolong(hero, RecallGlyph.UsedGlyphTracker.class, hero.pointsInTalent(RECALL_GLYPH) == 2 ? 300 : 10).item = cls;
Buff.prolong(hero, RecallInscription.UsedGlyphTracker.class, hero.pointsInTalent(RECALL_INSCRIPTION) == 2 ? 300 : 10).item = cls;
}
}
@@ -908,7 +908,7 @@ public enum Talent {
Collections.addAll(tierTalents, STRENGTHENING_MEAL, ADVENTURERS_INTUITION, PATIENT_STRIKE, AGGRESSIVE_BARRIER);
break;
case CLERIC:
Collections.addAll(tierTalents, SATIATED_SPELLS, DETECT_CURSE, SEARING_LIGHT, SHIELD_OF_LIGHT);
Collections.addAll(tierTalents, SATIATED_SPELLS, HOLY_INTUITION, SEARING_LIGHT, SHIELD_OF_LIGHT);
break;
}
for (Talent talent : tierTalents){
@@ -937,7 +937,7 @@ public enum Talent {
Collections.addAll(tierTalents, FOCUSED_MEAL, LIQUID_AGILITY, WEAPON_RECHARGING, LETHAL_HASTE, SWIFT_EQUIP);
break;
case CLERIC:
Collections.addAll(tierTalents, ENLIGHTENING_MEAL, RECALL_GLYPH, SUNRAY, DIVINE_SENSE, BLESS);
Collections.addAll(tierTalents, ENLIGHTENING_MEAL, RECALL_INSCRIPTION, SUNRAY, DIVINE_SENSE, BLESS);
break;
}
for (Talent talent : tierTalents){
@@ -1092,6 +1092,10 @@ public enum Talent {
private static final HashMap<String, String> renamedTalents = new HashMap<>();
static{
//v3.0.0 ALPHA
renamedTalents.put("DETECT_CURSE", "HOLY_INTUITION");
renamedTalents.put("RECALL_GLYPH", "RECALL_INSCRIPTION");
//v2.4.0
renamedTalents.put("SECONDARY_CHARGE", "VARIED_CHARGE");

12
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/spells/ClericSpell.java
View File

@@ -80,8 +80,8 @@ public abstract class ClericSpell {
spells.add(HolyWeapon.INSTANCE);
spells.add(HolyWard.INSTANCE);
if (cleric.hasTalent(Talent.DETECT_CURSE)) {
spells.add(DetectCurse.INSTANCE);
if (cleric.hasTalent(Talent.HOLY_INTUITION)) {
spells.add(HolyIntuition.INSTANCE);
}
if (cleric.hasTalent(Talent.SHIELD_OF_LIGHT)) {
@@ -90,8 +90,8 @@ public abstract class ClericSpell {
} else if (tier == 2) {
if (cleric.hasTalent(Talent.RECALL_GLYPH)){
spells.add(RecallGlyph.INSTANCE);
if (cleric.hasTalent(Talent.RECALL_INSCRIPTION)){
spells.add(RecallInscription.INSTANCE);
}
if (cleric.hasTalent(Talent.SUNRAY)){
@@ -134,9 +134,9 @@ public abstract class ClericSpell {
spells.add(GuidingLight.INSTANCE);
spells.add(HolyWeapon.INSTANCE);
spells.add(HolyWard.INSTANCE);
spells.add(DetectCurse.INSTANCE);
spells.add(HolyIntuition.INSTANCE);
spells.add(ShieldOfLight.INSTANCE);
spells.add(RecallGlyph.INSTANCE);
spells.add(RecallInscription.INSTANCE);
spells.add(Sunray.INSTANCE);
spells.add(DivineSense.INSTANCE);
spells.add(BlessSpell.INSTANCE);

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/spells/DetectCurse.java → core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/spells/HolyIntuition.java
View File

@@ -33,9 +33,9 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.noosa.audio.Sample;
public class DetectCurse extends InventoryClericSpell {
public class HolyIntuition extends InventoryClericSpell {
public static final DetectCurse INSTANCE = new DetectCurse();
public static final HolyIntuition INSTANCE = new HolyIntuition();
@Override
public int icon() {
@@ -49,7 +49,7 @@ public class DetectCurse extends InventoryClericSpell {
@Override
public float chargeUse(Hero hero) {
return 4 - hero.pointsInTalent(Talent.DETECT_CURSE);
return 4 - hero.pointsInTalent(Talent.HOLY_INTUITION);
}
@Override

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/spells/RecallGlyph.java → core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/spells/RecallInscription.java
View File

@@ -43,9 +43,9 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon;
import com.watabou.utils.Bundle;
import com.watabou.utils.Reflection;
public class RecallGlyph extends ClericSpell {
public class RecallInscription extends ClericSpell {
public static RecallGlyph INSTANCE = new RecallGlyph();
public static RecallInscription INSTANCE = new RecallInscription();
@Override
public int icon() {
@@ -54,7 +54,7 @@ public class RecallGlyph extends ClericSpell {
@Override
public String desc() {
return Messages.get(this, "desc", Dungeon.hero.pointsInTalent(Talent.RECALL_GLYPH) == 2 ? 300 : 10) + "\n\n" + Messages.get(this, "charge_cost", (int)chargeUse(Dungeon.hero));
return Messages.get(this, "desc", Dungeon.hero.pointsInTalent(Talent.RECALL_INSCRIPTION) == 2 ? 300 : 10) + "\n\n" + Messages.get(this, "charge_cost", (int)chargeUse(Dungeon.hero));
}
@Override
@@ -135,7 +135,7 @@ public class RecallGlyph extends ClericSpell {
@Override
public float iconFadePercent() {
float duration = Dungeon.hero.pointsInTalent(Talent.RECALL_GLYPH) == 2 ? 300 : 10;
float duration = Dungeon.hero.pointsInTalent(Talent.RECALL_INSCRIPTION) == 2 ? 300 : 10;
return Math.max(0, (duration - visualcooldown()) / duration);
}