nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2025-01-31 12:22:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix game teams

Browse Source
This commit is contained in:
Alejandro 2019-06-10 19:06:22 +03:00
parent 38ac515158
commit 8908e601d3
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java
View File

@ -24,7 +24,7 @@ import java.util.concurrent.ThreadPoolExecutor;
public class BattleBanzaiGame extends Game { public class BattleBanzaiGame extends Game {
public static final int effectId = 33; public static final int effectId = 32;
public static final int POINTS_HIJACK_TILE = Emulator.getConfig().getInt("hotel.banzai.points.tile.steal", 0); public static final int POINTS_HIJACK_TILE = Emulator.getConfig().getInt("hotel.banzai.points.tile.steal", 0);
@ -136,7 +136,7 @@ public class BattleBanzaiGame extends Game {
if (highestScore != null) { if (highestScore != null) {
for (HabboItem item : this.room.getRoomSpecialTypes().getItemsOfType(InteractionBattleBanzaiSphere.class)) { for (HabboItem item : this.room.getRoomSpecialTypes().getItemsOfType(InteractionBattleBanzaiSphere.class)) {
item.setExtradata((highestScore.teamColor.type + 3) + ""); item.setExtradata((highestScore.teamColor.type + 2) + "");
this.room.updateItemState(item); this.room.updateItemState(item);
} }
} }
@ -179,7 +179,7 @@ public class BattleBanzaiGame extends Game {
} }
for (HabboItem item : this.room.getRoomSpecialTypes().getItemsOfType(InteractionBattleBanzaiSphere.class)) { for (HabboItem item : this.room.getRoomSpecialTypes().getItemsOfType(InteractionBattleBanzaiSphere.class)) {
item.setExtradata((7 + winningTeam.teamColor.type) + ""); item.setExtradata((6 + winningTeam.teamColor.type) + "");
this.room.updateItemState(item); this.room.updateItemState(item);
} }
@ -263,7 +263,7 @@ public class BattleBanzaiGame extends Game {
tileItem.ifPresent(habboItem -> { tileItem.ifPresent(habboItem -> {
this.tileLocked(teamColor, habboItem, habbo, true); this.tileLocked(teamColor, habboItem, habbo, true);
habboItem.setExtradata((2 + (teamColor.type * 3) + 3) + ""); habboItem.setExtradata((2 + (teamColor.type * 3)) + "");
this.room.updateItem(habboItem); this.room.updateItem(habboItem);
}); });
} }
@ -373,7 +373,7 @@ public class BattleBanzaiGame extends Game {
if (!this.gameTiles.contains(tile.getId())) return; if (!this.gameTiles.contains(tile.getId())) return;
int check = state - (habbo.getHabboInfo().getGamePlayer().getTeamColor().type * 3); int check = state - (habbo.getHabboInfo().getGamePlayer().getTeamColor().type * 3);
if (check == 3 || check == 4) { if (check == 0 || check == 1) {
state++; state++;
if (state % 3 == 2) { if (state % 3 == 2) {
@ -383,7 +383,7 @@ public class BattleBanzaiGame extends Game {
habbo.getHabboInfo().getGamePlayer().addScore(BattleBanzaiGame.POINTS_FILL_TILE); habbo.getHabboInfo().getGamePlayer().addScore(BattleBanzaiGame.POINTS_FILL_TILE);
} }
} else { } else {
state = (habbo.getHabboInfo().getGamePlayer().getTeamColor().type * 3) + 3; state = habbo.getHabboInfo().getGamePlayer().getTeamColor().type * 3;
habbo.getHabboInfo().getGamePlayer().addScore(BattleBanzaiGame.POINTS_HIJACK_TILE); habbo.getHabboInfo().getGamePlayer().addScore(BattleBanzaiGame.POINTS_HIJACK_TILE);
} }

2
src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGame.java
View File

@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class FreezeGame extends Game { public class FreezeGame extends Game {
public static final int effectId = 40; public static final int effectId = 39;
public static int POWER_UP_POINTS; public static int POWER_UP_POINTS;
public static int POWER_UP_CHANCE; public static int POWER_UP_CHANCE;

2
src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGamePlayer.java
View File

@ -195,7 +195,7 @@ public class FreezeGamePlayer extends GamePlayer {
return 0; return 0;
if (!this.isFrozen()) { if (!this.isFrozen()) {
int effectId = 40; int effectId = FreezeGame.effectId;
effectId += super.getTeamColor().type; effectId += super.getTeamColor().type;

2
src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiPuck.java
View File

@ -165,7 +165,7 @@ public class InteractionBattleBanzaiPuck extends InteractionPushable {
} }
} }
this.setExtradata(team.teamColor.type + 1 + ""); this.setExtradata(team.teamColor.type + "");
room.updateItemState(this); room.updateItemState(this);
} }
} }

2
src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInTeam.java
View File

@ -75,7 +75,7 @@ public class WiredConditionNotInTeam extends InteractionWiredCondition {
message.appendInt(this.getId()); message.appendInt(this.getId());
message.appendString(""); message.appendString("");
message.appendInt(1); message.appendInt(1);
message.appendInt(this.teamColor.type + 1); message.appendInt(this.teamColor.type);
message.appendInt(0); message.appendInt(0);
message.appendInt(this.getType().code); message.appendInt(this.getType().code);
message.appendInt(0); message.appendInt(0);

2
src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTeamMember.java
View File

@ -75,7 +75,7 @@ public class WiredConditionTeamMember extends InteractionWiredCondition {
message.appendInt(this.getId()); message.appendInt(this.getId());
message.appendString(""); message.appendString("");
message.appendInt(1); message.appendInt(1);
message.appendInt(this.teamColor.type + 1); message.appendInt(this.teamColor.type);
message.appendInt(0); message.appendInt(0);
message.appendInt(this.getType().code); message.appendInt(this.getType().code);
message.appendInt(0); message.appendInt(0);

2
src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveScoreToTeam.java
View File

@ -107,7 +107,7 @@ public class WiredEffectGiveScoreToTeam extends InteractionWiredEffect {
message.appendInt(3); message.appendInt(3);
message.appendInt(this.points); message.appendInt(this.points);
message.appendInt(this.count); message.appendInt(this.count);
message.appendInt(this.teamColor.type + 1); message.appendInt(this.teamColor.type);
message.appendInt(0); message.appendInt(0);
message.appendInt(this.getType().code); message.appendInt(this.getType().code);
message.appendInt(this.getDelay()); message.appendInt(this.getDelay());

2
src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectJoinTeam.java
View File

@ -90,7 +90,7 @@ public class WiredEffectJoinTeam extends InteractionWiredEffect {
message.appendInt(this.getId()); message.appendInt(this.getId());
message.appendString(""); message.appendString("");
message.appendInt(1); message.appendInt(1);
message.appendInt(this.teamColor.type + 1); message.appendInt(this.teamColor.type);
message.appendInt(0); message.appendInt(0);
message.appendInt(this.getType().code); message.appendInt(this.getType().code);
message.appendInt(this.getDelay()); message.appendInt(this.getDelay());

2
src/main/java/com/eu/habbo/threading/runnables/BattleBanzaiTilesFlicker.java
View File

@ -28,7 +28,7 @@ public class BattleBanzaiTilesFlicker implements Runnable {
int state = 0; int state = 0;
if (this.on) { if (this.on) {
state = (this.color.type * 3) + 5; state = (this.color.type * 3) + 2;
this.on = false; this.on = false;
} else { } else {
this.on = true; this.on = true;