Leahnaya/pkmn-classic-framework
1
0
Fork 0
mirror of https://github.com/mm201/pkmn-classic-framework.git synced 2026-04-24 23:36:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Store trendy phrases in separate fields.

Browse Source
This commit is contained in:
Greg Edwards 2014-08-07 18:37:38 -04:00
parent ffbb2d6c10
commit 8e072eb06e
5 changed files with 104 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gts/RoomLeaders.aspx.cs
View File

@ -61,23 +61,13 @@ namespace PkmnFoundations.GTS
{
builder.Append("<li>");
byte[] phrase = new byte[8];
System.Buffer.BlockCopy(record.Unknown3, 0, phrase, 0, 8);
TrendyPhrase4 tp = new TrendyPhrase4(phrase);
builder.Append(tp.Render("<span style=\"color: #0066ff; font-weight: bold;\">{0}</span>"));
builder.Append(record.PhraseChallenged.Render("<span style=\"color: #0066ff; font-weight: bold;\">{0}</span>"));
builder.Append("<br />");
phrase = new byte[8];
System.Buffer.BlockCopy(record.Unknown3, 8, phrase, 0, 8);
tp = new TrendyPhrase4(phrase);
builder.Append(tp.Render("<span style=\"color: #0066ff; font-weight: bold;\">{0}</span>"));
builder.Append(record.PhraseWon.Render("<span style=\"color: #0066ff; font-weight: bold;\">{0}</span>"));
builder.Append("<br />");
phrase = new byte[8];
System.Buffer.BlockCopy(record.Unknown3, 16, phrase, 0, 8);
tp = new TrendyPhrase4(phrase);
builder.Append(tp.Render("<span style=\"color: #0066ff; font-weight: bold;\">{0}</span>"));
builder.Append(record.PhraseLost.Render("<span style=\"color: #0066ff; font-weight: bold;\">{0}</span>"));
builder.Append("</li>");
}

69
library/Data/DataMysql.cs
View File

@ -481,7 +481,10 @@ namespace PkmnFoundations.Data
tran.ExecuteNonQuery("UPDATE GtsBattleTower4 SET pid = @pid, Name = @name, " +
"Version = @version, Language = @language, Country = @country, " +
"Region = @region, TrainerID = @trainer_id, " +
"TrendyPhrase = @trendy_phrase, Gender = @gender, Unknown2 = @unknown2, Unknown3 = @unknown3, " +
"PhraseLeader = @phrase_leader, Gender = @gender, " +
"Unknown2 = @unknown2, PhraseChallenged = @phrase_challenged, " +
"PhraseWon = @phrase_won, PhraseLost = @phrase_lost, " +
"Unknown3 = @unknown3, " +
"Unknown5 = @unknown5, ParseVersion = 1, Rank = @rank, " +
"BattlesWon = @battles_won, Position = @position, " +
"TimeUpdated = UTC_TIMESTAMP() WHERE id = @id",
@ -498,10 +501,12 @@ namespace PkmnFoundations.Data
pkey = Convert.ToUInt64(tran.ExecuteScalar("INSERT INTO GtsBattleTower4 " +
"(pid, Name, Version, Language, Country, Region, TrainerID, " +
"TrendyPhrase, Gender, Unknown2, Unknown3, Unknown5, ParseVersion, " +
"PhraseLeader, Gender, Unknown2, PhraseChallenged, PhraseWon, " +
"PhraseLost, Unknown3, Unknown5, ParseVersion, " +
"Rank, RoomNum, BattlesWon, Position, TimeAdded, TimeUpdated) VALUES " +
"(@pid, @name, @version, @language, @country, @region, @trainer_id, " +
"@trendy_phrase, @gender, @unknown2, @unknown3, @unknown5, 1, " +
"@phrase_leader, @gender, @unknown2, @phrase_challenged, @phrase_won, " +
"@phrase_lost, @unknown3, @unknown5, 1, " +
"@rank, @room, @battles_won, @position, UTC_TIMESTAMP(), UTC_TIMESTAMP()); " +
"SELECT LAST_INSERT_ID()",
_params.ToArray()));
@ -553,13 +558,16 @@ namespace PkmnFoundations.Data
result.Add(new MySqlParameter("@country", record.Profile.Country));
result.Add(new MySqlParameter("@region", record.Profile.Region));
result.Add(new MySqlParameter("@trainer_id", record.Profile.OT));
result.Add(new MySqlParameter("@trendy_phrase", record.Profile.PhraseLeader.Data));
result.Add(new MySqlParameter("@phrase_leader", record.Profile.PhraseLeader.Data));
result.Add(new MySqlParameter("@gender", record.Profile.Gender));
result.Add(new MySqlParameter("@unknown2", record.Profile.Unknown));
result.Add(new MySqlParameter("@rank", record.Rank));
result.Add(new MySqlParameter("@room", record.RoomNum));
if (!leader)
{
result.Add(new MySqlParameter("@phrase_challenged", record.PhraseChallenged.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("@unknown5", record.Unknown5));
result.Add(new MySqlParameter("@battles_won", record.BattlesWon));
@ -616,7 +624,7 @@ namespace PkmnFoundations.Data
"pid = @pid, Name = @name, Version = @version, " +
"Language = @language, Country = @country, Region = @region, " +
"TrainerID = @trainer_id, " +
"TrendyPhrase = @trendy_phrase, Gender = @gender, Unknown2 = @unknown2, " +
"PhraseLeader = @phrase_leader, Gender = @gender, Unknown2 = @unknown2, " +
"ParseVersion = 1, Rank = @rank, " +
"TimeUpdated = UTC_TIMESTAMP() WHERE id = @id",
_params.ToArray());
@ -628,10 +636,10 @@ namespace PkmnFoundations.Data
pkey = Convert.ToUInt64(tran.ExecuteScalar("INSERT INTO " +
"GtsBattleTowerLeaders4 " +
"(pid, Name, Version, Language, Country, Region, TrainerID, " +
"TrendyPhrase, Gender, Unknown2, ParseVersion, Rank, " +
"PhraseLeader, Gender, Unknown2, ParseVersion, Rank, " +
"RoomNum, TimeAdded, TimeUpdated) VALUES " +
"(@pid, @name, @version, @language, @country, @region, @trainer_id, " +
"@trendy_phrase, @gender, @unknown2, 1, @rank, " +
"@phrase_leader, @gender, @unknown2, 1, @rank, " +
"@room, UTC_TIMESTAMP(), UTC_TIMESTAMP()); " +
"SELECT LAST_INSERT_ID()",
_params.ToArray()));
@ -699,7 +707,8 @@ namespace PkmnFoundations.Data
MySqlDataReader reader = (MySqlDataReader)tran.ExecuteReader(
"SELECT id, pid, Name, " +
"Version, Language, Country, Region, TrainerID, " +
"TrendyPhrase, Gender, Unknown2, Unknown3, Unknown5 FROM GtsBattleTower4 " +
"PhraseLeader, Gender, Unknown2, PhraseChallenged, " +
"PhraseWon, PhraseLost, Unknown3, Unknown5 FROM GtsBattleTower4 " +
"WHERE Rank = @rank AND RoomNum = @room AND pid != @pid " +
"ORDER BY Position LIMIT 7",
new MySqlParameter("@rank", rank),
@ -740,8 +749,12 @@ namespace PkmnFoundations.Data
// todo: Stop using ordinals everywhere.
BattleTowerRecord4 result = new BattleTowerRecord4();
result.PID = reader.GetInt32(1);
if (reader.FieldCount > 11) result.Unknown3 = reader.GetByteArray(11, 26);
if (reader.FieldCount > 12) result.Unknown5 = reader.GetUInt64(12);
if (reader.FieldCount > 11) result.PhraseChallenged = new TrendyPhrase4(reader.GetByteArray(11, 8));
if (reader.FieldCount > 12) result.PhraseWon = new TrendyPhrase4(reader.GetByteArray(12, 8));
if (reader.FieldCount > 13) result.PhraseLost = new TrendyPhrase4(reader.GetByteArray(13, 8));
if (reader.FieldCount > 14) result.Unknown3 = reader.GetUInt16(14);
if (reader.FieldCount > 15) result.Unknown5 = reader.GetUInt64(15);
BattleTowerProfile4 profile = new BattleTowerProfile4();
profile.Name = new EncodedString4(reader.GetByteArray(2, 16));
@ -792,7 +805,7 @@ namespace PkmnFoundations.Data
MySqlDataReader reader = (MySqlDataReader)tran.ExecuteReader(
"SELECT id, pid, Name, " +
"Version, Language, Country, Region, TrainerID, " +
"TrendyPhrase, Gender, Unknown2 FROM GtsBattleTowerLeaders4 " +
"PhraseLeader, Gender, Unknown2 FROM GtsBattleTowerLeaders4 " +
"WHERE Rank = @rank AND RoomNum = @room " +
"ORDER BY TimeUpdated DESC, id LIMIT 30",
new MySqlParameter("@rank", rank),
@ -1324,7 +1337,9 @@ namespace PkmnFoundations.Data
tran.ExecuteNonQuery("UPDATE GtsBattleSubway5 SET pid = @pid, Name = @name, " +
"Version = @version, Language = @language, Country = @country, " +
"Region = @region, TrainerID = @trainer_id, " +
"TrendyPhrase = @trendy_phrase, Gender = @gender, Unknown2 = @unknown2, Unknown3 = @unknown3, " +
"PhraseLeader = @phrase_leader, Gender = @gender, " +
"Unknown2 = @unknown2, PhraseChallenged = @phrase_challenged, " +
"PhraseWon = @phrase_won, PhraseLost = @phrase_lost, Unknown3 = @unknown3, " +
"Unknown4 = @unknown4, Unknown5 = @unknown5, ParseVersion = 1, Rank = @rank, " +
"BattlesWon = @battles_won, Position = @position, " +
"TimeUpdated = UTC_TIMESTAMP() WHERE id = @id",
@ -1341,10 +1356,12 @@ namespace PkmnFoundations.Data
pkey = Convert.ToUInt64(tran.ExecuteScalar("INSERT INTO GtsBattleSubway5 " +
"(pid, Name, Version, Language, Country, Region, TrainerID, " +
"TrendyPhrase, Gender, Unknown2, Unknown3, Unknown4, Unknown5, ParseVersion, " +
"PhraseLeader, Gender, Unknown2, PhraseChallenged, PhraseWon, " +
"PhraseLost, Unknown3, Unknown4, Unknown5, ParseVersion, " +
"Rank, RoomNum, BattlesWon, Position, TimeAdded, TimeUpdated) VALUES " +
"(@pid, @name, @version, @language, @country, @region, @trainer_id, " +
"@trendy_phrase, @gender, @unknown2, @unknown3, @unknown4, @unknown5, 1, " +
"@phrase_leader, @gender, @unknown2, @phrase_challenged, @phrase_won, " +
"@phrase_lost, @unknown3, @unknown4, @unknown5, 1, " +
"@rank, @room, @battles_won, @position, UTC_TIMESTAMP(), UTC_TIMESTAMP()); " +
"SELECT LAST_INSERT_ID()",
_params.ToArray()));
@ -1399,13 +1416,16 @@ namespace PkmnFoundations.Data
result.Add(new MySqlParameter("@country", record.Profile.Country));
result.Add(new MySqlParameter("@region", record.Profile.Region));
result.Add(new MySqlParameter("@trainer_id", record.Profile.OT));
result.Add(new MySqlParameter("@trendy_phrase", record.Profile.PhraseLeader.Data));
result.Add(new MySqlParameter("@phrase_leader", record.Profile.PhraseLeader.Data));
result.Add(new MySqlParameter("@gender", record.Profile.Gender));
result.Add(new MySqlParameter("@unknown2", record.Profile.Unknown));
result.Add(new MySqlParameter("@rank", record.Rank));
result.Add(new MySqlParameter("@room", record.RoomNum));
if (!leader)
{
result.Add(new MySqlParameter("@phrase_challenged", record.PhraseChallenged.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("@unknown5", record.Unknown5));
@ -1464,7 +1484,7 @@ namespace PkmnFoundations.Data
"pid = @pid, Name = @name, Version = @version, " +
"Language = @language, Country = @country, Region = @region, " +
"TrainerID = @trainer_id, " +
"TrendyPhrase = @trendy_phrase, Gender = @gender, Unknown2 = @unknown2, " +
"PhraseLeader = @phrase_leader, Gender = @gender, Unknown2 = @unknown2, " +
"ParseVersion = 1, Rank = @rank, " +
"TimeUpdated = UTC_TIMESTAMP() WHERE id = @id",
_params.ToArray());
@ -1476,10 +1496,10 @@ namespace PkmnFoundations.Data
pkey = Convert.ToUInt64(tran.ExecuteScalar("INSERT INTO " +
"GtsBattleSubwayLeaders5 " +
"(pid, Name, Version, Language, Country, Region, TrainerID, " +
"TrendyPhrase, Gender, Unknown2, ParseVersion, Rank, " +
"PhraseLeader, Gender, Unknown2, ParseVersion, Rank, " +
"RoomNum, TimeAdded, TimeUpdated) VALUES " +
"(@pid, @name, @version, @language, @country, @region, @trainer_id, " +
"@trendy_phrase, @gender, @unknown2, 1, @rank, " +
"@phrase_leader, @gender, @unknown2, 1, @rank, " +
"@room, UTC_TIMESTAMP(), UTC_TIMESTAMP()); " +
"SELECT LAST_INSERT_ID()",
_params.ToArray()));
@ -1547,7 +1567,7 @@ namespace PkmnFoundations.Data
MySqlDataReader reader = (MySqlDataReader)tran.ExecuteReader(
"SELECT id, pid, Name, " +
"Version, Language, Country, Region, TrainerID, " +
"TrendyPhrase, Gender, Unknown2, Unknown3, Unknown4, Unknown5 FROM GtsBattleSubway5 " +
"PhraseLeader, Gender, Unknown2, Unknown3, Unknown4, Unknown5 FROM GtsBattleSubway5 " +
"WHERE Rank = @rank AND RoomNum = @room AND pid != @pid " +
"ORDER BY Position LIMIT 7",
new MySqlParameter("@rank", rank),
@ -1589,9 +1609,12 @@ namespace PkmnFoundations.Data
BattleSubwayRecord5 result = new BattleSubwayRecord5();
result.PID = reader.GetInt32(1);
// this is unsustainable. What happens if I add columns to Leaders?
if (reader.FieldCount > 11) result.Unknown3 = reader.GetByteArray(11, 26);
if (reader.FieldCount > 12) result.Unknown4 = reader.GetByteArray(12, 5);
if (reader.FieldCount > 13) result.Unknown5 = reader.GetUInt64(13);
if (reader.FieldCount > 11) result.PhraseChallenged = new TrendyPhrase5(reader.GetByteArray(11, 8));
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 > 16) result.Unknown5 = reader.GetUInt64(16);
BattleSubwayProfile5 profile = new BattleSubwayProfile5();
profile.Name = new EncodedString5(reader.GetByteArray(2, 16));
@ -1643,7 +1666,7 @@ namespace PkmnFoundations.Data
MySqlDataReader reader = (MySqlDataReader)tran.ExecuteReader(
"SELECT id, pid, Name, " +
"Version, Language, Country, Region, TrainerID, " +
"TrendyPhrase, Gender, Unknown2 FROM GtsBattleTowerLeaders4 " +
"PhraseLeader, Gender, Unknown2 FROM GtsBattleTowerLeaders4 " +
"WHERE Rank = @rank AND RoomNum = @room " +
"ORDER BY TimeUpdated DESC, id LIMIT 30",
new MySqlParameter("@rank", rank),

25
library/Structures/BattleSubwayRecord5.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using PkmnFoundations.Support;
namespace PkmnFoundations.Structures
{
@ -25,8 +26,11 @@ namespace PkmnFoundations.Structures
public BattleSubwayPokemon5[] Party;
public BattleSubwayProfile5 Profile;
// todo: Should be three trendy phrases followed by 2 bytes of Unknown3.
public byte[] Unknown3;
public TrendyPhrase5 PhraseChallenged;
public TrendyPhrase5 PhraseWon;
public TrendyPhrase5 PhraseLost;
public ushort Unknown3;
public byte Rank;
public byte RoomNum;
@ -46,6 +50,9 @@ namespace PkmnFoundations.Structures
writer.Write(Party[x].Save());
}
writer.Write(Profile.Save());
writer.Write(PhraseChallenged.Data);
writer.Write(PhraseWon.Data);
writer.Write(PhraseLost.Data);
writer.Write(Unknown3);
writer.Flush();
@ -63,8 +70,18 @@ namespace PkmnFoundations.Structures
Party[x] = new BattleSubwayPokemon5(data, start + x * 0x3c);
}
Profile = new BattleSubwayProfile5(data, 0xb4 + start);
Unknown3 = new byte[0x1a];
Array.Copy(data, start + 0xd6, Unknown3, 0, 0x1a);
byte[] trendyPhrase = new byte[8];
Array.Copy(data, 0xd6 + start, trendyPhrase, 0, 8);
PhraseChallenged = new TrendyPhrase5(trendyPhrase);
trendyPhrase = new byte[8];
Array.Copy(data, 0xde + start, trendyPhrase, 0, 8);
PhraseWon = new TrendyPhrase5(trendyPhrase);
trendyPhrase = new byte[8];
Array.Copy(data, 0xe6 + start, trendyPhrase, 0, 8);
PhraseLost = new TrendyPhrase5(trendyPhrase);
Unknown3 = BitConverter.ToUInt16(data, 0xee + start);
}
}
}

24
library/Structures/BattleTowerRecord4.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using PkmnFoundations.Support;
namespace PkmnFoundations.Structures
{
@ -25,7 +26,11 @@ namespace PkmnFoundations.Structures
public BattleTowerPokemon4[] Party;
public BattleTowerProfile4 Profile;
public byte[] Unknown3;
public TrendyPhrase4 PhraseChallenged;
public TrendyPhrase4 PhraseWon;
public TrendyPhrase4 PhraseLost;
public ushort Unknown3;
public byte Rank;
public byte RoomNum;
@ -44,6 +49,9 @@ namespace PkmnFoundations.Structures
writer.Write(Party[x].Save());
}
writer.Write(Profile.Save());
writer.Write(PhraseChallenged.Data);
writer.Write(PhraseWon.Data);
writer.Write(PhraseLost.Data);
writer.Write(Unknown3);
writer.Flush();
@ -61,8 +69,18 @@ namespace PkmnFoundations.Structures
Party[x] = new BattleTowerPokemon4(data, start + x * 0x38);
}
Profile = new BattleTowerProfile4(data, 0xa8 + start);
Unknown3 = new byte[0x1a];
Array.Copy(data, start + 0xca, Unknown3, 0, 0x1a);
byte[] trendyPhrase = new byte[8];
Array.Copy(data, 0xca + start, trendyPhrase, 0, 8);
PhraseChallenged = new TrendyPhrase4(trendyPhrase);
trendyPhrase = new byte[8];
Array.Copy(data, 0xd2 + start, trendyPhrase, 0, 8);
PhraseWon = new TrendyPhrase4(trendyPhrase);
trendyPhrase = new byte[8];
Array.Copy(data, 0xda + start, trendyPhrase, 0, 8);
PhraseLost = new TrendyPhrase4(trendyPhrase);
Unknown3 = BitConverter.ToUInt16(data, 0xe2 + start);
}
}
}

20
library/database.sql
View File

@ -7,7 +7,7 @@
#
# Host: 127.0.0.1 (MySQL 5.5.27)
# Database: gts
# Generation Time: 2014-08-06 06:32:15 +0000
# Generation Time: 2014-08-07 22:36:38 +0000
# ************************************************************
@ -223,10 +223,13 @@ CREATE TABLE `GtsBattleSubway5` (
`Country` tinyint(3) unsigned DEFAULT NULL,
`Region` tinyint(3) unsigned DEFAULT NULL,
`TrainerID` int(10) unsigned DEFAULT NULL,
`TrendyPhrase` binary(8) DEFAULT NULL,
`PhraseLeader` binary(8) DEFAULT NULL,
`Gender` tinyint(3) unsigned DEFAULT NULL,
`Unknown2` tinyint(3) unsigned DEFAULT NULL,
`Unknown3` binary(26) 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',
`PhraseChallenged` binary(8) DEFAULT NULL,
`PhraseWon` binary(8) DEFAULT NULL,
`PhraseLost` binary(8) DEFAULT NULL,
`Unknown3` smallint(5) unsigned DEFAULT NULL,
`Unknown4` binary(5) DEFAULT NULL,
`Unknown5` bigint(20) DEFAULT NULL,
`ParseVersion` int(10) unsigned DEFAULT NULL,
@ -257,7 +260,7 @@ CREATE TABLE `GtsBattleSubwayLeaders5` (
`Country` tinyint(3) unsigned DEFAULT NULL,
`Region` tinyint(3) unsigned DEFAULT NULL,
`TrainerID` int(10) unsigned DEFAULT NULL,
`TrendyPhrase` binary(8) DEFAULT NULL,
`PhraseLeader` binary(8) DEFAULT NULL,
`Gender` tinyint(3) unsigned DEFAULT NULL,
`Unknown2` tinyint(3) unsigned DEFAULT NULL,
`ParseVersion` int(10) unsigned DEFAULT NULL,
@ -315,10 +318,13 @@ CREATE TABLE `GtsBattleTower4` (
`Country` tinyint(3) unsigned DEFAULT NULL,
`Region` tinyint(3) unsigned DEFAULT NULL,
`TrainerID` int(10) unsigned DEFAULT NULL,
`TrendyPhrase` binary(8) DEFAULT NULL,
`PhraseLeader` binary(8) DEFAULT NULL,
`Gender` tinyint(3) unsigned DEFAULT NULL,
`Unknown2` tinyint(3) unsigned DEFAULT NULL,
`Unknown3` binary(26) 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',
`PhraseChallenged` binary(8) DEFAULT NULL,
`PhraseWon` binary(8) DEFAULT NULL,
`PhraseLost` binary(8) DEFAULT NULL,
`Unknown3` smallint(5) unsigned DEFAULT NULL,
`Unknown5` bigint(20) DEFAULT NULL,
`ParseVersion` int(10) unsigned DEFAULT NULL,
`Rank` tinyint(3) unsigned DEFAULT NULL,
@ -348,7 +354,7 @@ CREATE TABLE `GtsBattleTowerLeaders4` (
`Country` tinyint(3) unsigned DEFAULT NULL,
`Region` tinyint(3) unsigned DEFAULT NULL,
`TrainerID` int(10) unsigned DEFAULT NULL,
`TrendyPhrase` binary(8) DEFAULT NULL,
`PhraseLeader` binary(8) DEFAULT NULL,
`Gender` tinyint(3) unsigned DEFAULT NULL,
`Unknown2` tinyint(3) unsigned DEFAULT NULL,
`ParseVersion` int(10) unsigned DEFAULT NULL,