From 9ed14f94b644b1a94c131e5b3039ee29b262674e Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 23 Jun 2014 04:19:39 +0200 Subject: [PATCH] load info --- mojotrollz/api/charcreation/charcreation.php | 16 ++++- mojotrollz/dbd/tbl/locale_string.php | 3 +- mojotrollz/page/default_info/default_info.php | 15 +++++ mojotrollz/page/page_mojotrollz.php | 3 + mojotrollz/page/register_page_classes.php | 27 ++++----- mojotrollz/page/wizard_details/details.tpl | 60 +++++++++---------- .../page/wizard_details/js/wizard_details.js | 5 ++ .../page/wizard_details/wizard_details.php | 5 +- .../page/wizard_toolbar/wizard_toolbar.php | 9 +-- 9 files changed, 85 insertions(+), 58 deletions(-) create mode 100644 mojotrollz/page/default_info/default_info.php diff --git a/mojotrollz/api/charcreation/charcreation.php b/mojotrollz/api/charcreation/charcreation.php index be8cbb4..542e09a 100644 --- a/mojotrollz/api/charcreation/charcreation.php +++ b/mojotrollz/api/charcreation/charcreation.php @@ -12,7 +12,21 @@ class charcreation { call_user_func('charcreation_validator::'.$key,$value);} } } - return JsonResult::toString(\SYSTEM\SECURITY\Security::load(self::MOJO_CC_SESSIONKEY)); + return JsonResult::toString(self::get()); } + + public static function get(){ + $vars = array('char_name' => 'Choose your name', 'char_gender' => 'default', 'char_race' => 'default', 'char_class' => 'default'); + if($data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY)){ + $vars['char_name'] = $data->char_name; + $vars['char_class'] = $data->char_class; + $vars['char_gender'] = $data->char_gender; + $vars['char_race'] = $data->char_race; + $vars['char_class'] = $data->char_class; + } + return $vars; + } + + public static function checkClassRace($class,$race){ return true;} //todo } diff --git a/mojotrollz/dbd/tbl/locale_string.php b/mojotrollz/dbd/tbl/locale_string.php index 3eb3b46..2daa0cc 100644 --- a/mojotrollz/dbd/tbl/locale_string.php +++ b/mojotrollz/dbd/tbl/locale_string.php @@ -5,8 +5,7 @@ namespace DBD; class locale_string extends \SYSTEM\DBD\system_locale_string { const VALUE_CATEGORY_MAINPAGE = 100; -const VALUE_CATEGORY_WOW_INFOTEXT_RACES = 120; -const VALUE_CATEGORY_WOW_INFOTEXT_HELP = 130; +const VALUE_CATEGORY_WOW_INFOTEXT = 120; const VALUE_CATEGORY_WOW_SERVERINFO = 140; } \ No newline at end of file diff --git a/mojotrollz/page/default_info/default_info.php b/mojotrollz/page/default_info/default_info.php new file mode 100644 index 0000000..d1c329e --- /dev/null +++ b/mojotrollz/page/default_info/default_info.php @@ -0,0 +1,15 @@ +id =$id; + } + public function html(){ + $data = \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT); + if(!array_key_exists($this->id, $data)){ + return $data['default'];} + return $data[$this->id]; + } +} + diff --git a/mojotrollz/page/page_mojotrollz.php b/mojotrollz/page/page_mojotrollz.php index 24c7db5..b003175 100644 --- a/mojotrollz/page/page_mojotrollz.php +++ b/mojotrollz/page/page_mojotrollz.php @@ -40,4 +40,7 @@ class page_mojotrollz extends \SYSTEM\API\api_default { public static function action_user_logout(){ return new user_logout();} + + public static function action_default_info($id){ + return new default_info($id);} } diff --git a/mojotrollz/page/register_page_classes.php b/mojotrollz/page/register_page_classes.php index 85100ae..31f4a40 100644 --- a/mojotrollz/page/register_page_classes.php +++ b/mojotrollz/page/register_page_classes.php @@ -1,15 +1,14 @@ -
- - +
+ +
- - - - + + + +
- - - - + + + +
- - - - + + + +
- - - - + + + +
- - + +
- - + +
- - + +
- - + +
- +
-