From 0eba5f2990c1694c09547d11b0d94288a7af23ca Mon Sep 17 00:00:00 2001 From: Xackery Date: Fri, 23 Mar 2018 14:49:40 -0700 Subject: [PATCH] BT changed to BodyType, revised MessageType listings --- common/message.proto | 271 +++++++++++++++++++++---------------------- 1 file changed, 133 insertions(+), 138 deletions(-) diff --git a/common/message.proto b/common/message.proto index 36b04f088..12dc0c787 100644 --- a/common/message.proto +++ b/common/message.proto @@ -522,154 +522,149 @@ enum DeityTypeBit { enum MessageType { //option allow_alias = true; - WhiteSmoke = 0; // FF|F0F0F0 - DimGray = 1; // FF|606060 - Green = 2; // FF|008000 - BrightBlue = 3; // FF|0040FF - Magenta = 5; // FF|F000F0 - Gray = 6; // FF|808080 - LightGray = 7; // FF|E0E0E0 , also tell? - SayLocal = 8; //Say when you say it? - WhiteSmoke2 = 10; // FF|F0F0F0 - DarkGray = 12; // FF|A0A0A0 - Red= 13; // FF|F00000 - Lime = 14; // FF|00F000 - Yellow = 15; // FF|F0F000 - Blue = 16; // FF|0000F0 - LightNavy = 17; // FF|0000AF - Cyan = 18; // FF|00F0F0 - Black = 20; // FF|000000 - - Say = 256; - Tell = 257; - Group = 258; - Guild = 259; - OOC = 260; - Auction = 261; - Shout = 262; - Emote = 263; - Spells = 264; - YouHitOther = 265; - OtherHitsYou = 266; - YouMissOther = 267; - OtherMissesYou = 268; - Broadcasts = 269; - Skills = 270; - Disciplines = 271; - Unused1 = 272; - DefaultText = 273; - Unused2 = 274; - MerchantOffer = 275; - MerchantBuySell = 276; - YourDeath = 277; - OtherDeath = 278; - OtherHits = 279; - OtherMisses = 280; - Who = 281; - YellForHelp = 282; - NonMelee = 283; - WornOff = 284; - MoneySplit = 285; - LootMessages = 286; - DiceRoll = 287; - OtherSpells = 288; - SpellFailure = 289; - Chat = 290; - Channel1 = 291; - Channel2 = 292; - Channel3 = 293; - Channel4 = 294; - Channel5 = 295; - Channel6 = 296; - Channel7 = 297; - Channel8 = 298; - Channel9 = 299; - Channel10 = 300; - CritMelee = 301; - SpellCrits = 302; - TooFarAway = 303; - NPCRampage = 304; - NPCFlurry = 305; - NPCEnrage = 306; - SayEcho = 307; - TellEcho = 308; - GroupEcho = 309; - GuildEcho = 310; - OOCEcho = 311; - AuctionEcho = 312; - ShoutECho = 313; - EmoteEcho = 314; - Chat1Echo = 315; - Chat2Echo = 316; - Chat3Echo = 317; - Chat4Echo = 318; - Chat5Echo = 319; - Chat6Echo = 320; - Chat7Echo = 321; - Chat8Echo = 322; - Chat9Echo = 323; - Chat10Echo = 324; - DoTDamage = 325; - ItemLink = 326; - RaidSay = 327; - MyPet = 328; - DS = 329; - Leadership = 330; - PetFlurry = 331; - PetCrit = 332; - FocusEffect = 333; - Experience = 334; - System = 335; - PetSpell = 336; - PetResponse = 337; - ItemSpeech = 338; - StrikeThrough = 339; - Stun = 340; + MT_Auction = 0; + MT_Group = 2; // FF|F0F0F0 + MT_Shout = 3; + MT_Auction4 = 4; + MT_OOC = 5; + MT_Broadcast = 6; + MT_Tell = 7; + MT_Say = 8; + MT_Tell14 = 14; + MT_Raid = 15; + MT_Guild = 17; + MT_GMSayWeird18 = 18; + MT_LocalEmote20 = 20; + MT_Fellowship = 21; + MT_Emote = 22; + MT_Say256 = 256; + MT_Tell257 = 257; + MT_Group258 = 258; + MT_Shout259 = 259; + MT_Auction260 = 260; + MT_OOC261 = 261; + MT_Broadcast262 = 262; + MT_Tell263 = 263; + MT_Say264 = 264; + MT_YouHitOther = 265; + MT_OtherHitsYou = 266; + MT_YouMissOther = 267; + MT_OtherMissesYou = 268; + MT_Skills = 270; + MT_Disciplines = 271; + MT_Guild273 = 273; + MT_GMSay = 274; + MT_MerchantOffer = 275; + MT_MerchantBuySell = 276; + MT_Fellowship277 = 277; + MT_Emote278 = 278; + MT_OtherHits = 279; + MT_OtherMisses = 280; + MT_Who = 281; + MT_YellForHelp = 282; + MT_NonMelee = 283; + MT_WornOff = 284; + MT_MoneySplit = 285; + MT_LootMessages = 286; + MT_DiceRoll = 287; + MT_OtherSpells = 288; + MT_SpellFailure = 289; + MT_Chat = 290; + MT_Channel1 = 291; + MT_Channel2 = 292; + MT_Channel3 = 293; + MT_Channel4 = 294; + MT_Channel5 = 295; + MT_Channel6 = 296; + MT_Channel7 = 297; + MT_Channel8 = 298; + MT_Channel9 = 299; + MT_Channel10 = 300; + MT_CritMelee = 301; + MT_SpellCrits = 302; + MT_TooFarAway = 303; + MT_NPCRampage = 304; + MT_NPCFlurry = 305; + MT_NPCEnrage = 306; + MT_SayEcho = 307; + MT_TellEcho = 308; + MT_GroupEcho = 309; + MT_GuildEcho = 310; + MT_OOCEcho = 311; + MT_MT_Auction2 = 312; + MT_ShoutECho = 313; + MT_EmoteEcho = 314; + MT_Chat1Echo = 315; + MT_Chat2Echo = 316; + MT_Chat3Echo = 317; + MT_Chat4Echo = 318; + MT_Chat5Echo = 319; + MT_Chat6Echo = 320; + MT_Chat7Echo = 321; + MT_Chat8Echo = 322; + MT_Chat9Echo = 323; + MT_Chat10Echo = 324; + MT_DoTDamage = 325; + MT_ItemLink = 326; + MT_RaidSay = 327; + MT_MyPet = 328; + MT_DS = 329; + MT_Leadership = 330; + MT_PetFlurry = 331; + MT_PetCrit = 332; + MT_FocusEffect = 333; + MT_Experience = 334; + MT_System = 335; + MT_PetSpell = 336; + MT_PetResponse = 337; + MT_ItemSpeech = 338; + MT_StrikeThrough = 339; + MT_Stun = 340; } enum BodyType { //option allow_alias = true; - BT_Unknown = 0; - BT_Humanoid = 1; - BT_Lycanthrope = 2; - BT_Undead = 3; - BT_Giant = 4; - BT_Construct = 5; - BT_Extraplanar = 6; - BT_Magical = 7; //this name might be a bit off - BT_SummonedUndead = 8; - BT_RaidGiant = 9; + BodyType_Unknown = 0; + BodyType_Humanoid = 1; + BodyType_Lycanthrope = 2; + BodyType_Undead = 3; + BodyType_Giant = 4; + BodyType_Construct = 5; + BodyType_Extraplanar = 6; + BodyType_Magical = 7; //this name might be a bit off + BodyType_SummonedUndead = 8; + BodyType_RaidGiant = 9; - BT_NoTarget = 11; //no name; can't target this bodytype - BT_Vampire = 12; - BT_Atenha_Ra = 13; - BT_Greater_Akheva = 14; - BT_Khati_Sha = 15; - BT_Seru = 16; //not confirmed.... - BT_Draz_Nurakk = 18; - BT_Zek = 19; - BT_Luggald = 20; - BT_Animal = 21; - BT_Insect = 22; - BT_Monster = 23; - BT_Summoned = 24; //Elemental? - BT_Plant = 25; - BT_Dragon = 26; - BT_Summoned2 = 27; - BT_Summoned3 = 28; + BodyType_NoTarget = 11; //no name; can't target this bodytype + BodyType_Vampire = 12; + BodyType_Atenha_Ra = 13; + BodyType_Greater_Akheva = 14; + BodyType_Khati_Sha = 15; + BodyType_Seru = 16; //not confirmed.... + BodyType_Draz_Nurakk = 18; + BodyType_Zek = 19; + BodyType_Luggald = 20; + BodyType_Animal = 21; + BodyType_Insect = 22; + BodyType_Monster = 23; + BodyType_Summoned = 24; //Elemental? + BodyType_Plant = 25; + BodyType_Dragon = 26; + BodyType_Summoned2 = 27; + BodyType_Summoned3 = 28; - BT_VeliousDragon = 30; //might not be a tight set + BodyType_VeliousDragon = 30; //might not be a tight set - BT_Dragon3 = 32; - BT_Boxes = 33; - BT_Muramite = 34; //tribal dudes + BodyType_Dragon3 = 32; + BodyType_Boxes = 33; + BodyType_Muramite = 34; //tribal dudes - BT_NoTarget2 = 60; + BodyType_NoTarget2 = 60; - BT_SwarmPet = 63; //is this valid; or made up? + BodyType_SwarmPet = 63; //is this valid; or made up? - BT_InvisMan = 66; //no name; seen on 'InvisMan'; can be /targeted - BT_Special = 67; + BodyType_InvisMan = 66; //no name; seen on 'InvisMan'; can be /targeted + BodyType_Special = 67; } enum GenderType {