Updated quest icons, added toggle for quests to config and separate DB config for split bot

Author: ProfPokes

config.php.example

@@ -1,5 +1,5 @@
 <?php
-//DB connection details - same details as raidbot
+//Database connection details for raids
 define('DB_HOST',			'localhost');
 define('DB_NAME',			'your_database_name');
 define('DB_USER',			'your_database_user');
@@ -15,5 +15,17 @@ define('MAP_EX_IDENT',	'none'); //Do you have anything added to gym name to indi
 define('MAP_SHOW_GYMS',	 true); //Enable optional gym layers on the map to show all gyms / EX gyms (if gyms are tagged with an identifier)
 define('MAP_ICONPACK',	'numbers'); //Choose icons for the map - add folders of icons named id_x.png and set folder name here to switch icon pack
 define('LANGUAGE',  'EN'); // set the language to NL,DE,EN,PT-BR.
-define('LOCATION_QUEST_REWARD_JSON', '../raidbot/quests-rewards.json'); //select the folder where the quest-reward.json is located.
+
+
+//Quests - Optional settings for adding QuestBot data to your map
+define('MAP_SHOW_QUESTS', false);  //set to true to offer quest data on the map from your QuestBot.
+define('LOCATION_QUEST_REWARD_JSON', 'https://your-bot-url.com/questbot/quests-rewards.json'); //select the folder where the quest-reward.json is located.
+
+//Database connection details for quests
+define('QUEST_DB_HOST',	 		'localhost');
+define('QUEST_DB_NAME',         'your_database_name');
+define('QUEST_DB_USER',         'your_database_user');
+define('QUEST_DB_PASSWORD',     'your_database_password');
+
+
 ?>

getquest.php

@@ -3,7 +3,7 @@
 	require_once("config.php");
 
 	// Establish mysql connection.
-	$db = new PDO("mysql:host=" . DB_HOST . ";dbname=" . DB_NAME . ";charset=utf8mb4", DB_USER, DB_PASSWORD);
+	$db = new PDO("mysql:host=" . QUEST_DB_HOST . ";dbname=" . QUEST_DB_NAME . ";charset=utf8mb4", QUEST_DB_USER, QUEST_DB_PASSWORD);
 
 	// Error connecting to db.
 	if ($db->connect_errno) {
@@ -39,7 +39,7 @@
         ORDER BY   pokestops.pokestop_name
 	";
 
-	$json           = file_get_contents( LOCATION_QUEST_REWARD_JSON);
+	$json           = file_get_contents(LOCATION_QUEST_REWARD_JSON);
 	$translations   = json_decode($json,true);
 
 	$result = $db->query($sql);

icons/quests/pokestop.png

@@ -69,9 +69,30 @@
 				iconAnchor:   [10, 17], 
 				popupAnchor:  [-3, -10],	
 				iconUrl: 'icons/gymEX.png'
-			});			
+			});
+
+			var questPokeIcon = L.Icon.extend({
+				options: {
+					iconSize:     [32, 32],
+					iconAnchor:   [8, 8],
+					popupAnchor:  [-3, -10],
+					shadowUrl: 'icons/quests/pokestop.png',
+					shadowSize:   [48, 48],
+					shadowAnchor: [24, 24]
+				}
+			});
+
+			var questItemIcon = L.Icon.extend({
+				options: {
+					iconSize:     [32, 32],
+					iconAnchor:   [8, 8],
+					popupAnchor:  [-3, -10],
+					shadowUrl: 'icons/quests/pokestop.png',		
+					shadowSize:   [48, 48],
+					shadowAnchor: [24, 24]					
+				}
+			});		
 
-		
 			(function () {
 				//Separate layers for raid levels to allow toggle on/off of levels
 				gyms = new L.FeatureGroup();
@@ -138,8 +159,12 @@
 					"Level 3": raids3,
 					"Level 2": raids2,
 					"Level 1": raids1,
-					"Quest": quest,
 					<?php 
+						if (MAP_SHOW_QUESTS) {
+							echo('"Quests": quest,
+								'); 
+						}
+					
 						if (MAP_SHOW_GYMS) {
 							if (MAP_EX_IDENT != 'none') { 
 								echo('"EX Gyms": gymsEX,
@@ -362,9 +387,9 @@ function getQuest() {
 						var details = "<div style='text-align: center; margin-left: auto; margin-right: auto;'>"+ pokestop_info  + quest_info + "</div>";	
 
 						if( pokedex_id && reward_type == 1 ){
-						    pokemonIcon[i] = new raidIcon({iconUrl: 'icons<?php echo("/" . MAP_ICONPACK); ?>/id_' + pokedex_id +'.png'});
+						    pokemonIcon[i] = new questPokeIcon({iconUrl: 'icons<?php echo("/" . MAP_ICONPACK); ?>/id_' + pokedex_id +'.png'});
 						}else{
-						    pokemonIcon[i] = new raidIcon({iconUrl: 'icons/reward_type_' + reward_type + '.png'});
+						    pokemonIcon[i] = new questItemIcon({iconUrl: 'icons/quests/reward_type_' + reward_type + '.png'});
 						}