diff --git a/mojotrollz/api/char/css/inventory.css b/mojotrollz/api/char/css/inventory.css new file mode 100644 index 0000000..e69de29 diff --git a/mojotrollz/api/char/css/skilltree.css b/mojotrollz/api/char/css/skilltree.css index 094ddd4..bcbce23 100644 --- a/mojotrollz/api/char/css/skilltree.css +++ b/mojotrollz/api/char/css/skilltree.css @@ -91,26 +91,38 @@ .icon_arrow_yellow_down{background-position: -130px 0px;} .icon_arrow_yellow_down_right{background-position: -195px 0px;} -.icon_border_grey{background-position: 0px 0px;} -.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_grey {background-position: 0px 0px;} +.icon_border_grey_left {background-position: 0px -67px;} +.icon_border_grey_right {background-position: 0px -134px;} +.icon_border_grey_down {background-position: 0px -201px;} +.icon_border_grey_inc {background-position: 0px -268px;} +.icon_border_grey_inc_right {background-position: 0px -335px;} +.icon_border_grey_inc_left {background-position: 0px -402px;} +.icon_border_grey_down_right {background-position: 0px -469px;} +.icon_border_grey_inc_top_down {background-position: 0px -536px;} +.icon_border_grey_inc_top_right {background-position: 0px -603px;} -.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_green {background-position: -65px 0px;} +.icon_border_green_left {background-position: -65px -67px;} +.icon_border_green_right {background-position: -65px -134px;} +.icon_border_green_down {background-position: -65px -201px;} +.icon_border_green_inc {background-position: -65px -268px;} +.icon_border_green_inc_right {background-position: -65px -335px;} +.icon_border_green_inc_left {background-position: -65px -402px;} +.icon_border_green_down_right {background-position: -65px -469px;} +.icon_border_green_inc_top_down {background-position: -65px -536px;} +.icon_border_green_inc_top_right{background-position: -65px -603px;} -.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_border_yellow {background-position: -260px 0px;} +.icon_border_grey_left {background-position: -260px -67px;} +.icon_border_yellow_right {background-position: -260px -134px;} +.icon_border_yellow_down {background-position: -260px -201px;} +.icon_border_yellow_inc {background-position: -260px -268px;} +.icon_border_yellow_inc_right {background-position: -260px -335px;} +.icon_border_yellow_inc_left {background-position: -260px -402px;} +.icon_border_yellow_down_right {background-position: -260px -469px;} +.icon_border_yellow_inc_top_down{background-position: -260px -536px;} +.icon_border_yellow_inc_top_right{background-position: -260px -603px;} .icon_number{ position: relative; diff --git a/mojotrollz/api/char/inventory.php b/mojotrollz/api/char/inventory.php new file mode 100644 index 0000000..f5feeb9 --- /dev/null +++ b/mojotrollz/api/char/inventory.php @@ -0,0 +1,15 @@ +'; + for($i = 1; $i <= $x; $i++){ + $vars['items'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'char/tpl/inventory_item.tpl'), array()); + } + $vars['items'] .= ''; + } + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'char/tpl/inventory.tpl'), $vars); + } +} \ No newline at end of file diff --git a/mojotrollz/api/char/js/skilltree.js b/mojotrollz/api/char/js/skilltree.js index 2479ea8..98a4fb5 100644 --- a/mojotrollz/api/char/js/skilltree.js +++ b/mojotrollz/api/char/js/skilltree.js @@ -14,15 +14,11 @@ function skilltree(){ if(is_icon_skillable(id) && !is_point_max() && !is_icon_max(id_count)){ write_icon(id,id_count,id_img,1,true);} break; - case 2: - //alert('Middle Mouse button pressed.'); - break; case 3: if(is_icon_deskillable(id) && !is_icon_min(id_count)){ write_icon(id,id_count,id_img,-1,true);} break; default: - //alert('You have a strange Mouse!'); } }); $('.reset').click(function(){ @@ -322,6 +318,18 @@ function write_icon_green(id,id_count,id_img){ 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_top_down') || + $(id_img).hasClass('icon_border_yellow_inc_top_down')){ + $(id_img).removeClass('icon_border_grey_inc_top_down'); + $(id_img).removeClass('icon_border_yellow_inc_top_down'); + $(id_img).addClass('icon_border_green_inc_top_down'); + 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+2)+'c'+column+'i'); + } } function write_arrow_yellow(id){ if($(id).hasClass('talent_arrow')){ @@ -438,6 +446,18 @@ function write_icon_yellow(id,id_count,id_img){ 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_top_down') || + $(id_img).hasClass('icon_border_green_inc_top_down')){ + $(id_img).removeClass('icon_border_grey_inc_top_down'); + $(id_img).removeClass('icon_border_green_inc_top_down'); + $(id_img).addClass('icon_border_yellow_inc_top_down'); + 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+2)+'c'+column+'i'); + } } function write_icon_grey(id,id_count,id_img){ if($(id_img).hasClass('icon_empty')){ @@ -514,4 +534,16 @@ function write_icon_grey(id,id_count,id_img){ 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_top_down') || + $(id_img).hasClass('icon_border_green_inc_top_down')){ + $(id_img).removeClass('icon_border_yellow_inc_top_down'); + $(id_img).removeClass('icon_border_green_inc_top_down'); + $(id_img).addClass('icon_border_grey_inc_top_down'); + 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+2)+'c'+column+'i'); + } } \ No newline at end of file diff --git a/mojotrollz/api/char/skilltree.php b/mojotrollz/api/char/skilltree.php index ea0477e..5174cbb 100644 --- a/mojotrollz/api/char/skilltree.php +++ b/mojotrollz/api/char/skilltree.php @@ -1,6 +1,6 @@ + ${items} + \ No newline at end of file diff --git a/mojotrollz/api/char/tpl/inventory_item.tpl b/mojotrollz/api/char/tpl/inventory_item.tpl new file mode 100644 index 0000000..bac1b03 --- /dev/null +++ b/mojotrollz/api/char/tpl/inventory_item.tpl @@ -0,0 +1,4 @@ +
+ +
${count}
+
\ No newline at end of file diff --git a/mojotrollz/files/skilltree/skilltree_icons.gif b/mojotrollz/files/skilltree/skilltree_icons.gif index 62edf1a..a3813b1 100644 Binary files a/mojotrollz/files/skilltree/skilltree_icons.gif and b/mojotrollz/files/skilltree/skilltree_icons.gif differ diff --git a/mojotrollz/page/wizard_visuals/tpl/wizard_visuals.tpl b/mojotrollz/page/wizard_visuals/tpl/wizard_visuals.tpl index 206e1e4..feedd42 100644 --- a/mojotrollz/page/wizard_visuals/tpl/wizard_visuals.tpl +++ b/mojotrollz/page/wizard_visuals/tpl/wizard_visuals.tpl @@ -1,22 +1,5 @@ ${equipment} -
- - - - - - - - - - - - - - - - -
+${inventory}
${visual_skin} diff --git a/mojotrollz/page/wizard_visuals/wizard_visuals.php b/mojotrollz/page/wizard_visuals/wizard_visuals.php index aaadcd7..1116c97 100644 --- a/mojotrollz/page/wizard_visuals/wizard_visuals.php +++ b/mojotrollz/page/wizard_visuals/wizard_visuals.php @@ -26,6 +26,7 @@ class wizard_visuals extends SYSTEM\PAGE\Page { $vars['char_equip'], $vars['char_skin_color'], $vars['char_hair'], $vars['char_hair_color'], $vars['char_face'], $vars['char_facial_hair'], $vars['char_facial_hair_color']); + $vars['inventory'] = inventory::generate(5, 9); $vars['INV_PICS'] = \SYSTEM\FILES\files::getURL('inventory'); $vars['visual_skin'] = self::select($vars['char_race'], race_visuals::VISUAL_SKIN, $vars['char_skin_color']); $vars['visual_hair'] = self::select($vars['char_race'], race_visuals::VISUAL_HAIR, $vars['char_hair']); diff --git a/mojotrollz/sai/saimod_mojotrollz_skilltree/js/saimod_mojotrollz_skilltree.js b/mojotrollz/sai/saimod_mojotrollz_skilltree/js/saimod_mojotrollz_skilltree.js index b637ffb..81a6154 100644 --- a/mojotrollz/sai/saimod_mojotrollz_skilltree/js/saimod_mojotrollz_skilltree.js +++ b/mojotrollz/sai/saimod_mojotrollz_skilltree/js/saimod_mojotrollz_skilltree.js @@ -11,6 +11,10 @@ function init_saimod_mojotrollz_skilltree() { function load_skilltree_tab(tree){ $('img#loader').show(); $('#tab_skilltree').load(SAI_ENDPOINT+'sai_mod=saimod_mojotrollz_skilltree&action=tree&tree='+tree, function(){ + $('#tabs_skilltree_icons a').click(function(e) { + e.preventDefault(); + $(this).tab('show'); + }); register_icon_add(); register_icon_edit(); register_icon_delete(); @@ -20,20 +24,21 @@ function load_skilltree_tab(tree){ } function register_icon_add(){ - $('#btn_icon_add').click(function(){ + $('.btn_icon_add').click(function(){ _class = $(this).attr('_class'); + _tree = $(this).attr('_tree'); $.ajax({ type :'GET', url : SAI_ENDPOINT+'sai_mod=saimod_mojotrollz_skilltree&action=icon_insert'+ '&class='+_class+ - '&tree='+$('#input_tree').val()+ - '&row='+$('#input_row').val()+ - '&column='+$('#input_column').val()+ - '&type='+$('#input_type').val()+ - '&border='+$('#input_border').val()+ - '&icon='+$('#input_icon').val()+ - '&max='+$('#input_max').val()+ - '&parent_row='+$('#input_parent_row').val()+ - '&parent_column='+$('#input_parent_column').val(), + '&tree='+_tree+ + '&row='+$('#input_row_'+_tree).val()+ + '&column='+$('#input_column_'+_tree).val()+ + '&type='+$('#input_type_'+_tree).val()+ + '&border='+$('#input_border_'+_tree).val()+ + '&icon='+$('#input_icon_'+_tree).val()+ + '&max='+$('#input_max_'+_tree).val()+ + '&parent_row='+$('#input_parent_row_'+_tree).val()+ + '&parent_column='+$('#input_parent_column_'+_tree).val(), success : function(data) { if(data.status){ load_skilltree_tab(_class); @@ -46,15 +51,16 @@ function register_icon_add(){ function register_icon_edit(){ $('.btn_icon_edit').click(function(){ - $('#input_tree').val($(this).attr('tree')); - $('#input_row').val($(this).attr('row')); - $('#input_column').val($(this).attr('column')); - $('#input_type').val($(this).attr('_type')); - $('#input_border').val($(this).attr('border')); - $('#input_icon').val($(this).attr('icon')); - $('#input_max').val($(this).attr('max')); - $('#input_parent_row').val($(this).attr('parent_row')); - $('#input_parent_column').val($(this).attr('parent_column')); + var tree = $(this).attr('tree'); + $('#input_tree_'+tree).val(tree); + $('#input_row_'+tree).val($(this).attr('row')); + $('#input_column_'+tree).val($(this).attr('column')); + $('#input_type_'+tree).val($(this).attr('_type')); + $('#input_border_'+tree).val($(this).attr('border')); + $('#input_icon_'+tree).val($(this).attr('icon')); + $('#input_max_'+tree).val($(this).attr('max')); + $('#input_parent_row_'+tree).val($(this).attr('parent_row')); + $('#input_parent_column_'+tree).val($(this).attr('parent_column')); $("#btn_icon_add").focus(); @@ -63,20 +69,22 @@ function register_icon_edit(){ function register_icon_delete(){ $('.btn_icon_del').click(function(){ - _class = $(this).attr('_class'); - $.ajax({ type :'GET', - url : SAI_ENDPOINT+'sai_mod=saimod_mojotrollz_skilltree&action=icon_delete'+ - '&class='+_class+ - '&tree='+$(this).attr('tree')+ - '&row='+$(this).attr('row')+ - '&column='+$(this).attr('column'), - success : function(data) { - if(data.status){ - load_skilltree_tab(_class); - }else{ - alert('Problem: '+data);} - } - }); + if (confirm('Are you sure you want to delete?')) { + _class = $(this).attr('_class'); + $.ajax({ type :'GET', + url : SAI_ENDPOINT+'sai_mod=saimod_mojotrollz_skilltree&action=icon_delete'+ + '&class='+_class+ + '&tree='+$(this).attr('tree')+ + '&row='+$(this).attr('row')+ + '&column='+$(this).attr('column'), + success : function(data) { + if(data.status){ + load_skilltree_tab(_class); + }else{ + alert('Problem: '+data);} + } + }); + } }); } diff --git a/mojotrollz/sai/saimod_mojotrollz_skilltree/saimod_mojotrollz_skilltree.php b/mojotrollz/sai/saimod_mojotrollz_skilltree/saimod_mojotrollz_skilltree.php index 78a94bb..5cdea2f 100644 --- a/mojotrollz/sai/saimod_mojotrollz_skilltree/saimod_mojotrollz_skilltree.php +++ b/mojotrollz/sai/saimod_mojotrollz_skilltree/saimod_mojotrollz_skilltree.php @@ -12,10 +12,14 @@ class saimod_mojotrollz_skilltree extends \SYSTEM\SAI\SaiModule { if($tree_data == array()){ $tree_data['class'] = $tree;} $vars['tree_entry'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_tree_entry.tpl'), $tree_data); - $vars['icon_entry'] = ''; + $vars = array_merge($vars,$tree_data); + $vars['icon_entry_1'] = $vars['icon_entry_2'] = $vars['icon_entry_3'] = ''; $res = \DBD\TALENT_TREE_ICON::QQ(array($tree)); while($row = $res->next()){ - $vars['icon_entry'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_entry.tpl'), $row);} + $vars['icon_entry_'.$row['tree']] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_entry.tpl'), $row);} + $vars['tree1'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_tree.tpl'), array_merge($vars,array('tree' => 1, 'icon_entry' => $vars['icon_entry_1']))); + $vars['tree2'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_tree.tpl'), array_merge($vars,array('tree' => 2, 'icon_entry' => $vars['icon_entry_2']))); + $vars['tree3'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_tree.tpl'), array_merge($vars,array('tree' => 3, 'icon_entry' => $vars['icon_entry_3']))); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_page.tpl'), $vars);} public static function sai_mod_saimod_mojotrollz_skilltree_action_tree_edit($class,$t1n,$t1i,$t2n,$t2i,$t3n,$t3i){ if(!\DBD\SKILLTREE_TREE_EDIT::QI(array($class,$t1n,$t1i,$t2n,$t2i,$t3n,$t3i))){ diff --git a/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree.tpl b/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree.tpl index beaac7d..adae8d2 100644 --- a/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree.tpl +++ b/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree.tpl @@ -14,6 +14,6 @@
-
+
\ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_tree.tpl b/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_tree.tpl new file mode 100644 index 0000000..3b75b7b --- /dev/null +++ b/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_tree.tpl @@ -0,0 +1,29 @@ +
+ + + + + + + + + + + + + + ${icon_entry} + + + + + + + + + + + + + +
classtreerowcolumntypebordericonmaxparent_rowparent_columnaction
${class}${tree}
\ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_page.tpl b/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_page.tpl index 87d201b..6d4c0a8 100644 --- a/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_page.tpl +++ b/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_page.tpl @@ -15,32 +15,15 @@ ${skilltree} ${tree_entry}
- - - - - - - - - - - - - - - ${icon_entry} - - - - - - - - - - - - - -
classtreerowcolumntypebordericonmaxparent_rowparent_columnaction
${class}
\ No newline at end of file +
+ +
+
${tree1}
+
${tree2}
+
${tree3}
+
+
\ No newline at end of file diff --git a/system b/system index b3bf40d..c83b5a0 160000 --- a/system +++ b/system @@ -1 +1 @@ -Subproject commit b3bf40d17d3c707d7af17943b1f6ff147c0e71a6 +Subproject commit c83b5a03f95e08e6c38fea2c80715defdaab3262