Choose Avatar & Enter Tower

This commit is contained in:
Akka
2022-05-06 14:10:23 +08:00
committed by Melledy
parent 93b3265d72
commit c912b8d857
13 changed files with 350 additions and 13 deletions

View File

@@ -75,7 +75,8 @@ public class DungeonManager {
prevPos.set(entry.getPointData().getTranPos());
}
}
// clean temp team if it has
player.getTeamManager().cleanTemporaryTeam();
// Transfer player back to world
player.getWorld().transferPlayerToScene(player, prevScene, prevPos);
player.sendPacket(new BasePacket(PacketOpcodes.PlayerQuitDungeonRsp));

View File

@@ -27,6 +27,7 @@ import emu.grasscutter.game.props.EntityType;
import emu.grasscutter.game.props.PlayerProperty;
import emu.grasscutter.game.shop.ShopLimit;
import emu.grasscutter.game.managers.MapMarkManager.*;
import emu.grasscutter.game.tower.TowerManager;
import emu.grasscutter.game.world.Scene;
import emu.grasscutter.game.world.World;
import emu.grasscutter.net.packet.BasePacket;
@@ -89,6 +90,8 @@ public class Player {
@Transient private MessageHandler messageHandler;
private TeamManager teamManager;
private TowerManager towerManager;
private PlayerGachaInfo gachaInfo;
private PlayerProfile playerProfile;
private boolean showAvatar;
@@ -176,6 +179,7 @@ public class Player {
this.nickname = "Traveler";
this.signature = "";
this.teamManager = new TeamManager(this);
this.towerManager = new TowerManager(this);
this.birthday = new PlayerBirthday();
this.setProperty(PlayerProperty.PROP_PLAYER_LEVEL, 1);
this.setProperty(PlayerProperty.PROP_IS_SPRING_AUTO_USE, 1);
@@ -389,6 +393,10 @@ public class Player {
return this.teamManager;
}
public TowerManager getTowerManager() {
return towerManager;
}
public PlayerGachaInfo getGachaInfo() {
return gachaInfo;
}
@@ -1030,6 +1038,9 @@ public class Player {
if (this.getProfile().getUid() == 0) {
this.getProfile().syncWithCharacter(this);
}
if (this.getTowerManager() == null) {
this.towerManager = new TowerManager(this);
}
// Check if player object exists in server
// TODO - optimize

View File

@@ -18,6 +18,11 @@ public class TeamInfo {
this.avatars = new ArrayList<>(Grasscutter.getConfig().getGameServerOptions().MaxAvatarsInTeam);
}
public TeamInfo(List<Integer> avatars) {
this.name = "";
this.avatars = avatars;
}
public String getName() {
return name;
}

View File

@@ -1,12 +1,6 @@
package emu.grasscutter.game.player;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import dev.morphia.annotations.Entity;
import dev.morphia.annotations.Transient;
@@ -59,7 +53,13 @@ public class TeamManager {
@Transient private final Set<EntityBaseGadget> gadgets;
@Transient private final IntSet teamResonances;
@Transient private final IntSet teamResonancesConfig;
private int useTemporarilyTeamIndex = -1;
/**
* Temporary Team for tower
*/
private List<TeamInfo> temporaryTeam;
public TeamManager() {
this.mpTeam = new TeamInfo();
this.avatars = new ArrayList<>();
@@ -125,6 +125,10 @@ public class TeamManager {
}
public TeamInfo getCurrentTeamInfo() {
if (useTemporarilyTeamIndex >= 0 &&
useTemporarilyTeamIndex < temporaryTeam.size()){
return temporaryTeam.get(useTemporarilyTeamIndex);
}
if (this.getPlayer().isInMultiplayer()) {
return this.getMpTeam();
}
@@ -352,7 +356,51 @@ public class TeamManager {
// Packet
this.updateTeamEntities(new PacketChangeMpTeamAvatarRsp(getPlayer(), teamInfo));
}
public void setupTemporaryTeam(List<List<Long>> guidList) {
var team = guidList.stream().map(list -> {
// Sanity checks
if (list.size() == 0 || list.size() > getMaxTeamSize()) {
return null;
}
// Set team data
LinkedHashSet<Avatar> newTeam = new LinkedHashSet<>();
for (int i = 0; i < list.size(); i++) {
Avatar avatar = getPlayer().getAvatars().getAvatarByGuid(list.get(i));
if (avatar == null || newTeam.contains(avatar)) {
// Should never happen
return null;
}
newTeam.add(avatar);
}
// convert to avatar ids
return newTeam.stream()
.map(Avatar::getAvatarId)
.toList();
})
.filter(Objects::nonNull)
.map(TeamInfo::new)
.toList();
this.temporaryTeam = team;
}
public void useTemporaryTeam(int index) {
this.useTemporarilyTeamIndex = index;
updateTeamEntities(null);
}
public void cleanTemporaryTeam() {
// check if using temporary team
if(useTemporarilyTeamIndex < 0){
return;
}
this.useTemporarilyTeamIndex = -1;
this.temporaryTeam = null;
updateTeamEntities(null);
}
public synchronized void setCurrentTeam(int teamId) {
//
if (getPlayer().isInMultiplayer()) {

View File

@@ -0,0 +1,40 @@
package emu.grasscutter.game.tower;
import dev.morphia.annotations.Entity;
import emu.grasscutter.data.GameData;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.packet.send.PacketTowerEnterLevelRsp;
import java.util.List;
@Entity
public class TowerManager {
private final Player player;
public TowerManager(Player player) {
this.player = player;
}
private int currentLevel;
private int currentFloor;
public void teamSelect(int floor, List<List<Long>> towerTeams) {
var floorData = GameData.getTowerFloorDataMap().get(floor);
this.currentFloor = floorData.getFloorId();
this.currentLevel = floorData.getLevelId();
player.getTeamManager().setupTemporaryTeam(towerTeams);
}
public void enterLevel(int enterPointId) {
var levelData = GameData.getTowerLevelDataMap().get(currentLevel);
var id = levelData.getDungeonId();
// use team user choose
player.getTeamManager().useTemporaryTeam(0);
player.getServer().getDungeonManager()
.enterDungeon(player, enterPointId, id);
player.getSession().send(new PacketTowerEnterLevelRsp(currentFloor, currentLevel));
}
}