Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1019 from Kieaer/patch-4

Browse Source 
Add WithdrawEvent
This commit is contained in:
Anuken
2019-12-13 23:19:19 -05:00
committed by GitHub
parent 7b1a0a42d4 1f5e773c77
commit 9033ebcfd7
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/io/anuke/mindustry/game/EventType.java
View File

@@ -139,9 +139,19 @@ public class EventType{
} }
/** Called when a player withdraws items from a block. Tutorial only.*/ /** Called when the player withdraws items from a block. */
public static class WithdrawEvent{ public static class WithdrawEvent{
public final Tile tile;
public final Player player;
public final Item item;
public final int amount;
public WithdrawEvent(Tile tile, Player player, Item item, int amount){
this.tile = tile;
this.player = player;
this.item = item;
this.amount = amount;
}
} }
/** Called when a player deposits items to a block.*/ /** Called when a player deposits items to a block.*/

5
core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
View File

@@ -42,6 +42,7 @@ public class BlockInventoryFragment extends Fragment{
int removed = tile.block().removeStack(tile, item, amount); int removed = tile.block().removeStack(tile, item, amount);
player.addItem(item, removed); player.addItem(item, removed);
Events.fire(new WithdrawEvent(tile, player, item, amount));
for(int j = 0; j < Mathf.clamp(removed / 3, 1, 8); j++){ for(int j = 0; j < Mathf.clamp(removed / 3, 1, 8); j++){
Time.run(j * 3f, () -> Call.transferItemEffect(item, tile.drawx(), tile.drawy(), player)); Time.run(j * 3f, () -> Call.transferItemEffect(item, tile.drawx(), tile.drawy(), player));
} }
@@ -100,7 +101,7 @@ public class BlockInventoryFragment extends Fragment{
holding = false; holding = false;
holdTime = 0f; holdTime = 0f;
Events.fire(new WithdrawEvent()); if(net.client()) Events.fire(new WithdrawEvent(tile, player, lastItem, amount));
} }
} }
@@ -153,7 +154,7 @@ public class BlockInventoryFragment extends Fragment{
lastItem = item; lastItem = item;
holding = true; holding = true;
holdTime = 0f; holdTime = 0f;
Events.fire(new WithdrawEvent()); if(net.client()) Events.fire(new WithdrawEvent(tile, player, item, amount));
} }
return true; return true;
} }