From 23b599aee36c9a3177d50004353c22a0d040bcd7 Mon Sep 17 00:00:00 2001 From: rylon Date: Thu, 20 Nov 2014 16:17:33 +0100 Subject: [PATCH] wizard guild, summary, toolbar, charcreation --- mojotrollz/api/char/charcreation.php | 1 + .../api/char/charcreation_validator.php | 10 +++++-- mojotrollz/files/guild/a_guild.png | Bin 0 -> 2515 bytes mojotrollz/files/guild/no_guild.png | Bin 0 -> 1788 bytes mojotrollz/files/register_files.php | 2 ++ .../page/default_page/css/default_page.css | 4 +-- .../page/default_start/js/default_start.js | 2 +- .../page/default_start/tpl/default_start.tpl | 6 ++-- .../page/wizard_guild/js/wizard_guild.js | 3 ++ mojotrollz/page/wizard_guild/tpl/guild.tpl | 2 +- .../page/wizard_summary/js/wizard_summary.js | 6 ++++ .../page/wizard_summary/tpl/summary.tpl | 28 +++++++++--------- .../page/wizard_summary/wizard_summary.php | 5 +++- .../wizard_toolbar/tpl/wizard_toolbar.tpl | 2 +- .../page/wizard_toolbar/wizard_toolbar.php | 1 + 15 files changed, 46 insertions(+), 26 deletions(-) create mode 100644 mojotrollz/files/guild/a_guild.png create mode 100644 mojotrollz/files/guild/no_guild.png create mode 100644 mojotrollz/page/wizard_summary/js/wizard_summary.js 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 0000000000000000000000000000000000000000..649bf8a960fe6016220e1872cf9039e94cca8465 GIT binary patch literal 2515 zcmV;^2`u)BP)63=GNGvD)w`p?Wlwf*iqrYZmrIj?2>^qVg zK32B1GxPg)b~H09$8}xDz;R+6_5&pn%l1_1(*U+*b~s

!#@7#$q!ZlvLT}`L0x(Nk7~8rcysp7f*`jzSXP#OgWOU8+cGabNJRvAkpe$^>Nu^xOsuc&UAR31o31kPzEp>F~F zhpjB7S$Qibj-Bq&;<8D*dv-I!kGB;fTwbv@=dhWWWSf_LSajGy!Q|1RNz<5M$%@aj z7IWh0gbCPQRy@ur_IRWB?kgaml$8VpAiQYsZFN-vLf0#90wRI}aE>lu-3t%5o{{wi zu@XSRKgdfEx>8X5{?`gf*nh{AK$TL1_3-H%;o)0>Ky)sZhg%^Sn%G=y?lIyVO+-fl z6uh!grywQJEr8H3b`%FiQ-WS`DW?LsLlPSSAUV-2Kp#{Qx|maxLLd<>1h_1}lw|u` zo}kJD5eS@&I&9Qc4MK>_O(meZrFgV#R*Ei+fz38_ko=q)G=pQ%<{e(oMmT8Kc2=QZ z?6v~ZvDS^DD@n{vwHAQJVo)nC^e+Ge1(fee^stbzz97*B5M2vs*N~t90^v~!H56C> zutQnB2%zAVhq68j-s%>E2wec^D4HPz-^0j z5I!KlVOhS2C~Xy4d@^R;FseAk2dnZb|8&@tV0^$BGAIErN)r7ODH_G{w)--?DG2Zd zD@&PrA7EF~`Bv!bN-A)ipK z4o*OsFOF(u`4NqevrLK)Zjl}YWan79lo!Vf7l5hpk4ivp_VNV`55J}Yz#wk{gdc=} zM0`9Tz>P3(Hpv$VKEvx?1%TY!=4$bX_X7WC{RNL)aoCglvMg}0F4qRph{RTadnLjr zd_MENq6Oesdg@=fs0Ne5qJXC;?(4zoc{nJmB0Py^MDWLLB z?*b^iE&%i@0O3Og)SebZm$MZ>;e!J38UlLl1t?n&PXbOVsu$Rlhi$l{Y9S~f$`)qh z>`8H&9Y6KhX~nKkGy=OZ-&Xk*- z0z-DGz-ur;410@ z&;tO8h)sk`04;g|7DGN?3>9UCt|G>b`nODWS4}WT>C|@Q-kYk_HHno?q6L#Sy#bRe z{kesBcCo1NZpuXxfCvy7Z7v53KP&+2zc&j&aNwm>@W;Q9h|pyX9{TZ;!{#Q#8m@(p zr27&;;F$%s+aQ4U|4G8yZBqgS1SPZ;poh=TtKeU}E1}@KtKHtyTKIHDgdSOcuK3kw z4TOL<$E?N(Ty+E|5#?M!!nlQicsyo=CjkgfpALf%5IZ|p{8KXa#aB|mgl{E)rq}>7 zAV8OpPBu$u65ub)vEoLa#cqrw!xcE(|;Nx69f@Sb9^$b8=q7tjd5BZFf*s^)AEngt*{u-bDU9^oT>tPyk^n@qt(4nT=V!yeE$&j6Z%6&=kj-1lRC$F>8 zR)J-gGW4GR3uqEh>2gcV;3rp^Gn#nq1R(h32mqRZvBQ50M*e!1Y5Ah;>OjWK^N!77hZ?4+7zFKc|6S?*B)COwn8T)+#BBT1~n z2g!W+Jb=q`l3d=kyFBQ}5=@M4@iMOOs-vX<`VKO{>*jBX4N?FacQqp=0K7(MgeM7| z1RyjC0DAbJW~>DOYXLol*CiO+UNH$oKteY?U?{4f&?C+yk!Szn-M=P3O7V#@;QH|Z zM?7HJ@B}M&l5{&M0T&kjH4p$o1;i)Eg@nrx;LIMe$REE|@Zi8LeRbgi&;9a3lw04A95Z2hb5CqmP(}tT(LQbUA-1F7`vWqP=8QyVIUha)_<2j zqobn@=uOxyAw17B(EryB-ngmYVUzQ4lyk$N$!jruy2nmoBc6IUt}Rfk-40 z1|&#-PdgIaxDG-mlIaGx@(|D d2=;pX{15eaa@z=(K4bs@002ovPDHLkV1f{Jh2a1I literal 0 HcmV?d00001 diff --git a/mojotrollz/files/guild/no_guild.png b/mojotrollz/files/guild/no_guild.png new file mode 100644 index 0000000000000000000000000000000000000000..393bfbf8837a36cd2b3be3ea82dd53e4601bcdfb GIT binary patch literal 1788 zcmV+~M_XFoC2jxOWRf56LE=1MX-m3EF&-Zz~UgxEZ;dA9Hvny7_H8d_Tjf&lxm7Jk* zB@>{{{naeUhK$I1*hi!cH9Szi&`SZ=zcD2g+`a5^XX$7>38sVulxI2@04OI(kOJ)4 zocsljy%bPBZ)xGz<}5$>_O~97R-+*au474#ln_&ZnzgS2WcV4ThhJ<4-?`?o=SD*! zswI!0gq{h&&`_|m+^v-4vFj=?N{6_9!Q^hi^4YD3j`pTbDQo#`i=g{=b>w#hYx9;5 zu1oib`+RCvqn`rska$=v{Got~s0~JVk|N2SGiC7VlBEeyB@Da(JfJE-4Usu(9vMCg zTtgLrW~53$QyUloUb|OHe^D>NWWtCQUe4S;GQ;DWG8I3# zG9;mQrtup+I6ARsu19vlj2&L3VtX|K9VkW-8cxgS(F{~tKQA&OD>5T{PX(ZNjuNm@ zu(}ElGAUCN;7gbpKminf@38c{4NpJ-hEA;(42l3$|Mw+8ZwALKfF>BS{a+BwGk$NG z@!!O7_goBPwdF1aj5Vom3#sekn%`k!QyKBsBFn=;@Y?e?ltfNFo8K0&}RVyGYVix>Sq%;sIicMu7^Rn7|Lh3d(Dx@_=_NK z0)okiT%wA}$>sv%4@4)mCm!_GL&l5Zb4=WfjddQrCQ83i^Cnjhu8MmUJDUlrS(~fD zJ_`Wd2%zu-EdZzjfGXh0RjXqG6dq7`5)gMa*jE9v7AOKx3lLnb1>FchP0&ie7Xq*` z=*(rgd$S~uT?@cykT=C*#gdzum0~756B0 zuqCEuWxW>QHv>VGfKFzG2o3?iuMdHMb~ONe@=<&NV4wx~BY+bAC;_Q6@dO}vlmL=| zcMoy)1w#VlL})=wgl>t6(79CG7YpjXKlS=5)x{=HzGwXBRnZCVFrVbd@dQAg$}biD z9>I5q?OyC4BeEiMb0*lKfXYShU0=1Ra2Oo?dAk`LA_~*-H%4dAnS5)>(gdgy*5^!# zFX3xb(sKdjtjSkrEg70{7c4*c&Q%Wz4h|kR!*@FkCJBEXLL%;n-vbg+$y>ez(3JqR zEebBf+f0U*!A08!6r8rdDLB!K@M?2-z2iX=YAYTj!o>nfNbp67KBA=nbOcL9#1zs8uxYTcRli7nBGQ)(K`|eeOe5j-Dh3f< zwHI4n=r?;F5D^M|OafF;@+3fgy)OU0VBU%^fWo7yQ*iM5u@{_5ALj=_0FnLNl%=jp zz(}D=h!o)1Vu4U`{vr}!qgd4PQbwS6%V<4B#2%NMF{Z6@x$N{ zG3dcV`v^k7?u`xvPyjrm(m{k0+$@sqy z7=J4|JhwEw0@7!iYY7aQpjgO?POv18?<8R2Q*&qq(0*bp0cv<0hdDe*C5_Gnpf-$( z0Fn?Xpj?>dHP@D?V?G-*hF$R{&qhhd3yVUV_(eli>;y<3dMv7P-l;h|HKH8yGd~cypQGVanyo$65yBq2nnEC z5Ed|&;C6O`*M7+I#-79X?|J@+oO`@Z8iJd?@D zBZxZRia7V9!qqYd1o#q&$;n9#5~O~n6;a<;NhXt001-T|o{NG$N6*yiepK?I%mD$$ e2=@V@y#E8zBEA2ejyWv=0000${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