diff --git a/mojotrollz/api/char/charcreation.php b/mojotrollz/api/char/charcreation.php index 2976353..994ce9f 100644 --- a/mojotrollz/api/char/charcreation.php +++ b/mojotrollz/api/char/charcreation.php @@ -5,7 +5,7 @@ class charcreation { const DEFAULT_CHAR_RACE = 'default'; const DEFAULT_CHAR_CLASS = 0; const MOJO_CC_SESSIONKEY = 'mojo_charcreation'; - const DEFAULT_CHAR_APPEARANCE = 0; + const DEFAULT_CHAR_APPEARANCE = 1; public static function data($json = NULL, $returnasjson = true){ if(!\SYSTEM\SECURITY\Security::load(self::MOJO_CC_SESSIONKEY)){ \SYSTEM\SECURITY\Security::save(self::MOJO_CC_SESSIONKEY, self::session_default());} @@ -41,7 +41,7 @@ class charcreation { case 'human': return in_array($class, array(player_classes::WARRIOR, player_classes::ROGUE, player_classes::PRIEST, player_classes::MAGE, player_classes::WARLOCK, player_classes::PALADIN)); case 'ork': return in_array($class, array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::SHAMAN, player_classes::ROGUE, player_classes::WARLOCK)); case 'dwarf': return in_array($class, array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::ROGUE, player_classes::PRIEST, player_classes::PALADIN)); - case 'undead': return in_array($class, array(player_classes::WARRIOR, player_classes::ROGUE, player_classes::PRIEST, player_classes::MAGE, player_classes::WARLOCK)); + case 'scorge': return in_array($class, array(player_classes::WARRIOR, player_classes::ROGUE, player_classes::PRIEST, player_classes::MAGE, player_classes::WARLOCK)); case 'nightelf': return in_array($class,array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::ROGUE, player_classes::PRIEST, player_classes::DRUID)); case 'tauren': return in_array($class, array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::SHAMAN, player_classes::DRUID)); case 'gnome': return in_array($class, array(player_classes::WARRIOR, player_classes::ROGUE, player_classes::MAGE, player_classes::WARLOCK)); diff --git a/mojotrollz/files/default_page/button.png b/mojotrollz/files/default_start/button.png similarity index 100% rename from mojotrollz/files/default_page/button.png rename to mojotrollz/files/default_start/button.png diff --git a/mojotrollz/files/default_page/help_gnome.png b/mojotrollz/files/default_start/help_gnome.png similarity index 100% rename from mojotrollz/files/default_page/help_gnome.png rename to mojotrollz/files/default_start/help_gnome.png diff --git a/mojotrollz/files/wowicons/dwarf_female.png b/mojotrollz/files/race/dwarf_female.png similarity index 100% rename from mojotrollz/files/wowicons/dwarf_female.png rename to mojotrollz/files/race/dwarf_female.png diff --git a/mojotrollz/files/wowicons/dwarf_male.png b/mojotrollz/files/race/dwarf_male.png similarity index 100% rename from mojotrollz/files/wowicons/dwarf_male.png rename to mojotrollz/files/race/dwarf_male.png diff --git a/mojotrollz/files/wowicons/gnome_female.png b/mojotrollz/files/race/gnome_female.png similarity index 100% rename from mojotrollz/files/wowicons/gnome_female.png rename to mojotrollz/files/race/gnome_female.png diff --git a/mojotrollz/files/wowicons/gnome_male.png b/mojotrollz/files/race/gnome_male.png similarity index 100% rename from mojotrollz/files/wowicons/gnome_male.png rename to mojotrollz/files/race/gnome_male.png diff --git a/mojotrollz/files/wowicons/human_female.png b/mojotrollz/files/race/human_female.png similarity index 100% rename from mojotrollz/files/wowicons/human_female.png rename to mojotrollz/files/race/human_female.png diff --git a/mojotrollz/files/wowicons/human_male.png b/mojotrollz/files/race/human_male.png similarity index 100% rename from mojotrollz/files/wowicons/human_male.png rename to mojotrollz/files/race/human_male.png diff --git a/mojotrollz/files/wowicons/nightelf_female.png b/mojotrollz/files/race/nightelf_female.png similarity index 100% rename from mojotrollz/files/wowicons/nightelf_female.png rename to mojotrollz/files/race/nightelf_female.png diff --git a/mojotrollz/files/wowicons/nightelf_male.png b/mojotrollz/files/race/nightelf_male.png similarity index 100% rename from mojotrollz/files/wowicons/nightelf_male.png rename to mojotrollz/files/race/nightelf_male.png diff --git a/mojotrollz/files/wowicons/ork_female.png b/mojotrollz/files/race/ork_female.png similarity index 100% rename from mojotrollz/files/wowicons/ork_female.png rename to mojotrollz/files/race/ork_female.png diff --git a/mojotrollz/files/wowicons/ork_male.png b/mojotrollz/files/race/ork_male.png similarity index 100% rename from mojotrollz/files/wowicons/ork_male.png rename to mojotrollz/files/race/ork_male.png diff --git a/mojotrollz/files/wowicons/undead_female.png b/mojotrollz/files/race/scourge_female.png similarity index 100% rename from mojotrollz/files/wowicons/undead_female.png rename to mojotrollz/files/race/scourge_female.png diff --git a/mojotrollz/files/wowicons/undead_male.png b/mojotrollz/files/race/scourge_male.png similarity index 100% rename from mojotrollz/files/wowicons/undead_male.png rename to mojotrollz/files/race/scourge_male.png diff --git a/mojotrollz/files/wowicons/tauren_female.png b/mojotrollz/files/race/tauren_female.png similarity index 100% rename from mojotrollz/files/wowicons/tauren_female.png rename to mojotrollz/files/race/tauren_female.png diff --git a/mojotrollz/files/wowicons/tauren_male.png b/mojotrollz/files/race/tauren_male.png similarity index 100% rename from mojotrollz/files/wowicons/tauren_male.png rename to mojotrollz/files/race/tauren_male.png diff --git a/mojotrollz/files/wowicons/troll_female.png b/mojotrollz/files/race/troll_female.png similarity index 100% rename from mojotrollz/files/wowicons/troll_female.png rename to mojotrollz/files/race/troll_female.png diff --git a/mojotrollz/files/wowicons/troll_male.png b/mojotrollz/files/race/troll_male.png similarity index 100% rename from mojotrollz/files/wowicons/troll_male.png rename to mojotrollz/files/race/troll_male.png diff --git a/mojotrollz/files/register_files.php b/mojotrollz/files/register_files.php index a4cb0e1..cb0322c 100644 --- a/mojotrollz/files/register_files.php +++ b/mojotrollz/files/register_files.php @@ -4,9 +4,14 @@ \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/buttons/','buttons','*.png'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/backgrounds/','backgrounds','*.png'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/wow_city_icons/','wow_city_icons','*.png'); -\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/default_page/','default_page','*.png'); + \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/','skilltree','*.*'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/tree/','skilltree_tree','*.*'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/skills/','skilltree_skills','*.*'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/skilltree/skills_grey/','skilltree_skills_grey','*.*'); -\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/class/','class','*.*'); \ No newline at end of file + +\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/class/','class','*.*'); +\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/race/','race','*.*'); + +\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/default_page/','default_page','*.png'); +\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/default_start/','default_start','*.png'); \ No newline at end of file diff --git a/mojotrollz/page/default_page/img/World-Of-Warcraft-Logo.png b/mojotrollz/files/wowicons/World-Of-Warcraft-Logo.png similarity index 100% rename from mojotrollz/page/default_page/img/World-Of-Warcraft-Logo.png rename to mojotrollz/files/wowicons/World-Of-Warcraft-Logo.png diff --git a/mojotrollz/page/default_page/img/World-Of-Warcraft-Logo.psd b/mojotrollz/files/wowicons/World-Of-Warcraft-Logo.psd similarity index 100% rename from mojotrollz/page/default_page/img/World-Of-Warcraft-Logo.psd rename to mojotrollz/files/wowicons/World-Of-Warcraft-Logo.psd diff --git a/mojotrollz/page/default_page/img/background1.png b/mojotrollz/files/wowicons/background1.png similarity index 100% rename from mojotrollz/page/default_page/img/background1.png rename to mojotrollz/files/wowicons/background1.png diff --git a/mojotrollz/page/default_page/img/background2.png b/mojotrollz/files/wowicons/background2.png similarity index 100% rename from mojotrollz/page/default_page/img/background2.png rename to mojotrollz/files/wowicons/background2.png diff --git a/mojotrollz/page/default_page/img/background3.png b/mojotrollz/files/wowicons/background3.png similarity index 100% rename from mojotrollz/page/default_page/img/background3.png rename to mojotrollz/files/wowicons/background3.png diff --git a/mojotrollz/page/default_page/img/border_bot.png b/mojotrollz/files/wowicons/border_bot.png similarity index 100% rename from mojotrollz/page/default_page/img/border_bot.png rename to mojotrollz/files/wowicons/border_bot.png diff --git a/mojotrollz/page/default_page/img/border_top.png b/mojotrollz/files/wowicons/border_top.png similarity index 100% rename from mojotrollz/page/default_page/img/border_top.png rename to mojotrollz/files/wowicons/border_top.png diff --git a/mojotrollz/page/default_page/img/button.jpg b/mojotrollz/files/wowicons/button.jpg similarity index 100% rename from mojotrollz/page/default_page/img/button.jpg rename to mojotrollz/files/wowicons/button.jpg diff --git a/mojotrollz/page/default_page/img/button.psd b/mojotrollz/files/wowicons/button.psd similarity index 100% rename from mojotrollz/page/default_page/img/button.psd rename to mojotrollz/files/wowicons/button.psd diff --git a/mojotrollz/page/default_page/img/eastern_kingdoms_map.png b/mojotrollz/files/wowicons/eastern_kingdoms_map.png similarity index 100% rename from mojotrollz/page/default_page/img/eastern_kingdoms_map.png rename to mojotrollz/files/wowicons/eastern_kingdoms_map.png diff --git a/mojotrollz/page/default_page/img/eastern_kingdoms_map.psd b/mojotrollz/files/wowicons/eastern_kingdoms_map.psd similarity index 100% rename from mojotrollz/page/default_page/img/eastern_kingdoms_map.psd rename to mojotrollz/files/wowicons/eastern_kingdoms_map.psd diff --git a/mojotrollz/page/default_page/img/eastern_kingdoms_map2.png b/mojotrollz/files/wowicons/eastern_kingdoms_map2.png similarity index 100% rename from mojotrollz/page/default_page/img/eastern_kingdoms_map2.png rename to mojotrollz/files/wowicons/eastern_kingdoms_map2.png diff --git a/mojotrollz/page/default_page/img/help_gnome.psd b/mojotrollz/files/wowicons/help_gnome.psd similarity index 100% rename from mojotrollz/page/default_page/img/help_gnome.psd rename to mojotrollz/files/wowicons/help_gnome.psd diff --git a/mojotrollz/page/default_page/img/kalimdor_map.png b/mojotrollz/files/wowicons/kalimdor_map.png similarity index 100% rename from mojotrollz/page/default_page/img/kalimdor_map.png rename to mojotrollz/files/wowicons/kalimdor_map.png diff --git a/mojotrollz/page/default_page/img/logo.xcf b/mojotrollz/files/wowicons/logo_1.xcf similarity index 100% rename from mojotrollz/page/default_page/img/logo.xcf rename to mojotrollz/files/wowicons/logo_1.xcf diff --git a/mojotrollz/page/default_page/img/maps.psd b/mojotrollz/files/wowicons/maps.psd similarity index 100% rename from mojotrollz/page/default_page/img/maps.psd rename to mojotrollz/files/wowicons/maps.psd diff --git a/mojotrollz/page/default_page/img/nav_test.png b/mojotrollz/files/wowicons/nav_test.png similarity index 100% rename from mojotrollz/page/default_page/img/nav_test.png rename to mojotrollz/files/wowicons/nav_test.png diff --git a/mojotrollz/page/default_page/img/navbar_background.png b/mojotrollz/files/wowicons/navbar_background.png similarity index 100% rename from mojotrollz/page/default_page/img/navbar_background.png rename to mojotrollz/files/wowicons/navbar_background.png diff --git a/mojotrollz/page/default_page/img/paper_huge.jpg b/mojotrollz/files/wowicons/paper_huge.jpg similarity index 100% rename from mojotrollz/page/default_page/img/paper_huge.jpg rename to mojotrollz/files/wowicons/paper_huge.jpg diff --git a/mojotrollz/page/default_page/img/register_button.png b/mojotrollz/files/wowicons/register_button.png similarity index 100% rename from mojotrollz/page/default_page/img/register_button.png rename to mojotrollz/files/wowicons/register_button.png diff --git a/mojotrollz/page/default_page/img/wall.jpg b/mojotrollz/files/wowicons/wall.jpg similarity index 100% rename from mojotrollz/page/default_page/img/wall.jpg rename to mojotrollz/files/wowicons/wall.jpg diff --git a/mojotrollz/page/default_page/img/x.png b/mojotrollz/files/wowicons/x.png similarity index 100% rename from mojotrollz/page/default_page/img/x.png rename to mojotrollz/files/wowicons/x.png diff --git a/mojotrollz/page/default_page/default_page.php b/mojotrollz/page/default_page/default_page.php index 88d177f..76e6913 100644 --- a/mojotrollz/page/default_page/default_page.php +++ b/mojotrollz/page/default_page/default_page.php @@ -11,26 +11,22 @@ class default_page extends SYSTEM\PAGE\Page { ''. ''. ''. - ''; - } + '';} private function css (){ return ''. - ''. - //''. - ''; - } + '';} public function html(){ $vars = array(); $vars['js'] = $this->js(); $vars['css'] = $this->css(); - $vars['PICPATH'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=default_page&id='; + $vars['PICPATH'] = \SYSTEM\FILES\files::getURL('default_page'); $vars['copyright'] = ''; $vars['inprint'] = ''; $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE), \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_SERVERINFO), \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_BASIC)); - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page.tpl'), $vars); + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars); } } \ No newline at end of file diff --git a/mojotrollz/page/default_page/default_page.tpl b/mojotrollz/page/default_page/tpl/default_page.tpl similarity index 100% rename from mojotrollz/page/default_page/default_page.tpl rename to mojotrollz/page/default_page/tpl/default_page.tpl diff --git a/mojotrollz/page/default_start/default_page_toolbar.tpl b/mojotrollz/page/default_start/default_page_toolbar.tpl deleted file mode 100644 index e69de29..0000000 diff --git a/mojotrollz/page/default_start/default_start.php b/mojotrollz/page/default_start/default_start.php index 85a14d5..ecbe2d3 100644 --- a/mojotrollz/page/default_start/default_start.php +++ b/mojotrollz/page/default_start/default_start.php @@ -1,26 +1,26 @@
-
-
-
+
+
+
-
+
${default_page_login}
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
${default_page_serverinfo}
-
+
-
-
-
+
+
+
-
${default_page_toolbar}
\ No newline at end of file +
\ No newline at end of file diff --git a/mojotrollz/page/wizard_details/js/wizard_details.js b/mojotrollz/page/wizard_details/js/wizard_details.js index f7a9c0e..df64245 100644 --- a/mojotrollz/page/wizard_details/js/wizard_details.js +++ b/mojotrollz/page/wizard_details/js/wizard_details.js @@ -2,12 +2,12 @@ function init_wizard_details_toolbar(){ wizard_toolbar();} function init_wizard_details (){ - //sys.load('wizard_details_toolbar'); - - $('#charname').keyup(function(event){ + /*$('#charname').keyup(function(event){ if(event.keyCode == 13){ sendInfo('{"char_name" : "'+$(this).val()+'"}','wizard_details');} - }); + });*/ + $('#btn_check_name').click(function(){ + sendInfo('{"char_name" : "'+$('#charname').val()+'"}','wizard_details');}) $('.info').mouseover(function(){ var info = $(this).attr('info'); $('#info_content').load('./?page=default_info&id='+info); @@ -43,8 +43,8 @@ function init_wizard_details (){ $('#details_race .ork').addClass('fadein');} if($(this).hasClass('dwarf')){ $('#details_race .dwarf').addClass('fadein');} - if($(this).hasClass('undead')){ - $('#details_race .undead').addClass('fadein');} + if($(this).hasClass('scorge')){ + $('#details_race .scorge').addClass('fadein');} if($(this).hasClass('nightelf')){ $('#details_race .nightelf').addClass('fadein');} if($(this).hasClass('tauren')){ @@ -63,7 +63,7 @@ function init_wizard_details (){ $('#content .male').click(function (){male();}); $('#content .female').click(function (){female ();}); - $('#details_race .human, #details_race .ork, #details_race .dwarf, #details_race .undead, #details_race .nightelf, #details_race .tauren, #details_race .gnome, #details_race .troll').click(function (){wowrace($(this).attr('race'));}); + $('#details_race .human, #details_race .ork, #details_race .dwarf, #details_race .scorge, #details_race .nightelf, #details_race .tauren, #details_race .gnome, #details_race .troll').click(function (){wowrace($(this).attr('race'));}); } function male (){ diff --git a/mojotrollz/page/wizard_details/details.tpl b/mojotrollz/page/wizard_details/tpl/details.tpl similarity index 71% rename from mojotrollz/page/wizard_details/details.tpl rename to mojotrollz/page/wizard_details/tpl/details.tpl index 9ddfc2e..98be5a1 100644 --- a/mojotrollz/page/wizard_details/details.tpl +++ b/mojotrollz/page/wizard_details/tpl/details.tpl @@ -1,28 +1,29 @@
-
+ +

- - - - + + + +
- - - - + + + +
- - - - + + + +
- - - - + + + +
diff --git a/mojotrollz/page/wizard_details/wizard_details.php b/mojotrollz/page/wizard_details/wizard_details.php index 836127c..fcf3906 100644 --- a/mojotrollz/page/wizard_details/wizard_details.php +++ b/mojotrollz/page/wizard_details/wizard_details.php @@ -7,11 +7,15 @@ class wizard_details extends SYSTEM\PAGE\Page { return array();} public function html(){ - $vars = json_decode(charcreation::data(),true)['result']; - $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id='; - $vars['WOW_CLASS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=class&id='; + $vars = charcreation::data(NULL, false); + + $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id='; + $vars['WOW_RACE'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=race&id='; + $vars['WOW_CLASS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=class&id='; + $vars['infotext_default'] = \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT)['default']; $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_details/details.tpl'), $vars); + + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_details/tpl/details.tpl'), $vars); } } \ No newline at end of file diff --git a/mojotrollz/page/wizard_skills/wizard_skills.tpl b/mojotrollz/page/wizard_skills/tpl/wizard_skills.tpl similarity index 100% rename from mojotrollz/page/wizard_skills/wizard_skills.tpl rename to mojotrollz/page/wizard_skills/tpl/wizard_skills.tpl diff --git a/mojotrollz/page/wizard_skills/wizard_skills.php b/mojotrollz/page/wizard_skills/wizard_skills.php index 992b40f..6ba6cb8 100644 --- a/mojotrollz/page/wizard_skills/wizard_skills.php +++ b/mojotrollz/page/wizard_skills/wizard_skills.php @@ -6,11 +6,11 @@ class wizard_skills extends SYSTEM\PAGE\Page { \SYSTEM\WEBPATH(new PPAGE(),'wizard_skills/js/wizard_skills.js'));} public static function css (){ - return array();} + return array( \SYSTEM\WEBPATH(new PAPI(),'char/css/skilltree.css'));} public function html(){ - $vars = json_decode(charcreation::data(),true)['result']; + $vars = charcreation::data(NULL,false); $vars['skilltree'] = skilltree::generate($vars['char_class']); - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_skills/wizard_skills.tpl'), $vars); + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_skills/tpl/wizard_skills.tpl'), $vars); } } \ No newline at end of file diff --git a/mojotrollz/page/wizard_toolbar/wizard_toolbar.tpl b/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl similarity index 96% rename from mojotrollz/page/wizard_toolbar/wizard_toolbar.tpl rename to mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl index 2d2f61c..4c9324a 100644 --- a/mojotrollz/page/wizard_toolbar/wizard_toolbar.tpl +++ b/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl @@ -1,6 +1,6 @@ ${char_name} - + diff --git a/mojotrollz/page/wizard_toolbar/wizard_toolbar.php b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php index 4d6683d..7b42672 100644 --- a/mojotrollz/page/wizard_toolbar/wizard_toolbar.php +++ b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php @@ -18,8 +18,9 @@ class wizard_toolbar extends SYSTEM\PAGE\Page { $vars['char_class'] = player_classes::name($vars['char_class']); $vars['last'] = $this->last; $vars['next'] = $this->next; - $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id='; - $vars['WOW_CLASS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=class&id='; - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_toolbar/wizard_toolbar.tpl'), $vars); + $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons'); + $vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race'); + $vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class'); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_toolbar/tpl/wizard_toolbar.tpl'), $vars); } } \ No newline at end of file diff --git a/mojotrollz/page/wizard_visuals/wizard_visuals.tpl b/mojotrollz/page/wizard_visuals/tpl/wizard_visuals.tpl similarity index 100% rename from mojotrollz/page/wizard_visuals/wizard_visuals.tpl rename to mojotrollz/page/wizard_visuals/tpl/wizard_visuals.tpl diff --git a/mojotrollz/page/wizard_visuals/wizard_visuals.php b/mojotrollz/page/wizard_visuals/wizard_visuals.php index cdc5054..73506ee 100644 --- a/mojotrollz/page/wizard_visuals/wizard_visuals.php +++ b/mojotrollz/page/wizard_visuals/wizard_visuals.php @@ -10,11 +10,9 @@ class wizard_visuals extends SYSTEM\PAGE\Page { public function html(){ $vars = json_decode(charcreation::data(),true)['result']; - if($vars['char_race'] == 'undead'){ - $vars['char_race'] = 'scourge';} $vars['char_equip'] = '';//'1,110744,3,109807,16,111412,5,111190,9,111188,10,126342,6,110003,7,120793,8,115217,21,125312,14,110641';// $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id='; $vars['infotext_default'] = \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT)['default']; - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_visuals/wizard_visuals.tpl'), $vars); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_visuals/tpl/wizard_visuals.tpl'), $vars); } } \ No newline at end of file diff --git a/system b/system index f4352cc..8d25945 160000 --- a/system +++ b/system @@ -1 +1 @@ -Subproject commit f4352cced5fd3e75c40df43e33ce5f06e9bf27da +Subproject commit 8d259452fa874c185a2593b4660fe1a74292c2ba