diff --git a/mojotrollz/api/char/charcreation.php b/mojotrollz/api/char/charcreation.php index 7d79274..7f505c7 100644 --- a/mojotrollz/api/char/charcreation.php +++ b/mojotrollz/api/char/charcreation.php @@ -7,6 +7,7 @@ class charcreation { const MOJO_CC_SESSIONKEY = 'mojo_charcreation'; const DEFAULT_CHAR_APPEARANCE = 0; const DEFAULT_CHAR_SPAWN = 0; + const DEFAULT_CHAR_GUILD = 'no_guild'; public static function data($json = NULL, $returnasjson = true){ if(!\SYSTEM\SECURITY\Security::load(self::MOJO_CC_SESSIONKEY)){ \SYSTEM\SECURITY\Security::save(self::MOJO_CC_SESSIONKEY, self::session_default());} diff --git a/mojotrollz/api/char/charcreation_validator.php b/mojotrollz/api/char/charcreation_validator.php index e705bea..6d1d3c1 100644 --- a/mojotrollz/api/char/charcreation_validator.php +++ b/mojotrollz/api/char/charcreation_validator.php @@ -21,7 +21,7 @@ class charcreation_validator { public static function char_race($value){ $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); $data['char_race'] = $value; - if(!is_char_race($value) || !charcreation::checkClassRace($data['char_class'], $data['char_race'])){ + if(!self::is_char_race($value) || !charcreation::checkClassRace($data['char_class'], $data['char_race'])){ $data['char_class'] = charcreation::DEFAULT_CHAR_CLASS;} \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); } @@ -92,8 +92,12 @@ class charcreation_validator { public static function char_equip($value){} public static function is_char_guild($value){ - return false;} - public static function char_guild($value){} + return ($value == charcreation::DEFAULT_CHAR_GUILD) ? true : false;} + public static function char_guild($value){ + $data = \SYSTEM\SECURITY\Security::load(charcreation::MOJO_CC_SESSIONKEY); + $data['char_guild'] = self::is_char_guild($value) ? $value : charcreation::DEFAULT_CHAR_GUILD; + \SYSTEM\SECURITY\Security::save(charcreation::MOJO_CC_SESSIONKEY,$data); + } public static function is_char_spawn($value){ return player_spawns::is($value);} diff --git a/mojotrollz/files/guild/a_guild.png b/mojotrollz/files/guild/a_guild.png new file mode 100644 index 0000000..649bf8a Binary files /dev/null and b/mojotrollz/files/guild/a_guild.png differ diff --git a/mojotrollz/files/guild/no_guild.png b/mojotrollz/files/guild/no_guild.png new file mode 100644 index 0000000..393bfbf Binary files /dev/null and b/mojotrollz/files/guild/no_guild.png differ diff --git a/mojotrollz/files/register_files.php b/mojotrollz/files/register_files.php index 5ec7564..2eb683a 100644 --- a/mojotrollz/files/register_files.php +++ b/mojotrollz/files/register_files.php @@ -14,6 +14,8 @@ \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/city/','city','*.png'); +\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/guild/','guild','*.png'); + \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/equipment/','equipment','*.*'); \SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/inventory/','inventory','*.*'); diff --git a/mojotrollz/page/default_page/css/default_page.css b/mojotrollz/page/default_page/css/default_page.css index 5031af8..f2cfa49 100644 --- a/mojotrollz/page/default_page/css/default_page.css +++ b/mojotrollz/page/default_page/css/default_page.css @@ -92,7 +92,7 @@ body { } #frame_content_wrapper{ - height: 550px; + //height: 550px; } #frame_content_right { @@ -109,7 +109,7 @@ body { } .table_summ{ - color: black; padding: 10px; margin-left: 20px; margin-top: 20px; width: 100%; + color: black; padding: 10px; margin-left: auto; margin-right: auto; margin-top: 20px; width: 90%; } .table_summ tr{ diff --git a/mojotrollz/page/default_start/js/default_start.js b/mojotrollz/page/default_start/js/default_start.js index 4b87c7f..1faf3e7 100644 --- a/mojotrollz/page/default_start/js/default_start.js +++ b/mojotrollz/page/default_start/js/default_start.js @@ -39,7 +39,7 @@ function load_visualisation(id){ }); $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? 0 : parseFloat(v)];}}));}); - var options = {title: id, backgroundColor: 'darkslategrey', aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:20,top:40}, interpolateNulls: false, height: "200"}; + var options = {title: id, backgroundColor: { fill:'transparent' }, aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:20,top:40}, interpolateNulls: false, height: "200"}; new google.visualization.LineChart(document.getElementById(id)).draw(data, options); }, {},'json',true); diff --git a/mojotrollz/page/default_start/tpl/default_start.tpl b/mojotrollz/page/default_start/tpl/default_start.tpl index 9b890be..8667aed 100644 --- a/mojotrollz/page/default_start/tpl/default_start.tpl +++ b/mojotrollz/page/default_start/tpl/default_start.tpl @@ -1,6 +1,6 @@
${default_page_welcome}
-
+
@@ -19,7 +19,7 @@
-
+
@@ -38,4 +38,4 @@
-
\ No newline at end of file +
\ No newline at end of file diff --git a/mojotrollz/page/wizard_guild/js/wizard_guild.js b/mojotrollz/page/wizard_guild/js/wizard_guild.js index f745e90..4a25ec1 100644 --- a/mojotrollz/page/wizard_guild/js/wizard_guild.js +++ b/mojotrollz/page/wizard_guild/js/wizard_guild.js @@ -1,2 +1,5 @@ function init_wizard_guild(){ + $('#btn_no_guild').click(function(){ + sendInfo('{"char_guild" : "no_guild"}','wizard_guild'); + }); } \ No newline at end of file diff --git a/mojotrollz/page/wizard_guild/tpl/guild.tpl b/mojotrollz/page/wizard_guild/tpl/guild.tpl index 87b8bfe..f6ea963 100644 --- a/mojotrollz/page/wizard_guild/tpl/guild.tpl +++ b/mojotrollz/page/wizard_guild/tpl/guild.tpl @@ -1,2 +1,2 @@ -guild +
  • No Guild
  • \ No newline at end of file diff --git a/mojotrollz/page/wizard_summary/js/wizard_summary.js b/mojotrollz/page/wizard_summary/js/wizard_summary.js new file mode 100644 index 0000000..52ff26c --- /dev/null +++ b/mojotrollz/page/wizard_summary/js/wizard_summary.js @@ -0,0 +1,6 @@ +function init_wizard_summary(){ + $('.table_summ tr').click(function(){ + system.load($(this).attr('sysload'));}); +} + + diff --git a/mojotrollz/page/wizard_summary/tpl/summary.tpl b/mojotrollz/page/wizard_summary/tpl/summary.tpl index 2f84a48..6379b24 100644 --- a/mojotrollz/page/wizard_summary/tpl/summary.tpl +++ b/mojotrollz/page/wizard_summary/tpl/summary.tpl @@ -3,67 +3,67 @@
    - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/mojotrollz/page/wizard_summary/wizard_summary.php b/mojotrollz/page/wizard_summary/wizard_summary.php index c6ff08a..6c90647 100644 --- a/mojotrollz/page/wizard_summary/wizard_summary.php +++ b/mojotrollz/page/wizard_summary/wizard_summary.php @@ -1,6 +1,8 @@ $value){ @@ -23,6 +25,7 @@ class wizard_summary extends SYSTEM\PAGE\Page { $vars['char_spawn'] = player_spawns::name($vars['char_spawn']); $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons'); + $vars['WOW_GUILD'] = \SYSTEM\FILES\files::getURL('guild'); $vars['WOW_GENDER'] = \SYSTEM\FILES\files::getURL('gender'); $vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race'); $vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class'); diff --git a/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl b/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl index bd0c73c..0cb6275 100644 --- a/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl +++ b/mojotrollz/page/wizard_toolbar/tpl/wizard_toolbar.tpl @@ -4,7 +4,7 @@ - + \ 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 b833341..8a5e1ca 100644 --- a/mojotrollz/page/wizard_toolbar/wizard_toolbar.php +++ b/mojotrollz/page/wizard_toolbar/wizard_toolbar.php @@ -22,6 +22,7 @@ class wizard_toolbar extends SYSTEM\PAGE\Page { $vars['last'] = $this->last; $vars['next'] = $this->next; $vars['WOWICONS'] = \SYSTEM\FILES\files::getURL('wowicons'); + $vars['WOW_GUILD'] = \SYSTEM\FILES\files::getURL('guild'); $vars['WOW_RACE'] = \SYSTEM\FILES\files::getURL('race'); $vars['WOW_CLASS'] = \SYSTEM\FILES\files::getURL('class'); $vars['WOW_CITY'] = \SYSTEM\FILES\files::getURL('city');
    Name ${char_name}
    Gender
    Race
    Class
    Skin Color ${char_skin_color}
    Hair ${char_hair}
    Hair Color ${char_hair_color}
    Face ${char_face}
    Facial Hair ${char_facial_hair}
    Facial Hair Color ${char_facial_hair_color}
    Skill Tree ${char_skill_tree}
    Guild${char_guild}
    Spawn