Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-15 08:25:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename Zone to Block

Browse Source
This commit is contained in:
wish
2023-06-18 20:38:04 +10:00
parent a9c3f82903
commit 5464594c98
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
network/mhfpacket/msg_mhf_post_tower_info.go
View File

@@ -19,7 +19,7 @@ type MsgMhfPostTowerInfo struct {
Cost int32 Cost int32
Unk6 int32 Unk6 int32
Unk7 int32 Unk7 int32
Zone1 int32 Block1 int32
Unk9 int64 Unk9 int64
} }
@@ -39,7 +39,7 @@ func (m *MsgMhfPostTowerInfo) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clie
m.Cost = bf.ReadInt32() m.Cost = bf.ReadInt32()
m.Unk6 = bf.ReadInt32() m.Unk6 = bf.ReadInt32()
m.Unk7 = bf.ReadInt32() m.Unk7 = bf.ReadInt32()
m.Zone1 = bf.ReadInt32() m.Block1 = bf.ReadInt32()
m.Unk9 = bf.ReadInt64() m.Unk9 = bf.ReadInt64()
return nil return nil
} }

3
patch-schema/tower.sql
View File

@@ -5,7 +5,8 @@ CREATE TABLE IF NOT EXISTS tower (
tr INT, tr INT,
trp INT, trp INT,
tsp INT, tsp INT,
zone1 INT, block1 INT,
block2 INT,
skills TEXT DEFAULT '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0', skills TEXT DEFAULT '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0',
gems TEXT DEFAULT '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0' gems TEXT DEFAULT '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0'
); );

14
server/channelserver/handlers_tower.go
View File

@@ -24,7 +24,7 @@ type TowerInfoHistory struct {
} }
type TowerInfoLevel struct { type TowerInfoLevel struct {
Zone1 int32 Floors int32
Unk1 int32 Unk1 int32
Unk2 int32 Unk2 int32
Unk3 int32 Unk3 int32
@@ -44,13 +44,13 @@ func handleMsgMhfGetTowerInfo(s *Session, p mhfpacket.MHFPacket) {
TRP: []TowerInfoTRP{{0, 0}}, TRP: []TowerInfoTRP{{0, 0}},
Skill: []TowerInfoSkill{{0, make([]int16, 40)}}, Skill: []TowerInfoSkill{{0, make([]int16, 40)}},
History: []TowerInfoHistory{{make([]int16, 5), make([]int16, 5)}}, History: []TowerInfoHistory{{make([]int16, 5), make([]int16, 5)}},
Level: []TowerInfoLevel{{0, 0, 0, 0}}, Level: []TowerInfoLevel{{0, 0, 0, 0}, {0, 0, 0, 0}},
} }
tempSkills := "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" tempSkills := "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"
err := s.server.db.QueryRow(`SELECT COALESCE(tr, 0), COALESCE(trp, 0), COALESCE(tsp, 0), COALESCE(zone1, 0), skills FROM tower WHERE char_id=$1 err := s.server.db.QueryRow(`SELECT COALESCE(tr, 0), COALESCE(trp, 0), COALESCE(tsp, 0), COALESCE(block1, 0), COALESCE(block2, 0), skills FROM tower WHERE char_id=$1
`, s.charID).Scan(&towerInfo.TRP[0].TR, &towerInfo.TRP[0].TRP, &towerInfo.Skill[0].TSP, &towerInfo.Level[0].Zone1, &tempSkills) `, s.charID).Scan(&towerInfo.TRP[0].TR, &towerInfo.TRP[0].TRP, &towerInfo.Skill[0].TSP, &towerInfo.Level[0].Floors, &towerInfo.Level[1].Floors, &tempSkills)
if err != nil { if err != nil {
s.server.db.Exec(`INSERT INTO tower (char_id) VALUES ($1)`, s.charID) s.server.db.Exec(`INSERT INTO tower (char_id) VALUES ($1)`, s.charID)
} }
@@ -90,7 +90,7 @@ func handleMsgMhfGetTowerInfo(s *Session, p mhfpacket.MHFPacket) {
case 5: case 5:
for _, level := range towerInfo.Level { for _, level := range towerInfo.Level {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteInt32(level.Zone1) bf.WriteInt32(level.Floors)
bf.WriteInt32(level.Unk1) bf.WriteInt32(level.Unk1)
bf.WriteInt32(level.Unk2) bf.WriteInt32(level.Unk2)
bf.WriteInt32(level.Unk3) bf.WriteInt32(level.Unk3)
@@ -114,7 +114,7 @@ func handleMsgMhfPostTowerInfo(s *Session, p mhfpacket.MHFPacket) {
zap.Int32("Cost", pkt.Cost), zap.Int32("Cost", pkt.Cost),
zap.Int32("Unk6", pkt.Unk6), zap.Int32("Unk6", pkt.Unk6),
zap.Int32("Unk7", pkt.Unk7), zap.Int32("Unk7", pkt.Unk7),
zap.Int32("Zone1", pkt.Zone1), zap.Int32("Block1", pkt.Block1),
zap.Int64("Unk9", pkt.Unk9), zap.Int64("Unk9", pkt.Unk9),
) )
} }
@@ -125,7 +125,7 @@ func handleMsgMhfPostTowerInfo(s *Session, p mhfpacket.MHFPacket) {
s.server.db.QueryRow(`SELECT skills FROM tower WHERE char_id=$1`, s.charID).Scan(&skills) s.server.db.QueryRow(`SELECT skills FROM tower WHERE char_id=$1`, s.charID).Scan(&skills)
s.server.db.Exec(`UPDATE tower SET skills=$1, tsp=tsp-$2 WHERE char_id=$3`, stringsupport.CSVSetIndex(skills, int(pkt.Skill), stringsupport.CSVGetIndex(skills, int(pkt.Skill))+1), pkt.Cost, s.charID) s.server.db.Exec(`UPDATE tower SET skills=$1, tsp=tsp-$2 WHERE char_id=$3`, stringsupport.CSVSetIndex(skills, int(pkt.Skill), stringsupport.CSVGetIndex(skills, int(pkt.Skill))+1), pkt.Cost, s.charID)
case 7: case 7:
s.server.db.Exec(`UPDATE tower SET tr=$1, trp=trp+$2, zone1=zone1+$3 WHERE char_id=$4`, pkt.TR, pkt.TRP, pkt.Zone1, s.charID) s.server.db.Exec(`UPDATE tower SET tr=$1, trp=trp+$2, block1=block1+$3 WHERE char_id=$4`, pkt.TR, pkt.TRP, pkt.Block1, s.charID)
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }