Merge branch 'dev' into 'dev'

The sphere now flashes blue when the timer starts

See merge request morningstar/Arcturus-Community!301
This commit is contained in:
Harmonic 2020-09-24 16:09:57 -04:00
commit 6815cdf248

View File

@ -44,6 +44,7 @@ public class BattleBanzaiGame extends Game {
private final THashMap<Integer, HabboItem> gameTiles; private final THashMap<Integer, HabboItem> gameTiles;
private int tileCount; private int tileCount;
private int countDown; private int countDown;
private int countDown2;
public BattleBanzaiGame(Room room) { public BattleBanzaiGame(Room room) {
super(BattleBanzaiGameTeam.class, BattleBanzaiGamePlayer.class, room, true); super(BattleBanzaiGameTeam.class, BattleBanzaiGamePlayer.class, room, true);
@ -59,7 +60,11 @@ public class BattleBanzaiGame extends Game {
if (!this.state.equals(GameState.IDLE)) if (!this.state.equals(GameState.IDLE))
return; return;
/* The first countdown is activated for the first two seconds emitting only the blue light (second interaction),
the second, after another two seconds, completely activates the sphere (third interaction).
*/
this.countDown = 3; this.countDown = 3;
this.countDown2 = 2;
this.resetMap(); this.resetMap();
@ -105,8 +110,15 @@ public class BattleBanzaiGame extends Game {
if (this.countDown == 0) { if (this.countDown == 0) {
for (HabboItem item : this.room.getRoomSpecialTypes().getItemsOfType(InteractionBattleBanzaiSphere.class)) { for (HabboItem item : this.room.getRoomSpecialTypes().getItemsOfType(InteractionBattleBanzaiSphere.class)) {
item.setExtradata("2"); item.setExtradata("1");
this.room.updateItemState(item); this.room.updateItemState(item);
if(this.countDown2 > 0) {
this.countDown2--;
if(this.countDown2 == 0) {
item.setExtradata("2");
this.room.updateItemState(item);
}
}
} }
} }