Merge pull request #18 from versx/develop

Small fixes

alarms.example.json

@@ -9,146 +9,168 @@
 	[
 		{
 			"name":"City1-Rare",
+			"description": "<!@324234324> <iv> L<lvl> <geofence>",
 			"alerts": "default.json",
 			"filters":"all.json",
 			"geofence":"City1.txt",
+			"mentions":"<!@324234324> <iv> L<lvl> <geofence>",  
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name":"City1-100iv",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"100iv.json",
 			"geofence":"City1.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name":"City1-Raids",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"raids.json",
 			"geofence":"City1.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name":"City1-LegendaryRaids",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"legendary_raids.json",
 			"geofence":"City1.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name":"City1-ExRaids",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"ex_raids.json",
 			"geofence":"City1.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name": "City1-Quests",
+			"description": "",
 			"alerts": "default.json",
 			"filters": "quests.json",
 			"geofence": "City1.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name": "City1-Lures",
+			"description": "",
 			"alerts": "default.json",
 			"filters": "lures.json",
 			"geofence": "City1.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name": "City1-Invasions",
+			"description": "",
 			"alerts": "default.json",
 			"filters": "invasions.json",
 			"geofence": "City1.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name": "City1-Gyms",
+			"description": "",
 			"alerts": "default.json",
 			"filters": "gyms.json",
 			"geofence": "City1.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
-			"name":"City2-Weather",
+			"name":"City1-Weather",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"weather.json",
-			"geofence":"City2.txt",
+			"geofence":"City1.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name":"City2-Rare",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"all.json",
 			"geofence":"City2.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name":"City2-100iv",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"100iv.json",
 			"geofence":"City2.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name":"City2-Raids",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"raids.json",
 			"geofence":"City2.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name":"City2-LegendaryRaids",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"legendary_raids.json",
 			"geofence":"City2.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name":"City2-ExRaids",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"ex_raids.json",
 			"geofence":"City2.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name": "City2-Quests",
+			"description": "",
 			"alerts": "default.json",
 			"filters": "quests.json",
 			"geofence": "City2.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name": "City2-Lures",
+			"description": "",
 			"alerts": "default.json",
 			"filters": "lures.json",
 			"geofence": "City2.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name": "City2-Invasions",
+			"description": "",
 			"alerts": "default.json",
 			"filters": "invasions.json",
 			"geofence": "City2.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name": "City2-Gyms",
+			"description": "",
 			"alerts": "default.json",
 			"filters": "gyms.json",
 			"geofence": "City2.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name":"Absol-Quests",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"quests_absol.json",
 			"geofence":"City2.txt",
 			"webhook":"<DISCORD_WEBHOOK_URL>"
 		},
 		{
 			"name":"City2-Weather",
+			"description": "",
 			"alerts": "default.json",
 			"filters":"weather.json",
 			"geofence":"City2.txt",

config.example.json

@@ -107,7 +107,8 @@
     320
   ],
   "urls": {
-    "staticMap": "http://tiles.example.com:8080/static/klokantech-basic/{0}/{1}/15/300/175/1/png"
+    "staticMap": "http://tiles.example.com:8080/static/klokantech-basic/{0}/{1}/15/300/175/1/png",
+    "scannerMap": "http://map.example.com/@/{0}/{1}/15"
   },
   "iconStyles": {
     "Default": "https://raw.githubusercontent.com/versx/WhMgr-Assets/master/original/",

docs/commands/subscriptions.md

@@ -6,6 +6,8 @@
 **disable** - Disable direct message subscription notifications.  
 **info** - List all Pokemon, Raid, Quest, Invasion, and Gym subscriptions and settings.  
 **expire** / **expires** - Check stripe API when Donor/Supporter subscription expires.  
+**set-number** - Set a phone number to receive text message alerts for ultra rare Pokemon.  
+
 **set-distance** - Set minimum distance to Pokemon, raids, quests, invasions and gyms need to be within. (Measured in kilometers)  
 Usage: `set-distance <kilometers> <latitude>,<longitude>`  
 
@@ -23,14 +25,15 @@ Examples:
 Usage: `pokeme <pokemon> [iv] [level] [gender]`  
 
 * `<pokemon>` - Parameter can take a list of Ids or names or the `all` keyword for everything.  
-* `<iv>` - (Optional) Minimum IV value.  
+* `<iv>` - (Optional) Minimum IV value, or individual attack, defense, and stamina values i.e. `0-14-15`  
 * `<level>` - (Optional) Minimum level value.  
 * `<gender>` - (Optional) Specific gender `m` or `f` or `*` for all.  
 
 Examples:  
 
 * `.pokeme tyranitar`  
 * `.pokeme pikachu 100 35 f`  
+* `.pokeme Skarmory 0-15-15 12`  
 * `.pokeme pikachu 100`  
 * `.pokeme all 100 35`  
 <br>  
@@ -135,29 +138,27 @@ Examples:
 ### Team Rocket Invasions  
 
 **invme** - Subscribe to specific Team Rocket invasion notifications.  
-Usage: `invme <grunt_type>-<gender> [city]`  
+Usage: `invme <reward_pokemon> [city]`  
 
-* `<grunt_type>` - Grunt Pokemon type i.e. `fire`, `water`  
-* `<gender>` - Grunt gender i.e. `male` | `m` | `female` | `f`  
+* `<grunt_type>` - Reward Pokemon i.e. `Dratini`, `147`  
 * `[city]` - (Optional) City name to get the notifications for or leave blank for all available cities.  
 
 Examples:  
 
-* `.invme tier2-f`  
-* `.invme ground-male city1`  
+* `.invme Beldum`  
+* `.invme beldum city1`  
 <br>  
 
 **invmenot** - Unsubscribe from specific Team Rocket invasion notifications.  
-Usage: `invmenot <grunt_type>-<gender> [city]`  
+Usage: `invmenot <reward_pokemon> [city]`  
 
-* `<grunt_type>` - Grunt Pokemon type i.e. `fire`, `water`  
-* `<gender>` - Grunt gender i.e. `male` | `m` | `female` | `f`  
+* `<reward_pokemon>` - Pokemon reward i.e. `Pikachu`, `25`  
 * `[city]` - (Optional) City name to get the notifications for or leave blank for all available cities.  
 
 Examples:  
 
-* `.invmenot tier2-f`  
-* `.invmenot ground-male city1`  
+* `.invmenot Bulbasaur`  
+* `.invmenot Dratini city1`  
 * `.invmenot all`  
 <br>  
 

docs/index.md

@@ -2,6 +2,7 @@
 
 Works with [RealDeviceMap](https://github.com/123FLO321/RealDeviceMap)  
 
+Made in C#, runs on .NET Core CLR. Cross platform compatibility, can run on Windows, macOS, and Linux operating systems.  
 Parses and sends Discord notifications based on pre-defined filters for Pokemon, raids, raid eggs, field research quests, gym team control changes, and weather changes. Also supports Discord user's subscribing to Pokemon, raid, quest, or Team Rocket invasion notifications via direct messages.
 
 ## Features:  
@@ -28,12 +29,15 @@ Parses and sends Discord notifications based on pre-defined filters for Pokemon,
 - Lots more...
 
 ### Frameworks and Libraries
-- .NET Framework v4.6.2  
-- DSharpPlus v3.2.3   
-- ServiceStack.OrmLite.MySql v5.7.0  
-- Stripe.net v34.1.0  
+- .NET Core v2.1.803  
+- DSharpPlus v3.2.3  
+- DSharpPlus.CommandsNext v3.2.3  
+- DSharpPlus.Interactivity v3.2.3  
+- Microsoft.Win32.SystemEvents v4.7.0  
 - Newtonsoft.Json v12.0.3  
-- MySql.Data v8.0.18  
+- ServiceStack.OrmLite.MySql v5.8.0  
+- Stripe.net v37.14.0  
+- Twilio v5.44.0  
 
 [Click here](user-guide/config) to get started!  
 

docs/user-guide/alarms.md

@@ -17,6 +17,8 @@ There is no limit to the amount of alarms you can add under the `alarms` propert
     "enablePokestops": true,
     //Enable or disable Gym alarms globally
     "enableGyms": true, 
+    //Enable or disable Weather alarms globally
+    "enableWeather": true,
     //List of alarms
 	"alarms":
 	[
@@ -27,6 +29,8 @@ There is no limit to the amount of alarms you can add under the `alarms` propert
             "alerts": "default.json",
             //Alarm filters
             "filters":"all.json",
+            //Mentionable string that supports DTS  
+            "mentions":"<!@324234324> <iv> L<lvl> <geofence>",  
             //Geofence file name
             "geofence":"City1.txt",
             //Discord webhook url address

docs/user-guide/filters.md

@@ -16,6 +16,8 @@ Filters allow you to narrow down what is reported. All filters are options and c
 		"size": "Big", //Tiny, Small, Normal, Large, Big
 		"great_league": true, //Great League
 		"ultra_league": true, //Ultra League
+		"min_rank": 1, //Minimum rank of #1 PVP stats
+		"max_rank": 5, //Maximum rank of #5 PVP stats
 		"type": "Include", //Include or Exclude the `pokemon` list
 		"ignoreMissing": true //Ignore Pokemon missing stats
 	},
@@ -40,8 +42,8 @@ Filters allow you to narrow down what is reported. All filters are options and c
 	{
 		"enabled": true, //Filter is enabled
         "rewards": ["spinda", "nincada"], //Quest reward string (Chansey, stardust, candy, etc.)
-        "type": "Include", //Include or Exclude the `rewards` list
-		"isShiny": false //Only shiny encounter quests.
+		"isShiny": false, //Only shiny encounter quests.
+		"type": "Include" //Include or Exclude the `rewards` list
 	},
 	"pokestops":
 	{
@@ -51,7 +53,14 @@ Filters allow you to narrow down what is reported. All filters are options and c
 	},
 	"gyms":
 	{
-		"enabled": true //Filter is enabled
+		"enabled": true, //Filter is enabled
+		"underAttack": true, //Only gyms that are under attack
+		"team": "All" //Team change to notify about (i.e. Neutral/Mystic/Valor/Instinct/All)
+	},
+	"weather":
+	{
+		"enabled": true, //Filter is enabled
+		"types": ["Clear", "Rain", "PartlyCloudy", "Cloudy", "Windy", "Snow", "Fog"] //Only send weather types that are in the list
 	}
 }
 ```