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

v2.4.0: increased ghost enchant rate, smith can now also enchant

Browse Source
This commit is contained in:
Evan Debenham
2024-03-15 12:54:06 -04:00
parent 46e30809c2
commit c80fa10980
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
View File

@@ -287,6 +287,8 @@ public class Blacksmith extends NPC {
//pre-generate these so they are consistent between seeds
public static ArrayList<Item> smithRewards;
public static Weapon.Enchantment smithEnchant;
public static Armor.Glyph smithGlyph;
public static void reset() {
type = 0;
@@ -306,6 +308,8 @@ public class Blacksmith extends NPC {
smiths = 0;
smithRewards = null;
smithEnchant = null;
smithGlyph = null;
}
private static final String NODE = "blacksmith";
@@ -326,6 +330,8 @@ public class Blacksmith extends NPC {
private static final String UPGRADES = "upgrades";
private static final String SMITHS = "smiths";
private static final String SMITH_REWARDS = "smith_rewards";
private static final String ENCHANT = "enchant";
private static final String GLYPH = "glyph";
public static void storeInBundle( Bundle bundle ) {
@@ -349,7 +355,13 @@ public class Blacksmith extends NPC {
node.put( UPGRADES, upgrades );
node.put( SMITHS, smiths );
if (smithRewards != null) node.put( SMITH_REWARDS, smithRewards );
if (smithRewards != null) {
node.put( SMITH_REWARDS, smithRewards );
if (smithEnchant != null) {
node.put(ENCHANT, smithEnchant);
node.put(GLYPH, smithGlyph);
}
}
}
bundle.put( NODE, node );
@@ -386,6 +398,10 @@ public class Blacksmith extends NPC {
if (node.contains( SMITH_REWARDS )){
smithRewards = new ArrayList<>((Collection<Item>) ((Collection<?>) node.getCollection( SMITH_REWARDS )));
if (node.contains(ENCHANT)) {
smithEnchant = (Weapon.Enchantment) node.get(ENCHANT);
smithGlyph = (Armor.Glyph) node.get(GLYPH);
}
}
} else {
@@ -447,6 +463,14 @@ public class Blacksmith extends NPC {
}
i.cursed = false;
}
// 30% base chance to be enchanted, stored separately so status isn't revealed early
float enchantRoll = Random.Float();
if (enchantRoll <= 0.3f){
smithEnchant = Weapon.Enchantment.random();
smithGlyph = Armor.Glyph.random();
}
}
public static int Type(){

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java
View File

@@ -347,8 +347,9 @@ public class Ghost extends NPC {
weapon.upgrade(itemLevel);
armor.upgrade(itemLevel);
//10% to be enchanted. We store it separately so enchant status isn't revealed early
if (Random.Int(10) == 0){
// 20% base chance to be enchanted, stored separately so status isn't revealed early
float enchantRoll = Random.Float();
if (enchantRoll < 0.20f){
enchant = Weapon.Enchantment.random();
glyph = Armor.Glyph.random();
}

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java
View File

@@ -506,6 +506,13 @@ public class WndBlacksmith extends Window {
@Override
protected void onClick() {
RewardWindow.this.hide();
if (item instanceof Weapon && Blacksmith.Quest.smithEnchant != null){
((Weapon) item).enchant(Blacksmith.Quest.smithEnchant);
} else if (item instanceof Armor && Blacksmith.Quest.smithGlyph != null){
((Armor) item).inscribe(Blacksmith.Quest.smithGlyph);
}
item.identify(false);
Sample.INSTANCE.play(Assets.Sounds.EVOKE);
Item.evoke( Dungeon.hero );