diff --git a/mojotrollz/api/char/css/inventory.css b/mojotrollz/api/char/css/inventory.css index e69de29..dfa4a75 100644 --- a/mojotrollz/api/char/css/inventory.css +++ b/mojotrollz/api/char/css/inventory.css @@ -0,0 +1,40 @@ +.item{ + float: left; + position: relative; + width:48px; + height:48px; + top: 0px; + opacity: 1; + background-image:none; + background-repeat:no-repeat; + background-position:0px 0px; + text-align:center; + vertical-align:middle; +} + +.item_count{ + position: relative; + float: right; + font-size:10px; + vertical-align:middle; + text-align:center; + color: white; + font-family:Verdana, Helvetica, Arial, sans-serif; + width:15px; + height:8px; + right:2px; + bottom:15px; + z-index: 3; +} + +.item_icon{ + background-repeat:no-repeat; + width:48px; + height:48px; +} +.item_arrow{ + background-image:url(http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=skilltree&id=arrows.gif); + background-repeat:no-repeat; + width:48px; + height:48px; +} \ No newline at end of file diff --git a/mojotrollz/api/char/inventory.php b/mojotrollz/api/char/inventory.php index f5feeb9..6528e36 100644 --- a/mojotrollz/api/char/inventory.php +++ b/mojotrollz/api/char/inventory.php @@ -6,7 +6,7 @@ class inventory { for($j = 1; $j <= $y; $j++){ $vars['items'] .= '
'; for($i = 1; $i <= $x; $i++){ - $vars['items'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'char/tpl/inventory_item.tpl'), array()); + $vars['items'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PAPI(),'char/tpl/inventory_item.tpl'), array('count' => 1)); } $vars['items'] .= '
'; } diff --git a/mojotrollz/api/char/tpl/inventory_item.tpl b/mojotrollz/api/char/tpl/inventory_item.tpl index bac1b03..85f40a7 100644 --- a/mojotrollz/api/char/tpl/inventory_item.tpl +++ b/mojotrollz/api/char/tpl/inventory_item.tpl @@ -1,4 +1,4 @@
- +
${count}
\ No newline at end of file diff --git a/mojotrollz/page/wizard_start/tpl/default_page_new_char.tpl b/mojotrollz/page/wizard_start/tpl/default_page_new_char.tpl index bbcda3a..117e48b 100644 --- a/mojotrollz/page/wizard_start/tpl/default_page_new_char.tpl +++ b/mojotrollz/page/wizard_start/tpl/default_page_new_char.tpl @@ -4,8 +4,9 @@
Feel free to snoop around. +
Project Status: ${project_perc}%
-
+
diff --git a/mojotrollz/page/wizard_start/wizard_start.php b/mojotrollz/page/wizard_start/wizard_start.php index 68e3c04..beec22e 100644 --- a/mojotrollz/page/wizard_start/wizard_start.php +++ b/mojotrollz/page/wizard_start/wizard_start.php @@ -17,6 +17,7 @@ class wizard_start extends SYSTEM\PAGE\Page { $vars['realm_status'] = realm::status(); $vars['world_status'] = world::status(); $vars['player_online'] = database::player_online(); + $vars['project_perc'] = \SYSTEM\SAI\saimod_sys_todo::statistics()['project_perc']; $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE), \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_SERVERINFO), diff --git a/mojotrollz/page/wizard_visuals/wizard_visuals.php b/mojotrollz/page/wizard_visuals/wizard_visuals.php index 1116c97..8370be8 100644 --- a/mojotrollz/page/wizard_visuals/wizard_visuals.php +++ b/mojotrollz/page/wizard_visuals/wizard_visuals.php @@ -6,7 +6,8 @@ class wizard_visuals extends SYSTEM\PAGE\Page { return array( \SYSTEM\WEBPATH(new PPAGE(),'wizard_visuals/js/wizard_visuals.js'));} public static function css (){ - return array( \SYSTEM\WEBPATH(new PAPI(),'char/css/equipment.css'));} + return array( \SYSTEM\WEBPATH(new PAPI(),'char/css/equipment.css'), + \SYSTEM\WEBPATH(new PAPI(),'char/css/inventory.css'));} private static function select($race,$type,$value){ $res = \DBD\RACE_VISUALS_BY_TYPE::QQ(array($race,$type)); diff --git a/system b/system index 381f999..835eb2a 160000 --- a/system +++ b/system @@ -1 +1 @@ -Subproject commit 381f999f0ff9b84de4036a3d0c1da6ad24517b6f +Subproject commit 835eb2a29a0a050811b273679de4d39fe0cb7410