From adb63adbb1f19a8282549933a16fb2a64f720079 Mon Sep 17 00:00:00 2001 From: Nilanth Animosus Date: Wed, 18 Jul 2018 11:01:53 +0100 Subject: [PATCH 1/3] Update Homoglyphs Updated the list of Homoglyphs from https://github.com/codebox/homoglyph/ --- .../Source/Utils/Homoglyphs.cs | 233 ++++++++++-------- 1 file changed, 137 insertions(+), 96 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Source/Utils/Homoglyphs.cs b/Barotrauma/BarotraumaShared/Source/Utils/Homoglyphs.cs index 70157f98f..30ce32a0c 100644 --- a/Barotrauma/BarotraumaShared/Source/Utils/Homoglyphs.cs +++ b/Barotrauma/BarotraumaShared/Source/Utils/Homoglyphs.cs @@ -13,7 +13,7 @@ namespace Barotrauma new uint[]{0x24,0xff04}, new uint[]{0x25,0xff05}, new uint[]{0x26,0xa778,0xff06}, - new uint[]{0x27,0x60,0xb4,0x2b9,0x2bb,0x2bc,0x2bd,0x2be,0x2c8,0x2ca,0x2cb,0x2f4,0x374,0x384,0x55a,0x55d,0x5d9,0x5f3,0x7f4,0x7f5,0x144a,0x16cc,0x1fbd,0x1fbf,0x1fef,0x1ffd,0x1ffe,0x2018,0x2019,0x201b,0x2032,0x2035,0xa78c,0xff07,0xff40}, + new uint[]{0x27,0x60,0xb4,0x2b9,0x2bb,0x2bc,0x2bd,0x2be,0x2c8,0x2ca,0x2cb,0x2f4,0x374,0x384,0x55a,0x55d,0x5d9,0x5f3,0x7f4,0x7f5,0x144a,0x16cc,0x1fbd,0x1fbf,0x1fef,0x1ffd,0x1ffe,0x2018,0x2019,0x201b,0x2032,0x2035,0xa78c,0xff07,0xff40,0x16f51,0x16f52}, new uint[]{0x28,0x2768,0x2772,0x3014,0xfd3e,0xff08,0xff3b}, new uint[]{0x29,0x2769,0x2773,0x3015,0xfd3f,0xff09,0xff3d}, new uint[]{0x2a,0x66d,0x204e,0x2217,0xff0a,0x1031f}, @@ -21,76 +21,75 @@ namespace Barotrauma new uint[]{0x2c,0xb8,0x60d,0x66b,0x201a,0xa4f9,0xff0c}, new uint[]{0x2d,0x2d7,0x6d4,0x2010,0x2011,0x2012,0x2013,0x2043,0x2212,0x2796,0x2cba,0xfe58}, new uint[]{0x2e,0x660,0x6f0,0x701,0x702,0x2024,0xa4f8,0xa60e,0xff0e,0x10a50,0x1d16d}, - new uint[]{0x2f,0x1735,0x2041,0x2044,0x2215,0x2571,0x27cb,0x29f8,0x2cc6,0x2f03,0x3033,0x31d3,0x4e3f,0xff0f}, - new uint[]{0x30,0x4f,0x39f,0x41e,0x555,0x7c0,0x9e6,0xb20,0xb66,0xd20,0x2c9e,0x2d54,0x3007,0xa4f3,0xff10,0xff2f,0x10292,0x102ab,0x10404,0x10516,0x114d0,0x118b5,0x118e0,0x1d40e,0x1d442,0x1d476,0x1d4aa,0x1d4de,0x1d512,0x1d546,0x1d57a,0x1d5ae,0x1d5e2,0x1d616,0x1d64a,0x1d67e,0x1d6b6,0x1d6f0,0x1d72a,0x1d764,0x1d79e,0x1d7ce,0x1d7d8,0x1d7e2,0x1d7ec,0x1d7f6}, - new uint[]{0x31,0x49,0x6c,0x7c,0x196,0x1c0,0x399,0x406,0x4c0,0x5c0,0x5d5,0x5df,0x627,0x661,0x6f1,0x7ca,0x16c1,0x2110,0x2111,0x2113,0x2160,0x217c,0x2223,0x2c92,0x2d4f,0xa4f2,0xfe8d,0xfe8e,0xff11,0xff29,0xff4c,0xffe8,0x1028a,0x10309,0x10320,0x1d408,0x1d425,0x1d43c,0x1d459,0x1d470,0x1d48d,0x1d4c1,0x1d4d8,0x1d4f5,0x1d529,0x1d540,0x1d55d,0x1d574,0x1d591,0x1d5a8,0x1d5c5,0x1d5dc,0x1d5f9,0x1d610,0x1d62d,0x1d644,0x1d661,0x1d678,0x1d695,0x1d6b0,0x1d6ea,0x1d724,0x1d75e,0x1d798,0x1d7cf,0x1d7d9,0x1d7e3,0x1d7ed,0x1d7f7,0x1e8c7,0x1ee00,0x1ee80}, - new uint[]{0x32,0x1a7,0x3e8,0x14bf,0xa644,0xa75a,0xff12,0x1d7d0,0x1d7da,0x1d7e4,0x1d7ee,0x1d7f8}, - new uint[]{0x33,0x1b7,0x21c,0x417,0x4e0,0x2ccc,0xa76a,0xa7ab,0xff13,0x118ca,0x1d7d1,0x1d7db,0x1d7e5,0x1d7ef,0x1d7f9}, + new uint[]{0x2f,0x1735,0x2041,0x2044,0x2215,0x2571,0x27cb,0x29f8,0x2cc6,0x2f03,0x3033,0x30ce,0x31d3,0x4e3f,0xff0f,0x1d23a}, + new uint[]{0x30,0x4f,0x6f,0x39f,0x3bf,0x3c3,0x41e,0x43e,0x555,0x585,0x5e1,0x647,0x665,0x6be,0x6c1,0x6d5,0x6f5,0x7c0,0x966,0x9e6,0xa66,0xae6,0xb20,0xb66,0xbe6,0xc02,0xc66,0xc82,0xce6,0xd02,0xd20,0xd66,0xd82,0xe50,0xed0,0x101d,0x1040,0x10ff,0x12d0,0x1d0f,0x1d11,0x2134,0x2c9e,0x2c9f,0x2d54,0x3007,0xa4f3,0xab3d,0xfba6,0xfba7,0xfba8,0xfba9,0xfbaa,0xfbab,0xfbac,0xfbad,0xfee9,0xfeea,0xfeeb,0xfeec,0xff10,0xff2f,0xff4f,0x10292,0x102ab,0x10404,0x1042c,0x104c2,0x104ea,0x10516,0x114d0,0x118b5,0x118c8,0x118d7,0x118e0,0x1d40e,0x1d428,0x1d442,0x1d45c,0x1d476,0x1d490,0x1d4aa,0x1d4de,0x1d4f8,0x1d512,0x1d52c,0x1d546,0x1d560,0x1d57a,0x1d594,0x1d5ae,0x1d5c8,0x1d5e2,0x1d5fc,0x1d616,0x1d630,0x1d64a,0x1d664,0x1d67e,0x1d698,0x1d6b6,0x1d6d0,0x1d6d4,0x1d6f0,0x1d70a,0x1d70e,0x1d72a,0x1d744,0x1d748,0x1d764,0x1d77e,0x1d782,0x1d79e,0x1d7b8,0x1d7bc,0x1d7ce,0x1d7d8,0x1d7e2,0x1d7ec,0x1d7f6,0x1ee24,0x1ee64,0x1ee84}, + new uint[]{0x31,0x49,0x6c,0x7c,0x196,0x1c0,0x399,0x406,0x4c0,0x5c0,0x5d5,0x5df,0x627,0x661,0x6f1,0x7ca,0x16c1,0x2110,0x2111,0x2113,0x2160,0x217c,0x2223,0x23fd,0x2c92,0x2d4f,0xa4f2,0xfe8d,0xfe8e,0xff11,0xff29,0xff4c,0xffe8,0x1028a,0x10309,0x10320,0x16f28,0x1d408,0x1d425,0x1d43c,0x1d459,0x1d470,0x1d48d,0x1d4c1,0x1d4d8,0x1d4f5,0x1d529,0x1d540,0x1d55d,0x1d574,0x1d591,0x1d5a8,0x1d5c5,0x1d5dc,0x1d5f9,0x1d610,0x1d62d,0x1d644,0x1d661,0x1d678,0x1d695,0x1d6b0,0x1d6ea,0x1d724,0x1d75e,0x1d798,0x1d7cf,0x1d7d9,0x1d7e3,0x1d7ed,0x1d7f7,0x1e8c7,0x1ee00,0x1ee80}, + new uint[]{0x32,0x1a7,0x3e8,0x14bf,0xa644,0xa6ef,0xa75a,0xff12,0x1d7d0,0x1d7da,0x1d7e4,0x1d7ee,0x1d7f8}, + new uint[]{0x33,0x1b7,0x21c,0x417,0x4e0,0x2ccc,0xa76a,0xa7ab,0xff13,0x118ca,0x16f3b,0x1d206,0x1d7d1,0x1d7db,0x1d7e5,0x1d7ef,0x1d7f9}, new uint[]{0x34,0x13ce,0xff14,0x118af,0x1d7d2,0x1d7dc,0x1d7e6,0x1d7f0,0x1d7fa}, new uint[]{0x35,0x1bc,0xff15,0x118bb,0x1d7d3,0x1d7dd,0x1d7e7,0x1d7f1,0x1d7fb}, new uint[]{0x36,0x431,0x13ee,0x2cd2,0xff16,0x118d5,0x1d7d4,0x1d7de,0x1d7e8,0x1d7f2,0x1d7fc}, - new uint[]{0x37,0xff17,0x118c6,0x1d7d5,0x1d7df,0x1d7e9,0x1d7f3,0x1d7fd}, + new uint[]{0x37,0xff17,0x104d2,0x118c6,0x1d212,0x1d7d5,0x1d7df,0x1d7e9,0x1d7f3,0x1d7fd}, new uint[]{0x38,0x222,0x223,0x9ea,0xa6a,0xb03,0xff18,0x1031a,0x1d7d6,0x1d7e0,0x1d7ea,0x1d7f4,0x1d7fe,0x1e8cb}, - new uint[]{0x39,0x9ed,0xa67,0xb68,0x2cca,0xa76e,0xff19,0x118ac,0x118cc,0x118d6,0x1d7d7,0x1d7e1,0x1d7eb,0x1d7f5,0x1d7ff}, + new uint[]{0x39,0x9ed,0xa67,0xb68,0xd6d,0x2cca,0xa76e,0xff19,0x118ac,0x118cc,0x118d6,0x1d7d7,0x1d7e1,0x1d7eb,0x1d7f5,0x1d7ff}, new uint[]{0x3a,0x2d0,0x2f8,0x589,0x5c3,0x703,0x704,0x903,0xa83,0x16ec,0x1803,0x1809,0x205a,0x2236,0xa4fd,0xa789,0xfe30,0xff1a}, new uint[]{0x3b,0x37e,0xff1b}, - new uint[]{0x3c,0x2c2,0x1438,0x16b2,0x2039,0x276e,0xff1c}, + new uint[]{0x3c,0x2c2,0x1438,0x16b2,0x2039,0x276e,0xff1c,0x1d236}, new uint[]{0x3d,0x1400,0x2e40,0x30a0,0xa4ff,0xff1d}, - new uint[]{0x3e,0x2c3,0x1433,0x203a,0x276f,0xff1e}, - new uint[]{0x3f,0x241,0x294,0x97d,0x13ae,0xff1f}, + new uint[]{0x3e,0x2c3,0x1433,0x203a,0x276f,0xff1e,0x16f3f,0x1d237}, + new uint[]{0x3f,0x241,0x294,0x97d,0x13ae,0xa6eb,0xff1f}, new uint[]{0x40,0xff20}, - new uint[]{0x41,0x391,0x410,0x13aa,0x15c5,0x1d00,0xa4ee,0xff21,0x102a0,0x1d400,0x1d434,0x1d468,0x1d49c,0x1d4d0,0x1d504,0x1d538,0x1d56c,0x1d5a0,0x1d5d4,0x1d608,0x1d63c,0x1d670,0x1d6a8,0x1d6e2,0x1d71c,0x1d756,0x1d790}, - new uint[]{0x42,0x299,0x392,0x412,0x432,0x13f4,0x15f7,0x16d2,0x212c,0xa4d0,0xa7b4,0xff22,0x10282,0x102a1,0x10301,0x1d401,0x1d435,0x1d469,0x1d4d1,0x1d505,0x1d539,0x1d56d,0x1d5a1,0x1d5d5,0x1d609,0x1d63d,0x1d671,0x1d6a9,0x1d6e3,0x1d71d,0x1d757,0x1d791}, + new uint[]{0x41,0x391,0x410,0x13aa,0x15c5,0x1d00,0xa4ee,0xab7a,0xff21,0x102a0,0x16f40,0x1d400,0x1d434,0x1d468,0x1d49c,0x1d4d0,0x1d504,0x1d538,0x1d56c,0x1d5a0,0x1d5d4,0x1d608,0x1d63c,0x1d670,0x1d6a8,0x1d6e2,0x1d71c,0x1d756,0x1d790}, + new uint[]{0x42,0x299,0x392,0x412,0x432,0x13f4,0x13fc,0x15f7,0x16d2,0x212c,0xa4d0,0xa7b4,0xff22,0x10282,0x102a1,0x10301,0x1d401,0x1d435,0x1d469,0x1d4d1,0x1d505,0x1d539,0x1d56d,0x1d5a1,0x1d5d5,0x1d609,0x1d63d,0x1d671,0x1d6a9,0x1d6e3,0x1d71d,0x1d757,0x1d791}, new uint[]{0x43,0x3f9,0x421,0x13df,0x2102,0x212d,0x216d,0x2ca4,0xa4da,0xff23,0x102a2,0x10302,0x10415,0x1051c,0x118e9,0x118f2,0x1d402,0x1d436,0x1d46a,0x1d49e,0x1d4d2,0x1d56e,0x1d5a2,0x1d5d6,0x1d60a,0x1d63e,0x1d672,0x1f74c}, - new uint[]{0x44,0x13a0,0x15de,0x15ea,0x2145,0x216e,0xa4d3,0xff24,0x1d403,0x1d437,0x1d46b,0x1d49f,0x1d4d3,0x1d507,0x1d53b,0x1d56f,0x1d5a3,0x1d5d7,0x1d60b,0x1d63f,0x1d673}, - new uint[]{0x45,0x395,0x415,0x13ac,0x2130,0x22ff,0x2d39,0xa4f0,0xff25,0x10286,0x118a6,0x118ae,0x1d404,0x1d438,0x1d46c,0x1d4d4,0x1d508,0x1d53c,0x1d570,0x1d5a4,0x1d5d8,0x1d60c,0x1d640,0x1d674,0x1d6ac,0x1d6e6,0x1d720,0x1d75a,0x1d794}, - new uint[]{0x46,0x3dc,0x15b4,0x2131,0xa4dd,0xa798,0xff26,0x10287,0x102a5,0x10525,0x118a2,0x118c2,0x1d405,0x1d439,0x1d46d,0x1d4d5,0x1d509,0x1d53d,0x1d571,0x1d5a5,0x1d5d9,0x1d60d,0x1d641,0x1d675,0x1d7ca}, - new uint[]{0x47,0x262,0x50c,0x50d,0x13c0,0x13f3,0xa4d6,0xff27,0x1d406,0x1d43a,0x1d46e,0x1d4a2,0x1d4d6,0x1d50a,0x1d53e,0x1d572,0x1d5a6,0x1d5da,0x1d60e,0x1d642,0x1d676}, - new uint[]{0x48,0x29c,0x397,0x41d,0x43d,0x13bb,0x157c,0x210b,0x210c,0x210d,0x2c8e,0xa4e7,0xff28,0x102cf,0x1d407,0x1d43b,0x1d46f,0x1d4d7,0x1d573,0x1d5a7,0x1d5db,0x1d60f,0x1d643,0x1d677,0x1d6ae,0x1d6e8,0x1d722,0x1d75c,0x1d796}, - new uint[]{0x4a,0x37f,0x408,0x13ab,0x148d,0xa4d9,0xa7b2,0xff2a,0x1d409,0x1d43d,0x1d471,0x1d4a5,0x1d4d9,0x1d50d,0x1d541,0x1d575,0x1d5a9,0x1d5dd,0x1d611,0x1d645,0x1d679}, + new uint[]{0x44,0x13a0,0x15de,0x15ea,0x1d05,0x2145,0x216e,0xa4d3,0xab70,0xff24,0x1d403,0x1d437,0x1d46b,0x1d49f,0x1d4d3,0x1d507,0x1d53b,0x1d56f,0x1d5a3,0x1d5d7,0x1d60b,0x1d63f,0x1d673}, + new uint[]{0x45,0x395,0x415,0x13ac,0x1d07,0x2130,0x22ff,0x2d39,0xa4f0,0xab7c,0xff25,0x10286,0x118a6,0x118ae,0x1d404,0x1d438,0x1d46c,0x1d4d4,0x1d508,0x1d53c,0x1d570,0x1d5a4,0x1d5d8,0x1d60c,0x1d640,0x1d674,0x1d6ac,0x1d6e6,0x1d720,0x1d75a,0x1d794}, + new uint[]{0x46,0x3dc,0x15b4,0x2131,0xa4dd,0xa798,0xff26,0x10287,0x102a5,0x10525,0x118a2,0x118c2,0x1d213,0x1d405,0x1d439,0x1d46d,0x1d4d5,0x1d509,0x1d53d,0x1d571,0x1d5a5,0x1d5d9,0x1d60d,0x1d641,0x1d675,0x1d7ca}, + new uint[]{0x47,0x262,0x50c,0x50d,0x13c0,0x13f3,0x13fb,0xa4d6,0xab90,0xff27,0x1d406,0x1d43a,0x1d46e,0x1d4a2,0x1d4d6,0x1d50a,0x1d53e,0x1d572,0x1d5a6,0x1d5da,0x1d60e,0x1d642,0x1d676}, + new uint[]{0x48,0x29c,0x397,0x41d,0x43d,0x13bb,0x157c,0x210b,0x210c,0x210d,0x2c8e,0xa4e7,0xab8b,0xff28,0x102cf,0x1d407,0x1d43b,0x1d46f,0x1d4d7,0x1d573,0x1d5a7,0x1d5db,0x1d60f,0x1d643,0x1d677,0x1d6ae,0x1d6e8,0x1d722,0x1d75c,0x1d796}, + new uint[]{0x4a,0x37f,0x408,0x13ab,0x148d,0x1d0a,0xa4d9,0xa7b2,0xab7b,0xff2a,0x1d409,0x1d43d,0x1d471,0x1d4a5,0x1d4d9,0x1d50d,0x1d541,0x1d575,0x1d5a9,0x1d5dd,0x1d611,0x1d645,0x1d679}, new uint[]{0x4b,0x39a,0x41a,0x13e6,0x16d5,0x212a,0x2c94,0xa4d7,0xff2b,0x10518,0x1d40a,0x1d43e,0x1d472,0x1d4a6,0x1d4da,0x1d50e,0x1d542,0x1d576,0x1d5aa,0x1d5de,0x1d612,0x1d646,0x1d67a,0x1d6b1,0x1d6eb,0x1d725,0x1d75f,0x1d799}, - new uint[]{0x4c,0x29f,0x13de,0x14aa,0x2112,0x216c,0x2cd0,0x2cd1,0xa4e1,0xff2c,0x1041b,0x10443,0x10526,0x118a3,0x118b2,0x1d40b,0x1d43f,0x1d473,0x1d4db,0x1d50f,0x1d543,0x1d577,0x1d5ab,0x1d5df,0x1d613,0x1d647,0x1d67b}, + new uint[]{0x4c,0x29f,0x13de,0x14aa,0x2112,0x216c,0x2cd0,0x2cd1,0xa4e1,0xabae,0xff2c,0x1041b,0x10443,0x10526,0x118a3,0x118b2,0x16f16,0x1d22a,0x1d40b,0x1d43f,0x1d473,0x1d4db,0x1d50f,0x1d543,0x1d577,0x1d5ab,0x1d5df,0x1d613,0x1d647,0x1d67b}, new uint[]{0x4d,0x39c,0x3fa,0x41c,0x13b7,0x15f0,0x16d6,0x2133,0x216f,0x2c98,0xa4df,0xff2d,0x102b0,0x10311,0x1d40c,0x1d440,0x1d474,0x1d4dc,0x1d510,0x1d544,0x1d578,0x1d5ac,0x1d5e0,0x1d614,0x1d648,0x1d67c,0x1d6b3,0x1d6ed,0x1d727,0x1d761,0x1d79b}, new uint[]{0x4e,0x274,0x39d,0x2115,0x2c9a,0xa4e0,0xff2e,0x10513,0x1d40d,0x1d441,0x1d475,0x1d4a9,0x1d4dd,0x1d511,0x1d579,0x1d5ad,0x1d5e1,0x1d615,0x1d649,0x1d67d,0x1d6b4,0x1d6ee,0x1d728,0x1d762,0x1d79c}, - new uint[]{0x50,0x3a1,0x420,0x13e2,0x146d,0x2119,0x2ca2,0xa4d1,0xff30,0x10295,0x1d40f,0x1d443,0x1d477,0x1d4ab,0x1d4df,0x1d513,0x1d57b,0x1d5af,0x1d5e3,0x1d617,0x1d64b,0x1d67f,0x1d6b8,0x1d6f2,0x1d72c,0x1d766,0x1d7a0}, + new uint[]{0x50,0x3a1,0x420,0x13e2,0x146d,0x1d18,0x1d29,0x2119,0x2ca2,0xa4d1,0xabb2,0xff30,0x10295,0x1d40f,0x1d443,0x1d477,0x1d4ab,0x1d4df,0x1d513,0x1d57b,0x1d5af,0x1d5e3,0x1d617,0x1d64b,0x1d67f,0x1d6b8,0x1d6f2,0x1d72c,0x1d766,0x1d7a0}, new uint[]{0x51,0x211a,0x2d55,0xff31,0x1d410,0x1d444,0x1d478,0x1d4ac,0x1d4e0,0x1d514,0x1d57c,0x1d5b0,0x1d5e4,0x1d618,0x1d64c,0x1d680}, - new uint[]{0x52,0x1a6,0x280,0x13a1,0x13d2,0x1587,0x16b1,0x211b,0x211c,0x211d,0xa4e3,0xff32,0x1d411,0x1d445,0x1d479,0x1d4e1,0x1d57d,0x1d5b1,0x1d5e5,0x1d619,0x1d64d,0x1d681}, - new uint[]{0x53,0x405,0x54f,0x13d5,0x13da,0xa4e2,0xff33,0x10296,0x10420,0x1d412,0x1d446,0x1d47a,0x1d4ae,0x1d4e2,0x1d516,0x1d54a,0x1d57e,0x1d5b2,0x1d5e6,0x1d61a,0x1d64e,0x1d682}, - new uint[]{0x54,0x3a4,0x422,0x13a2,0x22a4,0x27d9,0x2ca6,0xa4d4,0xff34,0x10297,0x102b1,0x10315,0x118bc,0x1d413,0x1d447,0x1d47b,0x1d4af,0x1d4e3,0x1d517,0x1d54b,0x1d57f,0x1d5b3,0x1d5e7,0x1d61b,0x1d64f,0x1d683,0x1d6bb,0x1d6f5,0x1d72f,0x1d769,0x1d7a3,0x1f768}, - new uint[]{0x55,0x54d,0x144c,0x222a,0x22c3,0xa4f4,0xff35,0x118b8,0x1d414,0x1d448,0x1d47c,0x1d4b0,0x1d4e4,0x1d518,0x1d54c,0x1d580,0x1d5b4,0x1d5e8,0x1d61c,0x1d650,0x1d684}, - new uint[]{0x56,0x474,0x667,0x6f7,0x13d9,0x142f,0x2164,0x2d38,0xa4e6,0xff36,0x1051d,0x118a0,0x1d415,0x1d449,0x1d47d,0x1d4b1,0x1d4e5,0x1d519,0x1d54d,0x1d581,0x1d5b5,0x1d5e9,0x1d61d,0x1d651,0x1d685}, + new uint[]{0x52,0x1a6,0x280,0x13a1,0x13d2,0x1587,0x16b1,0x211b,0x211c,0x211d,0xa4e3,0xab71,0xaba2,0xff32,0x104b4,0x16f35,0x1d216,0x1d411,0x1d445,0x1d479,0x1d4e1,0x1d57d,0x1d5b1,0x1d5e5,0x1d619,0x1d64d,0x1d681}, + new uint[]{0x53,0x405,0x54f,0x13d5,0x13da,0xa4e2,0xff33,0x10296,0x10420,0x16f3a,0x1d412,0x1d446,0x1d47a,0x1d4ae,0x1d4e2,0x1d516,0x1d54a,0x1d57e,0x1d5b2,0x1d5e6,0x1d61a,0x1d64e,0x1d682}, + new uint[]{0x54,0x3a4,0x3c4,0x422,0x442,0x13a2,0x1d1b,0x22a4,0x27d9,0x2ca6,0xa4d4,0xab72,0xff34,0x10297,0x102b1,0x10315,0x118bc,0x16f0a,0x1d413,0x1d447,0x1d47b,0x1d4af,0x1d4e3,0x1d517,0x1d54b,0x1d57f,0x1d5b3,0x1d5e7,0x1d61b,0x1d64f,0x1d683,0x1d6bb,0x1d6d5,0x1d6f5,0x1d70f,0x1d72f,0x1d749,0x1d769,0x1d783,0x1d7a3,0x1d7bd,0x1f768}, + new uint[]{0x55,0x54d,0x1200,0x144c,0x222a,0x22c3,0xa4f4,0xff35,0x104ce,0x118b8,0x16f42,0x1d414,0x1d448,0x1d47c,0x1d4b0,0x1d4e4,0x1d518,0x1d54c,0x1d580,0x1d5b4,0x1d5e8,0x1d61c,0x1d650,0x1d684}, + new uint[]{0x56,0x474,0x667,0x6f7,0x13d9,0x142f,0x2164,0x2d38,0xa4e6,0xa6df,0xff36,0x1051d,0x118a0,0x16f08,0x1d20d,0x1d415,0x1d449,0x1d47d,0x1d4b1,0x1d4e5,0x1d519,0x1d54d,0x1d581,0x1d5b5,0x1d5e9,0x1d61d,0x1d651,0x1d685}, new uint[]{0x57,0x51c,0x13b3,0x13d4,0xa4ea,0xff37,0x118e6,0x118ef,0x1d416,0x1d44a,0x1d47e,0x1d4b2,0x1d4e6,0x1d51a,0x1d54e,0x1d582,0x1d5b6,0x1d5ea,0x1d61e,0x1d652,0x1d686}, new uint[]{0x58,0x3a7,0x425,0x166d,0x16b7,0x2169,0x2573,0x2cac,0x2d5d,0xa4eb,0xa7b3,0xff38,0x10290,0x102b4,0x10317,0x10322,0x10527,0x118ec,0x1d417,0x1d44b,0x1d47f,0x1d4b3,0x1d4e7,0x1d51b,0x1d54f,0x1d583,0x1d5b7,0x1d5eb,0x1d61f,0x1d653,0x1d687,0x1d6be,0x1d6f8,0x1d732,0x1d76c,0x1d7a6}, - new uint[]{0x59,0x3a5,0x3d2,0x4ae,0x13a9,0x13bd,0x2ca8,0xa4ec,0xff39,0x102b2,0x118a4,0x1d418,0x1d44c,0x1d480,0x1d4b4,0x1d4e8,0x1d51c,0x1d550,0x1d584,0x1d5b8,0x1d5ec,0x1d620,0x1d654,0x1d688,0x1d6bc,0x1d6f6,0x1d730,0x1d76a,0x1d7a4}, + new uint[]{0x59,0x3a5,0x3d2,0x423,0x4ae,0x13a9,0x13bd,0x2ca8,0xa4ec,0xff39,0x102b2,0x118a4,0x16f43,0x1d418,0x1d44c,0x1d480,0x1d4b4,0x1d4e8,0x1d51c,0x1d550,0x1d584,0x1d5b8,0x1d5ec,0x1d620,0x1d654,0x1d688,0x1d6bc,0x1d6f6,0x1d730,0x1d76a,0x1d7a4}, new uint[]{0x5a,0x396,0x13c3,0x2124,0x2128,0xa4dc,0xff3a,0x102f5,0x118a9,0x118e5,0x1d419,0x1d44d,0x1d481,0x1d4b5,0x1d4e9,0x1d585,0x1d5b9,0x1d5ed,0x1d621,0x1d655,0x1d689,0x1d6ad,0x1d6e7,0x1d721,0x1d75b,0x1d795}, - new uint[]{0x5c,0x2216,0x27cd,0x29f5,0x29f9,0x2f02,0x31d4,0x4e36,0xfe68,0xff3c}, + new uint[]{0x5c,0x2216,0x27cd,0x29f5,0x29f9,0x2f02,0x31d4,0x4e36,0xfe68,0xff3c,0x1d20f,0x1d23b}, new uint[]{0x5e,0x2c4,0x2c6}, new uint[]{0x5f,0x7fa,0xfe4d,0xfe4e,0xfe4f,0xff3f}, new uint[]{0x61,0x251,0x3b1,0x430,0x237a,0xff41,0x1d41a,0x1d44e,0x1d482,0x1d4b6,0x1d4ea,0x1d51e,0x1d552,0x1d586,0x1d5ba,0x1d5ee,0x1d622,0x1d656,0x1d68a,0x1d6c2,0x1d6fc,0x1d736,0x1d770,0x1d7aa}, new uint[]{0x62,0x184,0x42c,0x13cf,0x15af,0xff42,0x1d41b,0x1d44f,0x1d483,0x1d4b7,0x1d4eb,0x1d51f,0x1d553,0x1d587,0x1d5bb,0x1d5ef,0x1d623,0x1d657,0x1d68b}, - new uint[]{0x63,0x3f2,0x441,0x1d04,0x217d,0x2ca5,0xff43,0x1043d,0x1d41c,0x1d450,0x1d484,0x1d4b8,0x1d4ec,0x1d520,0x1d554,0x1d588,0x1d5bc,0x1d5f0,0x1d624,0x1d658,0x1d68c}, + new uint[]{0x63,0x3f2,0x441,0x1d04,0x217d,0x2ca5,0xabaf,0xff43,0x1043d,0x1d41c,0x1d450,0x1d484,0x1d4b8,0x1d4ec,0x1d520,0x1d554,0x1d588,0x1d5bc,0x1d5f0,0x1d624,0x1d658,0x1d68c}, new uint[]{0x64,0x501,0x13e7,0x146f,0x2146,0x217e,0xa4d2,0xff44,0x1d41d,0x1d451,0x1d485,0x1d4b9,0x1d4ed,0x1d521,0x1d555,0x1d589,0x1d5bd,0x1d5f1,0x1d625,0x1d659,0x1d68d}, new uint[]{0x65,0x435,0x4bd,0x212e,0x212f,0x2147,0xab32,0xff45,0x1d41e,0x1d452,0x1d486,0x1d4ee,0x1d522,0x1d556,0x1d58a,0x1d5be,0x1d5f2,0x1d626,0x1d65a,0x1d68e}, - new uint[]{0x66,0x17f,0x584,0x1e9d,0xa799,0xab35,0xff46,0x1d41f,0x1d453,0x1d487,0x1d4bb,0x1d4ef,0x1d523,0x1d557,0x1d58b,0x1d5bf,0x1d5f3,0x1d627,0x1d65b,0x1d68f}, + new uint[]{0x66,0x17f,0x3dd,0x584,0x1e9d,0xa799,0xab35,0xff46,0x1d41f,0x1d453,0x1d487,0x1d4bb,0x1d4ef,0x1d523,0x1d557,0x1d58b,0x1d5bf,0x1d5f3,0x1d627,0x1d65b,0x1d68f,0x1d7cb}, new uint[]{0x67,0x18d,0x261,0x581,0x1d83,0x210a,0xff47,0x1d420,0x1d454,0x1d488,0x1d4f0,0x1d524,0x1d558,0x1d58c,0x1d5c0,0x1d5f4,0x1d628,0x1d65c,0x1d690}, new uint[]{0x68,0x4bb,0x570,0x13c2,0x210e,0xff48,0x1d421,0x1d489,0x1d4bd,0x1d4f1,0x1d525,0x1d559,0x1d58d,0x1d5c1,0x1d5f5,0x1d629,0x1d65d,0x1d691}, - new uint[]{0x69,0x131,0x269,0x26a,0x2db,0x37a,0x3b9,0x456,0x4cf,0x13a5,0x1fbe,0x2139,0x2148,0x2170,0x2373,0xa647,0xff49,0x118c3,0x1d422,0x1d456,0x1d48a,0x1d4be,0x1d4f2,0x1d526,0x1d55a,0x1d58e,0x1d5c2,0x1d5f6,0x1d62a,0x1d65e,0x1d692,0x1d6a4,0x1d6ca,0x1d704,0x1d73e,0x1d778,0x1d7b2}, + new uint[]{0x69,0x131,0x269,0x26a,0x2db,0x37a,0x3b9,0x456,0x4cf,0x13a5,0x1fbe,0x2139,0x2148,0x2170,0x2373,0xa647,0xab75,0xff49,0x118c3,0x1d422,0x1d456,0x1d48a,0x1d4be,0x1d4f2,0x1d526,0x1d55a,0x1d58e,0x1d5c2,0x1d5f6,0x1d62a,0x1d65e,0x1d692,0x1d6a4,0x1d6ca,0x1d704,0x1d73e,0x1d778,0x1d7b2}, new uint[]{0x6a,0x3f3,0x458,0x2149,0xff4a,0x1d423,0x1d457,0x1d48b,0x1d4bf,0x1d4f3,0x1d527,0x1d55b,0x1d58f,0x1d5c3,0x1d5f7,0x1d62b,0x1d65f,0x1d693}, - new uint[]{0x6b,0x138,0x3ba,0x3f0,0x43a,0x1d0b,0x2c95,0xff4b,0x1d424,0x1d458,0x1d48c,0x1d4c0,0x1d4f4,0x1d528,0x1d55c,0x1d590,0x1d5c4,0x1d5f8,0x1d62c,0x1d660,0x1d694,0x1d6cb,0x1d6de,0x1d705,0x1d718,0x1d73f,0x1d752,0x1d779,0x1d78c,0x1d7b3,0x1d7c6}, + new uint[]{0x6b,0xff4b,0x1d424,0x1d458,0x1d48c,0x1d4c0,0x1d4f4,0x1d528,0x1d55c,0x1d590,0x1d5c4,0x1d5f8,0x1d62c,0x1d660,0x1d694}, new uint[]{0x6d,0xff4d}, - new uint[]{0x6e,0x3c0,0x3d6,0x43f,0x578,0x57c,0x1d28,0x213c,0xff4e,0x1d427,0x1d45b,0x1d48f,0x1d4c3,0x1d4f7,0x1d52b,0x1d55f,0x1d593,0x1d5c7,0x1d5fb,0x1d62f,0x1d663,0x1d697,0x1d6d1,0x1d6e1,0x1d70b,0x1d71b,0x1d745,0x1d755,0x1d77f,0x1d78f,0x1d7b9,0x1d7c9}, - new uint[]{0x6f,0x3bf,0x3c3,0x43e,0x585,0x5e1,0x647,0x665,0x6be,0x6c1,0x6d5,0x6f5,0x966,0xa66,0xae6,0xbe6,0xc02,0xc66,0xc82,0xce6,0xd02,0xd66,0xd82,0xe50,0xed0,0x101d,0x1040,0x10ff,0x1d0f,0x1d11,0x2134,0x2c9f,0xab3d,0xfba6,0xfba7,0xfba8,0xfba9,0xfbaa,0xfbab,0xfbac,0xfbad,0xfee9,0xfeea,0xfeeb,0xfeec,0xff4f,0x1042c,0x118c8,0x118d7,0x1d428,0x1d45c,0x1d490,0x1d4f8,0x1d52c,0x1d560,0x1d594,0x1d5c8,0x1d5fc,0x1d630,0x1d664,0x1d698,0x1d6d0,0x1d6d4,0x1d70a,0x1d70e,0x1d744,0x1d748,0x1d77e,0x1d782,0x1d7b8,0x1d7bc,0x1ee24,0x1ee64,0x1ee84}, + new uint[]{0x6e,0x578,0x57c,0xff4e,0x1d427,0x1d45b,0x1d48f,0x1d4c3,0x1d4f7,0x1d52b,0x1d55f,0x1d593,0x1d5c7,0x1d5fb,0x1d62f,0x1d663,0x1d697}, new uint[]{0x70,0x3c1,0x3f1,0x440,0x2374,0x2ca3,0xff50,0x1d429,0x1d45d,0x1d491,0x1d4c5,0x1d4f9,0x1d52d,0x1d561,0x1d595,0x1d5c9,0x1d5fd,0x1d631,0x1d665,0x1d699,0x1d6d2,0x1d6e0,0x1d70c,0x1d71a,0x1d746,0x1d754,0x1d780,0x1d78e,0x1d7ba,0x1d7c8}, new uint[]{0x71,0x51b,0x563,0x566,0xff51,0x1d42a,0x1d45e,0x1d492,0x1d4c6,0x1d4fa,0x1d52e,0x1d562,0x1d596,0x1d5ca,0x1d5fe,0x1d632,0x1d666,0x1d69a}, - new uint[]{0x72,0x433,0x1d26,0x2c85,0xab47,0xab48,0xff52,0x1d42b,0x1d45f,0x1d493,0x1d4c7,0x1d4fb,0x1d52f,0x1d563,0x1d597,0x1d5cb,0x1d5ff,0x1d633,0x1d667,0x1d69b}, - new uint[]{0x73,0x1bd,0x455,0xa731,0xff53,0x10448,0x118c1,0x1d42c,0x1d460,0x1d494,0x1d4c8,0x1d4fc,0x1d530,0x1d564,0x1d598,0x1d5cc,0x1d600,0x1d634,0x1d668,0x1d69c}, - new uint[]{0x74,0x3c4,0x442,0x1d1b,0xff54,0x1d42d,0x1d461,0x1d495,0x1d4c9,0x1d4fd,0x1d531,0x1d565,0x1d599,0x1d5cd,0x1d601,0x1d635,0x1d669,0x1d69d,0x1d6d5,0x1d70f,0x1d749,0x1d783,0x1d7bd}, - new uint[]{0x75,0x28b,0x3c5,0x446,0x57d,0x1d1c,0xa79f,0xab4e,0xab52,0xff55,0x118d8,0x1d42e,0x1d462,0x1d496,0x1d4ca,0x1d4fe,0x1d532,0x1d566,0x1d59a,0x1d5ce,0x1d602,0x1d636,0x1d66a,0x1d69e,0x1d6d6,0x1d710,0x1d74a,0x1d784,0x1d7be}, - new uint[]{0x76,0x3bd,0x475,0x5d8,0x1d20,0x2174,0x2228,0x22c1,0xff56,0x118c0,0x1d42f,0x1d463,0x1d497,0x1d4cb,0x1d4ff,0x1d533,0x1d567,0x1d59b,0x1d5cf,0x1d603,0x1d637,0x1d66b,0x1d69f,0x1d6ce,0x1d708,0x1d742,0x1d77c,0x1d7b6}, - new uint[]{0x77,0xff57}, + new uint[]{0x72,0x433,0x1d26,0x2c85,0xab47,0xab48,0xab81,0xff52,0x1d42b,0x1d45f,0x1d493,0x1d4c7,0x1d4fb,0x1d52f,0x1d563,0x1d597,0x1d5cb,0x1d5ff,0x1d633,0x1d667,0x1d69b}, + new uint[]{0x73,0x1bd,0x455,0xa731,0xabaa,0xff53,0x10448,0x118c1,0x1d42c,0x1d460,0x1d494,0x1d4c8,0x1d4fc,0x1d530,0x1d564,0x1d598,0x1d5cc,0x1d600,0x1d634,0x1d668,0x1d69c}, + new uint[]{0x74,0xff54,0x1d42d,0x1d461,0x1d495,0x1d4c9,0x1d4fd,0x1d531,0x1d565,0x1d599,0x1d5cd,0x1d601,0x1d635,0x1d669,0x1d69d}, + new uint[]{0x75,0x28b,0x3c5,0x57d,0x1d1c,0xa79f,0xab4e,0xab52,0xff55,0x104f6,0x118d8,0x1d42e,0x1d462,0x1d496,0x1d4ca,0x1d4fe,0x1d532,0x1d566,0x1d59a,0x1d5ce,0x1d602,0x1d636,0x1d66a,0x1d69e,0x1d6d6,0x1d710,0x1d74a,0x1d784,0x1d7be}, + new uint[]{0x76,0x3bd,0x475,0x5d8,0x1d20,0x2174,0x2228,0x22c1,0xaba9,0xff56,0x11706,0x118c0,0x1d42f,0x1d463,0x1d497,0x1d4cb,0x1d4ff,0x1d533,0x1d567,0x1d59b,0x1d5cf,0x1d603,0x1d637,0x1d66b,0x1d69f,0x1d6ce,0x1d708,0x1d742,0x1d77c,0x1d7b6}, + new uint[]{0x77,0x26f,0x461,0x51d,0x561,0x1d21,0xab83,0xff57,0x1170a,0x1170e,0x1170f,0x1d430,0x1d464,0x1d498,0x1d4cc,0x1d500,0x1d534,0x1d568,0x1d59c,0x1d5d0,0x1d604,0x1d638,0x1d66c,0x1d6a0}, new uint[]{0x78,0xd7,0x445,0x1541,0x157d,0x166e,0x2179,0x292b,0x292c,0x2a2f,0xff58,0x1d431,0x1d465,0x1d499,0x1d4cd,0x1d501,0x1d535,0x1d569,0x1d59d,0x1d5d1,0x1d605,0x1d639,0x1d66d,0x1d6a1}, new uint[]{0x79,0x263,0x28f,0x3b3,0x443,0x4af,0x10e7,0x1d8c,0x1eff,0x213d,0xab5a,0xff59,0x118dc,0x1d432,0x1d466,0x1d49a,0x1d4ce,0x1d502,0x1d536,0x1d56a,0x1d59e,0x1d5d2,0x1d606,0x1d63a,0x1d66e,0x1d6a2,0x1d6c4,0x1d6fe,0x1d738,0x1d772,0x1d7ac}, - new uint[]{0x7a,0x1d22,0xff5a,0x118c4,0x1d433,0x1d467,0x1d49b,0x1d4cf,0x1d503,0x1d537,0x1d56b,0x1d59f,0x1d5d3,0x1d607,0x1d63b,0x1d66f,0x1d6a3}, + new uint[]{0x7a,0x1d22,0xab93,0xff5a,0x118c4,0x1d433,0x1d467,0x1d49b,0x1d4cf,0x1d503,0x1d537,0x1d56b,0x1d59f,0x1d5d3,0x1d607,0x1d63b,0x1d66f,0x1d6a3}, new uint[]{0x7b,0x2774,0xff5b,0x1d114}, new uint[]{0x7d,0x2775,0xff5d}, new uint[]{0x7e,0x2dc,0x1fc0,0x2053,0x223c}, @@ -106,7 +105,7 @@ namespace Barotrauma new uint[]{0xc4,0x4d2}, new uint[]{0xc5,0x226}, new uint[]{0xd6,0x150,0x4e6,0x2365}, - new uint[]{0xde,0x3f7}, + new uint[]{0xde,0x3f7,0x104c4}, new uint[]{0xdf,0x3b2,0x3d0,0x13f0,0xa7b5,0x1d6c3,0x1d6fd,0x1d737,0x1d771,0x1d7ab}, new uint[]{0xe4,0x4d3}, new uint[]{0xe5,0x227}, @@ -122,6 +121,7 @@ namespace Barotrauma new uint[]{0x123,0x1f5}, new uint[]{0x12c,0x1cf}, new uint[]{0x12d,0x1d0}, + new uint[]{0x138,0x3ba,0x3f0,0x43a,0x1d0b,0x2c95,0xabb6,0x1d6cb,0x1d6de,0x1d705,0x1d718,0x1d73f,0x1d752,0x1d779,0x1d78c,0x1d7b3,0x1d7c6}, new uint[]{0x146,0x272}, new uint[]{0x14e,0x1d1}, new uint[]{0x14f,0x1d2}, @@ -129,11 +129,11 @@ namespace Barotrauma new uint[]{0x163,0x1ab,0x21b,0x13bf}, new uint[]{0x16c,0x1d3}, new uint[]{0x16d,0x1d4}, - new uint[]{0x185,0x44c}, + new uint[]{0x185,0x44c,0xab9f}, new uint[]{0x186,0x3fd,0x2183,0xa4db,0x10423}, new uint[]{0x18e,0x2203,0x2d3a,0xa4f1}, new uint[]{0x18f,0x4d8}, - new uint[]{0x190,0x510,0x13cb,0x2107,0x10401}, + new uint[]{0x190,0x510,0x13cb,0x2107,0x10401,0x16f2d,0x1d221}, new uint[]{0x1a8,0x3e9,0x1d24,0xa645}, new uint[]{0x1a9,0x3a3,0x2140,0x2211,0x2d49,0x1d6ba,0x1d6f4,0x1d72e,0x1d768,0x1d7a2}, new uint[]{0x1b1,0x162e,0x1634,0x2127}, @@ -141,20 +141,23 @@ namespace Barotrauma new uint[]{0x1f6,0x50a}, new uint[]{0x21d,0x292,0x4e1,0x10f3,0x2ccd,0xa76b}, new uint[]{0x237,0x575,0x1d6a5}, - new uint[]{0x245,0x39b,0x41b,0x668,0x6f8,0x1431,0x2d37,0xa4e5,0x1028d,0x1d6b2,0x1d6ec,0x1d726,0x1d760,0x1d79a}, + new uint[]{0x242,0xab7e}, + new uint[]{0x245,0x39b,0x41b,0x668,0x6f8,0x1431,0x2d37,0xa4e5,0xa6ce,0x1028d,0x104b0,0x16f3d,0x1d6b2,0x1d6ec,0x1d726,0x1d760,0x1d79a}, new uint[]{0x24b,0x1d90}, new uint[]{0x254,0x37b,0x1d10,0x2184,0x1044b}, - new uint[]{0x25b,0x3b5,0x3f5,0x454,0x511,0x22f4,0x2c89,0xa793,0x10429,0x118ce,0x1d6c6,0x1d6dc,0x1d700,0x1d716,0x1d73a,0x1d750,0x1d774,0x1d78a,0x1d7ae,0x1d7c4}, + new uint[]{0x25b,0x3b5,0x3f5,0x454,0x511,0x22f4,0x2c89,0xa793,0xab9b,0x10429,0x118ce,0x1d6c6,0x1d6dc,0x1d700,0x1d716,0x1d73a,0x1d750,0x1d774,0x1d78a,0x1d7ae,0x1d7c4}, new uint[]{0x25c,0x437,0x1d08}, - new uint[]{0x25e,0xa79d,0x10442}, - new uint[]{0x270,0x57a}, + new uint[]{0x25e,0x10442}, + new uint[]{0x270,0x57a,0x1223}, new uint[]{0x277,0x1043f}, new uint[]{0x278,0x3c6,0x3d5,0x444,0x2cab,0x1d6d7,0x1d6df,0x1d711,0x1d719,0x1d74b,0x1d753,0x1d785,0x1d78d,0x1d7bf,0x1d7c7}, new uint[]{0x27f,0x2129}, new uint[]{0x283,0x222b,0xab4d}, - new uint[]{0x28c,0x1d27}, - new uint[]{0x298,0x2299,0x2609,0x2a00,0x2d59,0xa668}, - new uint[]{0x29a,0x1042a}, + new uint[]{0x28c,0x1d27,0x104d8}, + new uint[]{0x28d,0x43c,0x1d0d,0xab87}, + new uint[]{0x298,0x2299,0x2609,0x2a00,0x2d59,0xa668,0x104c3}, + new uint[]{0x29a,0xa79d,0x1042a}, + new uint[]{0x2a1,0xa6cd}, new uint[]{0x2b3,0x18f4}, new uint[]{0x2bf,0x2d3,0x559}, new uint[]{0x2c1,0x2e4}, @@ -162,20 +165,20 @@ namespace Barotrauma new uint[]{0x2cf,0x375}, new uint[]{0x2d9,0x971,0xd4e}, new uint[]{0x2e1,0x18f3}, - new uint[]{0x2e2,0x18f5}, + new uint[]{0x2e2,0x18db,0x18f5}, new uint[]{0x2ea,0x2fb,0xa716}, new uint[]{0x2eb,0xa714}, new uint[]{0x2f3,0x3002}, new uint[]{0x300,0x340,0x953}, new uint[]{0x301,0x341,0x59c,0x59d,0x618,0x64e,0x747,0x954}, - new uint[]{0x302,0x311,0x65b,0x7ee,0x1cd0}, + new uint[]{0x302,0x311,0x65b,0x7ee,0x1cd0,0xa6f0}, new uint[]{0x303,0x342,0x653}, - new uint[]{0x304,0x305,0x659,0x7eb,0x1cd2}, + new uint[]{0x304,0x305,0x659,0x7eb,0x1cd2,0xa6f1}, new uint[]{0x306,0x30c,0x36e,0x658,0x65a,0xa67c}, new uint[]{0x307,0x358,0x5b9,0x5ba,0x5c1,0x5c2,0x5c4,0x6ec,0x740,0x741,0x7ed,0x8ea,0x902,0xa02,0xa82,0xbcd}, new uint[]{0x308,0x7f3,0x8eb}, new uint[]{0x309,0x302c}, - new uint[]{0x30a,0x366,0x5af,0x652,0x6df,0xb82,0xe4d,0xecd,0x1036,0x17c6,0x17d3,0x309a}, + new uint[]{0x30a,0x366,0x5af,0x652,0x6df,0xb82,0xe4d,0xecd,0x1036,0x17c6,0x17d3,0x2dea,0x309a,0x11300}, new uint[]{0x30b,0x64b,0x8f0}, new uint[]{0x30d,0x670}, new uint[]{0x30e,0x1cda}, @@ -187,9 +190,9 @@ namespace Barotrauma new uint[]{0x320,0x331,0x952}, new uint[]{0x321,0x326,0x327,0x339}, new uint[]{0x322,0x328,0x345,0x1ab7}, - new uint[]{0x323,0x5b4,0x5c5,0x65c,0x8ed,0x93c,0x9bc,0xa3c,0xabc,0xb3c,0x1cdd,0x10a3a,0x114c3}, + new uint[]{0x323,0x5b4,0x5c5,0x65c,0x8ed,0x93c,0x9bc,0xa3c,0xabc,0xb3c,0x1cdd,0x10a3a,0x111ca,0x114c3}, new uint[]{0x324,0x8ee,0x1cde}, - new uint[]{0x325,0x302d}, + new uint[]{0x325,0xf37,0x302d}, new uint[]{0x329,0x656,0x1cdc}, new uint[]{0x32b,0x1cd5}, new uint[]{0x32d,0x1cd9}, @@ -201,31 +204,36 @@ namespace Barotrauma new uint[]{0x352,0x900}, new uint[]{0x354,0x8f9}, new uint[]{0x355,0x8fa}, - new uint[]{0x370,0x13a8,0x13b0,0x2c75}, - new uint[]{0x376,0x418,0x10425}, + new uint[]{0x363,0x2df6}, + new uint[]{0x364,0x2df7}, + new uint[]{0x368,0x2ded}, + new uint[]{0x36f,0x2def}, + new uint[]{0x370,0x13a8,0x13b0,0x2c75,0xa6b1}, + new uint[]{0x376,0x418,0xa6a1,0x10425,0x1d20b}, new uint[]{0x377,0x438,0x1d0e,0x1044d}, new uint[]{0x37d,0xa73f}, - new uint[]{0x393,0x413,0x13b1,0x14a5,0x213e,0x2c84,0x1d6aa,0x1d6e4,0x1d71e,0x1d758,0x1d792}, - new uint[]{0x394,0x1403,0x2206,0x25b3,0x2c86,0x2d60,0x10285,0x102a3,0x1d6ab,0x1d6e5,0x1d71f,0x1d759,0x1d793,0x1f702}, + new uint[]{0x393,0x413,0x13b1,0x14a5,0x213e,0x2c84,0x16f07,0x1d6aa,0x1d6e4,0x1d71e,0x1d758,0x1d792}, + new uint[]{0x394,0x1403,0x2206,0x25b3,0x2c86,0x2d60,0x10285,0x102a3,0x16f1a,0x1d6ab,0x1d6e5,0x1d71f,0x1d759,0x1d793,0x1f702}, new uint[]{0x39e,0x1d6b5,0x1d6ef,0x1d729,0x1d763,0x1d79d}, - new uint[]{0x3a0,0x41f,0x213f,0x220f,0x2ca0,0x1d6b7,0x1d6f1,0x1d72b,0x1d765,0x1d79f}, - new uint[]{0x3a6,0x424,0x553,0x16f0,0x2caa,0x102b3,0x1d6bd,0x1d6f7,0x1d731,0x1d76b,0x1d7a5}, - new uint[]{0x3a8,0x470,0x16d8,0x2cae,0x102b5,0x1d6bf,0x1d6f9,0x1d733,0x1d76d,0x1d7a7}, + new uint[]{0x3a0,0x41f,0x213f,0x220f,0x2ca0,0xa6db,0x1d6b7,0x1d6f1,0x1d72b,0x1d765,0x1d79f}, + new uint[]{0x3a6,0x424,0x553,0x1240,0x16f0,0x2caa,0x102b3,0x1d6bd,0x1d6f7,0x1d731,0x1d76b,0x1d7a5}, + new uint[]{0x3a8,0x470,0x16d8,0x2cae,0x102b5,0x104d1,0x1d6bf,0x1d6f9,0x1d733,0x1d76d,0x1d7a7}, new uint[]{0x3a9,0x162f,0x1635,0x2126,0x102b6,0x1d6c0,0x1d6fa,0x1d734,0x1d76e,0x1d7a8}, new uint[]{0x3b4,0x56e,0x1577,0x1e9f,0x2e39,0x1d6c5,0x1d6ff,0x1d739,0x1d773,0x1d7ad}, new uint[]{0x3b6,0x1d6c7,0x1d701,0x1d73b,0x1d775,0x1d7af}, - new uint[]{0x3bb,0x2c96,0x1d6cc,0x1d706,0x1d740,0x1d77a,0x1d7b4}, + new uint[]{0x3bb,0x2c96,0x104db,0x1d6cc,0x1d706,0x1d740,0x1d77a,0x1d7b4}, new uint[]{0x3be,0x1d6cf,0x1d709,0x1d743,0x1d77d,0x1d7b7}, + new uint[]{0x3c0,0x3d6,0x43f,0x1d28,0x213c,0x1d6d1,0x1d6e1,0x1d70b,0x1d71b,0x1d745,0x1d755,0x1d77f,0x1d78f,0x1d7b9,0x1d7c9}, new uint[]{0x3c2,0x3db,0x1d6d3,0x1d70d,0x1d747,0x1d781,0x1d7bb}, new uint[]{0x3c7,0x2cad,0xab53,0xab55,0x1d6d8,0x1d712,0x1d74c,0x1d786,0x1d7c0}, - new uint[]{0x3c8,0x471,0x1d6d9,0x1d713,0x1d74d,0x1d787,0x1d7c1}, + new uint[]{0x3c8,0x471,0x104f9,0x1d6d9,0x1d713,0x1d74d,0x1d787,0x1d7c1}, new uint[]{0x3c9,0x2375,0x2cb1,0xa64d,0xa7b7,0x1d6da,0x1d714,0x1d74e,0x1d788,0x1d7c2}, new uint[]{0x3d7,0x2ce4}, new uint[]{0x3d8,0x102ad,0x10312}, - new uint[]{0x3dd,0x1d7cb}, new uint[]{0x3ec,0x2cdc}, new uint[]{0x3ff,0xa73e}, new uint[]{0x404,0x20ac,0x2c88,0xa792}, + new uint[]{0x40b,0x104cd}, new uint[]{0x40d,0x419}, new uint[]{0x428,0x2cbc}, new uint[]{0x42d,0x2108}, @@ -234,11 +242,18 @@ namespace Barotrauma new uint[]{0x448,0x2cbd}, new uint[]{0x44f,0x1d19}, new uint[]{0x459,0xab60}, - new uint[]{0x460,0x13c7,0x15ef}, + new uint[]{0x460,0x13c7,0x15ef,0x1d222}, new uint[]{0x4b6,0x4cb}, new uint[]{0x4b7,0x4cc}, - new uint[]{0x548,0x144e,0x2229,0x22c2,0xa4f5}, + new uint[]{0x4c3,0x104bc}, + new uint[]{0x4fe,0x1d202}, + new uint[]{0x53b,0x12ae}, + new uint[]{0x544,0x1206}, + new uint[]{0x548,0x1260,0x144e,0x2229,0x22c2,0xa4f5,0x1d245}, + new uint[]{0x54a,0x1323}, + new uint[]{0x54c,0x1261}, new uint[]{0x554,0x20bd}, + new uint[]{0x571,0x1294}, new uint[]{0x596,0x5ad}, new uint[]{0x598,0x5ae}, new uint[]{0x599,0x5a8}, @@ -282,7 +297,7 @@ namespace Barotrauma new uint[]{0x645,0xfee1,0xfee2,0xfee3,0xfee4,0x1ee0c,0x1ee2c,0x1ee6c,0x1ee8c,0x1eeac}, new uint[]{0x646,0xfee5,0xfee6,0xfee7,0xfee8,0x1ee0d,0x1ee2d,0x1ee4d,0x1ee6d,0x1ee8d,0x1eead}, new uint[]{0x648,0x8b1,0xfeed,0xfeee,0x102e4,0x1ee05,0x1ee85,0x1eea5}, - new uint[]{0x649,0x64a,0x66e,0x6ba,0x6cc,0x6d2,0xfb9e,0xfb9f,0xfbae,0xfbaf,0xfbe8,0xfbe9,0xfbfc,0xfbfd,0xfbfe,0xfbff,0xfeef,0xfef0,0xfef1,0xfef2,0xfef3,0xfef4,0x1ee09,0x1ee1c,0x1ee1d,0x1ee29,0x1ee49,0x1ee5d,0x1ee69,0x1ee7c,0x1ee89,0x1eea9}, + new uint[]{0x649,0x64a,0x66e,0x6ba,0x6cc,0x6d2,0x8bd,0xfb9e,0xfb9f,0xfbae,0xfbaf,0xfbe8,0xfbe9,0xfbfc,0xfbfd,0xfbfe,0xfbff,0xfeef,0xfef0,0xfef1,0xfef2,0xfef3,0xfef4,0x1ee09,0x1ee1c,0x1ee1d,0x1ee29,0x1ee49,0x1ee5d,0x1ee69,0x1ee7c,0x1ee89,0x1eea9}, new uint[]{0x64c,0x8e5,0x8e8,0x8f1}, new uint[]{0x64d,0x8f2}, new uint[]{0x655,0x65f}, @@ -291,7 +306,7 @@ namespace Barotrauma new uint[]{0x664,0x6f4}, new uint[]{0x666,0x6f6}, new uint[]{0x669,0x6f9,0x967,0x118e4}, - new uint[]{0x66f,0x6a1,0x1ee1e,0x1ee1f,0x1ee5f,0x1ee7e}, + new uint[]{0x66f,0x6a1,0x8bb,0x8bc,0x1ee1e,0x1ee1f,0x1ee5f,0x1ee7e}, new uint[]{0x671,0xfb50,0xfb51}, new uint[]{0x67a,0xfb5e,0xfb5f,0xfb60,0xfb61}, new uint[]{0x67b,0x6d0,0xfb52,0xfb53,0xfb54,0xfb55,0xfbe4,0xfbe5,0xfbe6,0xfbe7}, @@ -314,11 +329,13 @@ namespace Barotrauma new uint[]{0x6db,0x1ab4,0x20db}, new uint[]{0x73c,0x742}, new uint[]{0x754,0x767,0x8a9}, + new uint[]{0x93a,0x111cb}, new uint[]{0x93d,0xabd}, new uint[]{0x941,0xac1}, new uint[]{0x942,0xac2}, new uint[]{0x946,0xa4b}, new uint[]{0x94d,0xa4d,0xacd}, + new uint[]{0x964,0xa830}, new uint[]{0x968,0xae8}, new uint[]{0x969,0xae9}, new uint[]{0x96a,0xaea}, @@ -421,6 +438,8 @@ namespace Barotrauma new uint[]{0xe5b,0x17da}, new uint[]{0xf0b,0xf0c}, new uint[]{0xf62,0xf6a}, + new uint[]{0xfd5,0x5350}, + new uint[]{0xfd6,0x534d}, new uint[]{0x1041,0x1065}, new uint[]{0x10a0,0xa786}, new uint[]{0x1100,0x11a8,0x3131}, @@ -466,25 +485,30 @@ namespace Barotrauma new uint[]{0x1546,0x1623}, new uint[]{0x154a,0x1624}, new uint[]{0x15b5,0x2132,0xa4de}, - new uint[]{0x15b7,0xa7fb}, - new uint[]{0x15c4,0x2200,0x2c6f,0xa4ef}, + new uint[]{0x15b7,0xa7fb,0x1d230}, + new uint[]{0x15c4,0x2200,0x2c6f,0xa4ef,0x1d217}, new uint[]{0x15d2,0x2aab}, new uint[]{0x15d5,0x2aaa}, new uint[]{0x15e1,0xa4f7}, new uint[]{0x1646,0x1dbb}, new uint[]{0x1660,0xa4ed}, + new uint[]{0x16b9,0xa6b0}, new uint[]{0x16bc,0x16e1}, new uint[]{0x16bd,0x16c2,0x237f}, + new uint[]{0x16cb,0x1d23f}, new uint[]{0x16cf,0x2191}, new uint[]{0x16d0,0x21bf}, new uint[]{0x16da,0x21be,0x2a21}, new uint[]{0x16dc,0x22c4,0x25c7,0x25ca,0x2662,0x10294,0x118b7,0x1f754}, new uint[]{0x16de,0x22c8,0x2a1d}, + new uint[]{0x16e6,0x104d0}, new uint[]{0x16e8,0x2195}, new uint[]{0x16ef,0x2d63}, new uint[]{0x17a2,0x17a3}, new uint[]{0x1835,0x1855}, new uint[]{0x185c,0x1896}, + new uint[]{0x18d4,0x1dba}, + new uint[]{0x18d6,0x1d3e}, new uint[]{0x199e,0x19d0}, new uint[]{0x19b1,0x19d1}, new uint[]{0x1a45,0x1a80,0x1a90}, @@ -492,19 +516,24 @@ namespace Barotrauma new uint[]{0x1b11,0x1b53}, new uint[]{0x1b28,0x1b58}, new uint[]{0x1b50,0x1b5c}, - new uint[]{0x1d18,0x1d29}, new uint[]{0x1d34,0x1d78}, new uint[]{0x1d4b,0x1d9f}, new uint[]{0x1d4d,0x1da2}, new uint[]{0x1ddf,0x2de8}, + new uint[]{0x1dee,0x2dec}, + new uint[]{0x1e43,0xab51}, new uint[]{0x1e9a,0x1ea3}, new uint[]{0x1f7d,0x1ff4}, new uint[]{0x205d,0x22ee,0x2d57,0xfe19}, new uint[]{0x205e,0x2999,0x2d42,0x2e3d}, + new uint[]{0x2079,0xa770}, new uint[]{0x20b8,0x3012,0x3036}, + new uint[]{0x20e9,0xa66f}, new uint[]{0x2117,0x24c5}, new uint[]{0x2141,0xa4e8}, - new uint[]{0x2142,0xa4f6,0x10411}, + new uint[]{0x2142,0xa4f6,0x10411,0x16f26,0x1d215,0x1d22b}, + new uint[]{0x2143,0x16f00}, + new uint[]{0x2144,0x1d21b}, new uint[]{0x219e,0x2bec}, new uint[]{0x219f,0x2bed}, new uint[]{0x21a0,0x2bee}, @@ -525,21 +554,23 @@ namespace Barotrauma new uint[]{0x2261,0x2263}, new uint[]{0x228d,0x2a03}, new uint[]{0x228e,0x2a04}, + new uint[]{0x228f,0x1d238}, + new uint[]{0x2290,0x1d239}, new uint[]{0x2293,0x2a05}, new uint[]{0x2294,0x2a06}, - new uint[]{0x2295,0x2a01,0x102a8,0x1f728}, + new uint[]{0x2295,0x2a01,0xa69a,0x102a8,0x1f728}, new uint[]{0x2297,0x2a02}, new uint[]{0x229b,0x235f}, new uint[]{0x22a0,0x1f771}, new uint[]{0x22a1,0x1f755}, - new uint[]{0x22a5,0x27c2,0xa4d5,0xa7b1}, + new uint[]{0x22a5,0x27c2,0xa4d5,0xa7b1,0x1d21c}, new uint[]{0x22b2,0x25c1}, new uint[]{0x22b3,0x25b7}, new uint[]{0x2307,0xfe34}, new uint[]{0x2312,0x25e0}, new uint[]{0x2319,0x2a3d}, new uint[]{0x2324,0x2325}, - new uint[]{0x2329,0x276c,0x27e8,0x3008}, + new uint[]{0x2329,0x276c,0x27e8,0x3008,0x304f,0x31db,0x21fe8}, new uint[]{0x232a,0x276d,0x27e9,0x3009}, new uint[]{0x233b,0x29c7}, new uint[]{0x233e,0x25ce,0x29be}, @@ -558,6 +589,8 @@ namespace Barotrauma new uint[]{0x23e0,0xfe39}, new uint[]{0x23e1,0xfe3a}, new uint[]{0x23e5,0x25b1}, + new uint[]{0x23fb,0x23fc}, + new uint[]{0x23fe,0x263e,0x1f318}, new uint[]{0x2460,0x2780}, new uint[]{0x2461,0x2781}, new uint[]{0x2462,0x2782}, @@ -578,23 +611,26 @@ namespace Barotrauma new uint[]{0x25a1,0x2610}, new uint[]{0x25aa,0xffed}, new uint[]{0x25b6,0x25b8,0x25ba}, - new uint[]{0x25bd,0x102bc,0x1f704}, + new uint[]{0x25bd,0x102bc,0x1d214,0x1f704}, new uint[]{0x2625,0x1099e,0x132f9}, new uint[]{0x2627,0x2ce9}, new uint[]{0x2629,0x1f70a}, new uint[]{0x2630,0x2cb6}, new uint[]{0x263d,0x1f312,0x1f319}, - new uint[]{0x263e,0x1f318}, new uint[]{0x27e6,0x301a}, new uint[]{0x27e7,0x301b}, new uint[]{0x299a,0x29d9}, new uint[]{0x29d6,0x102c0}, new uint[]{0x29df,0x1f73a}, new uint[]{0x2a1f,0x2a3e}, + new uint[]{0x2c3f,0xa992}, new uint[]{0x2c70,0x1041f}, + new uint[]{0x2c76,0xab80}, + new uint[]{0x2ce8,0x101a0}, new uint[]{0x2d40,0x102b8}, + new uint[]{0x2e82,0x31d6,0x4e5b}, new uint[]{0x2e83,0x31df,0x4e5a}, - new uint[]{0x2e85,0x4ebb}, + new uint[]{0x2e85,0x30a4,0x4ebb}, new uint[]{0x2e89,0x5202}, new uint[]{0x2e8b,0x353e}, new uint[]{0x2e8e,0x5140,0xfa0c}, @@ -662,36 +698,34 @@ namespace Barotrauma new uint[]{0x2ef3,0x9f9f}, new uint[]{0x2f04,0x31e0,0x4e59}, new uint[]{0x2f05,0x31da,0x4e85}, - new uint[]{0x2f06,0x4e8c}, + new uint[]{0x2f06,0x30cb,0x4e8c}, new uint[]{0x2f07,0x4ea0}, new uint[]{0x2f08,0x4eba}, new uint[]{0x2f09,0x513f}, new uint[]{0x2f0a,0x5165}, - new uint[]{0x2f0b,0x516b}, + new uint[]{0x2f0b,0x30cf,0x516b}, new uint[]{0x2f0c,0x5182}, new uint[]{0x2f0d,0x5196}, new uint[]{0x2f0e,0x51ab}, new uint[]{0x2f0f,0x51e0}, new uint[]{0x2f10,0x51f5,0x2f81d}, new uint[]{0x2f11,0x5200}, - new uint[]{0x2f12,0x529b,0xf98a}, + new uint[]{0x2f12,0x30ab,0x529b,0xf98a}, new uint[]{0x2f13,0x52f9}, new uint[]{0x2f14,0x5315}, new uint[]{0x2f15,0x531a}, new uint[]{0x2f16,0x5338}, new uint[]{0x2f17,0x3038,0x5341}, - new uint[]{0x2f18,0x535c}, + new uint[]{0x2f18,0x30c8,0x535c}, new uint[]{0x2f19,0x5369}, new uint[]{0x2f1a,0x5382}, new uint[]{0x2f1b,0x53b6}, new uint[]{0x2f1c,0x53c8}, - new uint[]{0x2f1d,0x53e3}, - new uint[]{0x2f1e,0x56d7}, - new uint[]{0x2f1f,0x571f}, - new uint[]{0x2f20,0x58eb}, + new uint[]{0x2f1d,0x2f1e,0x30ed,0x53e3,0x56d7}, + new uint[]{0x2f1f,0x2f20,0x571f,0x58eb}, new uint[]{0x2f21,0x5902}, new uint[]{0x2f22,0x590a}, - new uint[]{0x2f23,0x5915}, + new uint[]{0x2f23,0x30bf,0x5915}, new uint[]{0x2f24,0x5927}, new uint[]{0x2f25,0x5973,0xf981}, new uint[]{0x2f26,0x5b50}, @@ -702,7 +736,7 @@ namespace Barotrauma new uint[]{0x2f2c,0x5c6e,0xfa3c,0x2f878}, new uint[]{0x2f2d,0x5c71}, new uint[]{0x2f2e,0x5ddb}, - new uint[]{0x2f2f,0x5de5}, + new uint[]{0x2f2f,0x30a8,0x5de5}, new uint[]{0x2f30,0x5df1}, new uint[]{0x2f31,0x5dfe}, new uint[]{0x2f32,0x5e72}, @@ -871,7 +905,6 @@ namespace Barotrauma new uint[]{0x3078,0x30d8}, new uint[]{0x309b,0xff9e}, new uint[]{0x309c,0xff9f}, - new uint[]{0x31d6,0x4e5b}, new uint[]{0x349e,0x2f80c}, new uint[]{0x34b9,0x2f813}, new uint[]{0x34bb,0x2f9ca}, @@ -1688,12 +1721,15 @@ namespace Barotrauma new uint[]{0xa458,0xa4a7}, new uint[]{0xa4e4,0xa79e}, new uint[]{0xa64c,0xa7b6}, + new uint[]{0xa658,0x16f1c,0x1f701}, + new uint[]{0xa669,0x104eb}, new uint[]{0xa727,0xa795}, new uint[]{0xa779,0xa77a}, new uint[]{0xa79a,0x10412}, new uint[]{0xa79b,0x1043a}, new uint[]{0xa8fb,0x111dc}, new uint[]{0xa8fc,0x111db}, + new uint[]{0xa99d,0xa9a3}, new uint[]{0xa9c6,0xa9d0}, new uint[]{0xaa01,0xaa53}, new uint[]{0xaa23,0xaa56}, @@ -1713,9 +1749,14 @@ namespace Barotrauma new uint[]{0x10393,0x103d3}, new uint[]{0x1039a,0x12038}, new uint[]{0x10486,0x104a0}, + new uint[]{0x10c82,0x10cfc}, + new uint[]{0x10ca5,0x10cfa}, new uint[]{0x11582,0x115d8,0x115d9}, new uint[]{0x11583,0x115da}, new uint[]{0x11584,0x115db}, + new uint[]{0x115b2,0x115dc}, + new uint[]{0x115b3,0x115dd}, + new uint[]{0x11caa,0x11cb2}, new uint[]{0x20122,0x2f803}, new uint[]{0x2051c,0x2f812}, new uint[]{0x20525,0x2f91b}, @@ -1821,17 +1862,17 @@ namespace Barotrauma new uint[]{0x2a600,0x2fa1d}, }; - public static bool Compare(string a,string b) + public static bool Compare(string a, string b) { if (a.Equals(b, StringComparison.InvariantCulture)) return true; if (a.Length != b.Length) return false; - for (int i=0;i g.Contains((uint)a[i])); - if (glyphGroup==null || !glyphGroup.Contains((uint)b[i])) return false; + if (glyphGroup == null || !glyphGroup.Contains((uint)b[i])) return false; } return true; } } -} +} \ No newline at end of file From ad681d5a268317b8b29db812f904f0df43103f62 Mon Sep 17 00:00:00 2001 From: Nilanth Animosus Date: Wed, 18 Jul 2018 11:03:04 +0100 Subject: [PATCH 2/3] Chatbox removes from the first entry instead of the second Removes for clients "playername has joined" staying at the top of the chat history, as this feels unnecessary for both server and client. --- Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs b/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs index c0ecc0749..742f6cbab 100644 --- a/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs +++ b/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs @@ -162,7 +162,7 @@ namespace Barotrauma.Networking while (chatBox.CountChildren > 20) { - chatBox.RemoveChild(chatBox.children[1]); + chatBox.RemoveChild(chatBox.children[0]); } if (!string.IsNullOrWhiteSpace(message.SenderName)) From 2df7d6a4642fbf163ae81b53df76e46269cf165a Mon Sep 17 00:00:00 2001 From: Nilanth Animosus Date: Wed, 18 Jul 2018 11:06:49 +0100 Subject: [PATCH 3/3] Tweak item spawning to combine item names without quotes Retains ability to spawn items to characters, its unlikely that player names will match at the last half of an item - and the item must also not exist for this to be an issue. --- .../BarotraumaShared/Source/DebugConsole.cs | 95 +++++++++---------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs index ffb676918..2b65dccf9 100644 --- a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs +++ b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs @@ -249,7 +249,7 @@ namespace Barotrauma }; })); - commands.Add(new Command("spawnitem", "spawnitem [itemname] [cursor/inventory/random/[name]]: Spawn an item at the position of the cursor, in the inventory of the controlled character, in the inventory of the client with the given name, or at a random spawnpoint if the last parameter is omitted or \"random\".", + commands.Add(new Command("spawnitem", "spawnitem [itemname] [cursor/inventory/cargo/random/[name]]: Spawn an item at the position of the cursor, in the inventory of the controlled character, in the inventory of the client with the given name, or at a random spawnpoint if the last parameter is omitted or \"random\".", (string[] args) => { SpawnItem(args, GameMain.GameScreen.Cam.ScreenToWorld(PlayerInput.MousePosition), Character.Controlled, out string errorMsg); @@ -2131,65 +2131,63 @@ namespace Barotrauma } } - private static void SpawnItem(string[] args, Vector2 cursorPos, Character controlledCharacter, out string errorMsg) - { + private static void SpawnItem(string[] args, Vector2 cursorPos, Character controlledCharacter, out string errorMsg) + { errorMsg = ""; if (args.Length < 1) return; Vector2? spawnPos = null; Inventory spawnInventory = null; - if (args.Length > 1) + int extraParams = 0; + switch (args.Last().ToLowerInvariant()) { - switch (args[1]) - { - case "cursor": - spawnPos = cursorPos; - break; - case "inventory": - spawnInventory = controlledCharacter?.Inventory; - break; - default: - //Check if last arg matches the name of an in-game player - if (GameMain.Server != null) - { - var client = GameMain.Server.ConnectedClients.Find(c => c.Name.ToLower() == args.Last().ToLower()); - if (client == null) - { - NewMessage("No player found with the name \"" + args.Last() + "\". Spawning item at random location. If the player you want to give the item to has a space in their name, try surrounding their name with quotes (\").", Color.Red); - break; - } - else if (client.Character == null) - { - errorMsg = "The player \"" + args.Last() + "\" is connected, but hasn't spawned yet."; - return; - } - else - { - //If the last arg matches the name of an in-game player, set the destination to their inventory. - spawnInventory = client.Character.Inventory; - break; - } - } - else - { - var matchingCharacter = FindMatchingCharacter(args.Skip(1).ToArray()); - if (matchingCharacter?.Inventory != null) spawnInventory = matchingCharacter.Inventory; - } - break; + case "cursor": + extraParams = 1; + spawnPos = cursorPos; + break; + case "inventory": + extraParams = 1; + spawnInventory = controlledCharacter == null ? null : controlledCharacter.Inventory; + break; + case "cargo": + var wp = WayPoint.GetRandom(SpawnType.Cargo, null, Submarine.MainSub); + spawnPos = wp == null ? Vector2.Zero : wp.WorldPosition; + break; + //Dont do a thing, random is basically Human points anyways - its in the help description. + case "random": + extraParams = 1; + return; + default: + extraParams = 0; + break; + } + + string itemName = string.Join(" ", args.Take(args.Length - extraParams)).ToLowerInvariant(); + + ItemPrefab itemPrefab = MapEntityPrefab.Find(itemName) as ItemPrefab; + if (itemPrefab == null && extraParams == 0) + { + if (GameMain.Server != null) + { + var client = GameMain.Server.ConnectedClients.Find(c => c.Name.ToLower() == args.Last().ToLower()); + if (client != null) + { + extraParams += 1; + itemName = string.Join(" ", args.Take(args.Length - extraParams)).ToLowerInvariant(); + if (client.Character != null && client.Character.Name == args.Last().ToLower()) spawnInventory = client.Character.Inventory; + itemPrefab = MapEntityPrefab.Find(itemName) as ItemPrefab; + } } } - - string itemName = args[0]; - - var itemPrefab = MapEntityPrefab.Find(itemName) as ItemPrefab; - if (itemPrefab == null) - { + //Check again if the item can be found again after having checked for a character + if (itemPrefab == null) + { errorMsg = "Item \"" + itemName + "\" not found!"; - return; + return; } - if (spawnPos == null && spawnInventory == null) + if ((spawnPos == null || spawnPos == Vector2.Zero) && spawnInventory == null) { var wp = WayPoint.GetRandom(SpawnType.Human, null, Submarine.MainSub); spawnPos = wp == null ? Vector2.Zero : wp.WorldPosition; @@ -2198,6 +2196,7 @@ namespace Barotrauma if (spawnPos != null) { Entity.Spawner.AddToSpawnQueue(itemPrefab, (Vector2)spawnPos); + } else if (spawnInventory != null) {