From 8d63b0a159120da925f2f09dd971e5b624855710 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Sun, 28 Jul 2019 09:21:17 +0000 Subject: [PATCH] added comment about object rotation, changed lantern spawning command, changed /tell output when you /tell yourself --- assets/voxygen/voxel/object/bed_blue.vox | Bin 60541 -> 0 bytes .../voxygen/voxel/object/bed_human_blue.vox | Bin 0 -> 11776 bytes assets/voxygen/voxel/object/bedroll.vox | Bin 0 -> 51684 bytes assets/voxygen/voxel/object/campfire.vox | Bin 4648 -> 4116 bytes .../voxel/object/{carpet1.vox => carpet.vox} | Bin .../voxel/object/carpet_human_round.vox | Bin 0 -> 3560 bytes .../voxel/object/carpet_human_square.vox | Bin 0 -> 3912 bytes .../voxel/object/carpet_human_square_2.vox | Bin 0 -> 3912 bytes .../voxel/object/carpet_human_squircle.vox | Bin 0 -> 6856 bytes assets/voxygen/voxel/object/chair.vox | Bin 56093 -> 2128 bytes assets/voxygen/voxel/object/chair_2.vox | Bin 0 -> 2176 bytes assets/voxygen/voxel/object/chair_3.vox | Bin 0 -> 2128 bytes assets/voxygen/voxel/object/drawer.vox | Bin 58645 -> 11272 bytes .../{gravestone1.vox => gravestone.vox} | Bin .../{gravestone2.vox => gravestone_2.vox} | Bin .../object/{pumpkin1.vox => pumpkin.vox} | Bin .../object/{pumpkin2.vox => pumpkin_2.vox} | Bin .../object/{pumpkin3.vox => pumpkin_3.vox} | Bin .../object/{pumpkin4.vox => pumpkin_4.vox} | Bin .../object/{pumpkin5.vox => pumpkin_5.vox} | Bin assets/voxygen/voxel/object/table.vox | Bin 56853 -> 4488 bytes assets/voxygen/voxel/object/table_2.vox | Bin 0 -> 3528 bytes assets/voxygen/voxel/object/table_3.vox | Bin 0 -> 4040 bytes common/src/comp/body/object.rs | 32 +++-- server/src/cmd.rs | 117 ++++++++++++------ server/src/lib.rs | 3 + server/src/settings.rs | 6 +- voxygen/src/scene/figure.rs | 45 +++++-- 28 files changed, 140 insertions(+), 63 deletions(-) delete mode 100644 assets/voxygen/voxel/object/bed_blue.vox create mode 100644 assets/voxygen/voxel/object/bed_human_blue.vox create mode 100644 assets/voxygen/voxel/object/bedroll.vox rename assets/voxygen/voxel/object/{carpet1.vox => carpet.vox} (100%) create mode 100644 assets/voxygen/voxel/object/carpet_human_round.vox create mode 100644 assets/voxygen/voxel/object/carpet_human_square.vox create mode 100644 assets/voxygen/voxel/object/carpet_human_square_2.vox create mode 100644 assets/voxygen/voxel/object/carpet_human_squircle.vox create mode 100644 assets/voxygen/voxel/object/chair_2.vox create mode 100644 assets/voxygen/voxel/object/chair_3.vox rename assets/voxygen/voxel/object/{gravestone1.vox => gravestone.vox} (100%) rename assets/voxygen/voxel/object/{gravestone2.vox => gravestone_2.vox} (100%) rename assets/voxygen/voxel/object/{pumpkin1.vox => pumpkin.vox} (100%) rename assets/voxygen/voxel/object/{pumpkin2.vox => pumpkin_2.vox} (100%) rename assets/voxygen/voxel/object/{pumpkin3.vox => pumpkin_3.vox} (100%) rename assets/voxygen/voxel/object/{pumpkin4.vox => pumpkin_4.vox} (100%) rename assets/voxygen/voxel/object/{pumpkin5.vox => pumpkin_5.vox} (100%) create mode 100644 assets/voxygen/voxel/object/table_2.vox create mode 100644 assets/voxygen/voxel/object/table_3.vox diff --git a/assets/voxygen/voxel/object/bed_blue.vox b/assets/voxygen/voxel/object/bed_blue.vox deleted file mode 100644 index 9ada3b77d62312657c7ce35bf3e5727ac5b51474..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60541 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

do=_y4|1| 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/object/campfire.vox b/assets/voxygen/voxel/object/campfire.vox index d72cab43e7288ba97e1b53b823991f1088b18515..ab2ea769b6c5f0e6752bbcde344ab89e42149c67 100644 GIT binary patch delta 2061 zcmW-gyN+B%5Qh6w-PPA~#*2du5OS~x2OBtWNcwAE;rFjI#&vsdfmU;=(VR;(msrg?BVDt1woSi5nmd1GAA&cR zMqGI0?&XoYlPi<&)tO76z}p`_{=nfon7e#s@6)X1&H3%0*N<0fhSi+c#hgXWMfiUE z?&f+~NL6!=*eoR!J%Q6xd;2(}912MV2gQ`;r#JTYx|3BwqWXd};>_r$-|VwPBdU-Y z7_-h&@9gu`P&%bfPu+8AQ+e%vkxthi{q3=0DAaMu-ibH&b+H#oOe*F+h`9>^ndlSD zg9Lx)ynQH(J$s~pOs+747xD#`kP(D{oFF&RL&QIL4|5;@C+@B+CY+UKr{DceQYvLO zJN@IYQ-Z7(_;~MclVa_YfM;?mby{D`_s2wKFXT`l&MlCE8i&mC_$oX{F=r*FcY8_b zh2#R)D=`^=LXT8m_+HR6v5nX;-wO0h5Bv^2le>0eJ9WeyDM}N98-_L;@||V_zBB09 zO1J3t+-Q)dA6=1(jL1NoAU)E7L!(J!7|=oEyCQYgMaDTC$n7JFVMx_dfTGAgH?H_t#yb*?~u-afPv7my8FCcwj0elO-THRKf8>PElHS96V9+T{nWRxl+=#*jiiY>|> z)DNeA3(*gWewR#sk}aq^?xJq5MG17nfv&Q(iDXAb_Gm{=y0s|yEk(`lquFzD8~=rU ziDrvS9I3^v(vcF4gD2U-d+;Wx#eV%&1|dsX67 z97?}>guX=creRBy%83|ug-V_DL1joZPEZGhUZF3+6h%bs@IYXwLg$j~R)Qlxj?!Ra zGLUt|4tv-o*v-L~7G-c4>v0^lK?ewpi7Ikp344G#!u3JV9GX0;TyyDWB-)$Bds*SOaRW5~jijVF$5UsKpi4#!a&@6Se><5o%-3wnx5 zvLBUWQJ$khUt#k`V#yRte$Vp=%PcMxJHklyg#f);vzYL z!;E_L!)Kg{EkIN@;UGN|2dHgab;+_-=+h3JQ0r;p0yH+=;zZR=`#h@19dLXwsFT6Q z@vX21djgb$3!UaLCLnS*a^!&G{2M_>%#&_twdlDg9i6{iR{Y#fXXu7pkUg4Fi9I%sqC#Uwb|_hb-J7C=Qv6nV z^U4KRidUE@r3@{3eN_c_d8?ofvTX)1Fgez(j812(gv) Sh@(TP7#gyr?T-(aCjSBLPIg!T delta 2597 zcmW-iJ&zi(Is>C6oc5-F1STft{e(4mijkgv-^|LW{FsW!zkTt;oAd8~`^^`BpQh>8?>_tn znO?n|rr&+|_E+s_@JDlc1ux*6KYaV)za7KhpW-xyKHtw^9(MPzS_^AyVYeRE(B`|j z9nU9px{EL8Pbzs6$!mTQ?$e8KmtIcwzR;N^@8AFBXFn;}({xu~&iAFJRWxni-(J5G zukUI(mWARe(2wwQ=d^QVj!$QgxH zn7xEOrT8gEP7X4J6zDZ++vye9_rObWufz0hhE&}mhybws?>`ggBcKIT5WLxPzKa)*HEU- z`utcSiwcVKPFx#sJ8m9I6G~!KYY%={CU@FHlBkty^cCRb`aNh4fVsDzJK^w{&+IA_g+}t zfz|g9|1NKmH_YeqI$2}bYx(Y6cz1E(v^dRC);u`rUN-4vFOWf7S*4Y&Kn8W%PTP5o z%E)^eWYQp`dR`0Uj&FF#E$`xaD+>v*kQGZJhAbKByyZbgfb_(KWCog0X=DuKmbP>v zITrF@iCaR;z(a!4@sOaL0-41`n%8&=!~`Y`#DqPfWzZfZ0~*oN&vZ~9MA<>jdpyls zUS?J}6M!G{mLLxLP7^Pk_JF2k+Twx-?_qD$9P_w#zBespt@y!ro2Bqs<=qRDAFj6mTS&hZ`k)m2QXE%+0p}(=Kj@M&M&6_t~q_R5;chX-f6Ij?Q zg->hQ%`(Y!EJ&ER>^&bPMwpn%OJotUo!c>ai7bK);>8_b@y_H%`6(()%tEM5osYhu z12rb=l%`%d0VZ?m*C1J{1$Iy78ZjkpEzi4K*&9W#E)SI9<&6;P=P26tg^;W%8 zsymgqq2swqdp7Ua%2iOC(~p80dQknU>es6D3GIW$ZgoI2#-pHyf>yiMYBy0l)bsHp zOg`kMqh9M^5gl43_*f8XC`iRa1yMXykfF~y^rl^jMH>q0D5#;J6+KWq^Hn%2msdS# zTw+{wdR%sga(PwIi*tYV62alpUB|okiKfajHYFw$R5$jQh*P opN$i97G|!$xH&7cgJWfjUg}aWdg#fXb*azJ2|2s}7uRO`AK$~~kN^Mx diff --git a/assets/voxygen/voxel/object/carpet1.vox b/assets/voxygen/voxel/object/carpet.vox similarity index 100% rename from assets/voxygen/voxel/object/carpet1.vox rename to assets/voxygen/voxel/object/carpet.vox diff --git a/assets/voxygen/voxel/object/carpet_human_round.vox b/assets/voxygen/voxel/object/carpet_human_round.vox new file mode 100644 index 0000000000000000000000000000000000000000..ef5b08c75f1032f843c1d9f1a87e4c5318294257 GIT binary patch literal 3560 zcmc)MYlvM}6~OT|bMLw5{eInZCnjSaHj`-EJj}z?I(dxkBqlYD#&%3YD=j95(lSVB z!%%5Qi?O7}Ye*`z#;74mX>7wJD1L~cgi>f`h8RSUP>P6O{UGAE<$oIsMFM_w;KyEj z@3q%H=iKv{y$?Jzd{RVqZXVx7BR4{kJ>wH&f$8wK;6DavA9{FV{O7J26*({{60~K` zhX)t!T;@XB2svy^<{WqfGVdcm2$!(}32}-lmAR6&H98&E43Yy6J_3Y@U^8!#Zxz%> z®<$CkMYofbK8;KD<0%WRp+Yymr$SqG6Nvng|y!x|LCB`V??R$Jyfuo08ncFAGC zI%bZzM%&|9O-*!=kXJL-@;M*YRcI4;(YDwN9ki)YN9Tj-$Ja&6rar1fW_{*M+LRgzLO6xYx=6Xknc+~69FJVr)Fj8EpONF3`qb*8#Wm<+ z&>=?7e4G7h&dD`(Q6yZCgzM0i`2smIr0`J1>}~qw1t{q|^lfyh*`Uq(v?ud}F8iRv zT+X%i$#+o1a;+w(su_2=-X6zK9SbF61*(V`ZpnF)@53YRFxI7JgDy1^_8IWl3oTg8 z`{dc=7ZKOYtVb164;gV`u0OGbDj=8rQgS=A7JTB8@izB-jfT2Cv@@BD&3-=np{_Vi z*yI->Ylw61$&@&P4;w|meZW1Hp+nu2egq#j3ZMHB7IPtOL+u_c_KVDZ0sA3f&ab%M zv^E0b%ICb0d)yoJQ(BMTwZpNbv=L(#aZH;q*Cuvp9VCpk`RyBO_fYc;gl4~x{ZO%g z!1YR8?q76E-U;+0bl9_|?=fx>SHva1W6YdweovJAwys(0aK0$$hqM8D)UQo_vtPu1 z@ELc=@n|!in-n(v4jMDh^Hp%K=V(~((mJq_ndgsZ!9_q`2#46>xZ3Ek-r`;7oBd+; zLyPg4bpiYM=rAAA56u|disyyj-6!^#_skf&1<$hC!@PTlW8wq>eIE_Ad#I@Anf(&> zL&ozJBZ7~N`zApQ&y3TC2$1ufWblX++KTssOB@qN2;rDK?yrX0J#=_idK~jW%6@2} z&GBXA1iW`bwCK0_ojumOsCiE|IqxNMVswc^+LHHOKpUC&6?q3B0`D`9?yr503jm8$ly}fGqn*R zMuH4}i+dU&BE(4G@NJHfAVmg`?{SI@IUK&JISTW=<-2Ml>9P(HLIm(pFju0@cQdPr zX;az+9$YvmxNbRZ#kVu2jbQP;3~2-8%x7?5qvTo_=3UKPMV=?p_rd=ref~}9M~IOi zHHL^GDH7>t1JchCGZvZg7!g7Q(k}+3Um`SfK0N7HE$Y)BaN$UQ&_+l4Elc|Cw)8FL zZPwJpK6xEtmpvS#N4^1kyrE7;YctnD)s=pa`W9_n6SH5Nwp&Smh~pUI zcv>drIGd7|V;UwlfF z(Mp>~hjsY5l{#{Iqso}2a>!FTlc`*-G}$RyKPkH4xacR}6m<@XhSQ=s{pxkmwL5*? z{$!#P&*%EROCQs1Q=+?1h<@$7=(F>z-QClL2N&zosTI0zW>kkJ3tfDyrz_4b(pB%= zq4hq|rO#9Qr06}DMdeHEf5cHa5vg1#^ynR_p1Zr$8=oCg-TrYsA)=S?2mA#mo)JC& zL(wbeMBjaj{;24gG0|T?D0=hjq7(F=*(-YdamEjeZXFTbzd`iyHqloY-@Ue{2gerc zk=@JndWi(G+DJx^LZ`I=OA5?p;yo!L>tr?7n3>v;Qs~yJwX?@cE58@x{%0=+RwzR{mb={qx(9f(M(c|A zvu2I{VEt*mYtR?Z!-@563?me>nD$R{jMXl{>ir literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/object/carpet_human_square.vox b/assets/voxygen/voxel/object/carpet_human_square.vox new file mode 100644 index 0000000000000000000000000000000000000000..04bdd03f368c79acfbb2919eaad9f34f0c9ffc61 GIT binary patch literal 3912 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/object/carpet_human_squircle.vox b/assets/voxygen/voxel/object/carpet_human_squircle.vox new file mode 100644 index 0000000000000000000000000000000000000000..b67fdb677f6084f1037ec119a09eae58beb1f480 GIT binary patch literal 6856 zcmc)OYv}i9UBL0{|2v=0r|<84{{8N))E(NPneCWvYqPmpdN+rL($)}V#L#hL=uBF& zTK~popv@Iyg}8Lw8$}P+5D~%qk1UBGhDbzDdl1pHtJhZ(BnCa~hBu$%b^ct}_jmvA zd++;~&x8=}y6N`2iEwco!o9bjzpa)U{$2JzoRIJT!1>!hH%Pr9d?g>kxluShH^cya z^w32ooQ8x9rKTEl@q z7%Lbn7%LcSvlAbNO9iq5?3gLk!SI4_$Q7MhnxU^0tnvO`_nRZ zE1cy~MUCAg6J(rA4owU�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 bfBD|)pFVv5`R9*5c>V?OpWyj?-eLJ4(?=`& literal 56093 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 N&zp&7h=1Ub-vCJ`H!=VK literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/object/chair_3.vox b/assets/voxygen/voxel/object/chair_3.vox new file mode 100644 index 0000000000000000000000000000000000000000..6179f7e3517e953d971862861c97b8f9bbe2a392 GIT binary patch literal 2128 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 diff --git a/assets/voxygen/voxel/object/gravestone1.vox b/assets/voxygen/voxel/object/gravestone.vox similarity index 100% rename from assets/voxygen/voxel/object/gravestone1.vox rename to assets/voxygen/voxel/object/gravestone.vox diff --git a/assets/voxygen/voxel/object/gravestone2.vox b/assets/voxygen/voxel/object/gravestone_2.vox similarity index 100% rename from assets/voxygen/voxel/object/gravestone2.vox rename to assets/voxygen/voxel/object/gravestone_2.vox diff --git a/assets/voxygen/voxel/object/pumpkin1.vox b/assets/voxygen/voxel/object/pumpkin.vox similarity index 100% rename from assets/voxygen/voxel/object/pumpkin1.vox rename to assets/voxygen/voxel/object/pumpkin.vox diff --git a/assets/voxygen/voxel/object/pumpkin2.vox b/assets/voxygen/voxel/object/pumpkin_2.vox similarity index 100% rename from assets/voxygen/voxel/object/pumpkin2.vox rename to assets/voxygen/voxel/object/pumpkin_2.vox diff --git a/assets/voxygen/voxel/object/pumpkin3.vox b/assets/voxygen/voxel/object/pumpkin_3.vox similarity index 100% rename from assets/voxygen/voxel/object/pumpkin3.vox rename to assets/voxygen/voxel/object/pumpkin_3.vox diff --git a/assets/voxygen/voxel/object/pumpkin4.vox b/assets/voxygen/voxel/object/pumpkin_4.vox similarity index 100% rename from assets/voxygen/voxel/object/pumpkin4.vox rename to assets/voxygen/voxel/object/pumpkin_4.vox diff --git a/assets/voxygen/voxel/object/pumpkin5.vox b/assets/voxygen/voxel/object/pumpkin_5.vox similarity index 100% rename from assets/voxygen/voxel/object/pumpkin5.vox rename to assets/voxygen/voxel/object/pumpkin_5.vox diff --git a/assets/voxygen/voxel/object/table.vox b/assets/voxygen/voxel/object/table.vox index d529fdf6e382661e76b26f33c16464e7c46cc5fd..8862254be7af43b820f67c92702b1f8ba6182b94 100644 GIT binary patch literal 4488 zcmc(iedwN58OP5#_xm~bx!=$I=(M?}rJLc~Y|ea}ZBwUBovWqO%p%b-BpYHneh9XT zOlHHzG|0?EMu?)ar05SDA|go05(!E|qWZUuh@R*9t; z<>sn#(^0v(hOu@tUAuXw?L5(T)>U?vRCXSr!$OG<+D^5#)6v?wPV9VKklL9}(SlrI zXCbjuLp-p?uy%;;G>WO=Q0OB&k0Z21OFQih{S5s)>g}whPfGumo@qtR(#}TE5z4h= zM(+$eCkKJvh8Y6=4Gf8$MKI7mvUWC6YR1-QlUmJHjcR#+yy0o#-@By&Uk zK>dInsBfrgsA-~61gG++npKz&0^V-n7VxS=$Y3g*oD zn-$ENL&1Fb2A}H#*Bh=kTo<@LROEFI#Vl}r&;@^g?$yP8%soAV<~|>}&$Zz>;@&sp z0vMjHK;DoK9-mxzKkwL|n;Y%OJL>Vwg626M@duuZi05M9S&De3v?mVQu+H$TV^2Wg zPw)fJW6$$ul$%97_c0{OO;a>ObF@G$IP8*j9=k$o{043DJLq8`79d{KTs-UaiRqJ| zDP-6=T7boNP=d#=jGNck4R(v&VfWYrwu;=$M2`EE+Sm!CkVVW$tiZO|4odLEDyXp= zaxL0HPi(*sFu_)_o0^!tqcJ3q#_S!<(E=>bra@I z+$_dU&=fLaITY9y9JvzTqZQP|8fdXQ;yv~N0e=E2mn4oYl~R!~C&EwK*msWV^)bb_j! zdo^cXG=>B_&8ds#_yt&SP!ji0K~26vTeO272G#^(6Kqv5Z^8K%%!{3%DVm`<6yz+v zgA&_AMZCsupvCTp_2>WrdqP}U=C#a=#+GwHQ^<(rXaN@6kt@MNgzEf}>;zKC@N>t!V8P*+;IS+6HQL~}Xoug!0D;(qm@2s+O6o!k38cibl6j#3 zi|^19^=QSK8g1}f><;bm2kd}O(8%*VKmsXbo;lG1EWaNPzr^-vh1SqOORgi;`Sgb=W-&*nwEQ_)T<{d&f?FZn-z@ z+=Jzt!}H#^dOjG7X+?d9UDDHGmoasyUqjC9HT5%QZ6IUThM7}lZP|ZH{dTcm z-Y1^3v;01L-Z=%mD!!)*zQHQq8xFtZz2WFx;^*wGre994nw}ZG8pzmB11aaz(l4c7 z%YG7ib&$}n1Izo)^X+E&j`L8^yW)N*=wH#_F;58&zvTUv)4PV8-Zfaa_2yl+d$ znXP7?oLOq-%Q%k)GR~)Ao|GCb^Q6>mA>nV`LBiR0%o8(94>9xfoPWeD1LqMj%K(9M zH4xaN;oJxI9l=1)h~7E#)tpz(d^PiB#2exnvoy?V8g@k;JM(9|&V;V;1j%ye#K8yu^ zf#xWT8F3g>d>9ja7-KZXkBCR^*r1sUI_-|PXoJ>Jfrk(o6vU1-tS^dl@ za_;M=%j6a%r#(pRgGw%bMTz<}{rBXe4pgFE8swqVTRC)2khd>6N#yDe%K@e2Wq1ev z00-_<^89y|966-qjTiCPD|u>@lAqq7($iX`|$dPY-R{r$NPC4_`Q7%636uIWIGvxN|7s#%w zmF)eTk|*y`^2&FVtX;lLHm^QSZdrSl?A~~xY+pUf&ht-_eOG=&4&QpV?704N*>&5s zvUK;&^6&$9$eu6nkp17-C5I1vQ;xp+gz)Z_6Z%$GtXLuEu39N;&-$o*;=EO|>Ed(c zx+^Y}{a-&>p8w%W`SlyC<=tPNDc`5(;b)Y*`Ew<||CN$GJI|2E_pXuGp4%XQ{>?Vo z{ct1uemuyFZ=ERb$|?W%{jXoYUfxq8Du;Jom*}XH-~CL<+c%^9{no5mBVSQ_MVWn~ zp8b)Sr}_In_K&~ee)7wgFPA^wEOPBukq70kvOz8r`RzF(k6k5l$tC}G{+C|#sC??G zm*l2xZ_4gFMecv>knDZ>usrh8tMa{H9F>pX{g7PxwI}78AG{*lUN|cMG#~ZJ{2d-J%SD(M&Z21EGhdS!-7(cmd literal 56853 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 WT1L~Xq|T6t;g?C(oX+KRK;i=#3x`ht diff --git a/assets/voxygen/voxel/object/table_2.vox b/assets/voxygen/voxel/object/table_2.vox new file mode 100644 index 0000000000000000000000000000000000000000..4dae018f9ad405286af5b45714a52e03b5fb84f6 GIT binary patch literal 3528 zcmc(hd(4+*8OQI#bGnZ|j5ka$ctc7KP2~`W1bqomz`&3qeKDh!Q^s7znkjqdMp(-n z#f*V%8JT0OIhnFISL+XA&N(;N968rkthrYG8?3dS=lSF6^HBeEp#JQ)eRtjWb-u6r zy6)$<>(0B!k13_Lt>3a8qNbBlJGV@3io=HAjDKL*-+j;ImM7f6Rcen>${OD(9s0U~ z=Fr;YJFVE)zSkpY@_ng&SCzgiv+r&8U2S}8wePElj`wY4u_=9TB0A2uy27S{=X_T* z@R1d@Zwe-nXfo9bk z_*$vH#-B!CXWdpqEUmkW8kwZ~NR5oqT|*5G@@6=z)@|e*8hJC+6nQzEJDa|uep;Kp zq<$uuuH-Dnn64migWQ#az3Cgn*^oQxqLDl5WRmTiAL7~GQwI}muVSEHwl6rlP0*pn z#ZN6*KmeJ z-qxURN>H_l{3E_2^*6BqCB0B}fj&^49vbqt@GX2>^#%Pe9bt>e6odo+fM}hpX zH`oVsJ@qxZ;Vxb0sZqF`4|7(NH~m!8mztPi=nH%`VYq+aj(ord%K6M7C$^y%Jblqv z-;bKmdd?KskLu7h$VV0Z3o3fvqGPF%<({IW&cqp&p>^b>Qs_nnJ#RuA(Q)+L$Wm_= zI?LP_pj4r)hBpA}sac|bJiYEXkHSwvR?%A(vlm&1K@T|4;3p09ILt78=r~hgomh_y zv58;dC(?6~nk3GZn5Q(%D|U(VEAlIcUIHa?GdjwKE_1ILy^K!M4mABp<1>dolSigM zJoo6C^~l{uYM7aoOs{3mnW;^pW(i&-pU8a#Y89xHAL>i3-OvZvX6`d1%R~I32GlBH zAE{-;e#9Fx8Y$vKc{eg|NFFF}MdqEzyaSmxASGZx)?L!N&%6hjea;5C=~6PtO`q5& zWCxZ_9Y0zh`lBwIA05oO53}tB61Ha)u9Jw~gp&3fwXYM33 zFNrxz%t=C?kSF9RJNlj((R^ogxLANvhf5WxK?58-4-L==61o{^`qh|l$wCYIsDxIa zX5B!Y3EW|z*XV233Ej+I+i=m)-xd_~PzfqfTY44hpdJL|k$nQ$hD*8#mrTJ-(2K>; zkDw};31|a#z_SkML}-HMB3#rZ@k-*Ap(~h`5?X;8UITUTJnO(Zg2X;!qbuT7)TJU% zP=X57%ya|avG&jajUchk*yx&gya5&zpscZj*3bqx)*c#ob0X^m&DiLMc)TN)H?9CB z>#D&H+Cbg##()4K@&qqqqaE=a=X1p4eJY_9w1zfN2ldDUG=juBJM27myla;4LE*_0 zS`FU@cnxr@J^TP7NFZaQ19=AGfr9T+398HAC(Z}Y@#cE=0Ys4CWo&dL9&fk>1t>wq zce0MegF5ye8rVnH37WCdyiX>Di#BoZpad1D6Y-!9xn~_%N089X@HGFOOy(YPxKw2N z8d^bX&;SQK2q1zqyjj@Xb^FKGtK#zCF|~U2YMGjvl6Rk0viaH9X#SN){Z%_c0}F&ni)$B>sU$)X^;J%$PiR{Z(@6ruWL* z>*k1T{eT=*N?rl)fZv0ok19F+9VO>ZDS6{%_7h5;+oa?tcPY8>fRah}kM2@(q5DI*DBe!Rmq{xC^_+EC1<~_WaZr1vSslCxp(CavVY?m*|m6<>|HTO4&VMk znZEBvnf%0h*|%rAOg+3?o_hQNIq=0vIr6oAGJWdna{kq4g&vgm&Adv+$H!&qqWQA& zh7ZX{mo1V_YnRHMx2=&QPh2afe=uKu^~Pek@QWq#Jz`FuRPyG}l>F|ON)GH@D9;>P zF0Z|~LH_jXowEO_8FKhXWAgG_*T@B#_kTbC#KeTWt3*@--g#Z@c_qL7sgk#ML%F}@ z%a_ZS)FDyku&5V)DCT+Y_xRuM@Cfp`bLYw*c8hG^A#zauA{*pZk>A`Ta(uJMx^@3n z|66W;T0Xw{jNG&HP1*mT$YaM($)V?`>PGn-_z!;6-vCr|s>}cY literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/object/table_3.vox b/assets/voxygen/voxel/object/table_3.vox new file mode 100644 index 0000000000000000000000000000000000000000..b3f6b0f72ec769fbfdd0db95736c081477f91fe3 GIT binary patch literal 4040 zcmc(iUCbUu6~||HX7*!dcW3r_UyBqhwV=>q_$rnnU#+D;!Gfh)p&+7>K+_PhF$m2Y z5-b{#6dP;`CSpZG8bfG+RHE?$8$t*PF{Bb=qC|;NZ+#nM+}(@gZ@?Qr&`Y1>Zj6so&*FndpZY z{NRHhHPm!|be$h6xNrRw8b6uB4_)JjmT}Ygv4A?y9P&`@{aC^+JUBl%=f?^PmUA_G zYCl!*0BYBfJ(?hfjhJXcWeEaYd_Z9%|fR2gU-=Y zyGi%(;Ksn7GP=QPH&&e+J$J9Tvo76KGB)_9D>qukfqNIuO@=j#yuj}!`2*Ljn>^fj zKXo1C{8SfiD)7-VZt%+`pPa+KpGv4EmR;q?wn}%yHoSsL{4C&>wI;>6WFFmECqJDV z4Rc@MJ3eTw2Ag3pg!DA{DMwVX>j@X27$;HM^+b>=3Qxgn3#(Tw#O^_x*c zP))ux{#MBS3_s9WB5&AV5IaL0H8C$aW2xJk+!vPf$O~*YoU3zmLUoUw-VGJ?SLOHt zRm|&(F}&a|nw}`pQ|8!!jCVuXGlmLuv{1n~*J{k8BEI;?z7AbFW zob5Edp~oD(J$hq{ulSv(*jr1?izx>yYUDk>*kFeoTRlGK*y*9XL~e?qhv(?;(!HtW zo^eeqjWt6~-VAkX=$W2zN1x`@tTEJ}LB=@et|8eWzoqh%$6p<)u|cK{T!Alh;Kv;I z!Phx3NP#gX)YBX|;f)&&j$lg!bBwOWIdDsXXD#=d13wfr1G6$nb9R=n zhdMRXXiNSZ;+G{%B7Tl}<=r>~J2P-{2CnqrY7Ty6@EN)r{H};;OATktXWYTi6B&F4 z9)>gq4`*Ocm-3S^h?{2}O zsY){L5Xh4!eieJ&jC+EIk$Q{NTRlrU!4mK!BwR7s=rUvmS zT7{kt9P_MK>~ENtNoEZ=R!j}DlC{nh;9Gq#)$X>Lm1$`W1RW-PJK96T*pZ!_Le zQw>GBL#(h}akl16HFoF^NtSw_y@vOz)Y#YLAMW5DYM{V8vaSv99y#gITQaWF9Ni9# zkG$C}^Ne?B1}Uf}2Xk-_<}{Gvjh&-rGPotj1-UKZHPoa$v(}L#P3;uCJsO=|pjMf; zykUV{H{g&?wM6YWWRBWw7zbpY{hGJ0;!MeVR=_R1#a=+}z+KIK3^iM(`=##zYR1DG z=53NC{nSiLO%?P&#kdAX9lT2Vsc{3-`3QdX1`8v1p5oVA1pmnqsP*xd9J3s zSCio_snZ$8n))*)n;iAp(R&V^ni?$A8xr!Vd_`N2j+M+A>M^3vyO=u;o_4G>~RPv@M;@l*311M%I_ zSq-*WV#+syvGh0ZKK?}B;b>A{)%ZzW(<3!K(ZD05TYo&Ze$g1e7$9BvMH~HMw0^N~ zAnzCR8t(k@zJ@C16}>WP`CmzPM~tmK3{m7Kg! z$w!`5QtedI?ol$we96;F&fo0i>N}%szkg1?^}+|_@&zSZ_AB|qVI}vz&e<(XW!a7u za@xWwS#xBaoV06RR_t9WtDZVV&VA){IpJm{r`?b414=G_QHlB#_IFpJ_IIM5pO*(u z@8!@r?~^w!IZ5Q|56XU}Y`6tQVD?cPhZaG`Fe{#L-y!BdHxa%f)=)T)!_m{TIzOV0;BZs~r$6k6|_%9^y zpX+7$^5t^w$`!KatPjh_&RZ!PFFseUyW&FG_rS?=_y;TGSFf&;w|;S^d=HyPo>KDK z&y@WBmr8c;I71%Wvszw$W`q3s*IQ-RLs9nrXkMOs{X}_7PWiw4zi!<+d0UC73VQPu z(Z`hh_NPkTxCu`FR() .get(entity) .copied(); - if let Some(pos) = pos { + let ori = server + .state + .ecs() + .read_storage::() + .get(entity) + .copied(); + /*let builder = server + .create_object(pos, ori, obj_type) + .with(ori);*/ + if let (Some(pos), Some(ori)) = (pos, ori) { let obj_type = match obj_type.as_ref().map(String::as_str) { - Some("Scarecrow") => comp::object::Body::Scarecrow, - Some("Cauldron") => comp::object::Body::Cauldron, - Some("Chest_Vines") => comp::object::Body::ChestVines, - Some("Chest") => comp::object::Body::Chest, - Some("Chest_Dark") => comp::object::Body::ChestDark, - Some("Chest_Demon") => comp::object::Body::ChestDemon, - Some("Chest_Gold") => comp::object::Body::ChestGold, - Some("Chest_Light") => comp::object::Body::ChestLight, - Some("Chest_Open") => comp::object::Body::ChestOpen, - Some("Chest_Skull") => comp::object::Body::ChestSkull, - Some("Pumpkin_1") => comp::object::Body::Pumpkin1, - Some("Pumpkin_2") => comp::object::Body::Pumpkin2, - Some("Pumpkin_3") => comp::object::Body::Pumpkin3, - Some("Pumpkin_4") => comp::object::Body::Pumpkin4, - Some("Pumpkin_5") => comp::object::Body::Pumpkin5, - Some("Campfire") => comp::object::Body::Campfire, - Some("Lantern_Ground") => comp::object::Body::LanternGround, - Some("Lantern_Ground_Open") => comp::object::Body::LanternGroundOpen, - Some("Lantern_Standing_2") => comp::object::Body::LanternStanding2, - Some("Lantern_Standing") => comp::object::Body::LanternStanding, - Some("Potion_Blue") => comp::object::Body::PotionBlue, - Some("Potion_Green") => comp::object::Body::PotionGreen, - Some("Potion_Red") => comp::object::Body::PotionRed, - Some("Crate") => comp::object::Body::Crate, - Some("Tent") => comp::object::Body::Tent, - Some("Bomb") => comp::object::Body::Bomb, - Some("Window_Spooky") => comp::object::Body::WindowSpooky, - Some("Carpet_1") => comp::object::Body::Carpet1, - Some("Table") => comp::object::Body::Table, - Some("Drawer") => comp::object::Body::Drawer, - Some("Bed_Blue") => comp::object::Body::BedBlue, - Some("Anvil") => comp::object::Body::Anvil, - Some("Gravestone_1") => comp::object::Body::Gravestone1, - Some("Gravestone_2") => comp::object::Body::Gravestone2, - Some("Chair") => comp::object::Body::Chair, - Some("Bench") => comp::object::Body::Bench, + Some("scarecrow") => comp::object::Body::Scarecrow, + Some("cauldron") => comp::object::Body::Cauldron, + Some("chest_vines") => comp::object::Body::ChestVines, + Some("chest") => comp::object::Body::Chest, + Some("chest_dark") => comp::object::Body::ChestDark, + Some("chest_demon") => comp::object::Body::ChestDemon, + Some("chest_gold") => comp::object::Body::ChestGold, + Some("chest_light") => comp::object::Body::ChestLight, + Some("chest_open") => comp::object::Body::ChestOpen, + Some("chest_skull") => comp::object::Body::ChestSkull, + Some("pumpkin") => comp::object::Body::Pumpkin, + Some("pumpkin_2") => comp::object::Body::Pumpkin2, + Some("pumpkin_3") => comp::object::Body::Pumpkin3, + Some("pumpkin_4") => comp::object::Body::Pumpkin4, + Some("pumpkin_5") => comp::object::Body::Pumpkin5, + Some("campfire") => comp::object::Body::Campfire, + Some("lantern_ground") => comp::object::Body::LanternGround, + Some("lantern_ground_open") => comp::object::Body::LanternGroundOpen, + Some("lantern_2") => comp::object::Body::LanternStanding2, + Some("lantern") => comp::object::Body::LanternStanding, + Some("potion_blue") => comp::object::Body::PotionBlue, + Some("potion_green") => comp::object::Body::PotionGreen, + Some("potion_red") => comp::object::Body::PotionRed, + Some("crate") => comp::object::Body::Crate, + Some("tent") => comp::object::Body::Tent, + Some("bomb") => comp::object::Body::Bomb, + Some("window_spooky") => comp::object::Body::WindowSpooky, + Some("door_spooky") => comp::object::Body::DoorSpooky, + Some("carpet") => comp::object::Body::Carpet, + Some("table_human") => comp::object::Body::Table, + Some("table_human_2") => comp::object::Body::Table2, + Some("table_human_3") => comp::object::Body::Table3, + Some("drawer") => comp::object::Body::Drawer, + Some("bed_human_blue") => comp::object::Body::BedBlue, + Some("anvil") => comp::object::Body::Anvil, + Some("gravestone") => comp::object::Body::Gravestone, + Some("gravestone_2") => comp::object::Body::Gravestone2, + Some("chair") => comp::object::Body::Chair, + Some("chair_2") => comp::object::Body::Chair2, + Some("chair_3") => comp::object::Body::Chair3, + Some("bench_human") => comp::object::Body::Bench, + Some("bedroll") => comp::object::Body::Bedroll, + Some("carpet_human_round") => comp::object::Body::CarpetHumanRound, + Some("carpet_human_square") => comp::object::Body::CarpetHumanSquare, + Some("carpet_human_square_2") => comp::object::Body::CarpetHumanSquare2, + Some("carpet_human_squircle") => comp::object::Body::CarpetHumanSquircle, _ => { return server .clients .notify(entity, ServerMsg::chat(String::from("Object not found!"))); } }; - server.create_object(pos, obj_type).build(); + server + .create_object(pos, ori, obj_type) + .with(comp::Ori( + // converts player orientation into a 90° rotation for the object by using the axis with the highest value + ori.0 + .map(|e| { + if e.abs() == ori.0.map(|e| e.abs()).reduce_partial_max() { + e + } else { + 0.0 + } + }) + .normalized(), + )) + .build(); server .clients .notify(entity, ServerMsg::chat(format!("Spawned object."))); @@ -668,9 +702,10 @@ fn handle_tell(server: &mut Server, entity: EcsEntity, args: String, action: &Ch ); } } else { - server - .clients - .notify(entity, ServerMsg::private(format!("Don't be crazy!"))); + server.clients.notify( + entity, + ServerMsg::private(format!("You can't /tell yourself.")), + ); } } None => { diff --git a/server/src/lib.rs b/server/src/lib.rs index 8cb4763bc4..902e86fc21 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -163,12 +163,14 @@ impl Server { pub fn create_object( &mut self, pos: comp::Pos, + ori: comp::Ori, object: comp::object::Body, ) -> EcsEntityBuilder { self.state .ecs_mut() .create_entity_synced() .with(pos) + .with(ori) .with(comp::Vel(Vec3::zero())) .with(comp::Ori(Vec3::unit_y())) .with(comp::Body::Object(object)) @@ -176,6 +178,7 @@ impl Server { offset: Vec3::unit_z(), ..comp::LightEmitter::default() }) + //.with(comp::LightEmitter::default()) .with(comp::ActionState::default()) .with(comp::ForceUpdate) } diff --git a/server/src/settings.rs b/server/src/settings.rs index e18b0db40d..a6d5cd5c45 100644 --- a/server/src/settings.rs +++ b/server/src/settings.rs @@ -19,10 +19,10 @@ impl Default for ServerSettings { Self { address: SocketAddr::from(([0; 4], 14004)), world_seed: 1337, - server_name: "Server name".to_owned(), + server_name: "Veloren Alpha".to_owned(), server_description: "This is the best Veloren server.".to_owned(), - max_players: 16, - start_time: 0.0, + max_players: 100, + start_time: 12.0 * 3600.0, } } } diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index 9152d33558..47ecbb8219 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -526,11 +526,11 @@ impl FigureModelCache { object::Body::ChestLight => ("object/chest_light.vox", Vec3::new(-7.5, -6.0, 0.0)), object::Body::ChestOpen => ("object/chest_open.vox", Vec3::new(-7.5, -6.0, 0.0)), object::Body::ChestSkull => ("object/chest_skull.vox", Vec3::new(-7.5, -6.0, 0.0)), - object::Body::Pumpkin1 => ("object/pumpkin1.vox", Vec3::new(-5.5, -4.0, 0.0)), - object::Body::Pumpkin2 => ("object/pumpkin2.vox", Vec3::new(-5.0, -4.0, 0.0)), - object::Body::Pumpkin3 => ("object/pumpkin3.vox", Vec3::new(-5.0, -4.0, 0.0)), - object::Body::Pumpkin4 => ("object/pumpkin4.vox", Vec3::new(-5.0, -4.0, 0.0)), - object::Body::Pumpkin5 => ("object/pumpkin5.vox", Vec3::new(-4.0, -5.0, 0.0)), + object::Body::Pumpkin => ("object/pumpkin.vox", Vec3::new(-5.5, -4.0, 0.0)), + object::Body::Pumpkin2 => ("object/pumpkin_2.vox", Vec3::new(-5.0, -4.0, 0.0)), + object::Body::Pumpkin3 => ("object/pumpkin_3.vox", Vec3::new(-5.0, -4.0, 0.0)), + object::Body::Pumpkin4 => ("object/pumpkin_4.vox", Vec3::new(-5.0, -4.0, 0.0)), + object::Body::Pumpkin5 => ("object/pumpkin_5.vox", Vec3::new(-4.0, -5.0, 0.0)), object::Body::Campfire => ("object/campfire.vox", Vec3::new(-9.0, -10.0, 0.0)), object::Body::LanternGround => { ("object/lantern_ground.vox", Vec3::new(-3.5, -3.5, 0.0)) @@ -553,15 +553,36 @@ impl FigureModelCache { ("object/window_spooky.vox", Vec3::new(-15.0, -1.5, -1.0)) } object::Body::DoorSpooky => ("object/door_spooky.vox", Vec3::new(-15.0, -4.5, 0.0)), - object::Body::Table => ("object/table.vox", Vec3::new(-12.0, -6.0, 0.0)), - object::Body::Drawer => ("object/drawer.vox", Vec3::new(-6.5, -6.5, 0.0)), - object::Body::BedBlue => ("object/bed_blue.vox", Vec3::new(-8.5, -5.0, 0.0)), + object::Body::Table => ("object/table.vox", Vec3::new(-12.0, -8.0, 0.0)), + object::Body::Table2 => ("object/table_2.vox", Vec3::new(-8.0, -8.0, 0.0)), + object::Body::Table3 => ("object/table_3.vox", Vec3::new(-10.0, -10.0, 0.0)), + object::Body::Drawer => ("object/drawer.vox", Vec3::new(-11.0, -7.5, 0.0)), + object::Body::BedBlue => ("object/bed_human_blue.vox", Vec3::new(-11.0, -15.0, 0.0)), object::Body::Anvil => ("object/anvil.vox", Vec3::new(-3.0, -7.0, 0.0)), - object::Body::Gravestone1 => ("object/gravestone1.vox", Vec3::new(-5.0, -2.0, 0.0)), - object::Body::Gravestone2 => ("object/gravestone2.vox", Vec3::new(-8.5, -3.0, 0.0)), - object::Body::Chair => ("object/chair.vox", Vec3::new(-3.5, -4.0, 0.0)), + object::Body::Gravestone => ("object/gravestone.vox", Vec3::new(-5.0, -2.0, 0.0)), + object::Body::Gravestone2 => ("object/gravestone_2.vox", Vec3::new(-8.5, -3.0, 0.0)), + object::Body::Chair => ("object/chair.vox", Vec3::new(-5.0, -4.5, 0.0)), + object::Body::Chair2 => ("object/chair_2.vox", Vec3::new(-5.0, -4.5, 0.0)), + object::Body::Chair3 => ("object/chair_3.vox", Vec3::new(-5.0, -4.5, 0.0)), object::Body::Bench => ("object/bench.vox", Vec3::new(-8.8, -5.0, 0.0)), - object::Body::Carpet1 => ("object/carpet1.vox", Vec3::new(-14.0, -14.0, -0.5)), + object::Body::Carpet => ("object/carpet.vox", Vec3::new(-14.0, -14.0, -0.5)), + object::Body::Bedroll => ("object/bedroll.vox", Vec3::new(-11.0, -19.5, -0.5)), + object::Body::CarpetHumanRound => ( + "object/carpet_human_round.vox", + Vec3::new(-14.0, -14.0, -0.5), + ), + object::Body::CarpetHumanSquare => ( + "object/carpet_human_square.vox", + Vec3::new(-13.5, -14.0, -0.5), + ), + object::Body::CarpetHumanSquare2 => ( + "object/carpet_human_square_2.vox", + Vec3::new(-13.5, -14.0, -0.5), + ), + object::Body::CarpetHumanSquircle => ( + "object/carpet_human_squircle.vox", + Vec3::new(-21.0, -21.0, -0.5), + ), }; Self::load_mesh(name, offset) }