Merge branch 'master' of mojotrollz.eu:wow-server/mojo_zero_web

Conflicts:
	mojotrollz/page/user_start/user_start.php

mojotrollz/api/char/charcreation.php

@@ -3,7 +3,7 @@ class charcreation {
     const DEFAULT_CHAR_NAME = 'Charactername';
     const DEFAULT_CHAR_GENDER = 'default';
     const DEFAULT_CHAR_RACE = 'default';
-    const DEFAULT_CHAR_CLASS = 'default';
+    const DEFAULT_CHAR_CLASS = 0;
     const MOJO_CC_SESSIONKEY = 'mojo_charcreation';
     const DEFAULT_CHAR_APPEARANCE = 0;
     public static function data($json = NULL){
@@ -38,14 +38,14 @@ class charcreation {
     
     public static function checkClassRace($class,$race){
         switch($race){
-            case 'human': return in_array($class, array('warrior', 'rogue', 'priest', 'mage', 'warlock', 'paladin'));
-            case 'ork': return in_array($class, array('warrior', 'hunter', 'shaman', 'rogue', 'warlock'));
-            case 'dwarf': return in_array($class, array('warrior', 'hunter', 'rogue', 'priest', 'paladin'));
-            case 'undead': return in_array($class, array('warrior', 'rogue', 'priest', 'mage', 'warlock')); 
-            case 'nightelf': return in_array($class, array('warrior', 'hunter', 'rogue', 'priest', 'druid'));
-            case 'tauren': return in_array($class, array('warrior', 'hunter', 'shaman', 'druid'));
-            case 'gnome': return in_array($class, array('warrior', 'rogue', 'mage', 'warlock'));
-            case 'troll': return in_array($class, array('warrior', 'hunter', 'shaman', 'rogue', 'priest', 'mage'));
+            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 '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));
+            case 'troll': return in_array($class,   array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::SHAMAN, player_classes::ROGUE,  player_classes::PRIEST,  player_classes::MAGE));
             default: return false;
         }
     }

mojotrollz/api/char/css/skilltree.css

@@ -1,13 +1,13 @@
-body{
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 12px;
-	background-color: #000000;
-	color: #FFFFFF;
-	margin: 0px;
-	padding: 0px;
+.skilltree {
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    font-size: 12px;
+    background-color: #000000;
+    color: #FFFFFF;
+    margin: 0px;
+    padding: 0px;
 }
 
-input
+.skilltree input
 {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
 	font-size: 10px;
@@ -19,7 +19,7 @@ input
 	border-TOP: #6F6D67 1px solid;
 }
 
-.stdText
+.skilltree stdText
 {
 	font-family:Verdana, Helvetica, Arial, sans-serif;
 	color:#FFFFFF;
@@ -27,7 +27,7 @@ input
 	font-weight:normal;
 }
 
-a:link
+.skilltree a:link
 {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
 	font-size: 10px;
@@ -36,7 +36,7 @@ a:link
 	text-decoration: none;
 }
 
-a:active
+.skilltree a:active
 {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
 	font-size: 10px;
@@ -45,7 +45,7 @@ a:active
 	text-decoration: none;
 }
 
-a:hover
+.skilltree a:hover
 {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
 	font-size: 10px;
@@ -54,7 +54,7 @@ a:hover
 	text-decoration: underline;
 }
 
-a:visited
+.skilltree a:visited
 {
 	font-family: Verdana, Helvetica, Arial, sans-serif;
 	font-size: 10px;
@@ -86,16 +86,16 @@ a:visited
 .icon_text_green{color: rgb(46, 255, 0);}
 .icon_text_yellow{color: rgb(255, 209, 0);}
 
-.icon_arrow_gray_down{background-position: 0px 0px;}
-.icon_arrow_gray_down_right{background-position: -65px 0px;}
+.icon_arrow_grey_down{background-position: 0px 0px;}
+.icon_arrow_grey_down_right{background-position: -65px 0px;}
 .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_gray_inc_left{background-position: 0px -402px;}
-.icon_border_gray_inc{background-position: 0px -268px;}
-.icon_border_gray_down{background-position: 0px -201px;}
-.icon_border_gray_down_right{background-position: 0px -469px;}
+.icon_border_grey_inc_left{background-position: 0px -402px;}
+.icon_border_grey_inc{background-position: 0px -268px;}
+.icon_border_grey_down{background-position: 0px -201px;}
+.icon_border_grey_down_right{background-position: 0px -469px;}
 
 .icon_border_green{background-position: -65px 0px;}
 .icon_border_green_right{background-position: -65px -134px;}
@@ -145,7 +145,7 @@ a:visited
 .talentheader {width: 300px; border-bottom:0px solid #002B55;background-image: url(http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=skilltree&id=tableheader.png);}
 .talentheader div{padding-right:20px;background-repeat:no-repeat;background-position:bottom right;height:41px;width:209px;float:left;}
 .talentheader strong{font-weight:bold;display:block;padding-left:18px;padding-top:14px;vertical-align:bottom;}
-.talentheader img {margin-top:11px; cursor:pointer; background-image:url(http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=skilltree&id=resetbutton.png);}
+.talentheader img {height: 20px; width: 59px; margin-top:11px; cursor:pointer; background:url(http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=skilltree&id=resetbutton.png) no-repeat;}
 
 .outerbg{border:0px solid #002B55;background-color:#002B55; padding-left: 12px;}
 .talent_icon{

mojotrollz/api/char/js/skilltree.js

@@ -0,0 +1,114 @@
+var points_max = 51;
+var points_spent_t1 = 0;
+var points_spent_t2 = 0;
+var points_spent_t3 = 0;
+
+function skilltree(){
+    $('.icon').mousedown(function(event) {
+        event.preventDefault();
+        var id = '#'+this.id;
+        var id_count = '#'+this.id +'c';
+        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);}
+                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);}
+                break;
+            default:
+                //alert('You have a strange Mouse!');
+        }
+    });
+}
+
+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_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')){
+        $(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')){
+        $(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')){
+        $(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')){
+        $(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')){
+        $(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')){
+        $(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')){
+        $(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')){
+        $(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')){
+        $(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')){
+        $(id_img).removeClass('icon_border_grey_inc_left');
+        $(id_img).removeClass('icon_border_green_inc_left');
+        $(id_img).addClass('icon_border_yellow_inc_left');}
+}

mojotrollz/api/char/skilltree.php

@@ -1,5 +1,5 @@
 <?php
-class skilltree{
+class skilltree{    
     public static function generate($class){
         $vars = \DBD\TALENT_TREE::Q1(array($class));
         $res = \DBD\TALENT_TREE_ICON::QA(array($class));
@@ -19,9 +19,17 @@ class skilltree{
                         $res[$count]['row'] == $r &&
                         $res[$count]['column'] == $c){
                         
-                        $style = $res[$count]['icon'] ? 'background: url('.$res[$count]['icon'].') 50% 50% no-repeat;' : 'visibility:visible;';
-                        $max = $r == 1 ? (($res[$count]['parent_row']) ? '' : '0/'.$res[$count]['max']) : '';
-                        $text_color = $r == 1 ? 'icon_text_green' : '';
+                        if($r == 1){
+                            $max_text = $res[$count]['parent_row'] ? '' : '0/'.$res[$count]['max'];    
+                            $text_color = 'icon_text_green';
+                            $style = !$res[$count]['parent_row'] ?
+                                    ($res[$count]['icon'] ? 'background: url(./api.php?call=files&cat=skilltree_skills&id='.$res[$count]['icon'].') 50% 50% no-repeat;' : 'visibility:visible;') :
+                                    ($res[$count]['icon'] ? 'background: url(./api.php?call=files&cat=skilltree_skills_grey&id='.$res[$count]['icon'].') 50% 50% no-repeat;' : 'visibility:visible;') ;
+                        } else {
+                            $max_text = '';
+                            $text_color = '';
+                            $style = $res[$count]['icon'] ? 'background: url(./api.php?call=files&cat=skilltree_skills_grey&id='.$res[$count]['icon'].') 50% 50% no-repeat;' : 'visibility:visible;';
+                        }
 
                         $vars[$tree] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'char/tpl/skilltree_icon.tpl'),
                                             array(  'id' => $id,
@@ -29,7 +37,8 @@ class skilltree{
                                                     'type' => $res[$count]['type'],
                                                     'border' => $res[$count]['border'],
                                                     'text_color' => $text_color,
-                                                    'max' => $max));
+                                                    'max_text' => $max_text,
+                                                    'max' => $res[$count]['max']));
                             
                         $count++;
                     } else {
@@ -40,7 +49,8 @@ class skilltree{
                                                     'type' => 'talent_icon',
                                                     'border' => '',
                                                     'text_color' => '',
-                                                    'max' => ''));
+                                                    'max_text' => '',
+                                                    'max' => 0));
                     }
                     
                     if($c == 4){
@@ -48,7 +58,6 @@ class skilltree{
                 }
             }
         }
-        
         return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'char/tpl/skilltree.tpl'), $vars);
     }
 }

mojotrollz/api/char/tpl/skilltree.tpl

@@ -1,4 +1,4 @@
-<table width="900" border="0" cellspacing="0" cellpadding="0" align="left" style="margin-left: 10px;">
+<table oncontextmenu="return false;" class="skilltree" width="900" border="0" cellspacing="0" cellpadding="0" align="left" style="margin-left: 10px;">
     <tr>
         <td class="talentheader">
             <div id="treeheader1">
@@ -29,8 +29,8 @@
         </td>
     </tr>
     <tr>
-        <td class="outerbg" id="tree1" width="300" height="480" valign="top" style="background-image: url(${tree1_img}); background-color: rgb(0, 0, 0); background-repeat: no-repeat;">${tree1}</td>
-        <td class="outerbg" id="tree2" width="300" height="480" valign="top" style="background-image: url(${tree2_img}); background-color: rgb(0, 0, 0); background-repeat: no-repeat;">${tree2}</td>
-        <td class="outerbg" id="tree3" width="300" height="480" valign="top" style="background-image: url(${tree3_img}); background-color: rgb(0, 0, 0); background-repeat: no-repeat;">${tree3}</td>
+        <td class="outerbg" id="tree1" width="300" height="480" valign="top" style="background-image: url(./api.php?call=files&cat=skilltree_tree&id=${tree1_img}); background-color: rgb(0, 0, 0); background-repeat: no-repeat;">${tree1}</td>
+        <td class="outerbg" id="tree2" width="300" height="480" valign="top" style="background-image: url(./api.php?call=files&cat=skilltree_tree&id=${tree2_img}); background-color: rgb(0, 0, 0); background-repeat: no-repeat;">${tree2}</td>
+        <td class="outerbg" id="tree3" width="300" height="480" valign="top" style="background-image: url(./api.php?call=files&cat=skilltree_tree&id=${tree3_img}); background-color: rgb(0, 0, 0); background-repeat: no-repeat;">${tree3}</td>
     </tr>
 </table>

mojotrollz/api/char/tpl/skilltree_icon.tpl

@@ -1,4 +1,4 @@
 <div class="icon" id="${id}" style="${style}">
-    <img src="./api.php?call=files&cat=skilltree&id=spacer.gif" class="${type} ${border}" alt="" id="${id}}i">
-    <div class="icon_number ${text_color}" id="${id}}c">${max}</div>
+    <img src="./api.php?call=files&cat=skilltree&id=spacer.gif" class="${type} ${border}" alt="" id="${id}i">
+    <div class="icon_number ${text_color}" id="${id}c" max="${max}" cur="0">${max_text}</div>
 </div>

mojotrollz/api/database/player_classes.php

@@ -0,0 +1,54 @@
+<?php
+class player_classes {
+    const WARRIOR = 1;
+    const WARRIOR_NAME = 'Warrior';
+    
+    const PALADIN = 2;
+    const PALADIN_NAME = 'Paladin';
+    
+    const HUNTER = 3;
+    const HUNTER_NAME = 'Hunter';
+    
+    const ROGUE = 4;
+    const ROGUE_NAME = 'Rogue';
+    
+    const PRIEST = 5;
+    const PRIEST_NAME = 'Priest';
+    
+    const SHAMAN = 7;
+    const SHAMAN_NAME = 'Shaman';
+    
+    const MAGE = 8;
+    const MAGE_NAME = 'Mage';
+    
+    const WARLOCK = 9;
+    const WARLOCK_NAME = 'Warlock';
+    
+    const DRUID = 11;
+    const DRUID_NAME = 'Druid';
+    
+    public static function name($class){
+        switch($class){
+            case self::WARRIOR:
+                return self::WARRIOR_NAME;
+            case self::PALADIN:
+                return self::PALADIN_NAME;
+            case self::HUNTER:
+                return self::HUNTER_NAME;
+            case self::ROGUE:
+                return self::ROGUE_NAME;
+            case self::PRIEST:
+                return self::PRIEST_NAME;
+            case self::SHAMAN:
+                return self::SHAMAN_NAME;
+            case self::MAGE:
+                return self::MAGE_NAME;
+            case self::WARLOCK:
+                return self::WARLOCK_NAME;
+            case self::DRUID:
+                return self::DRUID_NAME;
+            default:
+                return 'class not valid';
+        }
+    }
+}

mojotrollz/dbd/sql/page.sql

@@ -1 +1,4 @@
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1, 1, 0, -1, NULL, 'action', NULL);
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1, 1, 0, -1, NULL, 'page', NULL);
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (10, 1, 2, 1, 'default_info', 'id', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (110, 1, 2, 1, 'wizard_toolbar', 'last', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (111, 1, 2, 1, 'wizard_toolbar', 'next', 'STRING');

mojotrollz/files/register_files.php

@@ -5,4 +5,8 @@
 \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/','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','*.*');