Items on timeline

NYRDS · Sep 27, 2024 · 142c0ba · 142c0ba
1 parent 1f0c6cc
commit 142c0ba
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 5 deletions.
diff --git a/RemixedDungeon/build.gradle b/RemixedDungeon/build.gradle
@@ -33,8 +33,8 @@ android {
         manifestPlaceholders = ["admob_app_id":getApiField("admob_app_id")]
 
         applicationId "com.nyrds.pixeldungeon.ml"
-        versionCode 1217
-        versionName "32.1.beta.10"
+        versionCode 1218
+        versionName "32.1.beta.1"
         targetSdkVersion 34
         compileSdkVersion 34
         minSdkVersion 21

diff --git a/RemixedDungeon/src/main/java/com/watabou/pixeldungeon/actors/Actor.java b/RemixedDungeon/src/main/java/com/watabou/pixeldungeon/actors/Actor.java
@@ -74,7 +74,8 @@ public void postpone(float time) {
         this.time = now + time;
     }
 
-    protected float cooldown() {
+    @LuaInterface
+    public float cooldown() {
         return time - now;
     }
 
@@ -409,6 +410,9 @@ private static void add(Actor actor, float time) {
 
             chars.put(ch.getPos(), ch);
             all.addAll(ch.buffs());
+            for (var item : ch.getBelongings()) {
+                all.add(item);
+            }
         }
 
 

diff --git a/RemixedDungeon/src/main/java/com/watabou/pixeldungeon/actors/hero/Belongings.java b/RemixedDungeon/src/main/java/com/watabou/pixeldungeon/actors/hero/Belongings.java
@@ -486,7 +486,7 @@ public Char getOwner() {
         return owner;
     }
 
-    private class ItemIterator implements Iterator<Item> {
+    public class ItemIterator implements Iterator<Item> {
 
         private int index = 0;
 

diff --git a/RemixedDungeon/src/main/java/com/watabou/pixeldungeon/items/Item.java b/RemixedDungeon/src/main/java/com/watabou/pixeldungeon/items/Item.java
@@ -317,6 +317,7 @@ public final Item detachAll(@NotNull Bag container) {
 
     protected void onDetach() {
         setOwner(CharsList.DUMMY);
+        Actor.remove(this);
     }
 
     public Item upgrade() {
@@ -495,13 +496,14 @@ protected boolean act() {
 
     @Override
     public void storeInBundle(Bundle bundle) {
+        super.storeInBundle(bundle);
         bundle.put(QUANTITY, quantity());
         bundle.put(LEVEL, level());
     }
 
     @Override
     public void restoreFromBundle(Bundle bundle) {
-
+        super.restoreFromBundle(bundle);
         getId();
 
         quantity(bundle.getInt(QUANTITY));
@@ -513,6 +515,7 @@ public void restoreFromBundle(Bundle bundle) {
             degrade(-level);
         }
 
+        setOwner(getOwner());
         //We still need this because upgrade erase cursed flag
         setCursed(bundle.optBoolean("cursed", false));
 
@@ -781,6 +784,7 @@ public void ownerDoesDamage(int damage) {
     }
 
     public void setOwner(Char owner) {
+        GLog.debug("%s owner %s", getEntityKind(), owner.getEntityKind());
         Actor.add(this);
         this.owner = owner;
         if (owner.valid()) {
@@ -822,5 +826,6 @@ public void removeItem() {
 
             owner.getBelongings().removeItem(this);
         }
+        Actor.remove(this);
     }
 }
diff --git a/RemixedDungeon/src/main/java/com/watabou/pixeldungeon/items/bags/Bag.java b/RemixedDungeon/src/main/java/com/watabou/pixeldungeon/items/bags/Bag.java
@@ -210,4 +210,12 @@ public void remove() {
 	public String getEntityKind() {
 		return getClass().getSimpleName();
 	}
+
+	@Override
+	public void setOwner(Char owner) {
+		super.setOwner(owner);
+		for(Item i:items) {
+			i.setOwner(owner);
+		}
+	}
 }
diff --git a/RemixedDungeon/src/main/java/com/watabou/pixeldungeon/windows/WndItem.java b/RemixedDungeon/src/main/java/com/watabou/pixeldungeon/windows/WndItem.java
@@ -9,6 +9,7 @@
 import com.nyrds.pixeldungeon.windows.VHBox;
 import com.nyrds.platform.util.StringsManager;
 import com.nyrds.util.GuiProperties;
+import com.nyrds.util.Util;
 import com.watabou.noosa.Text;
 import com.watabou.pixeldungeon.actors.Char;
 import com.watabou.pixeldungeon.items.Item;
@@ -44,6 +45,9 @@ public WndItem(final WndBag bag, final Item item) {
         }
 
         Text info = PixelScene.createMultiline(item.info(), GuiProperties.regularFontSize());
+        if(Util.isDebug()) {
+            info.text(info.text()+Utils.format("\ncooldown %.1f\nowner %s",item.cooldown(),item.getOwner().getEntityKind()));
+        }
         info.maxWidth(WIDTH);
         info.setX(titlebar.left());
         info.setY(titlebar.bottom() + GAP);