diff --git a/mojotrollz/api/char/js/skilltree.js b/mojotrollz/api/char/js/skilltree.js index 7a9821a..75852da 100644 --- a/mojotrollz/api/char/js/skilltree.js +++ b/mojotrollz/api/char/js/skilltree.js @@ -62,8 +62,13 @@ function is_icon_skillable(id){ tree = parseInt($(id).attr('t')); row = parseInt($(id).attr('r')); column = parseInt($(id).attr('r')); + parent_row = parseInt($(id).attr('parent_row')); + parent_column = parseInt($(id).attr('parent_column')); count = 0; + if(parent_row && parent_column && parent_row != 0 && parent_column != 0 && !is_icon_max('#t'+tree+'r'+parent_row+'c'+parent_column+'c')){ + return false;} + $('#tree'+tree+' .icon').each(function(){ if($(this).attr('r') < row){ count += parseInt($('#'+this.id+'c').attr('cur'));} @@ -152,7 +157,18 @@ function write_icon(id,id_count,id_img,amount){ } if(is_icon_max('#'+this.id+'c')){ write_icon_yellow('#'+this.id,'#'+this.id+'c','#'+this.id+'i'); + } else if(is_icon_skillable('#'+this.id)){ + 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'); + } + } else if(is_icon_skillable('#'+this.id)){ + 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 if(is_icon_skillable('#'+this.id)){ write_icon_green('#'+this.id,'#'+this.id+'c','#'+this.id+'i'); } } else { @@ -169,7 +185,9 @@ function write_icon_green(id,id_count,id_img){ $(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).attr('style') !== 'background: url(./api.php?call=files&cat=skilltree_skills&id='+$(id).attr('icon')+') 50% 50% no-repeat;'){ + $(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')){ @@ -181,19 +199,35 @@ function write_icon_green(id,id_count,id_img){ $(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');} + $(id_img).addClass('icon_border_green_down'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r'))+1; + var column = parseInt($(id).attr('c')); + write_arrow_grey('#t'+tree+'r'+row+'c'+column+'i'); + } 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');} + $(id_img).addClass('icon_border_green_down_right'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r')); + var column = parseInt($(id).attr('c')); + write_arrow_grey('#t'+tree+'r'+(row+1)+'c'+column+'i'); + write_arrow_grey('#t'+tree+'r'+row+'c'+(column+1)+'i'); + } 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');} + $(id_img).addClass('icon_border_green_right'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r')); + var column = parseInt($(id).attr('c'))+1; + write_arrow_grey('#t'+tree+'r'+row+'c'+column+'i'); + } if( $(id_img).hasClass('icon_border_grey_inc') || $(id_img).hasClass('icon_border_yellow_inc')){ @@ -211,7 +245,52 @@ function write_icon_green(id,id_count,id_img){ $(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');} + $(id_img).addClass('icon_border_green_left'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r')); + var column = parseInt($(id).attr('c'))-1; + write_arrow_grey('#t'+tree+'r'+row+'c'+column+'i'); + } +} +function write_arrow_yellow(id){ + if($(id).hasClass('talent_arrow')){ + if($(id).hasClass('icon_arrow_grey_down')){ + $(id).removeClass('icon_arrow_grey_down'); + $(id).addClass('icon_arrow_yellow_down'); + } + if($(id).hasClass('icon_arrow_grey_down_right')){ + $(id).removeClass('icon_arrow_grey_down_right'); + $(id).addClass('icon_arrow_yellow_down_right'); + } + if($(id).hasClass('icon_arrow_grey_right')){ + $(id).removeClass('icon_arrow_grey_right'); + $(id).addClass('icon_arrow_yellow_right'); + } + if($(id).hasClass('icon_arrow_grey_left')){ + $(id).removeClass('icon_arrow_grey_left'); + $(id).addClass('icon_arrow_yellow_left'); + } + } +} +function write_arrow_grey(id){ + if($(id).hasClass('talent_arrow')){ + if($(id).hasClass('icon_arrow_yellow_down')){ + $(id).removeClass('icon_arrow_yellow_down'); + $(id).addClass('icon_arrow_grey_down'); + } + if($(id).hasClass('icon_arrow_yellow_down_right')){ + $(id).removeClass('icon_arrow_yellow_down_right'); + $(id).addClass('icon_arrow_grey_down_right'); + } + if($(id).hasClass('icon_arrow_yellow_right')){ + $(id).removeClass('icon_arrow_yellow_right'); + $(id).addClass('icon_arrow_grey_right'); + } + if($(id).hasClass('icon_arrow_yellow_left')){ + $(id).removeClass('icon_arrow_yellow_left'); + $(id).addClass('icon_arrow_grey_left'); + } + } } function write_icon_yellow(id,id_count,id_img){ if($(id_img).hasClass('icon_empty')){ @@ -221,7 +300,9 @@ function write_icon_yellow(id,id_count,id_img){ $(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).attr('style') !== 'background: url(./api.php?call=files&cat=skilltree_skills&id='+$(id).attr('icon')+') 50% 50% no-repeat;'){ + $(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')){ @@ -233,19 +314,35 @@ function write_icon_yellow(id,id_count,id_img){ $(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');} + $(id_img).addClass('icon_border_yellow_down'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r'))+1; + var column = parseInt($(id).attr('c')); + write_arrow_yellow('#t'+tree+'r'+row+'c'+column+'i'); + } 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');} + $(id_img).addClass('icon_border_yellow_down_right'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r')); + var column = parseInt($(id).attr('c')); + write_arrow_yellow('#t'+tree+'r'+(row+1)+'c'+column+'i'); + write_arrow_yellow('#t'+tree+'r'+row+'c'+(column+1)+'i'); + } 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');} + $(id_img).addClass('icon_border_yellow_right'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r')); + var column = parseInt($(id).attr('c'))+1; + write_arrow_yellow('#t'+tree+'r'+row+'c'+column+'i'); + } if( $(id_img).hasClass('icon_border_grey_inc') || $(id_img).hasClass('icon_border_green_inc')){ @@ -263,7 +360,12 @@ function write_icon_yellow(id,id_count,id_img){ $(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');} + $(id_img).addClass('icon_border_yellow_left'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r')); + var column = parseInt($(id).attr('c'))-1; + write_arrow_yellow('#t'+tree+'r'+row+'c'+column+'i'); + } } function write_icon_grey(id,id_count,id_img){ if($(id_img).hasClass('icon_empty')){ @@ -273,7 +375,9 @@ function write_icon_grey(id,id_count,id_img){ $(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).attr('style') !== 'background: url(./api.php?call=files&cat=skilltree_skills_grey&id='+$(id).attr('icon')+') 50% 50% no-repeat;'){ + $(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')){ @@ -285,19 +389,35 @@ function write_icon_grey(id,id_count,id_img){ $(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');} + $(id_img).addClass('icon_border_grey_down'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r'))+1; + var column = parseInt($(id).attr('c')); + write_arrow_grey('#t'+tree+'r'+row+'c'+column+'i'); + } 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');} + $(id_img).addClass('icon_border_grey_down_right'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r')); + var column = parseInt($(id).attr('c')); + write_arrow_yellow('#t'+tree+'r'+(row+1)+'c'+column+'i'); + write_arrow_yellow('#t'+tree+'r'+row+'c'+(column+1)+'i'); + } 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');} + $(id_img).addClass('icon_border_grey_right'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r')); + var column = parseInt($(id).attr('c'))+1; + write_arrow_grey('#t'+tree+'r'+row+'c'+column+'i'); + } if( $(id_img).hasClass('icon_border_yellow_inc') || $(id_img).hasClass('icon_border_green_inc')){ @@ -315,5 +435,10 @@ function write_icon_grey(id,id_count,id_img){ $(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');} + $(id_img).addClass('icon_border_grey_left'); + var tree = parseInt($(id).attr('t')); + var row = parseInt($(id).attr('r')); + var column = parseInt($(id).attr('c'))-1; + write_arrow_grey('#t'+tree+'r'+row+'c'+column+'i'); + } } \ No newline at end of file diff --git a/mojotrollz/api/char/skilltree.php b/mojotrollz/api/char/skilltree.php index 19c16ab..c3c5257 100644 --- a/mojotrollz/api/char/skilltree.php +++ b/mojotrollz/api/char/skilltree.php @@ -44,7 +44,9 @@ class skilltree{ 'tree' => $t, 'row' => $r, 'column' => $c, - 'icon' => $res[$count]['icon'])); + 'icon' => $res[$count]['icon'], + 'parent_row' => $res[$count]['parent_row'], + 'parent_column' => $res[$count]['parent_column'])); $count++; } else { @@ -60,7 +62,9 @@ class skilltree{ 'tree' => $t, 'row' => $r, 'column' => $c, - 'icon' => '')); + 'icon' => '', + 'parent_row' => 0, + 'parent_column' => 0)); } if($c == 4){ diff --git a/mojotrollz/api/char/tpl/skilltree_icon.tpl b/mojotrollz/api/char/tpl/skilltree_icon.tpl index b52eac4..379994d 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/files/auctions.jpg b/mojotrollz/files/auctions.jpg new file mode 100644 index 0000000..f0b06af Binary files /dev/null and b/mojotrollz/files/auctions.jpg differ diff --git a/mojotrollz/files/cards.jpg b/mojotrollz/files/cards.jpg new file mode 100644 index 0000000..664cab3 Binary files /dev/null and b/mojotrollz/files/cards.jpg differ diff --git a/mojotrollz/files/dorn (2).jpg b/mojotrollz/files/dorn (2).jpg new file mode 100644 index 0000000..e30b86f Binary files /dev/null and b/mojotrollz/files/dorn (2).jpg differ diff --git a/mojotrollz/files/dorn.jpg b/mojotrollz/files/dorn.jpg new file mode 100644 index 0000000..eb262d3 Binary files /dev/null and b/mojotrollz/files/dorn.jpg differ diff --git a/mojotrollz/files/gemz.jpg b/mojotrollz/files/gemz.jpg new file mode 100644 index 0000000..af7247c Binary files /dev/null and b/mojotrollz/files/gemz.jpg differ diff --git a/mojotrollz/files/hunter_marksman.jpg b/mojotrollz/files/hunter_marksman.jpg new file mode 100644 index 0000000..4fdefdb Binary files /dev/null and b/mojotrollz/files/hunter_marksman.jpg differ diff --git a/mojotrollz/files/matsa.jpg b/mojotrollz/files/matsa.jpg new file mode 100644 index 0000000..e4a90f0 Binary files /dev/null and b/mojotrollz/files/matsa.jpg differ diff --git a/mojotrollz/files/mcmats.jpg b/mojotrollz/files/mcmats.jpg new file mode 100644 index 0000000..fc3f48f Binary files /dev/null and b/mojotrollz/files/mcmats.jpg differ diff --git a/mojotrollz/files/priest_holy.jpg b/mojotrollz/files/priest_holy.jpg new file mode 100644 index 0000000..8c63448 Binary files /dev/null and b/mojotrollz/files/priest_holy.jpg differ diff --git a/mojotrollz/files/priest_holy2.jpg b/mojotrollz/files/priest_holy2.jpg new file mode 100644 index 0000000..4106795 Binary files /dev/null and b/mojotrollz/files/priest_holy2.jpg differ diff --git a/mojotrollz/files/wowicons/default_default.png b/mojotrollz/files/race/default_default.png similarity index 100% rename from mojotrollz/files/wowicons/default_default.png rename to mojotrollz/files/race/default_default.png diff --git a/mojotrollz/files/wowicons/default_female.png b/mojotrollz/files/race/default_female.png similarity index 100% rename from mojotrollz/files/wowicons/default_female.png rename to mojotrollz/files/race/default_female.png diff --git a/mojotrollz/files/wowicons/default_male.png b/mojotrollz/files/race/default_male.png similarity index 100% rename from mojotrollz/files/wowicons/default_male.png rename to mojotrollz/files/race/default_male.png diff --git a/mojotrollz/files/rouge_combat.jpg b/mojotrollz/files/rouge_combat.jpg new file mode 100644 index 0000000..abf1b8d Binary files /dev/null and b/mojotrollz/files/rouge_combat.jpg differ diff --git a/mojotrollz/files/shards.jpg b/mojotrollz/files/shards.jpg new file mode 100644 index 0000000..abd4e01 Binary files /dev/null and b/mojotrollz/files/shards.jpg differ diff --git a/mojotrollz/files/warlock_affli_destro.jpg b/mojotrollz/files/warlock_affli_destro.jpg new file mode 100644 index 0000000..92ce9fe Binary files /dev/null and b/mojotrollz/files/warlock_affli_destro.jpg differ diff --git a/mojotrollz/files/warlock_affli_destro2.jpg b/mojotrollz/files/warlock_affli_destro2.jpg new file mode 100644 index 0000000..08878be Binary files /dev/null and b/mojotrollz/files/warlock_affli_destro2.jpg differ diff --git a/mojotrollz/files/warrior_tank.jpg b/mojotrollz/files/warrior_tank.jpg new file mode 100644 index 0000000..68bd9eb Binary files /dev/null and b/mojotrollz/files/warrior_tank.jpg differ