From 4ef2588add2f724dd8a00c5f3d6eb78e87714dab Mon Sep 17 00:00:00 2001 From: Tobi Date: Wed, 26 Nov 2014 22:43:35 +0100 Subject: [PATCH] creature --- mojotrollz/api/api_mojotrollz.php | 5 ++++ mojotrollz/api/autoload.inc.php | 4 ++- mojotrollz/api/creature/creature.php | 30 +++++++++++++++++++ .../creature/qq/GET_BASE_DATA_CREATURE.php | 13 ++++++++ .../qq/GET_QUESTRELATION_CREATURE.php | 12 ++++++++ mojotrollz/api/creature/tpl/creature.tpl | 24 +++++++++++++++ .../creature/tpl/creature_questrelation.tpl | 1 + .../tpl/creature_element.tpl | 1 + .../js/user_achievements_menu_sub.js | 17 ++++++++--- mojotrollz/page/user_start/user_start.php | 2 +- 10 files changed, 103 insertions(+), 6 deletions(-) create mode 100644 mojotrollz/api/creature/creature.php create mode 100644 mojotrollz/api/creature/qq/GET_BASE_DATA_CREATURE.php create mode 100644 mojotrollz/api/creature/qq/GET_QUESTRELATION_CREATURE.php create mode 100644 mojotrollz/api/creature/tpl/creature.tpl create mode 100644 mojotrollz/api/creature/tpl/creature_questrelation.tpl diff --git a/mojotrollz/api/api_mojotrollz.php b/mojotrollz/api/api_mojotrollz.php index 3091ebf..99f2e37 100644 --- a/mojotrollz/api/api_mojotrollz.php +++ b/mojotrollz/api/api_mojotrollz.php @@ -11,4 +11,9 @@ class api_mojotrollz extends \SYSTEM\API\api_system { throw new ERROR("You need to be logged in to view this ressource.");} $quest = quest::test($entry); return $quest;} + public static function call_creature($entry){ + if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ + throw new ERROR("You need to be logged in to view this ressource.");} + $creature = creature::data($entry); + return $creature;} } diff --git a/mojotrollz/api/autoload.inc.php b/mojotrollz/api/autoload.inc.php index 63e063a..b7500e5 100644 --- a/mojotrollz/api/autoload.inc.php +++ b/mojotrollz/api/autoload.inc.php @@ -9,4 +9,6 @@ SYSTEM\autoload::registerFolder(dirname(__FILE__).'/char/qq','DBD'); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/client',''); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest',''); -SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest/qq','DBD'); \ No newline at end of file +SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest/qq','DBD'); +SYSTEM\autoload::registerFolder(dirname(__FILE__).'/creature',''); +SYSTEM\autoload::registerFolder(dirname(__FILE__).'/creature/qq','DBD'); \ No newline at end of file diff --git a/mojotrollz/api/creature/creature.php b/mojotrollz/api/creature/creature.php new file mode 100644 index 0000000..6837ac5 --- /dev/null +++ b/mojotrollz/api/creature/creature.php @@ -0,0 +1,30 @@ +next()){ + $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'creature/tpl/creature_questrelation.tpl'), $rel); + } + return $result; + } +} diff --git a/mojotrollz/api/creature/qq/GET_BASE_DATA_CREATURE.php b/mojotrollz/api/creature/qq/GET_BASE_DATA_CREATURE.php new file mode 100644 index 0000000..1a61a1b --- /dev/null +++ b/mojotrollz/api/creature/qq/GET_BASE_DATA_CREATURE.php @@ -0,0 +1,13 @@ + + + +

+ ${Name}
+ ${SubName} +

+ + + + + + + + + + +

Vergibt Quest:

+ ${questrelation} + + + + diff --git a/mojotrollz/api/creature/tpl/creature_questrelation.tpl b/mojotrollz/api/creature/tpl/creature_questrelation.tpl new file mode 100644 index 0000000..6f87657 --- /dev/null +++ b/mojotrollz/api/creature/tpl/creature_questrelation.tpl @@ -0,0 +1 @@ +${Title}
\ No newline at end of file diff --git a/mojotrollz/page/user_achievements_content/tpl/creature_element.tpl b/mojotrollz/page/user_achievements_content/tpl/creature_element.tpl index c4e0335..ce3565a 100644 --- a/mojotrollz/page/user_achievements_content/tpl/creature_element.tpl +++ b/mojotrollz/page/user_achievements_content/tpl/creature_element.tpl @@ -2,6 +2,7 @@ ${Name}
Lvl: ${MaxLevel} + HP: ${MaxLevelHealth}
diff --git a/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js b/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js index 0ef8527..66194d3 100644 --- a/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js +++ b/mojotrollz/page/user_achievements_menu_sub/js/user_achievements_menu_sub.js @@ -2,15 +2,24 @@ function init_user_achievements_menu_sub(){ console.log('init'); $(".btn_achieve_menu").click(function(){ $('#achievement_list').load('./?page=user_achievements_content&menu=' + $(this).attr('menu') + '&filter=' + $(this).attr('filter')); - btn_info(); - + btn_creature_info(); + btn_quest_info(); + }); - function btn_info(){ - alert('info'); + function btn_quest_info(){ $(".btn_quest_info").click(function(){ alert('test'); $('#achievement_list').load('./api.php?call=quest&entry=' + $(this).attr('entry')); +// $('#achievement_list').load('./?page=user_achievements_content_quest&entry=' + $(this).attr('entry')); + }); + } + + function btn_creature_info(){ + alert('info'); + $(".btn_creature_info").click(function(){ + alert('test'); + $('#achievement_list').load('./api.php?call=creature&entry=' + $(this).attr('entry')); // $('#achievement_list').load('./?page=user_achievements_content_quest&entry=' + $(this).attr('entry')); }); } diff --git a/mojotrollz/page/user_start/user_start.php b/mojotrollz/page/user_start/user_start.php index 0c512b3..3c31458 100644 --- a/mojotrollz/page/user_start/user_start.php +++ b/mojotrollz/page/user_start/user_start.php @@ -52,7 +52,7 @@ class user_start extends SYSTEM\PAGE\Page { $vars['guildcount'] = \DBD\COUNT_GUILDS::Q1()['count']; $vars['realm_status'] = realm::status(); $vars['world_status'] = world::status(); - $vars['test'] = quest::test(248); + $vars['test'] = creature::data(1500); $vars['player_online'] = database::player_online(); $vars['factionbalance'] = $this->get_faction_balance(); $vars['role_balance'] =$this->get_role_balance();