Advertisement
Guest User

Untitled

a guest
Dec 2nd, 2016
77
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.96 KB | None | 0 0
  1. diff -r PROHaunter/AnimationFramePickerSystem.cs PROXmas/AnimationFramePickerSystem.cs
  2. 258c258
  3. < if (text == "08" || text == "09" || text == "22" || text == "23" || text == "29" || text == "30" || text == "41" || text == "42" || text == "43")
  4. ---
  5. > if (text == "08" || text == "09" || text == "22" || text == "23" || text == "29" || text == "30" || text == "41" || text == "42" || text == "43" || text == "52" || text == "53")
  6. 266c266
  7. < if (text == "09" || text == "23" || text == "30" || text == "43")
  8. ---
  9. > if (text == "09" || text == "23" || text == "30" || text == "43" || text == "53")
  10. 283c283
  11. < if (text == "02" || text == "03" || text == "04" || text == "05" || text == "06" || text == "10" || text == "14" || text == "15" || text == "16" || text == "06" || text == "17" || text == "18" || text == "19" || text == "20" || text == "21" || text == "24" || text == "25" || text == "26" || text == "27" || text == "28" || text == "31" || text == "32" || text == "33" || text == "34" || text == "35" || text == "36" || text == "37" || text == "38" || text == "39" || text == "40" || text == "44" || text == "45" || text == "46" || text == "47")
  12. ---
  13. > if (text == "02" || text == "03" || text == "04" || text == "05" || text == "06" || text == "10" || text == "14" || text == "15" || text == "16" || text == "06" || text == "17" || text == "18" || text == "19" || text == "20" || text == "21" || text == "24" || text == "25" || text == "26" || text == "27" || text == "28" || text == "31" || text == "32" || text == "33" || text == "34" || text == "35" || text == "36" || text == "37" || text == "38" || text == "39" || text == "40" || text == "44" || text == "45" || text == "46" || text == "47" || text == "48" || text == "49" || text == "50" || text == "51")
  14. 292c292
  15. < if (text == "06" || text == "03" || text == "15" || text == "16" || text == "10" || text == "21" || text == "18" || text == "25" || text == "27" || text == "45" || text == "47" || text == "32")
  16. ---
  17. > if (text == "51" || text == "49" || text == "06" || text == "03" || text == "15" || text == "16" || text == "10" || text == "21" || text == "18" || text == "25" || text == "27" || text == "45" || text == "47" || text == "32")
  18. diff -r PROHaunter/Assembly-CSharp.csproj PROXmas/Assembly-CSharp.csproj
  19. 4c4
  20. < <ProjectGuid>{78AFC7F8-2404-4883-957F-130A0245CF5A}</ProjectGuid>
  21. ---
  22. > <ProjectGuid>{000C7A13-B4E3-472A-B489-F704F4FFAE7C}</ProjectGuid>
  23. diff -r PROHaunter/ChatInput.cs PROXmas/ChatInput.cs
  24. 124c124
  25. < base.StartCoroutine(this.Game.ConnectToServerOveride("127.0.0.1"));
  26. ---
  27. > base.StartCoroutine(this.Game.ConnectToServerOveride("192.168.0.6"));
  28. diff -r PROHaunter/DSSock.cs PROXmas/DSSock.cs
  29. 348c348
  30. < private string Vers = "0.958";
  31. ---
  32. > private string Vers = "0.958x";
  33. 2073c2073
  34. < this.ServerSelect.value = PlayerPrefs.GetString("ServerSel", "PRO Yellow Server");
  35. ---
  36. > this.ServerSelect.value = PlayerPrefs.GetString("ServerSel", "PRO Blue Server");
  37. 4523c4523
  38. < int num2 = UnityEngine.Random.Range(0, 3);
  39. ---
  40. > int num2 = UnityEngine.Random.Range(0, 4);
  41. 4539c4539
  42. < else if (num2 == 3)
  43. ---
  44. > else if (num2 >= 3)
  45. 4541,4542c4541,4542
  46. < this.PlayMusic(78);
  47. < this.mapMusic = 78;
  48. ---
  49. > this.PlayMusic(109);
  50. > this.mapMusic = 109;
  51. 7345a7346,7351
  52. > case 186:
  53. > num10 = 1031;
  54. > break;
  55. > case 187:
  56. > num10 = 1032;
  57. > break;
  58. 7582a7589,7591
  59. > case 78:
  60. > num11 = 1030;
  61. > break;
  62. 7633,7634c7642,7643
  63. < UILabel expr_4798 = this.TrainerStats;
  64. < expr_4798.text += "\nActive";
  65. ---
  66. > UILabel expr_47C8 = this.TrainerStats;
  67. > expr_47C8.text += "\nActive";
  68. 7639,7640c7648,7649
  69. < UILabel expr_47CB = this.TrainerStats;
  70. < expr_47CB.text += "\nInactive";
  71. ---
  72. > UILabel expr_47FB = this.TrainerStats;
  73. > expr_47FB.text += "\nInactive";
  74. 9181a9191,9200
  75. > if (this.Items[i].ID == 1012)
  76. > {
  77. > this.MSGBOX("Halloween Box", "Are you sure you wish to use the Halloween Box?", true);
  78. > break;
  79. > }
  80. > if (this.Items[i].ID == 1013)
  81. > {
  82. > this.MSGBOX("Lunch Box", "Are you sure you wish to use the Lunch Box?", true);
  83. > break;
  84. > }
  85. 10835c10854
  86. < if (this.OtherForm == "_1" && (this.OtherPoke == 83 || this.OtherPoke == 161 || this.OtherPoke == 162 || this.OtherPoke == 216 || this.OtherPoke == 217 || this.OtherPoke == 234 || this.OtherPoke == 333 || this.OtherPoke == 334 || this.OtherPoke == 427 || this.OtherPoke == 428))
  87. ---
  88. > if (this.OtherForm == "_1" && (this.OtherPoke == 133 || this.OtherPoke == 196 || this.OtherPoke == 471 || this.OtherPoke == 135 || this.OtherPoke == 470 || this.OtherPoke == 197 || this.OtherPoke == 134 || this.OtherPoke == 136 || this.OtherPoke == 83 || this.OtherPoke == 25 || this.OtherPoke == 26 || this.OtherPoke == 27 || this.OtherPoke == 28 || this.OtherPoke == 161 || this.OtherPoke == 162 || this.OtherPoke == 216 || this.OtherPoke == 217 || this.OtherPoke == 234 || this.OtherPoke == 333 || this.OtherPoke == 334 || this.OtherPoke == 427 || this.OtherPoke == 428 || this.OtherPoke == 22 || this.OtherPoke == 21 || this.OtherPoke == 700))
  89. 10952c10971
  90. < if (this.Pokemons[this.SelPoke].Form == 1 && (this.Pokemons[this.SelPoke].ID == 83 || this.Pokemons[this.SelPoke].ID == 161 || this.Pokemons[this.SelPoke].ID == 162 || this.Pokemons[this.SelPoke].ID == 216 || this.Pokemons[this.SelPoke].ID == 217 || this.Pokemons[this.SelPoke].ID == 234 || this.Pokemons[this.SelPoke].ID == 333 || this.Pokemons[this.SelPoke].ID == 334 || this.Pokemons[this.SelPoke].ID == 427 || this.Pokemons[this.SelPoke].ID == 428))
  91. ---
  92. > if (this.Pokemons[this.SelPoke].Form == 1 && (this.Pokemons[this.SelPoke].ID == 133 || this.Pokemons[this.SelPoke].ID == 196 || this.Pokemons[this.SelPoke].ID == 471 || this.Pokemons[this.SelPoke].ID == 135 || this.Pokemons[this.SelPoke].ID == 470 || this.Pokemons[this.SelPoke].ID == 197 || this.Pokemons[this.SelPoke].ID == 134 || this.Pokemons[this.SelPoke].ID == 136 || this.Pokemons[this.SelPoke].ID == 25 || this.Pokemons[this.SelPoke].ID == 26 || this.Pokemons[this.SelPoke].ID == 27 || this.Pokemons[this.SelPoke].ID == 28 || this.Pokemons[this.SelPoke].ID == 83 || this.Pokemons[this.SelPoke].ID == 161 || this.Pokemons[this.SelPoke].ID == 162 || this.Pokemons[this.SelPoke].ID == 216 || this.Pokemons[this.SelPoke].ID == 217 || this.Pokemons[this.SelPoke].ID == 234 || this.Pokemons[this.SelPoke].ID == 333 || this.Pokemons[this.SelPoke].ID == 334 || this.Pokemons[this.SelPoke].ID == 427 || this.Pokemons[this.SelPoke].ID == 428 || this.Pokemons[this.SelPoke].ID == 21 || this.Pokemons[this.SelPoke].ID == 22 || this.Pokemons[this.SelPoke].ID == 700))
  93. diff -r PROHaunter/HandleBox.cs PROXmas/HandleBox.cs
  94. 79a80,91
  95. > if (this.Title == "Halloween Box")
  96. > {
  97. > this.Sock.sendPacket("*|.|1012");
  98. > UnityEngine.Object.Destroy(base.gameObject);
  99. > return;
  100. > }
  101. > if (this.Title == "Lunch Box")
  102. > {
  103. > this.Sock.sendPacket("*|.|1013");
  104. > UnityEngine.Object.Destroy(base.gameObject);
  105. > return;
  106. > }
  107. 148c160
  108. < if (this.Title == "MS Medalion")
  109. ---
  110. > if (this.Title == "MS Medalion" || this.Title == "Halloween Box" || this.Title == "Lunch Box")
  111. diff -r PROHaunter/InventoryButton.cs PROXmas/InventoryButton.cs
  112. 86a87,96
  113. > if (this.ID == 1012)
  114. > {
  115. > this.Sock.MSGBOX("Halloween Box", "Are you sure you wish to use the Halloween Box?", true);
  116. > return;
  117. > }
  118. > if (this.ID == 1013)
  119. > {
  120. > this.Sock.MSGBOX("Lunch Box", "Are you sure you wish to use the Lunch Box?", true);
  121. > return;
  122. > }
  123. diff -r PROHaunter/ItemDes.cs PROXmas/ItemDes.cs
  124. 16,21c16,21
  125. < this.Items[810] = "A Party Hat from Christmas 2015, You can wear this!";
  126. < this.Items[811] = "A Party Hat from Christmas 2015, You can wear this!";
  127. < this.Items[812] = "A Party Hat from Christmas 2015, You can wear this!";
  128. < this.Items[813] = "A Party Hat from Christmas 2015, You can wear this!";
  129. < this.Items[814] = "A Party Hat from Christmas 2015, You can wear this!";
  130. < this.Items[815] = "A Party Hat from Christmas 2015, You can wear this!";
  131. ---
  132. > this.Items[810] = "A Party Hat from Christmas, You can wear this!";
  133. > this.Items[811] = "A Party Hat from Christmas, You can wear this!";
  134. > this.Items[812] = "A Party Hat from Christmas, You can wear this!";
  135. > this.Items[813] = "A Party Hat from Christmas, You can wear this!";
  136. > this.Items[814] = "A Party Hat from Christmas, You can wear this!";
  137. > this.Items[815] = "A Party Hat from Christmas, You can wear this!";
  138. diff -r PROHaunter/NGUIText.cs PROXmas/NGUIText.cs
  139. 392c392
  140. < else if ((a == "083" || a == "161" || a == "162" || a == "216" || a == "217" || a == "234" || a == "333" || a == "334" || a == "427" || a == "428") && text[index + 75] == '1')
  141. ---
  142. > else if ((a == "133" || a == "196" || a == "136" || a == "471" || a == "135" || a == "470" || a == "197" || a == "134" || a == "025" || a == "026" || a == "027" || a == "028" || a == "083" || a == "161" || a == "162" || a == "216" || a == "217" || a == "234" || a == "333" || a == "334" || a == "427" || a == "022" || a == "021" || a == "700" || a == "428") && text[index + 75] == '1')
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement