From e366f85de1471055607ae7e6057d952ca302a6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Thu, 25 Aug 2022 13:59:22 +0200
Subject: [PATCH] Enable collecting items from map to equipment

---
 data.mv.db                                    | Bin 32768 -> 32768 bytes
 maps/551e1afc-9cda-4d9f-8817-bfd831fc0a75.dat | Bin 21681 -> 23444 bytes
 .../bartlomiejpluta/demo/entity/Player.java   |  30 ++++++++++--
 .../demo/gui/EquipmentWindow.java             |  24 ++++++++++
 .../com/bartlomiejpluta/demo/gui/HUD.java     |   8 +---
 .../demo/gui/ItemIconView.java                |  43 ++++++++++++++++++
 .../bartlomiejpluta/demo/world/item/Item.java |   7 +++
 .../demo/world/weapon/MeleeWeapon.java        |  18 ++++----
 .../demo/world/weapon/RangedWeapon.java       |  20 ++++----
 .../demo/world/weapon/Weapon.java             |   7 +--
 .../c473a91a-ff25-4e71-9bec-b35e48102aeb.xml  |  42 +++++++----------
 11 files changed, 142 insertions(+), 57 deletions(-)
 create mode 100644 src/main/java/com/bartlomiejpluta/demo/gui/ItemIconView.java
 create mode 100644 src/main/java/com/bartlomiejpluta/demo/world/item/Item.java

diff --git a/data.mv.db b/data.mv.db
index 9ae0793745c8eff4c72381360aa31e1fcae8bd64..408d1a5c2d4d59c505543881e4cba0af0f0c53d4 100644
GIT binary patch
delta 2916
zcmZo@U}|V!nxM>-YBo_-LnPHqCoLznBsn9s$jUU$G{qt@DRE=sA$~m4n-c|=^Gl?f
z=_KXkCudt3>Exv5SsCf%CKgy3nVC#hP>@$ov$QZUFfcGNGqEt%Dap)DwKB3yHZV^!
zHP9(bEh^5;&$BWzPBohx9}qS9fC3w%=j7uGxzd*pvM@3TGWnI~=clCR#V6&L8!|93
zFmQd;h}-P1_<@VjW3q$JWJb2hS9Ek4FKlMgJ;}tFH~EadFJtdyDT6vj&&e|ltQi|8
zUo}|H*fqJ<P|7Wofsv7c<7Wc{OU^Yg%~~``P@Xk6u|Us^fq_Nb%!xsefh#$qG%s7v
z$T-yy!8AcIO()+q^i?-z2kA00GXd*129prB=~70p2_P>SP7XBEW;B_s5FnwIW?_O6
z2uW$lX=W)prFo^rsVVS4nf%aEm_OANIcy9kKQt0$N;R4MKM8D}gPc~HCCE4f17iad
zc%XvJvot`M2j-hX%rikY&je&1SE?yA(#$6rD>Ir*zGw_G7VJz+V@(mpLgEf$EQ&Kt
zH}jRaF*2o?O`hkX0HO}KsIoCIFm;$L*?htDF=M?kvyqtzuLU$g7#pV<8X<UTh8AXU
zo{52}fdztRY@D13=YbrDkTWnzN;ZJY85^WpAXFL~8(Sc3FsL^*GDS$57?~s^9Ajdd
zk_<|uU<zV4BqU6rc0+hDyP-U&-4GtkZYU3GH-u*ZvRZ`KA`QZY*==HAusP6TH`^oy
z4o##ygq$r9InvVH)YK@^#AxzH`*4X=6KLd_fODK7BF8z%spCl;NJg7Xjt_{Qe87Rt
zjRlf37#J8VrZI5*aA0692|~&l%<8PTa)uEiXBdNW1}8jcOwKKoVM;Ze+~BAO$pTWi
zvj8Y9sihhsCs9M4g3LVU{L;J<D}yD7EM+uV$_bPO0*l18(k#H`3MfiYvVgfcBCUe5
zfO#6oeEw7;Wb=(cS%4|kc=7?Td2gKLw9+g<DF8D|nWv$eXK4U2&luS}W3;rt`G8A3
zJEK3ijA8_rQP(#!`L;1>B1If>Tp&fWsY!~F1uU8kq0wv#j%K8SH9$fgcYq?h%y4pi
zKsuuzxKO=<vrvtM6sl+r1{JEA;6k+vT&Vhi3)MDoq1p>BRD-}t=Z6ENP{l|(a%Mir
zNhc)*o?cSY;LKD5P}0FysIGyhfRvQUfl1n4COWx^6;_6p$p$)ksTCzw7CHrq>8Zt5
zsX9gZ`6X5sY3AUJhEnGwr5UDK7@@|cSqdaBk*lJV6mZ%|NrM)*+R1WSY3A6{hG80N
zach{C2uT|$X-F}Uk_I*})nM|PWKi0@0WuGgbkWi-NIzlsr5d26waM^ub_Z%X3#oHp
z<t&s3EoUJ-SUC&jLCZP_59BydISb`M%Q^@TR@Omz(6SD~gO{@qF08DB@@QGWLd#cP
z0|S_)C<QDcFCpbTL!_K%WNc_;YGME>VBxhRIOib>*o(%X0v4RSKp})u^jM<Shp+-R
zkQJOuemWo*utJEY$8PmK3_{qO9>@hOBEy(~G7M%}8)zgxdAg(ch$wF%d5U^XA}o1o
g^W4%!Y*@>1MA|?~Nv23C$;{l)$kN1Y@<w}q0EcZ*^Z)<=

delta 2669
zcmZo@U}|V!nxM>-m^M*WLnJXxCoLznBsn9s$SN^4EhRNE$!KHZA$~m4n-c|=^GhVA
z=_KXkCudt3>Exv5SsCf%CKgy3nHf%2P>@$oO-eQ}FfcGNGqEt%Dap)DwKB3aOH4B{
zw$Ld{Eh^5;&$BWzPE4B|9}qS9fC3vM!{p-%xze)^vM@3TGWnI~=clCR#V6&L8!|93
zFmQd;5Z~;t_<@U&ak7KXWJdqVS9Ek4XKrTFJ;}tVKKYEkFXNHPQU-O543lRXSTmlO
zeAQq%<KfA*hEi@a42+Bn9Ip>Bu;g3=)2v041m#(C6ASdr7#LW@&A1r^8Mu-&O7pVy
zjEoZ#5zG_>Gj;M^Ltk|Rc91S3GefX$V=!p~CQX+zf=vK<DRFY3kv5~@WQ70;t<*#d
zEP-HRVrryQnpaw!ngS1$$qyZc`4dx-!zOX^LnBe9#FWYZlfdRV$Z4e}nSjhQFg7qj
z3RDvlb7N%lOiauZA?BqZo0kGIk1H`18foT}jFlM;CtoxM84GqMrm>00#)9GwVl0X?
zQ#bRKxG^$WnogeQq5z@}xTvx*FfetPyxn}k^f6<-0ke^rA+H5AK^PmS85$vYX@(YN
zaGr^QseuK8XKb9D2<L$uhmbQcNlG?=%NZM_S|C&!8yj07Y%owaH8Mp=ni!cRo4_@i
zn5KYIDVW+=sLnn~fkP81RU;=<L>{rUv`8^EGfSPk(LP)vF$Ef&Cg40^h{yvDa_V@Z
z3(4q|$?*ZvlMgtsx%ooUssjUq#WV(vR}BoTB|%7Om08^fS6WR%q}60lTIGbN)ycVq
zGE9kylN%iMAc;~6ccKKvu3BOua-vDpDag!o&M(a?u`*bKNaRVArJS@G4JQW{iEE`M
zg2K=M6hSD7(liM<^_ZBL8G_8`PfS8KKM9m5nG%yH9{`*8#tD=f!D$@BJTpU7^URGQ
z<|QMWmyDJgHy?1RXJ=#qml|H+Qe)0$Cf_zDO{9oJjtit{Hn%V}HGxHQA~c#!!O@IV
z)CEYW;|@?{mnBY)4@hTZ1s8MkaTaqzkYWza!JuMJ30%w_1Q&Cx;9~A9xR^TzF6Jb`
zN#|7qq?p4<I&x<0C`rc*kzOniOiNJG!B@<!L8Jh)$$^k!NkLvK)e>BOpqBNPmL_Hf
zs4-@01c@<A<Zv;AqyP(OF{hm@r<IzBB?VYonwTS}082{~3p0p$C{>CD#5~K%Ymz}J
z^aj{GEX5{RKN0S;L`zYV;pN+B)bb5d*2Bs-C=Xh`L3pt84a$R-Zx9|Rxr53#C=Xh`
zL3pt84a$R-ZxEh=0<?UCaAD;elm{x`-~}5Z4I`!aM5GjNVrFS-XqF5q*x>a9IK?9h
zwu{D~f(;zuAUC6Ad2^JqBNbM#1^R(g=j#UKf=vif3GY__&LD)n5=JiA5D7H}lu$9t
zxIiQE$<rOhM?^UXN#)dQ9AHW1o9C7;V#88)Y9QJW$Qd~mDJ5AXTAG@gPu^f3003R2
B7-s+g

diff --git a/maps/551e1afc-9cda-4d9f-8817-bfd831fc0a75.dat b/maps/551e1afc-9cda-4d9f-8817-bfd831fc0a75.dat
index 10cfd19595b02fafba1d0772f83df24ffc1b45c3..1915183277f024c65bfd4646eb39e2f503d64f95 100644
GIT binary patch
delta 567
zcmdnEl5xs*#tjwf+>HiYEWU}Ec~U?0Cr?z5oV-AtZ?c?@z~lyPp2-U|*d}T4ZI;rg
z6W|g$#lpcWAR%>_WizkI3dZ`f#3F^_^8BI{1zUx@)N+O7{9L`H#G;a%{M^jctb&}<
zl0?0f)ZBc%^8BKl6ut7)#De@hJ>S%v)YNb=TSKWlKR+ckFCJ`)lBP8mn4wpkTH>6a
zUzC!WmspZotWlw(P>C!T<(Zd~TA`t)Yp7|>m6KSRTBMhllH!_Il37xz0X9L?TIe7P
zhk$^B)Gj2qCgqot<kFzTy!6x*G^ZxzmxCOdlwXd+nNS(1BcX1TMRjCSez~T#(0LXP
zX#okT6G%=>NlZ^qEh5R4*uoQH49J}j77nK(B%?g@6hUDMbuOxFA<8tZH_xz;lmP%G
CHpFfK

delta 54
zcmbQTopIwz#tjwf-1C&USbP&R^Q5LKO`fP8IeCFP-()!*fyoWpJd+n_uuan7+bpF~
LC$PENUQz}C1X2;V

diff --git a/src/main/java/com/bartlomiejpluta/demo/entity/Player.java b/src/main/java/com/bartlomiejpluta/demo/entity/Player.java
index 1f0639c..e8460c7 100644
--- a/src/main/java/com/bartlomiejpluta/demo/entity/Player.java
+++ b/src/main/java/com/bartlomiejpluta/demo/entity/Player.java
@@ -1,10 +1,12 @@
 package com.bartlomiejpluta.demo.entity;
 
 import com.bartlomiejpluta.base.api.character.Character;
+import com.bartlomiejpluta.demo.world.item.Item;
 import lombok.NonNull;
 import org.joml.Vector2i;
 
 public class Player extends Creature {
+   private final Item[] equipment = new Item[4 * 4];
 
    public Player(@NonNull Character entity) {
       super(entity);
@@ -14,13 +16,35 @@ public class Player extends Creature {
 
    public void interact() {
       var coords = getCoordinates().add(getFaceDirection().vector, new Vector2i());
-      for (var entity : getLayer().getEntities()) {
-         if (entity.getCoordinates().equals(coords) && entity instanceof MapObject) {
-            ((MapObject) entity).interact(this);
+      var entities = getLayer().getEntities();
+      for (var i=0; i< entities.size(); ++i) {
+         var entity = entities.get(i);
+
+         if (entity.getCoordinates().equals(coords) && entity instanceof MapObject object) {
+            object.interact(this);
+            return;
+         }
+
+         if (entity.getCoordinates().equals(getCoordinates()) && entity instanceof Item item) {
+            pushItemToEquipment(item);
+            getLayer().removeEntity(item);
          }
       }
    }
 
+   private void pushItemToEquipment(@NonNull Item item) {
+      for(int i=0; i<equipment.length; ++i) {
+         if(equipment[i] == null) {
+            equipment[i] = item;
+            return;
+         }
+      }
+   }
+
+   public Item getEquipmentItem(int index) {
+      return equipment[index];
+   }
+
    @Override
    public void die() {
       super.die();
diff --git a/src/main/java/com/bartlomiejpluta/demo/gui/EquipmentWindow.java b/src/main/java/com/bartlomiejpluta/demo/gui/EquipmentWindow.java
index ef19112..736efe5 100644
--- a/src/main/java/com/bartlomiejpluta/demo/gui/EquipmentWindow.java
+++ b/src/main/java/com/bartlomiejpluta/demo/gui/EquipmentWindow.java
@@ -2,11 +2,35 @@ package com.bartlomiejpluta.demo.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
 import com.bartlomiejpluta.base.api.gui.GUI;
+import com.bartlomiejpluta.base.api.gui.Ref;
+import com.bartlomiejpluta.base.api.gui.WindowManager;
+import com.bartlomiejpluta.base.api.screen.Screen;
+import com.bartlomiejpluta.base.lib.gui.VGridOptionChoice;
+import com.bartlomiejpluta.demo.entity.Player;
+import com.bartlomiejpluta.demo.runner.DemoRunner;
 
 
 public class EquipmentWindow extends DecoratedWindow {
+   private final DemoRunner runner;
+   private final Player player;
+
+   @Ref("eq")
+   private VGridOptionChoice eqGrid;
 
    public EquipmentWindow(Context context, GUI gui) {
       super(context, gui);
+      this.runner = (DemoRunner) context.getGameRunner();
+      this.player = runner.getPlayer();
+   }
+
+   @Override
+   public void onOpen(WindowManager manager) {
+      super.onOpen(manager);
+
+      var i = 0;
+      for(var child : eqGrid.getChildren()) {
+         var slot = (ItemIconView) child;
+         slot.setIcon(player.getEquipmentItem(i++));
+      }
    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/bartlomiejpluta/demo/gui/HUD.java b/src/main/java/com/bartlomiejpluta/demo/gui/HUD.java
index 86a3ce7..3176277 100644
--- a/src/main/java/com/bartlomiejpluta/demo/gui/HUD.java
+++ b/src/main/java/com/bartlomiejpluta/demo/gui/HUD.java
@@ -79,12 +79,8 @@ public class HUD extends BorderLayout {
          logVisibilityDuration = 0;
       }
 
-      if (player.getWeapon() != null && player.getWeapon() != currentWeapon) {
-         weapon.setIcon(player.getWeapon().getIcon());
-         this.currentWeapon = player.getWeapon();
-      } else if (player.getWeapon() == null) {
-         this.currentWeapon = null;
-      }
+
+      this.currentWeapon = player.getWeapon();
    }
 
    @Override
diff --git a/src/main/java/com/bartlomiejpluta/demo/gui/ItemIconView.java b/src/main/java/com/bartlomiejpluta/demo/gui/ItemIconView.java
new file mode 100644
index 0000000..43bf876
--- /dev/null
+++ b/src/main/java/com/bartlomiejpluta/demo/gui/ItemIconView.java
@@ -0,0 +1,43 @@
+package com.bartlomiejpluta.demo.gui;
+
+import com.bartlomiejpluta.base.api.context.Context;
+import com.bartlomiejpluta.base.api.gui.Color;
+import com.bartlomiejpluta.base.api.gui.GUI;
+import com.bartlomiejpluta.base.api.screen.Screen;
+import com.bartlomiejpluta.base.lib.gui.IconView;
+
+public class ItemIconView extends IconView {
+   private final Color normal;
+   private final Color hover;
+
+   public ItemIconView(Context context, GUI gui) {
+      super(context, gui);
+      this.normal = gui.createColor();
+      this.hover = gui.createColor();
+
+      normal.setRGBA(0x444444FF);
+      hover.setRGBA(0x888888FF);
+      super.setScale(2f);
+   }
+
+   @Override
+   protected float getContentWidth() {
+      return 68f;
+   }
+
+   @Override
+   protected float getContentHeight() {
+      return 68f;
+   }
+
+   @Override
+   public void draw(Screen screen, GUI gui) {
+      gui.beginPath();
+      gui.drawRectangle(x, y, getWidth(), getHeight());
+      gui.setFillColor(focused ? hover : normal);
+      gui.fill();
+      gui.closePath();
+
+      super.draw(screen, gui);
+   }
+}
diff --git a/src/main/java/com/bartlomiejpluta/demo/world/item/Item.java b/src/main/java/com/bartlomiejpluta/demo/world/item/Item.java
new file mode 100644
index 0000000..155dd5c
--- /dev/null
+++ b/src/main/java/com/bartlomiejpluta/demo/world/item/Item.java
@@ -0,0 +1,7 @@
+package com.bartlomiejpluta.demo.world.item;
+
+import com.bartlomiejpluta.base.api.icon.Icon;
+
+public interface Item extends Icon {
+   String getName();
+}
diff --git a/src/main/java/com/bartlomiejpluta/demo/world/weapon/MeleeWeapon.java b/src/main/java/com/bartlomiejpluta/demo/world/weapon/MeleeWeapon.java
index 06794d9..56d75a0 100644
--- a/src/main/java/com/bartlomiejpluta/demo/world/weapon/MeleeWeapon.java
+++ b/src/main/java/com/bartlomiejpluta/demo/world/weapon/MeleeWeapon.java
@@ -5,6 +5,7 @@ import com.bartlomiejpluta.base.api.context.ContextHolder;
 import com.bartlomiejpluta.base.api.icon.Icon;
 import com.bartlomiejpluta.base.lib.animation.AnimationRunner;
 import com.bartlomiejpluta.base.lib.animation.RandomAnimationsRunner;
+import com.bartlomiejpluta.base.lib.icon.IconDelegate;
 import com.bartlomiejpluta.base.util.random.DiceRoller;
 import com.bartlomiejpluta.demo.entity.Creature;
 import com.bartlomiejpluta.demo.event.HitEvent;
@@ -14,15 +15,12 @@ import org.joml.Vector2i;
 
 import java.util.Random;
 
-public class MeleeWeapon implements Weapon {
-   private final Random random = new Random();
+public class MeleeWeapon extends IconDelegate implements Weapon {
    private final Context context;
    private final DiceRoller roller;
    private final AnimationRunner animation;
    private final String sound;
    @Getter
-   private final Icon icon;
-   @Getter
    private final String name;
    @Getter
    private final int cooldown;
@@ -32,22 +30,21 @@ public class MeleeWeapon implements Weapon {
    }
 
    public MeleeWeapon(@NonNull DB.model.MeleeWeaponModel template) {
+      super(createIcon(template));
+
       this.context = ContextHolder.INSTANCE.getContext();
       this.name = template.getName();
       this.roller = DiceRoller.of(template.getDamage());
       this.cooldown = template.getCooldown();
       this.animation = new RandomAnimationsRunner(2).nRange(0, 2f).nScale(0.2f, 0.15f).uAnimationSpeed(0.5f, 1f).nRotation(0, 10).offset(0, -10).uDelay(250, 500).with(A.animations.get(template.getAnimation()).uid);
       this.sound = A.sounds.get(template.getSound()).uid;
-      var icons = template.getIcon().split(",");
-      this.icon = context.createIcon(A.iconsets.get(icons[0]).uid, Integer.valueOf(icons[1]), Integer.valueOf(icons[2]));
    }
 
    @Override
    public boolean attack(Creature attacker) {
       var facingNeighbour = attacker.getCoordinates().add(attacker.getFaceDirection().vector, new Vector2i());
       for (var entity : attacker.getLayer().getEntities()) {
-         if (entity.getCoordinates().equals(facingNeighbour) && entity.isBlocking() && entity instanceof Creature) {
-            var character = (Creature) entity;
+         if (entity.getCoordinates().equals(facingNeighbour) && entity.isBlocking() && entity instanceof Creature character) {
             var damage = roller.roll();
             character.hit(attacker, damage);
             animation.run(context, character.getLayer(), character);
@@ -59,4 +56,9 @@ public class MeleeWeapon implements Weapon {
 
       return false;
    }
+
+   private static Icon createIcon(DB.model.MeleeWeaponModel template) {
+      var icons = template.getIcon().split(",");
+      return ContextHolder.INSTANCE.getContext().createIcon(A.iconsets.get(icons[0]).uid, Integer.parseInt(icons[1]), Integer.parseInt(icons[2]));
+   }
 }
\ No newline at end of file
diff --git a/src/main/java/com/bartlomiejpluta/demo/world/weapon/RangedWeapon.java b/src/main/java/com/bartlomiejpluta/demo/world/weapon/RangedWeapon.java
index b9fd6b8..6311fcc 100644
--- a/src/main/java/com/bartlomiejpluta/demo/world/weapon/RangedWeapon.java
+++ b/src/main/java/com/bartlomiejpluta/demo/world/weapon/RangedWeapon.java
@@ -9,16 +9,14 @@ import com.bartlomiejpluta.base.api.move.Movable;
 import com.bartlomiejpluta.base.lib.animation.AnimationRunner;
 import com.bartlomiejpluta.base.lib.animation.BulletAnimationRunner;
 import com.bartlomiejpluta.base.lib.animation.SimpleAnimationRunner;
+import com.bartlomiejpluta.base.lib.icon.IconDelegate;
 import com.bartlomiejpluta.base.util.random.DiceRoller;
 import com.bartlomiejpluta.demo.entity.Creature;
 import com.bartlomiejpluta.demo.event.HitEvent;
 import lombok.Getter;
 import lombok.NonNull;
 
-import java.util.Random;
-
-public class RangedWeapon implements Weapon {
-   private final Random random = new Random();
+public class RangedWeapon extends IconDelegate implements Weapon {
    private final Context context;
    private final DiceRoller dmgRoller;
    private final DiceRoller rangeRoller;
@@ -29,8 +27,6 @@ public class RangedWeapon implements Weapon {
    private final AnimationRunner missAnimation;
    private final String missSound;
    @Getter
-   private final Icon icon;
-   @Getter
    private final String name;
    @Getter
    private final int cooldown;
@@ -40,6 +36,8 @@ public class RangedWeapon implements Weapon {
    }
 
    public RangedWeapon(@NonNull DB.model.RangedWeaponModel template) {
+      super(createIcon(template));
+
       this.context = ContextHolder.INSTANCE.getContext();
       this.name = template.getName();
       this.dmgRoller = DiceRoller.of(template.getDamage());
@@ -51,14 +49,11 @@ public class RangedWeapon implements Weapon {
       this.punchSound = A.sounds.get(template.getPunchSound()).uid;
       this.missAnimation = new SimpleAnimationRunner(A.animations.get(template.getMissAnimation()).uid).scale(0.4f);
       this.missSound = A.sounds.get(template.getMissSound()).uid;
-      var icons = template.getIcon().split(",");
-      this.icon = context.createIcon(A.iconsets.get(icons[0]).uid, Integer.valueOf(icons[1]), Integer.valueOf(icons[2]));
    }
 
    private void onHit(Movable attacker, Entity target) {
-      if (target.isBlocking() && target instanceof Creature) {
+      if (target.isBlocking() && target instanceof Creature character) {
          var namedAttacker = (Creature) attacker;
-         var character = (Creature) target;
          var damage = dmgRoller.roll();
          character.hit(namedAttacker, damage);
          punchAnimation.run(context, character.getLayer(), character);
@@ -79,4 +74,9 @@ public class RangedWeapon implements Weapon {
       animation.range(rangeRoller.roll()).direction(direction).rotation(direction.xAngle - 180).run(context, attacker.getLayer(), attacker);
       return true;
    }
+
+   private static Icon createIcon(DB.model.RangedWeaponModel template) {
+      var icons = template.getIcon().split(",");
+      return ContextHolder.INSTANCE.getContext().createIcon(A.iconsets.get(icons[0]).uid, Integer.parseInt(icons[1]), Integer.parseInt(icons[2]));
+   }
 }
\ No newline at end of file
diff --git a/src/main/java/com/bartlomiejpluta/demo/world/weapon/Weapon.java b/src/main/java/com/bartlomiejpluta/demo/world/weapon/Weapon.java
index c3895dd..7975bd4 100644
--- a/src/main/java/com/bartlomiejpluta/demo/world/weapon/Weapon.java
+++ b/src/main/java/com/bartlomiejpluta/demo/world/weapon/Weapon.java
@@ -1,12 +1,9 @@
 package com.bartlomiejpluta.demo.world.weapon;
 
-import com.bartlomiejpluta.base.api.icon.Icon;
 import com.bartlomiejpluta.demo.entity.Creature;
+import com.bartlomiejpluta.demo.world.item.Item;
 
-public interface Weapon {
-   String getName();
-
-   Icon getIcon();
+public interface Weapon extends Item {
 
    int getCooldown();
 
diff --git a/widgets/c473a91a-ff25-4e71-9bec-b35e48102aeb.xml b/widgets/c473a91a-ff25-4e71-9bec-b35e48102aeb.xml
index 29c5880..834c49d 100644
--- a/widgets/c473a91a-ff25-4e71-9bec-b35e48102aeb.xml
+++ b/widgets/c473a91a-ff25-4e71-9bec-b35e48102aeb.xml
@@ -21,31 +21,23 @@
                 fontSize="30f">Equipment
         </base:Label>
 
-        <base:VGridOptionChoice columns="4"
-                                scrollSpeed="0.2f"
-                                widthMode="SizeMode.ABSOLUTE"
-                                width="4 * 68f"
-                                heightMode="SizeMode.ABSOLUTE"
-                                height="4 * 68f">
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="5" iconSetColumn="0" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="5" iconSetColumn="1" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="5" iconSetColumn="2" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="5" iconSetColumn="3" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="5" iconSetColumn="4" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="5" iconSetColumn="5" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="5" iconSetColumn="6" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="5" iconSetColumn="7" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="5" iconSetColumn="8" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="5" iconSetColumn="9" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="5" iconSetColumn="10" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="6" iconSetColumn="0" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="7" iconSetColumn="1" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="8" iconSetColumn="2" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="9" iconSetColumn="3" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="10" iconSetColumn="4" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="11" iconSetColumn="5" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="11" iconSetColumn="6" scale="2f"/>
-            <base:IconView iconSet="A.iconsets.generic.uid" iconSetRow="11" iconSetColumn="7" scale="2f"/>
+        <base:VGridOptionChoice ref="eq" columns="4" widthMode="SizeMode.AUTO" heightMode="SizeMode.AUTO">
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
+            <demo:ItemIconView margin="5f" />
         </base:VGridOptionChoice>
     </base:VLayout>