Leahnaya/pkmn-classic-framework
1
0
Fork 0
mirror of https://github.com/mm201/pkmn-classic-framework.git synced 2026-08-21 17:54:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some stupid battle subway issues.

Browse Source
This commit is contained in:
Greg Edwards
2014-08-07 19:57:33 -04:00
parent 8e072eb06e
commit f7374e962d
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gts/syachi2ds.ashx.cs
View File

@@ -538,14 +538,14 @@ namespace PkmnFoundations.GTS
{
manager.Remove(session);
if (data.Length != 6)
if (data.Length != 10)
{
Error400(context);
return;
}
byte rank = data[0x04];
byte roomNum = data[0x05];
byte rank = data[0x08];
byte roomNum = data[0x09];
BattleSubwayRecord5[] opponents = DataAbstract.Instance.BattleSubwayGetOpponents5(pid, rank, roomNum);
@@ -575,7 +575,7 @@ namespace PkmnFoundations.GTS
{
manager.Remove(session);
if (data.Length != 243)
if (data.Length != 396)
{
Error400(context);
return;

10
library/Data/DataMysql.cs
View File

@@ -1427,7 +1427,7 @@ namespace PkmnFoundations.Data
result.Add(new MySqlParameter("@phrase_won", record.PhraseWon.Data));
result.Add(new MySqlParameter("@phrase_lost", record.PhraseLost.Data));
result.Add(new MySqlParameter("@unknown3", record.Unknown3));
result.Add(new MySqlParameter("@unknown4", record.Unknown4));
result.Add(new MySqlParameter("@unknown4", record.Unknown4 ?? new byte[5]));
result.Add(new MySqlParameter("@unknown5", record.Unknown5));
result.Add(new MySqlParameter("@battles_won", record.BattlesWon));
}
@@ -1567,7 +1567,9 @@ namespace PkmnFoundations.Data
MySqlDataReader reader = (MySqlDataReader)tran.ExecuteReader(
"SELECT id, pid, Name, " +
"Version, Language, Country, Region, TrainerID, " +
"PhraseLeader, Gender, Unknown2, Unknown3, Unknown4, Unknown5 FROM GtsBattleSubway5 " +
"PhraseLeader, Gender, Unknown2, PhraseChallenged, " +
"PhraseWon, PhraseLost, Unknown3, Unknown4, Unknown5 " +
"FROM GtsBattleSubway5 " +
"WHERE Rank = @rank AND RoomNum = @room AND pid != @pid " +
"ORDER BY Position LIMIT 7",
new MySqlParameter("@rank", rank),
@@ -1613,7 +1615,7 @@ namespace PkmnFoundations.Data
if (reader.FieldCount > 12) result.PhraseWon = new TrendyPhrase5(reader.GetByteArray(12, 8));
if (reader.FieldCount > 13) result.PhraseLost = new TrendyPhrase5(reader.GetByteArray(13, 8));
if (reader.FieldCount > 14) result.Unknown3 = reader.GetUInt16(14);
if (reader.FieldCount > 15) result.Unknown4 = reader.GetByteArray(15, 5);
if (reader.FieldCount > 15 && !reader.IsDBNull(15)) result.Unknown4 = reader.GetByteArray(15, 5);
if (reader.FieldCount > 16) result.Unknown5 = reader.GetUInt64(16);
BattleSubwayProfile5 profile = new BattleSubwayProfile5();
@@ -1666,7 +1668,7 @@ namespace PkmnFoundations.Data
MySqlDataReader reader = (MySqlDataReader)tran.ExecuteReader(
"SELECT id, pid, Name, " +
"Version, Language, Country, Region, TrainerID, " +
"PhraseLeader, Gender, Unknown2 FROM GtsBattleTowerLeaders4 " +
"PhraseLeader, Gender, Unknown2 FROM GtsBattleSubwayLeaders5 " +
"WHERE Rank = @rank AND RoomNum = @room " +
"ORDER BY TimeUpdated DESC, id LIMIT 30",
new MySqlParameter("@rank", rank),

2
library/Structures/BattleSubwayProfile5.cs
View File

@@ -41,7 +41,7 @@ namespace PkmnFoundations.Structures
MemoryStream ms = new MemoryStream(data);
BinaryWriter writer = new BinaryWriter(ms);
writer.Write(Name.RawData);
writer.Write(Name.RawData, 0, 16);
writer.Write((byte)Version);
writer.Write((byte)Language);
writer.Write(Country);

2
library/Structures/BattleTowerProfile4.cs
View File

@@ -41,7 +41,7 @@ namespace PkmnFoundations.Structures
MemoryStream ms = new MemoryStream(data);
BinaryWriter writer = new BinaryWriter(ms);
writer.Write(Name.RawData);
writer.Write(Name.RawData, 0, 16);
writer.Write((byte)Version);
writer.Write((byte)Language);
writer.Write(Country);

1
towerRestorer4/Program.cs
View File

@@ -158,6 +158,7 @@ namespace towerRestorer
record.Rank = rank;
record.RoomNum = room;
record.BattlesWon = 7;
record.Unknown4 = new byte[5];
db.BattleSubwayUpdateRecord5(record);
opponentSuccessCount++;
}