Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-30 08:32:06 +00:00
Code Issues Projects Releases Wiki Activity

Allow the player to finish dungeons

Browse Source
This commit is contained in:
Melledy 2022-04-29 00:49:05 -07:00
parent 069ae5fbb8
commit c3c170def9
9 changed files with 65 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proto/DungeonChallengeFinishNotify.proto
View File

@ -17,4 +17,6 @@ message DungeonChallengeFinishNotify {
uint32 challenge_record_type = 4;
uint32 current_value = 5;
map<uint32, StrengthenPointData> strengthen_point_data_map = 6;
uint32 unk1 = 7;
uint32 unk2 = 8;
}

16
proto/DungeonSettleNotify.proto Normal file
View File

@ -0,0 +1,16 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "ParamList.proto";
import "StrengthenPointData.proto";
message DungeonSettleNotify {
uint32 dungeon_id = 1;
bool is_success = 2;
repeated uint32 fail_cond_list = 3;
map<uint32, ParamList> settle_show = 4;
uint32 close_time = 5;
map<uint32, StrengthenPointData> strengthen_point_data_map = 6;
uint32 result = 7;
}

7
proto/ParamList.proto Normal file
View File

@ -0,0 +1,7 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
message ParamList {
repeated uint32 param_list_ = 1;
}

11
src/main/java/emu/grasscutter/game/dungeons/DungeonChallenge.java
View File

@ -12,6 +12,7 @@ import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
import emu.grasscutter.scripts.constants.EventType;
import emu.grasscutter.scripts.data.SceneGroup;
import emu.grasscutter.scripts.data.SceneMonster;
import emu.grasscutter.server.packet.send.PacketChallengeDataNotify;
import emu.grasscutter.server.packet.send.PacketDungeonChallengeBeginNotify;
import emu.grasscutter.server.packet.send.PacketDungeonChallengeFinishNotify;
import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
@ -66,6 +67,10 @@ public class DungeonChallenge {
this.isSuccess = isSuccess;
}
public int getScore() {
return score;
}
public void start() {
getScene().broadcastPacket(new PacketDungeonChallengeBeginNotify(this));
}
@ -81,9 +86,11 @@ public class DungeonChallenge {
}
public void onMonsterDie(EntityMonster entity) {
score++;
score = getScore() + 1;
if (score >= objective) {
getScene().broadcastPacket(new PacketChallengeDataNotify(this, 1, getScore()));
if (getScore() >= objective) {
this.setSuccess(true);
finish();
}

2
src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
View File

@ -44,6 +44,8 @@ public class DungeonManager {
return;
}
Grasscutter.getLogger().info(player.getNickname() + " is trying to enter dungeon " + dungeonId);
int sceneId = data.getSceneId();
player.getScene().setPrevScene(sceneId);

4
src/main/java/emu/grasscutter/scripts/ScriptLib.java
View File

@ -139,6 +139,10 @@ public class ScriptLib {
return 0;
}
public int AddExtraGroupSuite(int groupId, int param2) {
return 0;
}
public int ActiveChallenge(int challengeId, int challengeIndex, int param3, int groupId, int param4, int param5) {
SceneGroup group = getSceneScriptManager().getGroupById(groupId);

21
src/main/java/emu/grasscutter/server/packet/send/PacketChallengeDataNotify.java Normal file
View File

@ -0,0 +1,21 @@
package emu.grasscutter.server.packet.send;
import emu.grasscutter.game.dungeons.DungeonChallenge;
import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.proto.ChallengeDataNotifyOuterClass.ChallengeDataNotify;
public class PacketChallengeDataNotify extends BasePacket {
public PacketChallengeDataNotify(DungeonChallenge challenge, int index, int value) {
super(PacketOpcodes.ChallengeDataNotify);
ChallengeDataNotify proto = ChallengeDataNotify.newBuilder()
.setChallengeIndex(challenge.getChallengeIndex())
.setParamIndex(index)
.setValue(value)
.build();
this.setData(proto);
}
}

1
src/main/java/emu/grasscutter/server/packet/send/PacketDungeonChallengeBeginNotify.java
View File

@ -13,6 +13,7 @@ public class PacketDungeonChallengeBeginNotify extends BasePacket {
DungeonChallengeBeginNotify proto = DungeonChallengeBeginNotify.newBuilder()
.setChallengeId(challenge.getChallengeId())
.setChallengeIndex(challenge.getChallengeIndex())
.setGroupId(challenge.getGroup().id)
.build();
this.setData(proto);

4
src/main/java/emu/grasscutter/server/packet/send/PacketDungeonChallengeFinishNotify.java
View File

@ -11,8 +11,10 @@ public class PacketDungeonChallengeFinishNotify extends BasePacket {
super(PacketOpcodes.DungeonChallengeFinishNotify);
DungeonChallengeFinishNotify proto = DungeonChallengeFinishNotify.newBuilder()
.setChallengeIndex(challenge.getChallengeId())
.setChallengeIndex(challenge.getChallengeIndex())
.setIsSuccess(challenge.isSuccess())
.setUnk1(challenge.getChallengeId())
.setUnk2(30)
.build();
this.setData(proto);