diff --git a/.gitignore b/.gitignore index 14bc68c..14a2aba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/nbproject/private/ \ No newline at end of file +/nbproject/private/ +/config.php diff --git a/config.php b/config.dist.php similarity index 100% rename from config.php rename to config.dist.php diff --git a/mojotrollz/api/autoload.inc.php b/mojotrollz/api/autoload.inc.php index 1a5a814..7235e6d 100644 --- a/mojotrollz/api/autoload.inc.php +++ b/mojotrollz/api/autoload.inc.php @@ -4,5 +4,6 @@ SYSTEM\autoload::registerFolder(dirname(__FILE__).'/server',''); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/realm',''); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/world',''); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/database',''); -SYSTEM\autoload::registerFolder(dirname(__FILE__).'/charcreation',''); +SYSTEM\autoload::registerFolder(dirname(__FILE__).'/char',''); +SYSTEM\autoload::registerFolder(dirname(__FILE__).'/char/qq','DBD'); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/client',''); \ No newline at end of file diff --git a/mojotrollz/api/charcreation/charcreation.php b/mojotrollz/api/char/charcreation.php similarity index 100% rename from mojotrollz/api/charcreation/charcreation.php rename to mojotrollz/api/char/charcreation.php diff --git a/mojotrollz/api/charcreation/charcreation_validator.php b/mojotrollz/api/char/charcreation_validator.php similarity index 100% rename from mojotrollz/api/charcreation/charcreation_validator.php rename to mojotrollz/api/char/charcreation_validator.php diff --git a/mojotrollz/api/char/qq/TALENT_TREE.php b/mojotrollz/api/char/qq/TALENT_TREE.php new file mode 100644 index 0000000..dcf80b0 --- /dev/null +++ b/mojotrollz/api/char/qq/TALENT_TREE.php @@ -0,0 +1,12 @@ +';} + + if( count($res) > $count && + $res[$count]['tree'] == $t && + $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' : ''; + + $vars[$tree] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'char/tpl/skilltree_icon.tpl'), + array( 'id' => $id, + 'style' => $style, + 'type' => $res[$count]['type'], + 'border' => $res[$count]['border'], + 'text_color' => $text_color, + 'max' => $max)); + + $count++; + } else { + //empty + $vars[$tree] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'char/tpl/skilltree_icon.tpl'), + array( 'id' => $id, + 'style' => 'visibility:hidden;', + 'type' => 'talent_icon', + 'border' => '', + 'text_color' => '', + 'max' => '')); + } + + if($c == 4){ + $vars[$tree] .= '';} + } + } + } + + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'char/tpl/skilltree.tpl'), $vars); + } +} + diff --git a/mojotrollz/api/char/tpl/skilltree.tpl b/mojotrollz/api/char/tpl/skilltree.tpl new file mode 100644 index 0000000..a405177 --- /dev/null +++ b/mojotrollz/api/char/tpl/skilltree.tpl @@ -0,0 +1,36 @@ + + + + + + + + + + + +
+
+ + ${tree1_name} + - 0 points + +
+ Reset this tree + 		+
+ + ${tree2_name} + - 0 points + +
+ Reset this tree + 		+
+ + ${tree3_name} + - 0 points + +
+ Reset this tree +
${tree1}${tree2}${tree3}
\ No newline at end of file diff --git a/mojotrollz/api/char/tpl/skilltree_icon.tpl b/mojotrollz/api/char/tpl/skilltree_icon.tpl new file mode 100644 index 0000000..38e83c3 --- /dev/null +++ b/mojotrollz/api/char/tpl/skilltree_icon.tpl @@ -0,0 +1,4 @@ +
+ +
${max}
+
\ No newline at end of file diff --git a/mojotrollz/files/Mojologos/IMG_0084.gif b/mojotrollz/files/Mojologos/IMG_0084.gif new file mode 100644 index 0000000..f33aaa9 Binary files /dev/null and b/mojotrollz/files/Mojologos/IMG_0084.gif differ diff --git a/mojotrollz/files/Mojologos/Mojologo 16x16.png b/mojotrollz/files/Mojologos/Mojologo 16x16.png new file mode 100644 index 0000000..f8ff354 Binary files /dev/null and b/mojotrollz/files/Mojologos/Mojologo 16x16.png differ diff --git a/mojotrollz/files/Mojologos/Mojopulse.gif b/mojotrollz/files/Mojologos/Mojopulse.gif new file mode 100644 index 0000000..97851ec Binary files /dev/null and b/mojotrollz/files/Mojologos/Mojopulse.gif differ diff --git a/mojotrollz/files/default_page/favicon.ico b/mojotrollz/files/default_page/favicon.ico new file mode 100644 index 0000000..ac11a39 Binary files /dev/null and b/mojotrollz/files/default_page/favicon.ico differ diff --git a/mojotrollz/files/skilltree/arrows.gif b/mojotrollz/files/skilltree/arrows.gif new file mode 100644 index 0000000..66e5899 Binary files /dev/null and b/mojotrollz/files/skilltree/arrows.gif differ diff --git a/mojotrollz/files/skilltree/skilltree_icons.gif b/mojotrollz/files/skilltree/skilltree_icons.gif new file mode 100644 index 0000000..d78dffe Binary files /dev/null and b/mojotrollz/files/skilltree/skilltree_icons.gif differ diff --git a/mojotrollz/page/default_page/css/default_page.css b/mojotrollz/page/default_page/css/default_page.css index 1940807..b80f44a 100644 --- a/mojotrollz/page/default_page/css/default_page.css +++ b/mojotrollz/page/default_page/css/default_page.css @@ -18,7 +18,7 @@ body { } .threecol_col{ - display: table-cell; + display: table-cell; position: relative; } @@ -75,9 +75,8 @@ body { } #frame_content { - margin-left: 10px; - margin-right: 10px; - margin-bottom: 10px; + padding: 15px; + display: table-cell; } #frame_content_left { diff --git a/mojotrollz/page/default_page/default_page.tpl b/mojotrollz/page/default_page/default_page.tpl index 4f24732..c60e7a2 100644 --- a/mojotrollz/page/default_page/default_page.tpl +++ b/mojotrollz/page/default_page/default_page.tpl @@ -2,7 +2,8 @@ ${mojotrollz_page_title} - + + ${css} ${js} diff --git a/mojotrollz/page/wizard_details/details.tpl b/mojotrollz/page/wizard_details/details.tpl index 3ca7c98..f0e6d54 100644 --- a/mojotrollz/page/wizard_details/details.tpl +++ b/mojotrollz/page/wizard_details/details.tpl @@ -39,7 +39,7 @@
-