diff --git a/mojotrollz/api/char/charcreation.php b/mojotrollz/api/char/charcreation.php index ca5206c..994ce9f 100644 --- a/mojotrollz/api/char/charcreation.php +++ b/mojotrollz/api/char/charcreation.php @@ -5,8 +5,8 @@ class charcreation { const DEFAULT_CHAR_RACE = 'default'; const DEFAULT_CHAR_CLASS = 0; const MOJO_CC_SESSIONKEY = 'mojo_charcreation'; - const DEFAULT_CHAR_APPEARANCE = 0; - public static function data($json = NULL){ + 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());} //write @@ -17,7 +17,7 @@ class charcreation { call_user_func('charcreation_validator::'.$key,$value);} } } - return JsonResult::toString(\SYSTEM\SECURITY\Security::load(self::MOJO_CC_SESSIONKEY)); + return $returnasjson ? JsonResult::toString(\SYSTEM\SECURITY\Security::load(self::MOJO_CC_SESSIONKEY)) : \SYSTEM\SECURITY\Security::load(self::MOJO_CC_SESSIONKEY); } private static function 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/api/char/css/skilltree.css b/mojotrollz/api/char/css/skilltree.css index 7a5461d..094ddd4 100644 --- a/mojotrollz/api/char/css/skilltree.css +++ b/mojotrollz/api/char/css/skilltree.css @@ -92,18 +92,25 @@ .icon_arrow_yellow_down_right{background-position: -195px 0px;} .icon_border_grey{background-position: 0px 0px;} -.icon_border_grey_inc_left{background-position: 0px -402px;} .icon_border_grey_inc{background-position: 0px -268px;} +.icon_border_grey_inc_left{background-position: 0px -402px;} .icon_border_grey_down{background-position: 0px -201px;} .icon_border_grey_down_right{background-position: 0px -469px;} +.icon_border_grey_right{background-position: 0px -134px;} .icon_border_green{background-position: -65px 0px;} +.icon_border_green_inc{background-position: -65px -268px;} +.icon_border_green_inc_left{background-position: -65px -402px;} +.icon_border_green_down{background-position: -65px -201px;} +.icon_border_green_down_right{background-position: -65px -469px;} .icon_border_green_right{background-position: -65px -134px;} .icon_border_yellow{background-position: -260px 0px;} .icon_border_yellow_inc{background-position: -260px -268px;} +.icon_border_yellow_inc_left{background-position: -260px -402px;} .icon_border_yellow_down{background-position: -260px -201px;} .icon_border_yellow_down_right{background-position: -260px -469px;} +.icon_border_yellow_right{background-position: -260px -134px;} .icon_number{ position: relative; diff --git a/mojotrollz/api/char/js/skilltree.js b/mojotrollz/api/char/js/skilltree.js index 7908d15..7a9821a 100644 --- a/mojotrollz/api/char/js/skilltree.js +++ b/mojotrollz/api/char/js/skilltree.js @@ -4,6 +4,7 @@ var points_spent_t2 = 0; var points_spent_t3 = 0; function skilltree(){ + console.log("-MojoWoW: load skilltree") $('.icon').mousedown(function(event) { event.preventDefault(); var id = '#'+this.id; @@ -11,104 +12,308 @@ function skilltree(){ var id_img = '#'+this.id +'i'; switch (event.which) { case 1: - if(!is_point_max() && !is_icon_max(id_count)){ - write_icon_cur(id_count,id_img,1);} + if(is_icon_skillable(id) && !is_point_max() && !is_icon_max(id_count)){ + write_icon(id,id_count,id_img,1);} break; case 2: //alert('Middle Mouse button pressed.'); break; case 3: - if(!is_icon_min(id_count)){ - write_icon_cur(id_count,id_img,-1);} + if(is_icon_deskillable(id) && !is_icon_min(id_count)){ + write_icon(id,id_count,id_img,-1);} break; default: //alert('You have a strange Mouse!'); } }); + $('.reset').click(function(){ + write_reset(parseInt($(this).attr('t'))); + }); +} +function write_reset(tree){ + switch(tree){ + case 1: + points_spent_t1 = 0; + break; + case 2: + points_spent_t2 = 0; + break; + case 3: + points_spent_t3 = 0; + break; + } + write_points_spent(tree,0); + $('#tree'+tree+' .icon').each(function(){ + var id = '#'+this.id; + var id_count = '#'+this.id +'c'; + var id_img = '#'+this.id +'i'; + + if(parseInt($(id).attr('r')) == 1){ + write_icon_green(id,id_count,id_img); + write_icon_cur_null(id_count); + write_icon_cur(id_count,0); + }else{ + write_icon_grey(id,id_count,id_img); + write_icon_cur_null(id_count); + } + }); +} +function is_icon_skillable(id){ + tree = parseInt($(id).attr('t')); + row = parseInt($(id).attr('r')); + column = parseInt($(id).attr('r')); + count = 0; + + $('#tree'+tree+' .icon').each(function(){ + if($(this).attr('r') < row){ + count += parseInt($('#'+this.id+'c').attr('cur'));} + }); + + if(count < 5*(row-1)){ + return false;} + + if( $('#'+this.id+'i').hasClass('icon_border_grey_inc_left') || + $('#'+this.id+'i').hasClass('icon_border_green_inc_left') || + $('#'+this.id+'i').hasClass('icon_border_yellow_inc_left')){ + alert("abc"); + } + + if( $('#'+this.id+'i').hasClass('icon_border_grey_inc') || + $('#'+this.id+'i').hasClass('icon_border_green_inc') || + $('#'+this.id+'i').hasClass('icon_border_yellow_inc')){ + alert("abc2"); + } + + return true; + +} +function is_icon_deskillable(id){ + tree = parseInt($(id).attr('t')); + row = parseInt($(id).attr('r')); + count = 0; + $('#tree'+tree+' .icon').each(function(){ + if($(this).attr('r') > row){ + count += parseInt($('#'+this.id+'c').attr('cur'));} + }); + if(count > 0){ + return false;} + return true; } - function is_point_max(){ return points_max <= points_spent_t1 + points_spent_t2 +points_spent_t3;} function is_icon_max(id){ return $(id).attr('max') <= $(id).attr('cur');} function is_icon_min(id){ return 0 >= $(id).attr('cur');} -function write_icon_cur(id,id_img,amount){ - current = $(id).attr('cur'); - current = parseInt(current)+amount; - $(id).attr('cur',current); - $(id).html(current+'/'+$(id).attr('max')); - if(is_icon_max(id)){ - write_icon_yellow(id,id_img); - } else { - write_icon_green(id,id_img); +function write_points_spent(tree,amount){ + switch(tree){ + case 1: + points_spent_t1 += amount; + break; + case 2: + points_spent_t2 += amount; + break; + case 3: + points_spent_t3 += amount; + break; } -} -function write_icon_green(id,id_img){ - $(id).removeClass('icon_text_yellow'); - $(id).addClass('icon_text_green'); - if( $(id).hasClass('icon_border_grey') || - $(id).hasClass('icon_border_yellow')){ + $('#treeheader1 .stdText').html(' - '+points_spent_t1+' Points'); + $('#treeheader2 .stdText').html(' - '+points_spent_t2+' Points'); + $('#treeheader3 .stdText').html(' - '+points_spent_t3+' Points'); +} +function write_icon_cur(id_count,amount){ + var current = parseInt($(id_count).attr('cur'))+amount; + $(id_count).attr('cur',current); + $(id_count).html(current+'/'+$(id_count).attr('max')); +} +function write_icon_cur_null(id_count){ + $(id_count).attr('cur',0); + $(id_count).html(''); +} +function write_icon(id,id_count,id_img,amount){ + write_icon_cur(id_count,amount); + write_points_spent(tree,amount); + if(is_icon_max(id_count)){ + write_icon_yellow(id,id_count,id_img); + } else { + write_icon_green(id,id_count,id_img);} + + tree = parseInt($(id).attr('t')); + row = parseInt($(id).attr('r')); + + count = 0; + $('#tree'+tree+' .icon').each(function(){ + count += parseInt($('#'+this.id+'c').attr('cur')); + if((parseInt($('#'+this.id).attr('r'))-1)*5 <= count){ + if(!$('#'+this.id+'i').hasClass('talent_arrow')){ + current = parseInt($('#'+this.id+'c').attr('cur')); + $('#'+this.id+'c').html(current+'/'+$('#'+this.id+'c').attr('max')); + } + if(is_icon_max('#'+this.id+'c')){ + write_icon_yellow('#'+this.id,'#'+this.id+'c','#'+this.id+'i'); + } else { + write_icon_green('#'+this.id,'#'+this.id+'c','#'+this.id+'i'); + } + } else { + $('#'+this.id+'c').html(''); + write_icon_grey('#'+this.id,'#'+this.id+'c','#'+this.id+'i'); + } + }); +} +function write_icon_green(id,id_count,id_img){ + if($(id_img).hasClass('icon_empty')){ + return;} + + $(id_count).removeClass('icon_text_yellow'); + $(id_count).addClass('icon_text_green'); + + if($(id).attr('icon')){ + $(id).attr('style','background: url(./api.php?call=files&cat=skilltree_skills&id='+$(id).attr('icon')+') 50% 50% no-repeat;');} + + if( $(id_img).hasClass('icon_border_grey') || + $(id_img).hasClass('icon_border_yellow')){ $(id_img).removeClass('icon_border_grey'); $(id_img).removeClass('icon_border_yellow'); $(id_img).addClass('icon_border_green');} - if( $(id).hasClass('icon_border_grey_down') || - $(id).hasClass('icon_border_yellow_down')){ + if( $(id_img).hasClass('icon_border_grey_down') || + $(id_img).hasClass('icon_border_yellow_down')){ $(id_img).removeClass('icon_border_grey_down'); $(id_img).removeClass('icon_border_yellow_down'); $(id_img).addClass('icon_border_green_down');} - if( $(id).hasClass('icon_border_grey_down_right') || - $(id).hasClass('icon_border_yellow_down_right')){ + if( $(id_img).hasClass('icon_border_grey_down_right') || + $(id_img).hasClass('icon_border_yellow_down_right')){ $(id_img).removeClass('icon_border_grey_down_right'); $(id_img).removeClass('icon_border_yellow_down_right'); $(id_img).addClass('icon_border_green_down_right');} - if( $(id).hasClass('icon_border_grey_inc') || - $(id).hasClass('icon_border_yellow_inc')){ + if( $(id_img).hasClass('icon_border_grey_right') || + $(id_img).hasClass('icon_border_yellow_right')){ + $(id_img).removeClass('icon_border_grey_right'); + $(id_img).removeClass('icon_border_yellow_right'); + $(id_img).addClass('icon_border_green_right');} + + if( $(id_img).hasClass('icon_border_grey_inc') || + $(id_img).hasClass('icon_border_yellow_inc')){ $(id_img).removeClass('icon_border_grey_inc'); $(id_img).removeClass('icon_border_yellow_inc'); $(id_img).addClass('icon_border_green_inc');} - if( $(id).hasClass('icon_border_grey_inc_left') || - $(id).hasClass('icon_border_yellow_inc_left')){ + if( $(id_img).hasClass('icon_border_grey_inc_left') || + $(id_img).hasClass('icon_border_yellow_inc_left')){ $(id_img).removeClass('icon_border_grey_inc_left'); $(id_img).removeClass('icon_border_yellow_inc_left'); $(id_img).addClass('icon_border_green_inc_left');} -} -function write_icon_yellow(id,id_img){ - $(id).removeClass('icon_text_green'); - $(id).addClass('icon_text_yellow'); - if( $(id).hasClass('icon_border_grey') || - $(id).hasClass('icon_border_green')){ + if( $(id_img).hasClass('icon_border_grey_left') || + $(id_img).hasClass('icon_border_yellow_left')){ + $(id_img).removeClass('icon_border_grey_left'); + $(id_img).removeClass('icon_border_yellow_left'); + $(id_img).addClass('icon_border_green_left');} +} +function write_icon_yellow(id,id_count,id_img){ + if($(id_img).hasClass('icon_empty')){ + return;} + + $(id_count).removeClass('icon_text_green'); + $(id_count).addClass('icon_text_yellow'); + + if($(id).attr('icon')){ + $(id).attr('style','background: url(./api.php?call=files&cat=skilltree_skills&id='+$(id).attr('icon')+') 50% 50% no-repeat;');} + + if( $(id_img).hasClass('icon_border_grey') || + $(id_img).hasClass('icon_border_green')){ $(id_img).removeClass('icon_border_grey'); $(id_img).removeClass('icon_border_green'); $(id_img).addClass('icon_border_yellow');} - if( $(id).hasClass('icon_border_grey_down') || - $(id).hasClass('icon_border_green_down')){ + if( $(id_img).hasClass('icon_border_grey_down') || + $(id_img).hasClass('icon_border_green_down')){ $(id_img).removeClass('icon_border_grey_down'); $(id_img).removeClass('icon_border_green_down'); $(id_img).addClass('icon_border_yellow_down');} - if( $(id).hasClass('icon_border_grey_down_right') || - $(id).hasClass('icon_border_green_down_right')){ + if( $(id_img).hasClass('icon_border_grey_down_right') || + $(id_img).hasClass('icon_border_green_down_right')){ $(id_img).removeClass('icon_border_grey_down_right'); $(id_img).removeClass('icon_border_green_down_right'); $(id_img).addClass('icon_border_yellow_down_right');} - if( $(id).hasClass('icon_border_grey_inc') || - $(id).hasClass('icon_border_green_inc')){ + if( $(id_img).hasClass('icon_border_grey_right') || + $(id_img).hasClass('icon_border_green_right')){ + $(id_img).removeClass('icon_border_grey_right'); + $(id_img).removeClass('icon_border_green_right'); + $(id_img).addClass('icon_border_yellow_right');} + + if( $(id_img).hasClass('icon_border_grey_inc') || + $(id_img).hasClass('icon_border_green_inc')){ $(id_img).removeClass('icon_border_grey_inc'); $(id_img).removeClass('icon_border_green_inc'); $(id_img).addClass('icon_border_yellow_inc');} - if( $(id).hasClass('icon_border_grey_inc_left') || - $(id).hasClass('icon_border_green_inc_left')){ + if( $(id_img).hasClass('icon_border_grey_inc_left') || + $(id_img).hasClass('icon_border_green_inc_left')){ $(id_img).removeClass('icon_border_grey_inc_left'); $(id_img).removeClass('icon_border_green_inc_left'); $(id_img).addClass('icon_border_yellow_inc_left');} + + if( $(id_img).hasClass('icon_border_grey_left') || + $(id_img).hasClass('icon_border_green_left')){ + $(id_img).removeClass('icon_border_grey_left'); + $(id_img).removeClass('icon_border_green_left'); + $(id_img).addClass('icon_border_yellow_left');} +} +function write_icon_grey(id,id_count,id_img){ + if($(id_img).hasClass('icon_empty')){ + return;} + + $(id_count).removeClass('icon_text_green'); + $(id_count).removeClass('icon_text_yellow'); + + if($(id).attr('icon')){ + $(id).attr('style','background: url(./api.php?call=files&cat=skilltree_skills_grey&id='+$(id).attr('icon')+') 50% 50% no-repeat;');} + + if( $(id_img).hasClass('icon_border_yellow') || + $(id_img).hasClass('icon_border_green')){ + $(id_img).removeClass('icon_border_yellow'); + $(id_img).removeClass('icon_border_green'); + $(id_img).addClass('icon_border_grey');} + + if( $(id_img).hasClass('icon_border_yellow_down') || + $(id_img).hasClass('icon_border_green_down')){ + $(id_img).removeClass('icon_border_yellow_down'); + $(id_img).removeClass('icon_border_green_down'); + $(id_img).addClass('icon_border_grey_down');} + + if( $(id_img).hasClass('icon_border_yellow_down_right') || + $(id_img).hasClass('icon_border_green_down_right')){ + $(id_img).removeClass('icon_border_yellow_down_right'); + $(id_img).removeClass('icon_border_green_down_right'); + $(id_img).addClass('icon_border_grey_down_right');} + + if( $(id_img).hasClass('icon_border_yellow_right') || + $(id_img).hasClass('icon_border_green_right')){ + $(id_img).removeClass('icon_border_yellow_right'); + $(id_img).removeClass('icon_border_green_right'); + $(id_img).addClass('icon_border_grey_right');} + + if( $(id_img).hasClass('icon_border_yellow_inc') || + $(id_img).hasClass('icon_border_green_inc')){ + $(id_img).removeClass('icon_border_yellow_inc'); + $(id_img).removeClass('icon_border_green_inc'); + $(id_img).addClass('icon_border_grey_inc');} + + if( $(id_img).hasClass('icon_border_yellow_inc_left') || + $(id_img).hasClass('icon_border_green_inc_left')){ + $(id_img).removeClass('icon_border_yellow_inc_left'); + $(id_img).removeClass('icon_border_green_inc_left'); + $(id_img).addClass('icon_border_grey_inc_left');} + + if( $(id_img).hasClass('icon_border_yellow_left') || + $(id_img).hasClass('icon_border_green_left')){ + $(id_img).removeClass('icon_border_yellow_left'); + $(id_img).removeClass('icon_border_green_left'); + $(id_img).addClass('icon_border_grey_left');} } \ No newline at end of file diff --git a/mojotrollz/api/char/skilltree.php b/mojotrollz/api/char/skilltree.php index 54896cb..19c16ab 100644 --- a/mojotrollz/api/char/skilltree.php +++ b/mojotrollz/api/char/skilltree.php @@ -1,6 +1,8 @@ ';} + $vars[$tree] .= '
';} if( count($res) > $count && $res[$count]['tree'] == $t && @@ -38,7 +40,11 @@ class skilltree{ 'border' => $res[$count]['border'], 'text_color' => $text_color, 'max_text' => $max_text, - 'max' => $res[$count]['max'])); + 'max' => $res[$count]['max'], + 'tree' => $t, + 'row' => $r, + 'column' => $c, + 'icon' => $res[$count]['icon'])); $count++; } else { @@ -46,11 +52,15 @@ class skilltree{ $vars[$tree] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'char/tpl/skilltree_icon.tpl'), array( 'id' => $id, 'style' => 'visibility:hidden;', - 'type' => 'talent_icon', + 'type' => 'talent_icon icon_empty', 'border' => '', 'text_color' => '', 'max_text' => '', - 'max' => 0)); + 'max' => 0, + 'tree' => $t, + 'row' => $r, + 'column' => $c, + 'icon' => '')); } if($c == 4){ diff --git a/mojotrollz/api/char/tpl/skilltree.tpl b/mojotrollz/api/char/tpl/skilltree.tpl index 9187d4b..c5527f6 100644 --- a/mojotrollz/api/char/tpl/skilltree.tpl +++ b/mojotrollz/api/char/tpl/skilltree.tpl @@ -7,7 +7,7 @@ - 0 points
- Reset this tree + Reset this tree
@@ -16,7 +16,7 @@ - 0 points
- Reset this tree + Reset this tree
@@ -25,7 +25,7 @@ - 0 points
- Reset this tree + Reset this tree diff --git a/mojotrollz/api/char/tpl/skilltree_icon.tpl b/mojotrollz/api/char/tpl/skilltree_icon.tpl index 18255f8..b52eac4 100644 --- a/mojotrollz/api/char/tpl/skilltree_icon.tpl +++ b/mojotrollz/api/char/tpl/skilltree_icon.tpl @@ -1,4 +1,4 @@ -
+
${max_text}
\ No newline at end of file diff --git a/mojotrollz/api/database/player_classes.php b/mojotrollz/api/database/player_classes.php index 3437d37..232c3b3 100644 --- a/mojotrollz/api/database/player_classes.php +++ b/mojotrollz/api/database/player_classes.php @@ -51,4 +51,21 @@ class player_classes { return 'class not valid'; } } + + public static function is($class){ + switch($class){ + case self::WARRIOR: + case self::PALADIN: + case self::HUNTER: + case self::ROGUE: + case self::PRIEST: + case self::SHAMAN: + case self::MAGE: + case self::WARLOCK: + case self::DRUID: + return true; + default: + return false; + } + } } \ No newline at end of file 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/files/skilltree/skilltree_icons.gif b/mojotrollz/files/skilltree/skilltree_icons.gif index d78dffe..62edf1a 100644 Binary files a/mojotrollz/files/skilltree/skilltree_icons.gif and b/mojotrollz/files/skilltree/skilltree_icons.gif differ 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 b878bb0..76e6913 100644 --- a/mojotrollz/page/default_page/default_page.php +++ b/mojotrollz/page/default_page/default_page.php @@ -10,34 +10,23 @@ 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/js/onlinegraphic.js b/mojotrollz/page/default_page/js/onlinegraphic.js deleted file mode 100644 index 40e8d02..0000000 --- a/mojotrollz/page/default_page/js/onlinegraphic.js +++ /dev/null @@ -1,25 +0,0 @@ -var visual_id = null; -function load_visualisation(id){ - visual_id = id; - sys.call('call=stats',handle_visualisation_result,{},'json',true); -} - -function handle_visualisation_result(json){ - if(!json || json.status !== true || !json.result){ - return;} - json = json.result; - var data = new google.visualization.DataTable(); - first = true; - $.each(json[0], function(key, value){ - if(first){ - data.addColumn('datetime',key); - first = false; - } else { - data.addColumn('number',key); - } - }); - $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? 0 : parseFloat(v)];}}));}); - - var options = {title: visual_id, backgroundColor: 'darkslategrey', aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:20,top:40}, interpolateNulls: false, height: "200"}; - new google.visualization.LineChart(document.getElementById(visual_id)).draw(data, options); -} \ No newline at end of file diff --git a/mojotrollz/page/default_page/js/wizard.js b/mojotrollz/page/default_page/js/wizard.js index f551be5..9836c07 100644 --- a/mojotrollz/page/default_page/js/wizard.js +++ b/mojotrollz/page/default_page/js/wizard.js @@ -1,37 +1,8 @@ -var sys = null; - $(document).ready(function() { - sys = new SYSTEM('./api.php',1); - sys.go_state('start'); - //sys.load(); + new SYSTEM('./api.php',1,'start'); }); function sendInfo(json,toolbar){ - sys.call('call=charcreation&json='+json, - function(){sys.load(toolbar)}, + system.call('call=charcreation&json='+json, + function(){system.load(toolbar)}, {},'json',false);} - -function init_start(){ - register_login(); - load_visualisation('mojopulse'); - $('#start a').click(function() { - sys.load('wizard_details');}); -} - -function register_login(){ - $("#login_form input").not("[type=submit]").jqBootstrapValidation({ - preventSubmit: true, - submitError: function($form, event, errors) {}, - submitSuccess: function($form, event){ - $.get('./api.php?call=account&action=login&username='+$('#bt_login_user').val()+'&password_sha='+$.sha1($('#bt_login_password').val())+'&password_md5='+$.md5($('#bt_login_password').val()), function (data) { - if(data == 1){ - $('.help-block').html("Login successfull.
"); - window.location.reload(); - } else { - $('.help-block').html("Login not successfull.
User & Password combination wrong.") - } - }); - event.preventDefault(); - } - }); -} 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 e586ef9..ecbe2d3 100644 --- a/mojotrollz/page/default_start/default_start.php +++ b/mojotrollz/page/default_start/default_start.php @@ -1,24 +1,26 @@ "); + window.location.reload(); + } else { + $('.help-block').html("Login not successfull.
User & Password combination wrong.") + } + }); + event.preventDefault(); + } + }); +} +function load_visualisation(id){ + system.call('call=stats',function handle_visualisation_result(json){ + if(!json || json.status !== true || !json.result){ + return;} + json = json.result; + var data = new google.visualization.DataTable(); + first = true; + $.each(json[0], function(key, value){ + if(first){ + data.addColumn('datetime',key); + first = false; + } else { + data.addColumn('number',key); + } + }); + $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? 0 : parseFloat(v)];}}));}); + + var options = {title: id, backgroundColor: 'darkslategrey', aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:20,top:40}, interpolateNulls: false, height: "200"}; + new google.visualization.LineChart(document.getElementById(id)).draw(data, options); + }, + {},'json',true); +} \ No newline at end of file diff --git a/mojotrollz/page/default_start/default_page_login.tpl b/mojotrollz/page/default_start/tpl/default_page_login.tpl similarity index 100% rename from mojotrollz/page/default_start/default_page_login.tpl rename to mojotrollz/page/default_start/tpl/default_page_login.tpl diff --git a/mojotrollz/page/default_start/default_page_serverinfo.tpl b/mojotrollz/page/default_start/tpl/default_page_serverinfo.tpl similarity index 100% rename from mojotrollz/page/default_start/default_page_serverinfo.tpl rename to mojotrollz/page/default_start/tpl/default_page_serverinfo.tpl diff --git a/mojotrollz/page/default_start/default_page_welcome.tpl b/mojotrollz/page/default_start/tpl/default_page_welcome.tpl similarity index 100% rename from mojotrollz/page/default_start/default_page_welcome.tpl rename to mojotrollz/page/default_start/tpl/default_page_welcome.tpl diff --git a/mojotrollz/page/default_start/default_start.tpl b/mojotrollz/page/default_start/tpl/default_start.tpl similarity index 68% rename from mojotrollz/page/default_start/default_start.tpl rename to mojotrollz/page/default_start/tpl/default_start.tpl index fe9bb86..767ad66 100644 --- a/mojotrollz/page/default_start/default_start.tpl +++ b/mojotrollz/page/default_start/tpl/default_start.tpl @@ -2,40 +2,40 @@
-
-
-
+
+
+
-
+
${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/user_default/js/user_default.js b/mojotrollz/page/user_default/js/user_default.js index 4bdf2fd..8c59f17 100644 --- a/mojotrollz/page/user_default/js/user_default.js +++ b/mojotrollz/page/user_default/js/user_default.js @@ -1,28 +1,4 @@ var sys = null; - $(document).ready(function() { - sys = new SYSTEM('./api.php',2); - sys.go_state('user_start'); - //sys.load(); -}); - -function init_user_start(){} - -function init_user_menu(){ - register_logout(); - $("#btn_news").click(function(){ - sys.load('user_news'); - }); - $("#btn_db").click(function(){ - sys.load('user_database'); - }); -} - -function register_logout(){ - $("#btn_logout").click(function(){ - $.get('./api.php?call=account&action=logout', function (data) { - if(data == 1){ - window.location.reload();} - }); - }); -} \ No newline at end of file + sys = new SYSTEM('./api.php',2,'user_start'); +}); \ No newline at end of file diff --git a/mojotrollz/page/user_default/user_default.php b/mojotrollz/page/user_default/user_default.php index 393708c..cfcce61 100644 --- a/mojotrollz/page/user_default/user_default.php +++ b/mojotrollz/page/user_default/user_default.php @@ -10,7 +10,7 @@ class user_default extends SYSTEM\PAGE\Page { ''. ''. ''. - ''. + ''. ''; } diff --git a/mojotrollz/page/user_menu/js/user_menu.js b/mojotrollz/page/user_menu/js/user_menu.js new file mode 100644 index 0000000..c5e9d5a --- /dev/null +++ b/mojotrollz/page/user_menu/js/user_menu.js @@ -0,0 +1,17 @@ +function init_user_menu(){ + register_logout(); + $("#btn_news").click(function(){ + sys.load('user_news'); + }); + $("#btn_db").click(function(){ + sys.load('user_database'); + }); +} +function register_logout(){ + $("#btn_logout").click(function(){ + $.get('./api.php?call=account&action=logout', function (data) { + if(data == 1){ + window.location.reload();} + }); + }); +} \ No newline at end of file diff --git a/mojotrollz/page/user_menu/user_menu.php b/mojotrollz/page/user_menu/user_menu.php index 126612b..a39875b 100644 --- a/mojotrollz/page/user_menu/user_menu.php +++ b/mojotrollz/page/user_menu/user_menu.php @@ -1,6 +1,12 @@ -
+ +

- - - - + + + +
- - - - + + + +
- - - - + + + +
- - - - + + + +
diff --git a/mojotrollz/page/wizard_details/wizard_details.php b/mojotrollz/page/wizard_details/wizard_details.php index 30e6493..fcf3906 100644 --- a/mojotrollz/page/wizard_details/wizard_details.php +++ b/mojotrollz/page/wizard_details/wizard_details.php @@ -1,21 +1,21 @@ js(); - $vars['css'] = $this->css(); - $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 dbb69f3..6ba6cb8 100644 --- a/mojotrollz/page/wizard_skills/wizard_skills.php +++ b/mojotrollz/page/wizard_skills/wizard_skills.php @@ -1,17 +1,16 @@ ${char_name} - + diff --git a/mojotrollz/page/wizard_toolbar/wizard_toolbar.php b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php index c42fb71..7b42672 100644 --- a/mojotrollz/page/wizard_toolbar/wizard_toolbar.php +++ b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php @@ -5,15 +5,22 @@ class wizard_toolbar extends SYSTEM\PAGE\Page { public $next = null; public function __construct($last,$next) { $this->last = $last; - $this->next = $next; - } + $this->next = $next;} + + public static function js(){ + return array( \SYSTEM\WEBPATH(new PPAGE(),'wizard_toolbar/js/wizard_toolbar.js'));} + + public static function css (){ + return array();} + public function html(){ - $vars = json_decode(charcreation::data(),true)['result']; + $vars = charcreation::data(NULL,false); $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 56ca53f..73506ee 100644 --- a/mojotrollz/page/wizard_visuals/wizard_visuals.php +++ b/mojotrollz/page/wizard_visuals/wizard_visuals.php @@ -2,23 +2,17 @@ class wizard_visuals extends SYSTEM\PAGE\Page { - private function js(){ - return ''; - } - - private function css (){ - return ''; - } + public static function js(){ + return array( \SYSTEM\WEBPATH(new PPAGE(),'wizard_visuals/js/wizard_visuals.js'));} + + public static function css (){ + return array();} 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['js'] = $this->js(); - $vars['css'] = $this->css(); $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