master
Baptiste BAVEREL 2 years ago
parent 0cd03f2377
commit ef8f42333f

Binary file not shown.

@ -74,7 +74,12 @@ namespace BlazorApp1.Components
return; return;
} }
if (Parent.InventoryItems[this.Index] is not null) if (this.Index == Parent.CurrentEllement.getIndex())
{
Parent.InventoryItems[this.Index] = Parent.CurrentDragItem;
Parent.InventoryNbElems[this.Index] = Parent.CurrenttmpNbElem;
}
else if (Parent.InventoryItems[this.Index] is not null)
{ {
if (Parent.InventoryItems[this.Index].Equals(Parent.CurrentDragItem)) if (Parent.InventoryItems[this.Index].Equals(Parent.CurrentDragItem))
{ {
@ -82,17 +87,18 @@ namespace BlazorApp1.Components
{ {
Parent.InventoryNbElems[this.Index]++; Parent.InventoryNbElems[this.Index]++;
} }
else if (Parent.InventoryNbElems[this.Index] + Parent.CurrentEllement.getNbElement() > Parent.InventoryItems[this.Index].StackSize && Parent.CurrentEllement.getTypeID() == "InventoryItem") else if (Parent.InventoryNbElems[this.Index] + Parent.CurrenttmpNbElem > Parent.InventoryItems[this.Index].StackSize && Parent.CurrentEllement.getTypeID() == "InventoryItem")
{ {
int tmp = Parent.InventoryNbElems[this.Index] + Parent.CurrentEllement.getNbElement(); int tmp = Parent.InventoryNbElems[this.Index] + Parent.CurrenttmpNbElem;
Parent.InventoryNbElems[this.Index] = Parent.InventoryItems[this.Index].StackSize; Parent.InventoryNbElems[this.Index] = Parent.InventoryItems[this.Index].StackSize;
Parent.CurrentEllement.setNbElement(tmp - Parent.InventoryItems[this.Index].StackSize); Parent.InventoryItems[Parent.CurrentEllement.getIndex()] = Parent.CurrentDragItem;
Parent.InventoryNbElems[Parent.CurrentEllement.getIndex()] =tmp - Parent.InventoryItems[this.Index].StackSize;
} }
else if (Parent.CurrentEllement.getTypeID() == "InventoryItem") else if (Parent.CurrentEllement.getTypeID() == "InventoryItem")
{ {
Parent.InventoryNbElems[this.Index] += Parent.CurrentEllement.getNbElement(); Parent.InventoryNbElems[this.Index] += Parent.CurrenttmpNbElem;
Parent.CurrentEllement.setNbElement(0); //Parent.CurrentEllement.setNbElement(0);
Parent.CurrentEllement.setItem(null); //Parent.CurrentEllement.setItem(null);
} }
else else
{ {
@ -121,11 +127,12 @@ namespace BlazorApp1.Components
if (Parent.CurrentEllement.getTypeID() == "InventoryItem") if (Parent.CurrentEllement.getTypeID() == "InventoryItem")
{ {
int tmp = Parent.InventoryNbElems[this.Index]; int tmp = Parent.InventoryNbElems[this.Index];
Parent.InventoryNbElems[this.Index] = Parent.CurrentEllement.getNbElement(); Parent.InventoryNbElems[this.Index] = Parent.CurrenttmpNbElem;
Parent.CurrentEllement.setNbElement(tmp); Parent.InventoryNbElems[Parent.CurrentEllement.getIndex()] = tmp;
Item tmpI = Parent.InventoryItems[this.Index]; Item tmpI = Parent.InventoryItems[this.Index];
Parent.InventoryItems[this.Index] = Parent.CurrentEllement.getItem(); Parent.InventoryItems[this.Index] = Parent.CurrentDragItem;
Parent.CurrentEllement.setItem(tmpI); Parent.InventoryItems[Parent.CurrentEllement.getIndex()]=tmpI;
} }
} }
} }
@ -135,16 +142,13 @@ namespace BlazorApp1.Components
int tmpNb = Parent.InventoryNbElems[this.Index]; int tmpNb = Parent.InventoryNbElems[this.Index];
Parent.InventoryItems[this.Index] = Parent.CurrentDragItem; Parent.InventoryItems[this.Index] = Parent.CurrentDragItem;
Parent.InventoryNbElems[this.Index] = Parent.CurrentEllement.getNbElement(); Parent.InventoryNbElems[this.Index] = Parent.CurrenttmpNbElem;
if (Parent.CurrentEllement.getTypeID() == "InventoryItem") if (Parent.CurrentEllement.getTypeID() == "InventoryItem")
{ {
InventoryItem invItem = (InventoryItem)Parent.CurrentEllement;
Parent.InventoryItems[Parent.CurrentEllement.getIndex()] = tmp; Parent.InventoryItems[Parent.CurrentEllement.getIndex()] = tmp;
Parent.InventoryNbElems[Parent.CurrentEllement.getIndex()] = tmpNb; Parent.InventoryNbElems[Parent.CurrentEllement.getIndex()] = tmpNb;
Parent.CurrentEllement = invItem;
} }
else if (Parent.CurrentEllement.getTypeID() == "ListItem") else if (Parent.CurrentEllement.getTypeID() == "ListItem")
{ {
@ -160,6 +164,11 @@ namespace BlazorApp1.Components
{ {
Parent.CurrentDragItem = Parent.InventoryItems[this.Index]; Parent.CurrentDragItem = Parent.InventoryItems[this.Index];
Parent.CurrentEllement = this; Parent.CurrentEllement = this;
Parent.CurrenttmpNbElem = Parent.InventoryNbElems[this.Index];
Parent.InventoryItems[this.Index] = null;
Parent.InventoryNbElems[this.Index] = 0;
} }
public int getIndex() public int getIndex()

@ -69,6 +69,7 @@ namespace BlazorApp1.Components
{ {
Parent.CurrentDragItem = this.Item; Parent.CurrentDragItem = this.Item;
Parent.CurrentEllement = this; Parent.CurrentEllement = this;
Parent.CurrenttmpNbElem = 1;
} }
public int getIndex() public int getIndex()

@ -194,3 +194,8 @@
2.0 2.0
2.0 2.0
2.0 2.0
2.0
2.0
2.0
2.0
2.0

Loading…
Cancel
Save