diff --git a/mojotrollz/api/char/charcreation_validator.php b/mojotrollz/api/char/charcreation_validator.php index 5a9ec92..08c5ebe 100644 --- a/mojotrollz/api/char/charcreation_validator.php +++ b/mojotrollz/api/char/charcreation_validator.php @@ -64,5 +64,9 @@ class charcreation_validator { public static function char_skill_tree($value){} public static function char_equip($value){} public static function char_guild($value){} - public static function char_spawn($value){} + public static function char_spawn($value){ + $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); + $data['char_spawn'] = $value; + \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); + } } \ No newline at end of file diff --git a/mojotrollz/api/char/qq/RACE_VISUALS_BY_ID.php b/mojotrollz/api/char/qq/RACE_VISUALS_BY_ID.php new file mode 100644 index 0000000..4d629fa --- /dev/null +++ b/mojotrollz/api/char/qq/RACE_VISUALS_BY_ID.php @@ -0,0 +1,12 @@ +

- - + +
diff --git a/mojotrollz/page/wizard_details/wizard_details.php b/mojotrollz/page/wizard_details/wizard_details.php index 992b10f..4efe8e1 100644 --- a/mojotrollz/page/wizard_details/wizard_details.php +++ b/mojotrollz/page/wizard_details/wizard_details.php @@ -9,7 +9,7 @@ class wizard_details extends SYSTEM\PAGE\Page { public function html(){ $vars = charcreation::data(NULL, false); - $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=wowicons&id='; + $vars['WOW_GENDER'] = \SYSTEM\FILES\files::getURL('gender'); $vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race'); $vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class'); $vars['INV_PICS'] = \SYSTEM\FILES\files::getURL('inventory'); diff --git a/mojotrollz/page/wizard_spawn/js/wizard_spawn.js b/mojotrollz/page/wizard_spawn/js/wizard_spawn.js index 4cf7837..2f17bdb 100644 --- a/mojotrollz/page/wizard_spawn/js/wizard_spawn.js +++ b/mojotrollz/page/wizard_spawn/js/wizard_spawn.js @@ -23,8 +23,15 @@ function init_wizard_spawn(){ $('.city_icon_hover').hover(function(){ $(this).removeClass('fadein'); }, function(){ - $(this).addClass('fadein'); - + $(this).addClass('fadein');}); + + $('.icon_city').click(function(){ + sendInfo('{"char_spawn" : "'+$(this).attr('city')+'"}','wizard_spawn'); + }); + + $('.info').mouseover(function(){ + var info = $(this).attr('info'); + $('#info_content').load('./?page=default_info&id='+info); }); } diff --git a/mojotrollz/page/wizard_spawn/tpl/spawn.tpl b/mojotrollz/page/wizard_spawn/tpl/spawn.tpl index 291d093..ae9d5fa 100644 --- a/mojotrollz/page/wizard_spawn/tpl/spawn.tpl +++ b/mojotrollz/page/wizard_spawn/tpl/spawn.tpl @@ -1,10 +1,10 @@
- +

 ${spawn_info_title}

-

${spawn_info_text}

+
@@ -12,26 +12,26 @@
- +
- +
- +
diff --git a/mojotrollz/page/wizard_spawn/wizard_spawn.php b/mojotrollz/page/wizard_spawn/wizard_spawn.php index 224e3ea..5dd9c96 100644 --- a/mojotrollz/page/wizard_spawn/wizard_spawn.php +++ b/mojotrollz/page/wizard_spawn/wizard_spawn.php @@ -10,7 +10,7 @@ class wizard_spawn extends SYSTEM\PAGE\Page { public function html(){ $vars = array(); $vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(),'wizard_spawn/img/'); - $vars['CITYICONS'] = \SYSTEM\FILES\files::getURL('wow_city_icons'); + $vars['WOW_CITY'] = \SYSTEM\FILES\files::getURL('city'); $vars['BG'] = \SYSTEM\FILES\files::getURL('backgrounds'); $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT)); diff --git a/mojotrollz/page/wizard_summary/tpl/summary.tpl b/mojotrollz/page/wizard_summary/tpl/summary.tpl index 353cf4d..74a80c7 100644 --- a/mojotrollz/page/wizard_summary/tpl/summary.tpl +++ b/mojotrollz/page/wizard_summary/tpl/summary.tpl @@ -3,58 +3,72 @@ Option Wert + Check Name ${char_name} + ${char_name_ok} Gender - ${char_gender} + + ${char_gender_ok} Race - ${char_race} + + ${char_race_ok} Class - ${char_class} + + ${char_class_ok} Skin Color ${char_skin_color} + ${char_skin_color_ok} Hair ${char_hair} + ${char_hair_ok} Hair Color ${char_hair_color} + ${char_hair_color_ok} Face ${char_face} + ${char_face_ok} Facial Hair ${char_facial_hair} + ${char_facial_hair_ok} Facial Hair Color ${char_facial_hair_color} + ${char_facial_hair_color_ok} Skill Tree ${char_skill_tree} + ${char_skill_tree_ok} Guild ${char_guild} + ${char_guild_ok} Spawn ${char_spawn} + ${char_spawn_ok}
\ No newline at end of file diff --git a/mojotrollz/page/wizard_summary/wizard_summary.php b/mojotrollz/page/wizard_summary/wizard_summary.php index eb9c508..c2194fb 100644 --- a/mojotrollz/page/wizard_summary/wizard_summary.php +++ b/mojotrollz/page/wizard_summary/wizard_summary.php @@ -3,6 +3,21 @@ class wizard_summary extends SYSTEM\PAGE\Page { public function html(){ $vars = charcreation::data(NULL,false); + + $vars['char_skin_color'] = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_SKIN,$vars['char_skin_color']))['name']; + $vars['char_hair'] = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_HAIR,$vars['char_hair']))['name']; + $vars['char_hair_color'] = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_HAIR_COLOR,$vars['char_hair_color']))['name']; + $vars['char_face'] = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_FACE,$vars['char_face']))['name']; + $vars['char_facial_hair'] = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_FACIAL_HAIR,$vars['char_facial_hair']))['name']; + $vars['char_facial_hair_color'] = \DBD\RACE_VISUALS_BY_ID::Q1(array($vars['char_race'],race_visuals::VISUAL_FACIAL_HAIR_COLOR,$vars['char_facial_hair_color']))['name']; + + $vars['char_race'] = player_races::name($vars['char_race']); + $vars['char_class'] = player_classes::name($vars['char_class']); + + $vars['WOW_GENDER'] = \SYSTEM\FILES\files::getURL('gender'); + $vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race'); + $vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class'); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_summary/tpl/summary.tpl'), $vars); } } \ No newline at end of file diff --git a/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl b/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl index c17ad0b..4e80a34 100644 --- a/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl +++ b/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/mojotrollz/page/wizard_toolbar/wizard_toolbar.php b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php index d6e34d8..730b80a 100644 --- a/mojotrollz/page/wizard_toolbar/wizard_toolbar.php +++ b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php @@ -17,11 +17,13 @@ class wizard_toolbar extends SYSTEM\PAGE\Page { $vars = charcreation::data(NULL,false); $vars['char_class'] = player_classes::name($vars['char_class']); $vars['char_race'] = player_races::name($vars['char_race']); + $vars['char_spawn'] = player_spawns::name($vars['char_spawn']); $vars['last'] = $this->last; $vars['next'] = $this->next; $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons'); $vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race'); $vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class'); + $vars['WOW_CITY'] = \SYSTEM\FILES\files::getURL('city'); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_toolbar/tpl/wizard_toolbar.tpl'), $vars); } } \ No newline at end of file