2.0.0b2, See Releases for Notes

PartTimeJS · Jul 17, 2020 · 1eac992 · 1eac992
1 parent cd5c9ca
commit 1eac992
Show file tree

Hide file tree

Showing 119 changed files with 11,800 additions and 12,749 deletions.
diff --git a/configs/embeds/pokemon_iv.js.example b/configs/embeds/pokemon_iv.js.example
@@ -1,8 +1,8 @@
 module.exports = function(WDR, p) {
 
   // ADD YOUR CUSTOM SPACING
-  if (p.form_name) {
-    p.form_name = " " + p.form_name;
+  if (p.form) {
+    p.form = " " + p.form;
   }
 
   if (p.gender_wemoji) {
@@ -14,15 +14,15 @@ module.exports = function(WDR, p) {
   let Sighting_Embed = new WDR.DiscordJS.MessageEmbed()
     .setColor(p.color)
     .setThumbnail(p.sprite)
-    .setTitle("**" + p.name + "" + p.form_name + "** " + p.atk + "/" + p.def + "/" + p.sta + " (" + p.iv + "%) " + p.area)
+    .setTitle("**" + p.name + "" + p.form + "** " + p.atk + "/" + p.def + "/" + p.sta + " (" + p.iv + "%) " + p.area)
     .setDescription("Level " + p.lvl + " | CP " + p.cp + p.gender_wemoji + "\n" +
       "Ht: " + p.height + "m | Wt: " + p.weight + "kg | " + p.size + "\n" +
       p.move_1_name + " " + p.move_1_type + " / " + p.move_2_name + " " + p.move_2_type + "\n" +
       "Despawn: **" + p.time + " (" + p.mins + "m " + p.secs + "s)** " + p.verified + "\n" +
       p.weather_boost + " \n" +
       "Directions:" + "\n" +
-      p.google + " | " + p.apple + " | " + p.waze)
-    .setImage(p.static_map);
+      p.google + " | " + p.apple + " | " + p.waze);
+  // STATIC MAP ADDED AUTOMATICALLY IF YOU DO NOT ADD ONE MANUALLY
 
   return Sighting_Embed;
 }
@@ -38,7 +38,7 @@ module.exports = function(WDR, p) {
 //------------------------------------------------------------------------------
 //    p.gen             -   Generation
 //    p.name            -   Locale Name
-//    p.form_name            -   Locale Form Name
+//    p.form            -   Locale Form Name
 //    p.id              -   Pokedex ID
 //    p.sprite          -   Sprite Image
 //    p.iv              -   Internal Value

diff --git a/configs/embeds/pvp.js.example b/configs/embeds/pvp.js.example
@@ -1,8 +1,8 @@
 module.exports = function(WDR, p) {
 
   // ADD YOUR CUSTOM SPACING
-  if (p.form_name) {
-    p.form_name = " " + p.form_name;
+  if (p.form) {
+    p.form = " " + p.form;
   }
 
   if (p.gender_wemoji) {
@@ -11,42 +11,37 @@ module.exports = function(WDR, p) {
     p.gender_wemoji = "";
   }
 
-  //
-  //------------------------------------------------------------------------------
-  //  CUSTOMIZEABLE LIST FOR NAME, RANK, %, AND CP
-  //------------------------------------------------------------------------------
-  for (var pokemon_id in p.possible_cps) {
+  if (p.gender_noemoji) {
+    p.gender_noemoji = " | " + p.gender_noemoji;
+  } else {
+    p.gender_noemoji = "";
+  }
 
+  p.possible_cps.forEach(pvp => {
     let pipe = " | "; // SPACING
-
-    let Name = WDR.Master.Pokemon[pokemon_id].name;
-
-    let Level = "Lvl " + p.possible_cps[pokemon_id].level;
-
-    let Cp = "CP " + p.possible_cps[pokemon_id].cp;
-
-    let Rank = "Rank " + p.possible_cps[pokemon_id].rank;
-
-    let Percent = p.possible_cps[pokemon_id].percent + "%";
-
-    let string = "**" + Name + " (" + Percent + ") " + p.atk + "/" + p.def + "/" + p.sta + "** \n" + Rank + pipe + Level + pipe + Cp;
-
+    let Name = WDR.Master.Pokemon[pvp.pokemon_id].name;
+    let Level = "Lvl " + pvp.level;
+    let Cp = "CP " + pvp.cp;
+    let Rank = "**Rank " + pvp.rank + "**";
+    let Percent = pvp.percent + "%";
+    let string = Rank + " " + Name + " (" + Percent + ")\n" + Level + pipe + Cp + pipe + p.atk + "/" + p.def + "/" + p.sta;
     p.pvp_data += string + "\n";
-  }
+  });
 
   let Pokemon_Embed = new WDR.DiscordJS.MessageEmbed()
     .setColor(p.color)
     .setThumbnail(p.sprite)
     .setTitle(p.pvp_data)
-    .setDescription("**" + p.name + "" + p.form_name + "** " + p.atk + "/" + p.def + "/" + p.sta + " (" + p.iv + "%)" + "\n" +
+    .setDescription("**" + p.name + "" + p.form + "** " + p.atk + "/" + p.def + "/" + p.sta + " (" + p.iv + "%)" + "\n" +
       "Level " + p.lvl + " | CP " + p.cp + p.gender_wemoji + "\n" +
       "Ht: " + p.height + "m | Wt: " + p.weight + "kg | " + p.size + "\n" +
       p.move_1_name + " " + p.move_1_type + " / " + p.move_2_name + " " + p.move_2_type + "\n" +
       "Despawn: **" + p.time + " (" + p.mins + "m " + p.secs + "s)** " + p.verified + "\n" +
       p.weather_boost + " \n" +
       "Directions:" + "\n" +
       p.google + " | " + p.apple + " | " + p.waze)
-    .setImage(p.static_map);
+    .setFooter(p.footer);
+  // STATIC MAP ADDED AUTOMATICALLY IF YOU DO NOT ADD ONE MANUALLY
 
   return Pokemon_Embed;
 }
@@ -55,11 +50,11 @@ module.exports = function(WDR, p) {
 //  AVAILABLE VARIABLES
 //------------------------------------------------------------------------------
 //    p.pvpString       -   String of PVP data
-//    p.ranks       -   String of PVP Ranks
+//    p.ranks           -   String of PVP Ranks
 //    p.pvp_data        -   Lines of PVP Data
 //    p.gen             -   Generation
 //    p.name            -   Locale Name
-//    p.form_name       -   Locale Form Name
+//    p.form            -   Locale Form Name
 //    p.id              -   Pokedex ID
 //    p.sprite          -   Sprite Image
 //    p.iv              -   Internal Value
@@ -68,7 +63,7 @@ module.exports = function(WDR, p) {
 //    p.gender_noemoji  - Gender without Emoji
 //    p.height          -   Take a wild guess
 //    p.weight          -   Probably cant figure this one out
-//    p.type            -   Type(s) Emoji(s)
+//    p.type_wemoji     -   Type(s) w/ Emoji(s)
 //    p.type_noemoji    -   Type(s) Wording
 //    p.color           -   Type Color (Hex)
 //    p.weather_boost   -   If Weather-Boosted
@@ -85,7 +80,6 @@ module.exports = function(WDR, p) {
 //    p.waze            -   Waze Directions URL
 //    p.pmsf            -   PMSF Map Link to the Sighting
 //    p.rdm             -   RDM Map Link to the Sighting
-//    p.static_map      -   Static Map Tile Image
 //    p.verified        -   Spawnpoint Timer Verified Emoji (Yes/No)
 //    p.time            -   Despawn Time
 //    p.mins            -   Despawn Minutes
@@ -94,3 +88,4 @@ module.exports = function(WDR, p) {
 //    p.def             -   Defense IV
 //    p.sta             -   Stamina IV
 //    p.lvl             -   Level
+//    p.footer          -   Includes processing latency
diff --git a/configs/embeds/raids.js.example → configs/embeds/raid_boss.js.example b/configs/embeds/raids.js.example → configs/embeds/raid_boss.js.example
@@ -25,7 +25,7 @@ module.exports = function(WDR, g) {
       "Level " + g.lvl + " | " + g.team + g.sponsor + "\n" +
       "Counter(s): " + g.weaknesses + "\n" +
       g.exraid + g.notes + "\n" +
-      "**" + g.area + " | Directions:" + "\n" +
+      "**" + g.area + "** | Directions:" + "\n" +
       g.google + " | " + g.apple + " | " + g.waze)
     .setImage(g.static_map);
 

diff --git a/configs/embeds/raid_eggs.js.example → configs/embeds/raid_egg.js.example b/configs/embeds/raid_eggs.js.example → configs/embeds/raid_egg.js.example
@@ -24,7 +24,7 @@ module.exports = function(WDR, g) {
       "Hatches: **" + g.hatch_time + " (*" + g.hatch_mins + " Mins*)" + "**\n" +
       g.exraid + g.notes + "\n" +
       "**" + g.area + "** | Directions:" + "\n" +
-      g.google + " | " + g.apple + " | " + g.waze)
+      g.google + " - " + g.apple + " - " + g.waze)
     .setImage(g.static_map);
 
   return raid_embed;