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

v0.2.4d: applied beacon tweaks

Browse Source
This commit is contained in:
Evan Debenham 2015-03-22 15:18:24 -04:00
parent 3db441a5f7
commit f89179d346
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 13 KiB

5
src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
View File

@ -50,6 +50,11 @@ public class ShatteredPixelDungeon extends Game {
com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicalInfusion.class,
"com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfWeaponUpgrade" );
// 0.2.4d
com.watabou.utils.Bundle.addAlias(
com.shatteredpixel.shatteredpixeldungeon.items.artifacts.LloydsBeacon.class,
"com.shatteredpixel.shatteredpixeldungeon.items.LloydsBeacon" );
}

2
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java
View File

@ -32,7 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Ooze;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.items.LloydsBeacon;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.LloydsBeacon;
import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death;

9
src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java
View File

@ -18,7 +18,7 @@ public class MerchantsBeacon extends Item {
{
name = "merchant's beacon";
image = ItemSpriteSheet.BEACON; //TODO: make sprite
image = ItemSpriteSheet.BEACON;
stackable = true;
@ -56,15 +56,14 @@ public class MerchantsBeacon extends Item {
@Override
public int price() {
return 10 * quantity;
return 5 * quantity;
}
@Override
//todo add description
public String info() {
return "This odd piece of dwarvern technology allows you to communicate from great distances." +
return "This odd piece of dwarven technology allows you to communicate from great distances." +
"\n\nAfter being activated, this beacon will let you sell items to Pixel Mart from anywhere in the dungeon." +
"\n\nOnce activated, the magic within the beacon will only last for one session though, so use it wisely.";
"\n\nHowever, the magic within the beacon will only last for one session, so use it wisely.";
}
}

8
src/com/shatteredpixel/shatteredpixeldungeon/items/LloydsBeacon.java → src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java
View File

@ -15,7 +15,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package com.shatteredpixel.shatteredpixeldungeon.items;
package com.shatteredpixel.shatteredpixeldungeon.items.artifacts;
//If it weren't super obvious, this is going to become an artifact soon.
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@ -23,8 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.DriedRose;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TimekeepersHourglass;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene;
@ -65,7 +65,7 @@ public class LloydsBeacon extends Item {
{
name = "lloyd's beacon";
image = ItemSpriteSheet.BEACON;
image = ItemSpriteSheet.ARTIFACT_BEACON;
unique = true;
}

1
src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
View File

@ -147,6 +147,7 @@ public class ItemSpriteSheet {
public static final int ARTIFACT_HOURGLASS = ROW8+4;
public static final int ARTIFACT_TOOLKIT = ROW8+5;
public static final int ARTIFACT_SPELLBOOK = ROW8+6;
public static final int ARTIFACT_BEACON = ROW8+7;
//Row Nine: Artifacts with Dynamic Images
public static final int ARTIFACT_HORN1 = ROW9+0;