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

v2.4.0: adjusted some weapon ability error messages

Browse Source
This commit is contained in:
Evan Debenham
2024-05-02 17:16:06 -04:00
parent 4f8b638a9f
commit 969610dfd4
12 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/assets/messages/items/items.properties
View File

@@ -1733,7 +1733,8 @@ items.weapon.melee.meleeweapon.ability_low_str=You aren't strong enough to use t
items.weapon.melee.meleeweapon.ability_no_charge=You don't have enough energy to use that ability.
items.weapon.melee.meleeweapon.ability_cant_use=You can't use that ability right now.
items.weapon.melee.meleeweapon.ability_no_target=There is no target there.
items.weapon.melee.meleeweapon.ability_bad_position=That target can't be reached.
items.weapon.melee.meleeweapon.ability_target_range=That target isn't in range.
items.weapon.melee.meleeweapon.ability_occupied=That location is occupied.
items.weapon.melee.meleeweapon.prompt=Select a Target
items.weapon.melee.meleeweapon.swap=Swap Weapons
items.weapon.melee.meleeweapon.swap_full=You can't do that with a full inventory.

15
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java
View File

@@ -358,7 +358,7 @@ public class MonkEnergy extends Buff implements ActionIndicator.Action {
UnarmedAbilityTracker tracker = Buff.affect(hero, UnarmedAbilityTracker.class);
if (!hero.canAttack(enemy)){
GLog.w(Messages.get(MeleeWeapon.class, "ability_bad_position"));
GLog.w(Messages.get(MeleeWeapon.class, "ability_target_range"));
tracker.detach();
if (hero.buff(FlurryEmpowerTracker.class) != null){
hero.buff(FlurryEmpowerTracker.class).detach();
@@ -495,21 +495,24 @@ public class MonkEnergy extends Buff implements ActionIndicator.Action {
if (Dungeon.hero.rooted){
PixelScene.shake( 1, 1f );
GLog.w(Messages.get(MeleeWeapon.class, "ability_bad_position"));
GLog.w(Messages.get(MeleeWeapon.class, "ability_target_range"));
return;
}
if (Dungeon.level.distance(hero.pos, target) > range){
GLog.w(Messages.get(MeleeWeapon.class, "ability_bad_position"));
GLog.w(Messages.get(MeleeWeapon.class, "ability_target_range"));
return;
}
if (Actor.findChar(target) != null){
GLog.w(Messages.get(MeleeWeapon.class, "ability_occupied"));
}
Ballistica dash = new Ballistica(hero.pos, target, Ballistica.PROJECTILE);
if (!dash.collisionPos.equals(target)
|| Actor.findChar(target) != null
|| (Dungeon.level.solid[target] && !Dungeon.level.passable[target])){
GLog.w(Messages.get(MeleeWeapon.class, "ability_bad_position"));
GLog.w(Messages.get(MeleeWeapon.class, "ability_target_range"));
return;
}
@@ -574,7 +577,7 @@ public class MonkEnergy extends Buff implements ActionIndicator.Action {
UnarmedAbilityTracker tracker = Buff.affect(hero, UnarmedAbilityTracker.class);
if (!hero.canAttack(enemy)){
GLog.w(Messages.get(MeleeWeapon.class, "ability_bad_position"));
GLog.w(Messages.get(MeleeWeapon.class, "ability_target_range"));
tracker.detach();
return;
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java
View File

@@ -207,7 +207,7 @@ public class Pickaxe extends MeleeWeapon {
hero.belongings.abilityWeapon = this;
if (!hero.canAttack(enemy)){
GLog.w(Messages.get(this, "ability_bad_position"));
GLog.w(Messages.get(this, "ability_target_range"));
hero.belongings.abilityWeapon = null;
return;
}

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java
View File

@@ -107,15 +107,15 @@ public class Dagger extends MeleeWeapon {
return;
}
if (Actor.findChar(target) != null || !Dungeon.level.heroFOV[target] || hero.rooted) {
GLog.w(Messages.get(wep, "ability_bad_position"));
PathFinder.buildDistanceMap(Dungeon.hero.pos, BArray.or(Dungeon.level.passable, Dungeon.level.avoid, null), maxDist);
if (PathFinder.distance[target] == Integer.MAX_VALUE || !Dungeon.level.heroFOV[target] || hero.rooted) {
GLog.w(Messages.get(wep, "ability_target_range"));
if (Dungeon.hero.rooted) PixelScene.shake( 1, 1f );
return;
}
PathFinder.buildDistanceMap(Dungeon.hero.pos, BArray.or(Dungeon.level.passable, Dungeon.level.avoid, null), maxDist);
if (PathFinder.distance[target] == Integer.MAX_VALUE) {
GLog.w(Messages.get(wep, "ability_bad_position"));
if (Actor.findChar(target) != null) {
GLog.w(Messages.get(wep, "ability_occupied"));
return;
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java
View File

@@ -79,7 +79,7 @@ public class Greataxe extends MeleeWeapon {
hero.belongings.abilityWeapon = this;
if (!hero.canAttack(enemy)){
GLog.w(Messages.get(this, "ability_bad_position"));
GLog.w(Messages.get(this, "ability_target_range"));
hero.belongings.abilityWeapon = null;
return;
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java
View File

@@ -89,7 +89,7 @@ public class Mace extends MeleeWeapon {
hero.belongings.abilityWeapon = wep;
if (!hero.canAttack(enemy)){
GLog.w(Messages.get(wep, "ability_bad_position"));
GLog.w(Messages.get(wep, "ability_target_range"));
hero.belongings.abilityWeapon = null;
return;
}

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java
View File

@@ -99,7 +99,7 @@ public class Rapier extends MeleeWeapon {
if (hero.rooted || Dungeon.level.distance(hero.pos, target) < 2
|| Dungeon.level.distance(hero.pos, target)-1 > wep.reachFactor(hero)){
GLog.w(Messages.get(wep, "ability_bad_position"));
GLog.w(Messages.get(wep, "ability_target_range"));
if (hero.rooted) PixelScene.shake( 1, 1f );
return;
}
@@ -116,7 +116,7 @@ public class Rapier extends MeleeWeapon {
}
if (lungeCell == -1){
GLog.w(Messages.get(wep, "ability_bad_position"));
GLog.w(Messages.get(wep, "ability_target_range"));
return;
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RunicBlade.java
View File

@@ -77,7 +77,7 @@ public class RunicBlade extends MeleeWeapon {
tracker.boost = 2f + 0.50f*buffedLvl();
hero.belongings.abilityWeapon = this;
if (!hero.canAttack(enemy)){
GLog.w(Messages.get(this, "ability_bad_position"));
GLog.w(Messages.get(this, "ability_target_range"));
tracker.detach();
hero.belongings.abilityWeapon = null;
return;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java
View File

@@ -90,7 +90,7 @@ public class Sai extends MeleeWeapon {
hero.belongings.abilityWeapon = wep;
if (!hero.canAttack(enemy)){
GLog.w(Messages.get(wep, "ability_bad_position"));
GLog.w(Messages.get(wep, "ability_target_range"));
hero.belongings.abilityWeapon = null;
return;
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sickle.java
View File

@@ -89,7 +89,7 @@ public class Sickle extends MeleeWeapon {
hero.belongings.abilityWeapon = wep;
if (!hero.canAttack(enemy)){
GLog.w(Messages.get(wep, "ability_bad_position"));
GLog.w(Messages.get(wep, "ability_target_range"));
hero.belongings.abilityWeapon = null;
return;
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java
View File

@@ -89,7 +89,7 @@ public class Spear extends MeleeWeapon {
hero.belongings.abilityWeapon = wep;
if (!hero.canAttack(enemy) || Dungeon.level.adjacent(hero.pos, enemy.pos)){
GLog.w(Messages.get(wep, "ability_bad_position"));
GLog.w(Messages.get(wep, "ability_target_range"));
hero.belongings.abilityWeapon = null;
return;
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java
View File

@@ -91,7 +91,7 @@ public class Sword extends MeleeWeapon {
hero.belongings.abilityWeapon = wep;
if (!hero.canAttack(enemy)){
GLog.w(Messages.get(wep, "ability_bad_position"));
GLog.w(Messages.get(wep, "ability_target_range"));
hero.belongings.abilityWeapon = null;
return;
}