Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PartTimeJS/WDR
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.0.0
Choose a base ref
...
head repository: PartTimeJS/WDR
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
5 contributors
Loading
Showing with 8,798 additions and 36,107 deletions.
  1. +0 −20 WDR3/configs/choices.json
  2. +0 −20 WDR3/configs/choices.json.example
  3. +0 −171 WDR3/configs/config.ini.example
  4. +0 −32 WDR3/configs/discords/albuquerque.json
  5. +0 −45 WDR3/configs/discords/city.json.example
  6. +0 −31 WDR3/configs/discords/columbus.json
  7. +0 −31 WDR3/configs/discords/gainesville.json
  8. +0 −31 WDR3/configs/discords/memphis.json
  9. +0 −31 WDR3/configs/discords/montgomery.json
  10. +0 −31 WDR3/configs/discords/oklahomacity.json
  11. +0 −27 WDR3/configs/discords/tallahassee.json
  12. +0 −22 WDR3/configs/filters/Invasion.json
  13. +0 −22 WDR3/configs/filters/Invasion.json.example
  14. +0 −4 WDR3/configs/filters/Lure.json
  15. +0 −4 WDR3/configs/filters/Lure.json.example
  16. +0 −738 WDR3/configs/filters/Pokemon_100.json
  17. +0 −738 WDR3/configs/filters/Pokemon_100.json.ex
  18. +0 −737 WDR3/configs/filters/Pokemon_100_Level_1.json
  19. +0 −737 WDR3/configs/filters/Pokemon_100_Level_1.json.ex
  20. +0 −737 WDR3/configs/filters/Pokemon_100_Max_Level.json
  21. +0 −737 WDR3/configs/filters/Pokemon_100_Max_Level.json.ex
  22. +0 −738 WDR3/configs/filters/Pokemon_90-99.json
  23. +0 −738 WDR3/configs/filters/Pokemon_90-99.json.ex
  24. +0 −738 WDR3/configs/filters/Pokemon_BigKarp.json
  25. +0 −740 WDR3/configs/filters/Pokemon_BigKarp.json.example
  26. +0 −733 WDR3/configs/filters/Pokemon_Candy.json
  27. +0 −740 WDR3/configs/filters/Pokemon_Candy.json.example
  28. +0 −740 WDR3/configs/filters/Pokemon_Ditto.json
  29. +0 −740 WDR3/configs/filters/Pokemon_Ditto.json.example
  30. +0 −804 WDR3/configs/filters/Pokemon_Free.json
  31. +0 −796 WDR3/configs/filters/Pokemon_Free.json.example
  32. +0 −732 WDR3/configs/filters/Pokemon_Level_1.json
  33. +0 −740 WDR3/configs/filters/Pokemon_Level_1.json.example
  34. +0 −738 WDR3/configs/filters/Pokemon_TinyRat.json
  35. +0 −740 WDR3/configs/filters/Pokemon_TinyRat.json.example
  36. +0 −733 WDR3/configs/filters/Pokemon_Uber.json
  37. +0 −740 WDR3/configs/filters/Pokemon_Uber.json.example
  38. +0 −737 WDR3/configs/filters/Pokemon_Ultra_Rare.json
  39. +0 −736 WDR3/configs/filters/PvP_Perfect_Grass_Ultra.json
  40. +0 −736 WDR3/configs/filters/PvP_Perfect_Grass_Ultra.json.ex
  41. +0 −736 WDR3/configs/filters/PvP_Perfect_Grass_Ultra.json.example
  42. +0 −736 WDR3/configs/filters/PvP_Perfect_Great.json
  43. +0 −736 WDR3/configs/filters/PvP_Perfect_Ultra.json
  44. +0 −30 WDR3/configs/filters/Quest_All.json
  45. +0 −6 WDR3/configs/filters/Quest_Encounters.json
  46. +0 −18 WDR3/configs/filters/Quest_Encounters.json.example
  47. +0 −8 WDR3/configs/filters/Quest_Items.json
  48. +0 −17 WDR3/configs/filters/Quest_Items.json.example
  49. +0 −6 WDR3/configs/filters/Raids_All.json
  50. +0 −6 WDR3/configs/filters/Raids_All1&2.json
  51. +0 −6 WDR3/configs/filters/Raids_All3&4.json
  52. +0 −6 WDR3/configs/filters/Raids_All5.json
  53. +0 −6 WDR3/configs/filters/Raids_All6.json
  54. +0 −6 WDR3/configs/filters/Raids_Ex_Eligible.json
  55. +0 −6 WDR3/configs/filters/Raids_Ex_Eligible.json.example
  56. +0 −6 WDR3/configs/filters/Raids_Ex_Eligible_Egg.json
  57. +0 −6 WDR3/configs/filters/Raids_Ex_Eligible_Egg.json.example
  58. +0 −6 WDR3/configs/filters/Raids_Level1&2.json
  59. +0 −6 WDR3/configs/filters/Raids_Level1&2.json.example
  60. +0 −6 WDR3/configs/filters/Raids_Level1&2_Egg.json
  61. +0 −6 WDR3/configs/filters/Raids_Level1&2_Egg.json.example
  62. +0 −6 WDR3/configs/filters/Raids_Level3&4.json
  63. +0 −6 WDR3/configs/filters/Raids_Level3&4.json.example
  64. +0 −6 WDR3/configs/filters/Raids_Level3&4_Egg.json
  65. +0 −6 WDR3/configs/filters/Raids_Level3&4_Egg.json.example
  66. +0 −6 WDR3/configs/filters/Raids_Level5.json
  67. +0 −6 WDR3/configs/filters/Raids_Level5.json.example
  68. +0 −6 WDR3/configs/filters/Raids_Level5_Egg.json
  69. +0 −6 WDR3/configs/filters/Raids_Level5_Egg.json.example
  70. +0 −6 WDR3/configs/filters/Raids_Level6.json
  71. +0 −6 WDR3/configs/filters/Raids_Level6.json.example
  72. +0 −6 WDR3/configs/filters/Raids_Level6_Egg.json
  73. +0 −6 WDR3/configs/filters/Raids_Level6_Egg.json.example
  74. +0 −22 WDR3/configs/filters/Test_Invasion.json
  75. +0 −4 WDR3/configs/filters/Test_Lure.json
  76. +0 −738 WDR3/configs/filters/Test_Pokemon.json
  77. +0 −748 WDR3/configs/filters/Test_Pvp.json
  78. +0 −6 WDR3/configs/filters/Test_Quest.json
  79. +0 −6 WDR3/configs/filters/Test_Raid.json
  80. +0 −561 WDR3/configs/pokemon_channels/#city.ini.example
  81. +0 −14 WDR3/configs/pvp_channels/#city.ini.example
  82. +0 −11 WDR3/configs/sub_presets/pokemon/All_100%.ini.example
  83. +0 −11 WDR3/configs/sub_presets/pokemon/All_Gible.ini.example
  84. +0 −13 WDR3/configs/sub_presets/pokemon/All_Unown.ini.example
  85. +0 −23 WDR3/configs/sub_presets/pvp/All_Ultra_Rank_1s.ini.example
  86. +0 −23 WDR3/configs/sub_presets/pvp/Gen5_Rank_1s.ini.example
  87. +0 −23 WDR3/configs/sub_presets/pvp/Grass_Rank_1s.ini.example
  88. +0 −58 WDR3/configs/z_maptiles/Flo-Templates/invasions.json
  89. +0 −25 WDR3/configs/z_maptiles/Flo-Templates/location.json
  90. +0 −58 WDR3/configs/z_maptiles/Flo-Templates/lures.json
  91. +0 −93 WDR3/configs/z_maptiles/Flo-Templates/nest.json
  92. +0 −71 WDR3/configs/z_maptiles/Flo-Templates/pokemon-sat.json
  93. +0 −50 WDR3/configs/z_maptiles/Flo-Templates/pokemon.json
  94. +0 −58 WDR3/configs/z_maptiles/Flo-Templates/quests.json
  95. +0 −58 WDR3/configs/z_maptiles/Flo-Templates/raids.json
  96. +0 −29 WDR3/configs/z_maptiles/TileServer/config.json
  97. +0 −1 WDR3/configs/z_maptiles/TileServer/styles/dark-matter/icons/circle-11.svg
  98. +0 −3 WDR3/configs/z_maptiles/TileServer/styles/dark-matter/icons/star-11.svg
  99. +0 −38 WDR3/configs/z_maptiles/TileServer/styles/dark-matter/icons/wood-pattern.svg
  100. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/dark-matter/sprite.json
  101. BIN WDR3/configs/z_maptiles/TileServer/styles/dark-matter/sprite.png
  102. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/dark-matter/sprite@2x.json
  103. BIN WDR3/configs/z_maptiles/TileServer/styles/dark-matter/sprite@2x.png
  104. +0 −904 WDR3/configs/z_maptiles/TileServer/styles/dark-matter/style.json
  105. +0 −1 WDR3/configs/z_maptiles/TileServer/styles/klokantech-basic/icons/circle-11.svg
  106. +0 −3 WDR3/configs/z_maptiles/TileServer/styles/klokantech-basic/icons/star-11.svg
  107. +0 −38 WDR3/configs/z_maptiles/TileServer/styles/klokantech-basic/icons/wood-pattern.svg
  108. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/klokantech-basic/sprite.json
  109. BIN WDR3/configs/z_maptiles/TileServer/styles/klokantech-basic/sprite.png
  110. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/klokantech-basic/sprite@2x.json
  111. BIN WDR3/configs/z_maptiles/TileServer/styles/klokantech-basic/sprite@2x.png
  112. +0 −775 WDR3/configs/z_maptiles/TileServer/styles/klokantech-basic/style.json
  113. +0 −1 WDR3/configs/z_maptiles/TileServer/styles/osm-bright/icons/circle-11.svg
  114. +0 −3 WDR3/configs/z_maptiles/TileServer/styles/osm-bright/icons/star-11.svg
  115. +0 −38 WDR3/configs/z_maptiles/TileServer/styles/osm-bright/icons/wood-pattern.svg
  116. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/osm-bright/sprite.json
  117. BIN WDR3/configs/z_maptiles/TileServer/styles/osm-bright/sprite.png
  118. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/osm-bright/sprite@2x.json
  119. BIN WDR3/configs/z_maptiles/TileServer/styles/osm-bright/sprite@2x.png
  120. +0 −2,283 WDR3/configs/z_maptiles/TileServer/styles/osm-bright/style.json
  121. +0 −1 WDR3/configs/z_maptiles/TileServer/styles/pogo-daytime/icons/circle-11.svg
  122. +0 −3 WDR3/configs/z_maptiles/TileServer/styles/pogo-daytime/icons/star-11.svg
  123. +0 −38 WDR3/configs/z_maptiles/TileServer/styles/pogo-daytime/icons/wood-pattern.svg
  124. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/pogo-daytime/sprite.json
  125. BIN WDR3/configs/z_maptiles/TileServer/styles/pogo-daytime/sprite.png
  126. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/pogo-daytime/sprite@2x.json
  127. BIN WDR3/configs/z_maptiles/TileServer/styles/pogo-daytime/sprite@2x.png
  128. +0 −910 WDR3/configs/z_maptiles/TileServer/styles/pogo-daytime/style.json
  129. +0 −1 WDR3/configs/z_maptiles/TileServer/styles/pogo-nitetime/icons/circle-11.svg
  130. +0 −3 WDR3/configs/z_maptiles/TileServer/styles/pogo-nitetime/icons/star-11.svg
  131. +0 −38 WDR3/configs/z_maptiles/TileServer/styles/pogo-nitetime/icons/wood-pattern.svg
  132. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/pogo-nitetime/sprite.json
  133. BIN WDR3/configs/z_maptiles/TileServer/styles/pogo-nitetime/sprite.png
  134. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/pogo-nitetime/sprite@2x.json
  135. BIN WDR3/configs/z_maptiles/TileServer/styles/pogo-nitetime/sprite@2x.png
  136. +0 −910 WDR3/configs/z_maptiles/TileServer/styles/pogo-nitetime/style.json
  137. +0 −1 WDR3/configs/z_maptiles/TileServer/styles/positron/icons/circle-11.svg
  138. +0 −3 WDR3/configs/z_maptiles/TileServer/styles/positron/icons/star-11.svg
  139. +0 −38 WDR3/configs/z_maptiles/TileServer/styles/positron/icons/wood-pattern.svg
  140. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/positron/sprite.json
  141. BIN WDR3/configs/z_maptiles/TileServer/styles/positron/sprite.png
  142. +0 −23 WDR3/configs/z_maptiles/TileServer/styles/positron/sprite@2x.json
  143. BIN WDR3/configs/z_maptiles/TileServer/styles/positron/sprite@2x.png
  144. +0 −1,062 WDR3/configs/z_maptiles/TileServer/styles/positron/style.json
  145. +0 −25 WDR3/configs/z_maptiles/Versx-Templates/location.json
  146. +0 −93 WDR3/configs/z_maptiles/Versx-Templates/nest.json
  147. +0 −47 WDR3/configs/z_maptiles/Versx-Templates/pokemon.json
  148. +0 −58 WDR3/configs/z_maptiles/Versx-Templates/quests.json
  149. +0 −55 WDR3/configs/z_maptiles/Versx-Templates/raids.json
  150. +0 −40 WDR3/configs/z_maptiles/Versx-Templates/staticmap-complex.example.json
  151. +0 −42 WDR3/configs/z_maptiles/Versx-Templates/test.json
  152. +0 −281 WDR3/index.js
  153. 0 WDR3/src/configs.js
  154. +0 −159 WDR3/src/discord.js
  155. 0 WDR3/src/raid.js
  156. +0 −59 WDR3/src/sighting.js
  157. +0 −20 WDR3/src/utilities.js
  158. +0 −31 WDR3/src/utilities/Capitalize.js
  159. 0 WDR3/src/utilities/Console.js
  160. 0 WDR3/src/utilities/Discords.js
  161. +0 −22 WDR3/src/utilities/Gen.js
  162. 0 WDR3/src/utilities/Geofences.js
  163. +0 −153 WDR3/src/utilities/Locale.js
  164. 0 WDR3/src/utilities/Master.js
  165. +0 −812 WDR3/src/utilities/MySQL.js
  166. 0 WDR3/src/utilities/Time.js
  167. +0 −22 WDR3/src/utilities/Weather.js
  168. +0 −198 WDR3/src/webhook.js
  169. +0 −19 configs/db/daily.js.example
  170. +0 −6 configs/db/hourly.js.example
  171. +0 −6 configs/db/quarterhourly.js.example
  172. +0 −6 configs/db/scheduled.js.example
  173. +112 −0 configs/embeds/help.js.example
  174. +1 −1 configs/embeds/pvp.js.example
  175. +70 −0 configs/embeds/raid_eggs.js.example
  176. +77 −0 configs/embeds/raids.js.example
  177. +169 −1 configs/filters/Pokemon_0.json.example
  178. +169 −1 configs/filters/Pokemon_100.json.ex
  179. +336 −1 configs/filters/Pokemon_100_Level_1.json.ex
  180. +169 −1 configs/filters/Pokemon_100_Max_Level.json.ex
  181. +169 −1 configs/filters/Pokemon_90-99.json.ex
  182. +2 −2 WDR3/configs/filters/Pokemon_0.json.example → configs/filters/Pokemon_ALL.json.example
  183. +22 −5 WDR3/configs/filters/Pokemon_0.json → configs/filters/Pokemon_Advanced.json.example
  184. +170 −4 configs/filters/Pokemon_BigKarp.json.example
  185. +202 −39 configs/filters/Pokemon_Candy.json.example
  186. +169 −1 configs/filters/Pokemon_Ditto.json.example
  187. +171 −2 configs/filters/Pokemon_Free.json.example
  188. +169 −1 configs/filters/Pokemon_Level_1.json.example
  189. +4 −8 WDR3/configs/filters/Pokemon_Unown.json → configs/filters/Pokemon_Mega_Rare.json.example
  190. +171 −3 configs/filters/Pokemon_TinyRat.json.example
  191. +169 −1 configs/filters/Pokemon_Uber.json.example
  192. +1 −1 WDR3/configs/filters/PvP_Perfect_Great.json.example → configs/filters/PvP_Perfect_Great.json.ex
  193. +171 −2 configs/filters/PvP_Perfect_Great.json.example
  194. 0 WDR3/configs/filters/PvP_Perfect_Ultra.json.example → configs/filters/PvP_Perfect_Ultra.json.ex
  195. +170 −1 configs/filters/PvP_Perfect_Ultra.json.example
  196. +291 −0 configs/geofences/city.json.example
  197. 0 WDR3/configs/invasion_channels/#city.ini.example → configs/invasion_channels/city.ini.example
  198. 0 WDR3/configs/lure_channels/#city.ini.example → configs/lure_channels/city.ini.example
  199. 0 WDR3/configs/quest_channels/#city.ini.example → configs/quest_channels/city.ini.example
  200. 0 WDR3/configs/raid_channels/#city.ini.example → configs/raid_channels/city.ini.example
  201. +1 −1 ...s/sub_presets/pvp/All_Great_Rank_1s.ini.example → configs/sub_presets/pvp/All_Rank_1s.ini.example
  202. +0 −32 configs/z_maptiles/Flo-Templates/invasions.json
  203. +0 −32 configs/z_maptiles/Flo-Templates/lures.json
  204. +17 −73 configs/z_maptiles/Flo-Templates/nest.json
  205. +1 −33 configs/z_maptiles/Flo-Templates/pokemon.json
  206. +0 −32 configs/z_maptiles/Flo-Templates/quests.json
  207. +1 −33 configs/z_maptiles/Flo-Templates/raids.json
  208. +0 −29 configs/z_maptiles/Versx-Templates/pokemon.json
  209. +8 −40 configs/z_maptiles/Versx-Templates/quests.json
  210. +11 −29 package-lock.json
  211. +2 −2 package.json
  212. +6 −6 src/commands/admin/filter.js
  213. +3 −3 src/commands/admin/role.js
  214. +3 −2 src/commands/command-admin.js
  215. +11 −5 src/commands/command-channel.js
  216. +1 −0 src/commands/subscription/area/begin.js
  217. +2 −1 src/commands/subscription/location/begin.js
  218. +2 −0 src/commands/subscription/location/create.js
  219. +40 −28 src/commands/subscription/location/remove.js
  220. +5 −1 src/commands/subscription/location/set.js
  221. +7 −4 src/commands/subscription/pokemon/collect_detail.js
  222. +43 −37 src/commands/subscription/pokemon/create.js
  223. +6 −6 src/commands/subscription/pokemon/modify.js
  224. +8 −6 src/commands/subscription/pokemon/remove.js
  225. +21 −20 src/commands/subscription/pokemon/status.js
  226. +7 −5 src/commands/subscription/pokemon/view.js
  227. +16 −11 src/commands/subscription/pvp/collect_detail.js
  228. +6 −0 src/commands/subscription/pvp/create.js
  229. +19 −7 src/commands/subscription/pvp/modify.js
  230. +2 −2 src/commands/subscription/pvp/remove.js
  231. +9 −7 src/commands/subscription/pvp/view.js
  232. +1 −1 src/commands/subscription/quest/collect_detail.js
  233. +31 −31 src/commands/subscription/quest/create.js
  234. +1 −1 src/commands/subscription/raid/collect_detail.js
  235. +38 −36 src/commands/subscription/raid/create.js
  236. +1 −1 src/commands/subscription/raid/remove.js
  237. +34 −18 src/commands/subscription/raid/status.js
  238. +1 −1 src/commands/subscription/raid/view.js
  239. +28 −163 src/database.js
  240. +1 −1 src/events/channelUpdate.js
  241. +2 −2 src/events/guildMemberAdd.js
  242. +1 −1 src/events/guildMemberUpdate.js
  243. +222 −222 src/feeds/invasion.js
  244. +4 −4 src/feeds/pokemon.js
  245. +6 −6 src/feeds/pvp.js
  246. +8 −8 src/feeds/raids.js
  247. +39 −0 src/functions/CalculateCP.js
  248. +132 −9 src/functions/Fetch_Gyms.js
  249. +111 −9 src/functions/Fetch_Stops.js
  250. +782 −1 src/functions/Generate_Master.js
  251. +71 −8 src/functions/Generate_Tile.js
  252. +22 −22 src/functions/Get_Locale.js
  253. +2 −2 src/functions/Get_Quest_Reward.js
  254. +189 −8 src/functions/Get_Quest_Task.js
  255. +6 −6 src/functions/Get_Size.js
  256. +2 −2 src/functions/Get_Sprite.js
  257. +109 −9 src/functions/Get_Typing.js
  258. +3 −3 src/functions/Pokemon_ID_Search.js
  259. +1 −1 src/functions/Send_Embed.js
  260. +2 −11 src/handlers/webhooks.js
  261. +0 −332 src/pvp.js
  262. +8 −2 src/startup/load_data.js
  263. +4 −4 src/subscriptions/invasion.js
  264. +31 −24 src/subscriptions/pokemon.js
  265. +47 −32 src/subscriptions/pvp.js
  266. +1 −1 src/subscriptions/quests.js
  267. +8 −6 src/subscriptions/raids.js
  268. +0 −336 static/PvP_Ranks.js
  269. +3,437 −462 static/data/master.json
  270. +0 −7 wdr.js
20 changes: 0 additions & 20 deletions WDR3/configs/choices.json
View file

This file was deleted.

20 changes: 0 additions & 20 deletions WDR3/configs/choices.json.example
View file

This file was deleted.

171 changes: 0 additions & 171 deletions WDR3/configs/config.ini.example
View file

This file was deleted.

32 changes: 0 additions & 32 deletions WDR3/configs/discords/albuquerque.json
View file

This file was deleted.

45 changes: 0 additions & 45 deletions WDR3/configs/discords/city.json.example
View file

This file was deleted.

31 changes: 0 additions & 31 deletions WDR3/configs/discords/columbus.json
View file

This file was deleted.

31 changes: 0 additions & 31 deletions WDR3/configs/discords/gainesville.json
View file

This file was deleted.

31 changes: 0 additions & 31 deletions WDR3/configs/discords/memphis.json
View file

This file was deleted.

Loading