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

v1.3.0: renamed dreamfoil to mageroyal

Browse Source
This commit is contained in:
Evan Debenham
2022-05-29 18:33:54 -04:00
parent 039eacd4de
commit 34d62f9852
8 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1577,7 +1577,7 @@ items.weapon.missiles.darts.chillingdart.name=chilling dart
items.weapon.missiles.darts.chillingdart.desc=These darts are tipped with an icecap-based compound which will significantly chill their target.
items.weapon.missiles.darts.cleansingdart.name=cleansing dart
items.weapon.missiles.darts.cleansingdart.desc=These darts are tipped with a dreamfoil-based compound which will temporarily make allies immune to all negative effects, or will cleanse positive effects from enemies. Enemies may even briefly forget that they are attacking or fleeing from you. The dart itself is still harmful to enemies, but will not harm allies.
items.weapon.missiles.darts.cleansingdart.desc=These darts are tipped with a mageroyal-based compound which will temporarily make allies immune to all negative effects, or will cleanse positive effects from enemies. Enemies may even briefly forget that they are attacking or fleeing from you. The dart itself is still harmful to enemies, but will not harm allies.
items.weapon.missiles.darts.dart.name=dart
items.weapon.missiles.darts.dart.ac_tip=TIP

10
core/src/main/assets/messages/plants/plants.properties
View File

@@ -7,11 +7,11 @@ plants.blindweed.desc=Upon being touched a blindweed perishes in a bright flash
plants.blindweed.warden_desc=_The Warden_ will channel a blindweed's energy into a temporary shroud of invisibility, instead of being disoriented.
plants.blindweed$seed.name=seed of blindweed
plants.dreamfoil.name=dreamfoil
plants.dreamfoil.refreshed=You feel refreshed.
plants.dreamfoil.desc=The dreamfoil's prickly flowers contain a chemical which is known for its properties as a strong neutralizing agent. Anything that steps in this plant will be cleansed of many negative effects.
plants.dreamfoil.warden_desc=In addition to the neutralizing effect, _the Warden_ will become temporarily immune to all area-bound effects when stepping on dreamfoil.
plants.dreamfoil$seed.name=seed of dreamfoil
plants.mageroyal.name=mageroyal
plants.mageroyal.refreshed=You feel refreshed.
plants.mageroyal.desc=The mageroyal's prickly flowers contain a chemical which is known for its properties as a strong neutralizing agent. Anything that steps in this plant will be cleansed of many negative effects.
plants.mageroyal.warden_desc=In addition to the neutralizing effect, _the Warden_ will become temporarily immune to all area-bound effects when stepping on mageroyal.
plants.mageroyal$seed.name=seed of mageroyal
plants.earthroot.name=earthroot
plants.earthroot.desc=When a creature touches an earthroot, its roots create a kind of immobile natural armor around it.

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

@@ -47,6 +47,13 @@ public class ShatteredPixelDungeon extends Game {
super( sceneClass == null ? WelcomeScene.class : sceneClass, platform );
//v1.3.0
com.watabou.utils.Bundle.addAlias(
com.shatteredpixel.shatteredpixeldungeon.plants.Mageroyal.class,
"com.shatteredpixel.shatteredpixeldungeon.plants.Dreamfoil" );
com.watabou.utils.Bundle.addAlias(
com.shatteredpixel.shatteredpixeldungeon.plants.Mageroyal.Seed.class,
"com.shatteredpixel.shatteredpixeldungeon.plants.Dreamfoil.Seed" );
com.watabou.utils.Bundle.addAlias(
com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses.Dazzling.class,
"com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses.Exhausting" );

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
View File

@@ -154,7 +154,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.ThrowingSt
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Tomahawk;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Trident;
import com.shatteredpixel.shatteredpixeldungeon.plants.Blindweed;
import com.shatteredpixel.shatteredpixeldungeon.plants.Dreamfoil;
import com.shatteredpixel.shatteredpixeldungeon.plants.Mageroyal;
import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot;
import com.shatteredpixel.shatteredpixeldungeon.plants.Fadeleaf;
import com.shatteredpixel.shatteredpixeldungeon.plants.Firebloom;
@@ -276,7 +276,7 @@ public class Generator {
Blindweed.Seed.class,
Stormvine.Seed.class,
Earthroot.Seed.class,
Dreamfoil.Seed.class,
Mageroyal.Seed.class,
Starflower.Seed.class};
SEED.defaultProbs = new float[]{ 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 2 };
SEED.probs = SEED.defaultProbs.clone();

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
View File

@@ -22,10 +22,7 @@
package com.shatteredpixel.shatteredpixeldungeon.items.potions;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Challenges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire;
@@ -50,7 +47,7 @@ import com.shatteredpixel.shatteredpixeldungeon.journal.Catalog;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.plants.Blindweed;
import com.shatteredpixel.shatteredpixeldungeon.plants.Dreamfoil;
import com.shatteredpixel.shatteredpixeldungeon.plants.Mageroyal;
import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot;
import com.shatteredpixel.shatteredpixeldungeon.plants.Fadeleaf;
import com.shatteredpixel.shatteredpixeldungeon.plants.Firebloom;
@@ -448,7 +445,7 @@ public class Potion extends Item {
public static HashMap<Class<?extends Plant.Seed>, Class<?extends Potion>> types = new HashMap<>();
static {
types.put(Blindweed.Seed.class, PotionOfInvisibility.class);
types.put(Dreamfoil.Seed.class, PotionOfPurity.class);
types.put(Mageroyal.Seed.class, PotionOfPurity.class);
types.put(Earthroot.Seed.class, PotionOfParalyticGas.class);
types.put(Fadeleaf.Seed.class, PotionOfMindVision.class);
types.put(Firebloom.Seed.class, PotionOfLiquidFlame.class);

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java
View File

@@ -32,7 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfRegrowth;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.plants.Blindweed;
import com.shatteredpixel.shatteredpixeldungeon.plants.Dreamfoil;
import com.shatteredpixel.shatteredpixeldungeon.plants.Mageroyal;
import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot;
import com.shatteredpixel.shatteredpixeldungeon.plants.Fadeleaf;
import com.shatteredpixel.shatteredpixeldungeon.plants.Firebloom;
@@ -173,7 +173,7 @@ public abstract class TippedDart extends Dart {
private static HashMap<Class<?extends Plant.Seed>, Class<?extends TippedDart>> types = new HashMap<>();
static {
types.put(Blindweed.Seed.class, BlindingDart.class);
types.put(Dreamfoil.Seed.class, CleansingDart.class);
types.put(Mageroyal.Seed.class, CleansingDart.class);
types.put(Earthroot.Seed.class, ParalyticDart.class);
types.put(Fadeleaf.Seed.class, DisplacingDart.class);
types.put(Firebloom.Seed.class, IncendiaryDart.class);

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java → core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Mageroyal.java
View File

@@ -24,16 +24,14 @@ package com.shatteredpixel.shatteredpixeldungeon.plants;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.BlobImmunity;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicalSleep;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
public class Dreamfoil extends Plant {
public class Mageroyal extends Plant {
{
image = 7;
@@ -58,9 +56,9 @@ public class Dreamfoil extends Plant {
public static class Seed extends Plant.Seed {
{
image = ItemSpriteSheet.SEED_DREAMFOIL;
image = ItemSpriteSheet.SEED_MAGEROYAL;
plantClass = Dreamfoil.class;
plantClass = Mageroyal.class;
}
}
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
View File

@@ -562,7 +562,7 @@ public class ItemSpriteSheet {
public static final int SEED_ICECAP = SEEDS+4;
public static final int SEED_STORMVINE = SEEDS+5;
public static final int SEED_SORROWMOSS = SEEDS+6;
public static final int SEED_DREAMFOIL = SEEDS+7;
public static final int SEED_MAGEROYAL = SEEDS+7;
public static final int SEED_EARTHROOT = SEEDS+8;
public static final int SEED_STARFLOWER = SEEDS+9;
public static final int SEED_FADELEAF = SEEDS+10;