From c8e43d7e16a47515a8a76dcaf7282c4a9fa9bff7 Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 17 Nov 2014 18:42:24 +0100 Subject: [PATCH] spawn improvements, summary --- .../api/char/charcreation_validator.php | 6 +- mojotrollz/api/char/qq/RACE_VISUALS_BY_ID.php | 12 ++++ mojotrollz/api/database/player_spawns.php | 53 ++++++++++++++++++ mojotrollz/dbd/db/mangos_world_dev.php | 8 +++ .../{wow_city_icons => city}/Darnassus.png | Bin .../{wow_city_icons => city}/Ironforge.png | Bin .../{wow_city_icons => city}/Orgrimmar.png | Bin .../{wow_city_icons => city}/Stormwind.png | Bin .../Thunderbluff.png} | Bin .../{wow_city_icons => city}/Undercity.png | Bin mojotrollz/files/city/default.png | Bin 0 -> 6930 bytes .../files/{wowicons => gender}/female.png | Bin .../files/{wowicons => gender}/male.png | Bin mojotrollz/files/register_files.php | 14 ++--- .../page/wizard_details/tpl/details.tpl | 4 +- .../page/wizard_details/wizard_details.php | 2 +- .../page/wizard_spawn/js/wizard_spawn.js | 11 +++- mojotrollz/page/wizard_spawn/tpl/spawn.tpl | 16 +++--- mojotrollz/page/wizard_spawn/wizard_spawn.php | 2 +- .../page/wizard_summary/tpl/summary.tpl | 20 ++++++- .../page/wizard_summary/wizard_summary.php | 15 +++++ .../wizard_toolbar/tpl/wizard_toolbar.tpl | 2 +- .../page/wizard_toolbar/wizard_toolbar.php | 2 + 23 files changed, 141 insertions(+), 26 deletions(-) create mode 100644 mojotrollz/api/char/qq/RACE_VISUALS_BY_ID.php create mode 100644 mojotrollz/api/database/player_spawns.php create mode 100644 mojotrollz/dbd/db/mangos_world_dev.php rename mojotrollz/files/{wow_city_icons => city}/Darnassus.png (100%) rename mojotrollz/files/{wow_city_icons => city}/Ironforge.png (100%) rename mojotrollz/files/{wow_city_icons => city}/Orgrimmar.png (100%) rename mojotrollz/files/{wow_city_icons => city}/Stormwind.png (100%) rename mojotrollz/files/{wow_city_icons/Thunder_Bluff.png => city/Thunderbluff.png} (100%) rename mojotrollz/files/{wow_city_icons => city}/Undercity.png (100%) create mode 100644 mojotrollz/files/city/default.png rename mojotrollz/files/{wowicons => gender}/female.png (100%) rename mojotrollz/files/{wowicons => gender}/male.png (100%) 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 @@ +^@?g#_{*}nq~k(y2oAL4i@smb9Wv8jm2>Emhi_z(!% zSS8uVy02z4(!6zb4eG8XvGlO8g3tvN(Q;V=F^WQP@%ytgx{Ar(@NsS>?I!Q4W(?g| zO4E-MWM zxcaF^0_Vx{H^WGqsKu7bZ*y~WEOxcC6m5PO{D{AQ|9bkO8Df?m?sr~PnPvX$T$4u1D(W*8k8)(L8L zwTobVVJ9RwIC#?s9%F}e+=hkYYW-~yz24$Ov=)5Sh>)-_i*Fxja?Z}qXr!=42(!i|raWJ3Bjaa&p(pKW>PUk`mvsfc2q_QV|Um6^!isd`v`y{9Q>64Gq+u-?ivm zofF1S7rzTSxKDn5{+AXnW#zC5KDX8yo8gj*(9lq~QgcrIGPAY*1abk)_KC0dk5V+}I zS0|JZ*1F$8&-1QAOo>cNoPs zvV|_~yZqa?;{5#lWl!oO4^hM8V`J!T2Wta(#KhLKpY2}Q3}=WcXlRg7@tSxzyf7}O z%p2{6z*8jNigb2%PE1UUOip%BmKyZ+_TFY<3J3`a*`N%!swy<8T)ZzKQGxO2Xk4SX zxcCk`dq{Tn?Z(DNYDUJS!7UGw<&_mYBBFwt8lBl}^+K7-sZvS-tA6s2swo}i^+;u9 zWqeqFd}5-2pkNngWwW%o`5ieqIZJD6ZBx@>1Jk$Ncca8Qa^=Epot;?)1Y(`$>PV@n z+4qc0O?hkc3JZg0YHU=>Z){3PNJN@c+MFM47?$e`(nib=R#fm5hf;{d^SV$b}}6)h(gN?V4fbocN?99TStGqmA)eiK*>OX z_jYE)S3GO_R_idediH_le#nOp@c}nz1!!2<*lIjBv?CeBm7Se=Ha0d&p1u0B6zqL8 zs<385K*?p+9)LC0{`Pp%V0CRx>*>?MYO8_Om)12j{*bK%IP_Re0ABuFTr|m|ks4=^ zNfe`z@n@5F_*oQP?gAR1YKA2+%tmwN-o1a{XvJ{*;X?!8%(%GDaNe(qP!0o$+<9NV z7^aSO1Q8g0alPa1?ai?i;+mA2Dw6XF>oCCL`E$KHZcOV7RslTHP!)+BG!zta1_o4a zZf=OK?rtpugTiw)504`fqsg&?bdi_J#|u@@d#G>ST3ZTc{0O%e;IV~YpMNpH4H5JW zhlPj#3(ly{k%sr{pXK~P98Anl&I^rMiApD@rz@_)`$tF2e0N?aeg zud7-QrQh2M0knYb#KpzEEh3T{PR0A;{K&4lre>zjiSEtmZnvdC-y#kU4#w?j15(PV zif1ZXTBPmm?PK2fY9m|6W8O`+{$})MuU;9hU13>STlZhfiJ3IN;$K@^i=9bNr;ofP z`t7sbI06?RKew)q(qAT+xXQc}8$rw<*6UQifZcX>h-z?MLigvmTw7m{&B##m^b~?d z$<1Zj*zV})(B0BvwO?*j(y{YmJU=@t9@5B?C>JrXm(te0sidT&jfnQ>-heTSiG zV9=8z6I@hTiTc?di1>$lM@L6DZrqSEGrPU8un^mjrx1l6otdd_Y)m^>@4_Z7{;d0Q zC_}V>59^Sr?`F=)d-VO&(;hRvFGVG>nQwL<=~tS3-<&M3bXWsnpamXg>)+GP zcANHIUHIk|#sc%h?C~s;?i;0P$OOx{PX}7!@F5fIQC8MoD1`J7nz3Z zYA-25zudUHM6dKIL!)J1EM6Sja#oSd8ezA%R9Be&VqBofOARN%IiAzLG zY<{h#JDjQ%Q&UUpG5o?c6|7yla%yF3E4;Fj7jd}${lXLth!4O{Mo|&hx+bNqO$r?Y z!|1EeBd^7`^@Ng8ngA=gQ(H99@9SwUtb&5^IXQQB8@G4@0s?Fu9W6aP;`hE@5c~Q0 z_4oG+`(6s4&byNUoZn|)V4#kW-`w1^L?@%9Wc{99UJh0A*usK|HsU>OriiF0Fr2xq zZOFuguJ!j+7WeB99|-j;p5nFjCvdt6)2pTk1kKJGgD3&8VPRnjT3RxP(|z}c#X5o7 z0`yB+n3*wyJC`;w^veu$MCOY>x!ccesGll9I zOyc4hKYyA*4;Gh|buGE>Umgyxpisfk*09$;=NpBXn3&PY$sse2-|TCv9cKhQx2M}7 zGou?G^un(G7&ye5dV1aQ_jC-KJh>^uu_PrWLAUN7959K9&<3_kNl78-gdC&Ky4D7g zK;&u|LQ&P$*4|_rv9J9Q6-CCtFa$hFO-I-1TwnS?O3};KR*^xv1igHw+KS*wonuTZ zY2EJADT15AZJ}grutD)yH>6}_FdTlA#aL~D5=7{>m5f=-&2qZpEs@9~wG0h=d3}Eq zoNUkJl{jHzV^h=8S~xm79*9Zd8M7-1CwL*fgC98jaQ(Ay-e6mxyt~jewX@fau8}U> zKA3XfO4?E=O%EZjs`^2-c%Z-Eu=!P0e_g^L!F`(kUssoI`z-z<;4I*r@r z=AP_+y{X8~&7ClEJiyz^P@#iN-G2SjF=L>YHzc1Be-`$v>q~hl0Ca0nr zSOC3R_~}#h%dH>4p~MVtw)u@P*kc?}*dH#PLAzgoIw1mK3q2Pb6Z6=}D8&*vK28=P z-wEu!v9nVE*Z%rt`=iV#aKRZ>>37AcQ>eZM7l9@rWn|QV?P+Ogsg9QbJfNVUxZL$> zz01dUL(31hX?tTM2lU;yZ}NlI_d$ck$HxPTw?X6^dwVvZS$#m2OiWGP7Zz58+rT3J zxq^dLrGGpEiJh)>pqi>QO={@a-{%93dGk|5L_~r^v&Y6*HUUF)LP9qX(SkB37Z)Kw z`@c;91nU(c&ZrUeVug$r%eh2Xhx16-$)|B3~ zw47YfAOomNsL)vdh$17VyLZ+bD}a4(#1V`d&C8U#$>qe$csc#Y!9 z${tIB(b3VzrlyQgz;U#E0sH>#p;iONHx?(FQ`R60MIb4j^xLyTbb z{gczIK7*vhiu-Qex#X(&M#Ar}7)T~SgzWK+qS8{303)#7)v8p|HwH}` zJwjEIc#6}TM197~5nY`banaS)0(gcTG#;!=-xH>`XKI4Q-<(9p$9FkYwtVdWgLx?G zxqX|HGyHi^+^Ll=YLcOz7+DgHqDc)s5;Tt@SS?*)knAkg%&4|mxHB@W2~#YT79VeF$fVCpCzm{Zr zFs8z**4y0cG=Ii{(8wG80S27r+=33k#+&qqc%z^>4zi>g!Y9xpN12O={Ld zRu)qzEn<1u0v@iy^b?bl{91!OM?qc>Kewxw(OF5p^He?RU2yR8T4OtBXNL3DVE#bKz_ zP#C8GF;u&-+xtBxB_$=Ze=pDhmcdLY4NfJtwqBjg6_=DO!&h|;40OQBZE9AUw44`4 z%%~l814!xNh1bZCyGDwKJo(rYXFftZG zcfqJ8MM+*>{$IJPs0?Ide@V>9xMeGp_UOfGi1Kkwb#*=t#lj?n2<_SMVhtbe%JuY% zCYHwO$q9ONbhMPZdgRfvg*{jyIR@!o<;KGyQ9Zm5itlz?uYD7Fo^397S3YZ!H#g6@ zyi9!JoCA{tcht~t7}$`}(14-C1NmggMTw4%-a9x*-lu)~j*JN`?2BY2zE+EF{C}(n zbFZ&ozY-D>x-NI&(Y&!4Ouj=G4HO{;^SH|;5$b-Yf(6F%F;^Kdhl{0D2 za)?d>kQ0CE#!!CsD=+HLait&ko8(;YQpW+#zH)5#lh zL#+l9e?x1jps~B1(cHJ*2PsyPT0E5J>36xpXw>L&@8V=9udGZpi0TWOKlN@V^eXtj zPV1WA!+w8tPQ5@>#22bGkTTIJpylzQaIf>5{8`H`ZYCGovjr*K|m zweJ@+WHrvKo?Bjs{ocD#in7MeMJAO!ORhHn?{sy^z2@C;z+~Vsyprme?q9+y*B@wW z^T+qhEE6HeAaC;AiM=ynQPtaN#^-u<{t~GFpKhG4cgcF!OTs8I2!$BhZ4ndw#l2^i zW*ZLJ!qg$)NE|tV7K%r>max z^o?73EOlVEjjr{3Jo^8rMUbkLR2f1(6V#Kl6LUd|Nu2+>OGD`-lqQ=TkEac&3Nwk^ z{<2B*Q`pHCVlHA55-)E$OGiglft|~5$xSzeNE-;eB@^BF=lO($J{kvtAh#7f_}#;( z!hPd|D3vvnR#-?#_LncoKYsjp@l#@lJbsB-+(`%bAzl`|2u=Oq zA$0|%A(I*Fnw;?sa7NwMHGPX9UPh;<6=47YW+mZD>ObBu17ZooO)u8MRBAW2T_G$x z7ned<9{%+9zN@aC&y_E`6AlhGnLi0g8M62)mG~AT3L3L5E||OG5uD~ zVWcRpBA&OX3<{d=ASg7{bJPf<`^IPg!3;9~HJFVZTeU4

- - + +
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