Merge pull request #87 from versx/custom_pvp_leagues

Add custom pvp leagues support
versx · Jun 20, 2022 · baf70e6 · baf70e6
2 parents 9b577a9 + 7a4a76c
commit baf70e6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/src/config.example.json b/src/config.example.json
@@ -83,5 +83,12 @@
         },
         "map": "",
         "paypal": ""
+    },
+    "pvp": {
+        "leagues": [
+            "Little",
+            "Great",
+            "Ultra"
+        ]
     }
 }
diff --git a/src/data/default.js b/src/data/default.js
@@ -14,11 +14,9 @@ data.genders = [
     { 'id': 'm', 'name': 'Male' },
     { 'id': 'f', 'name': 'Female', }
 ];
-data.leagues = [
-    { 'id': 'great', 'name': 'Great' },
-    { 'id': 'ultra', 'name': 'Ultra' },
-    //{ 'id': 'master', 'name': 'Master' },
-];
+data.leagues = config.pvp.leagues.map(league => {
+    return { 'name': league };
+});
 data.icon_styles = config.iconStyles;
 data.enable_geofence_roles = config.enableGeofenceRoles;
 data.hide_phone_number = config.hidePhoneNumber;

diff --git a/src/views/pvp/edit.mustache b/src/views/pvp/edit.mustache
@@ -12,7 +12,7 @@
 <br>
 <div class="w-75" style="float: none; margin: 0 auto;">
     <div class="alert alert-info" style="float: none; margin: 0 auto;">
-        <div><strong>{{Description}}:</strong> PvP subscriptions are based on the desired final PvP ranked Pokemon and not the wild Pokemon found.</div>
+        <div><strong>{{Description}}:</strong> PvP subscriptions can be based on the desired final PvP ranked Pokemon or the wild Pokemon found.</div>
     </div>
     <br>
     <form action="/api/pvp/edit/{{id}}" method="post">

diff --git a/src/views/pvp/new.mustache b/src/views/pvp/new.mustache
@@ -12,7 +12,7 @@
 <br>
 <div class="w-75" style="float: none; margin: 0 auto;">
     <div class="alert alert-info" style="float: none; margin: 0 auto;">
-        <div><strong>{{Description}}:</strong> PvP subscriptions are based on the desired final PvP ranked Pokemon and not the wild Pokemon found.</div>
+        <div><strong>{{Description}}:</strong> PvP subscriptions can be based on the desired final PvP ranked Pokemon or the wild Pokemon found.</div>
     </div>
     <br>
     <form action="/api/pvp/new" method="post">