mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-12-22 20:04:56 +01:00
Add support for v3.5.0 (#2090)
* Fix Dvalin battle See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25. This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence. Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com> * Update protos * 3.4 protos * Fix Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended. * Change from false to true Per what smileoflove has been told on Discord * 3.5 * Remove the Dvalin crap from this PR Git is so confusing * Update version * Apply README changes from `origin/development` * Remove unnecessary debugging information --------- Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com> Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
@@ -1,3 +1,6 @@
|
||||
// removed due to proto not existing
|
||||
|
||||
/*
|
||||
package emu.grasscutter.server.packet.send;
|
||||
|
||||
import emu.grasscutter.net.packet.BasePacket;
|
||||
@@ -19,3 +22,4 @@ public class PacketFireworksLaunchDataNotify extends BasePacket {
|
||||
}
|
||||
|
||||
}
|
||||
*/
|
||||
@@ -1,3 +1,6 @@
|
||||
// removed due to proto not existing
|
||||
|
||||
/*
|
||||
package emu.grasscutter.server.packet.send;
|
||||
|
||||
import emu.grasscutter.net.packet.BasePacket;
|
||||
@@ -19,3 +22,4 @@ public class PacketFireworksReformDataNotify extends BasePacket {
|
||||
}
|
||||
|
||||
}
|
||||
*/
|
||||
@@ -4,6 +4,8 @@ import emu.grasscutter.net.packet.BasePacket;
|
||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
import emu.grasscutter.net.proto.QueryPathReqOuterClass;
|
||||
import emu.grasscutter.net.proto.QueryPathRspOuterClass;
|
||||
import emu.grasscutter.net.proto.PathStatusTypeOuterClass;
|
||||
|
||||
|
||||
public class PacketQueryPathRsp extends BasePacket {
|
||||
|
||||
@@ -15,7 +17,8 @@ public class PacketQueryPathRsp extends BasePacket {
|
||||
proto.addCorners(req.getSourcePos())
|
||||
.addCorners(req.getDestinationPos(0))
|
||||
.setQueryId(req.getQueryId())
|
||||
.setQueryStatus(QueryPathRspOuterClass.QueryPathRsp.PathStatusType.PATH_STATUS_TYPE_SUCC);
|
||||
.setQueryStatus(PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_SUCC);
|
||||
//.setQueryStatus(QueryPathRspOuterClass.QueryPathRsp.PathStatusType.PATH_STATUS_TYPE_SUCC);
|
||||
|
||||
this.setData(proto);
|
||||
}
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// removed due to proto not existing
|
||||
|
||||
/*
|
||||
package emu.grasscutter.server.packet.send;
|
||||
|
||||
import emu.grasscutter.net.packet.BasePacket;
|
||||
@@ -12,3 +15,4 @@ public class PacketReformFireworksRsp extends BasePacket {
|
||||
this.setData(proto);
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -14,15 +14,15 @@ public class PacketTowerLevelStarCondNotify extends BasePacket {
|
||||
.setFloorId(floorId)
|
||||
.setLevelIndex(levelIndex)
|
||||
.addCondDataList(TowerLevelStarCondData.newBuilder()
|
||||
.setCondValue(1)
|
||||
//.setCondValue(1)
|
||||
.build()
|
||||
)
|
||||
.addCondDataList(TowerLevelStarCondData.newBuilder()
|
||||
.setCondValue(2)
|
||||
//.setCondValue(2)
|
||||
.build()
|
||||
)
|
||||
.addCondDataList(TowerLevelStarCondData.newBuilder()
|
||||
.setCondValue(3)
|
||||
//.setCondValue(3)
|
||||
.build()
|
||||
)
|
||||
.build();
|
||||
|
||||
Reference in New Issue
Block a user