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

v0.3.0: added support for item sprites to contain emitters

Browse Source
This commit is contained in:
Evan Debenham 2015-05-26 10:19:49 -04:00
parent 8e2f0c0a37
commit 46dffad71d
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
View File

@ -37,6 +37,7 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.noosa.audio.Sample;
import com.watabou.noosa.particles.Emitter;
import com.watabou.utils.Bundlable;
import com.watabou.utils.Bundle;
import com.watabou.utils.Callback;
@ -358,6 +359,8 @@ public class Item implements Bundlable {
public ItemSprite.Glowing glowing() {
return null;
}
public Emitter emitter() { return null; }
public String info() {
return desc();

21
src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSprite.java
View File

@ -35,6 +35,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.watabou.noosa.particles.Emitter;
import com.watabou.utils.PointF;
import com.watabou.utils.Random;
@ -49,6 +50,9 @@ public class ItemSprite extends MovieClip {
public Heap heap;
private Glowing glowing;
//FIXME: a lot of this emitter functionality isn't very well implemented.
//right now I want to ship 0.3.0, but should refactor in the future.
protected Emitter emitter;
private float phase;
private boolean glowUp;
@ -101,6 +105,12 @@ public class ItemSprite extends MovieClip {
dropInterval = 0;
heap = null;
if (emitter != null) emitter.revive();
}
public void visible(boolean value){
this.visible = value;
if (emitter != null) emitter.visible = value;
}
public PointF worldToCamera( int cell ) {
@ -150,6 +160,13 @@ public class ItemSprite extends MovieClip {
}
public ItemSprite view(Item item){
if (this.emitter != null) this.emitter.on = false;
Emitter emitter = item.emitter();
if (emitter != null && parent != null) {
emitter.pos( this );
parent.add( emitter );
this.emitter = emitter;
}
return view(item.image(), item.glowing());
}
@ -160,7 +177,7 @@ public class ItemSprite extends MovieClip {
}
return this;
}
@Override
public void update() {
super.update();
@ -210,7 +227,7 @@ public class ItemSprite extends MovieClip {
ba = glowing.blue * value;
}
}
public static int pick( int index, int x, int y ) {
Bitmap bmp = TextureCache.get( Assets.ITEMS ).bitmap;
int rows = bmp.getWidth() / SIZE;

6
src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java
View File

@ -133,12 +133,14 @@ public class ItemSlot extends Button {
if (item == null) {
active = false;
icon.visible = topLeft.visible = topRight.visible = bottomRight.visible = false;
topLeft.visible = topRight.visible = bottomRight.visible = false;
icon.visible(false);
} else {
active = true;
icon.visible = topLeft.visible = topRight.visible = bottomRight.visible = true;
topLeft.visible = topRight.visible = bottomRight.visible = true;
icon.visible(true);
icon.view( item );

1
src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
View File

@ -365,6 +365,7 @@ public class Toolbar extends Component {
visible =
active =
false;
if (emitter != null) emitter.on = false;
} else {
float p = left / DURATION;