From 59c8ee3c70717313a6890ba9408bb9f42a0a8378 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Wed, 1 Sep 2021 23:48:50 +0100
Subject: [PATCH] Added sail boat

---
 assets/server/manifests/ship_manifest.ron   |  22 +++++++++++++
 assets/server/voxel/sail_boat/structure.vox | Bin 0 -> 5524 bytes
 assets/world/manifests/shrubs.ron           |  12 +++----
 assets/world/shrub/jungle-bush-0.vox        | Bin 2360 -> 2444 bytes
 assets/world/shrub/jungle-bush-1.vox        | Bin 1788 -> 2192 bytes
 assets/world/shrub/jungle-bush-2.vox        | Bin 2456 -> 2012 bytes
 assets/world/shrub/jungle-bush-3.vox        | Bin 1672 -> 1968 bytes
 assets/world/shrub/jungle-bush-4.vox        | Bin 1640 -> 2020 bytes
 assets/world/shrub/jungle-bush-5.vox        | Bin 2664 -> 3784 bytes
 common/src/comp/body.rs                     |   1 +
 common/src/comp/body/ship.rs                |  34 +++++++++++++++-----
 common/src/states/utils.rs                  |   2 ++
 voxygen/anim/src/ship/mod.rs                |  18 ++++++++---
 13 files changed, 70 insertions(+), 19 deletions(-)
 create mode 100644 assets/server/voxel/sail_boat/structure.vox

diff --git a/assets/server/manifests/ship_manifest.ron b/assets/server/manifests/ship_manifest.ron
index d964d990b4..36184ce50f 100644
--- a/assets/server/manifests/ship_manifest.ron
+++ b/assets/server/manifests/ship_manifest.ron
@@ -47,4 +47,26 @@
             central: ("air_balloon.rudder"),
         ),
     ),
+    SailBoat: (
+        bone0: (
+            offset: (-6.5, -15.5, 0.0),
+            phys_offset: (0.0, 0.0, 0.0),
+            central: ("sail_boat.structure"),
+        ),
+        bone1: (
+            offset: (0.0, 0.0, 0.0),
+            phys_offset: (0.0, 0.0, 0.0),
+            central: ("empty"),
+        ),
+        bone2: (
+            offset: (0.0, 0.0, 0.0),
+            phys_offset: (0.0, 0.0, 0.0),
+            central: ("empty"),
+        ),
+        bone3: (
+            offset: (-1.5, -6.0, -5.0),
+            phys_offset: (0.0, 0.0, 0.0),
+            central: ("empty"),
+        ),
+    ),
 })
diff --git a/assets/server/voxel/sail_boat/structure.vox b/assets/server/voxel/sail_boat/structure.vox
new file mode 100644
index 0000000000000000000000000000000000000000..dc7451ec138bc854782fb1552b54fe1fd70addc4
GIT binary patch
literal 5524
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
Y?bD}EZy!H?eEaa>!`phjwl{?T10fFu5dZ)H

literal 0
HcmV?d00001

diff --git a/assets/world/manifests/shrubs.ron b/assets/world/manifests/shrubs.ron
index 61cc9d34b6..b8cf355e61 100644
--- a/assets/world/manifests/shrubs.ron
+++ b/assets/world/manifests/shrubs.ron
@@ -7,26 +7,26 @@
     ),
     (
         specifier: "world.shrub.jungle-bush-0",
-        center: (5, 5, 1),
+        center: (5, 5, 3),
     ),
     (
         specifier: "world.shrub.jungle-bush-1",
-        center: (5, 5, 1),
+        center: (5, 5, 2),
     ),
     (
         specifier: "world.shrub.jungle-bush-2",
-        center: (5, 5, 1),
+        center: (5, 5, 3),
     ),
     (
         specifier: "world.shrub.jungle-bush-3",
-        center: (5, 5, 1),
+        center: (5, 5, 3),
     ),
     (
         specifier: "world.shrub.jungle-bush-4",
-        center: (5, 5, 1),
+        center: (5, 5, 4),
     ),
     (
         specifier: "world.shrub.jungle-bush-5",
-        center: (5, 5, 1),
+        center: (5, 5, 5),
     ),
 ]
diff --git a/assets/world/shrub/jungle-bush-0.vox b/assets/world/shrub/jungle-bush-0.vox
index cd4980287e85b8cab1421043ca3115cc36f4ff5d..1131e571740ebc933dbf6b526009453618e8bb29 100644
GIT binary patch
literal 2444
zcmXBUOK#;v6oBD!J?tCQ63PsT31kZv3uqJsJpk08pr&U`yoE4hNR%N1q}oDQLbgy_
z$QH5%^PTEW|JSbLdi>{9*}wh#;j4dBN<Y4R_mfNd^D3oZ-+lb<O*H(|oP6f`;rEa4
zerOR*>HU&Y&gpSQDa&I+X|BktIBL6Ex3aDaO5N5L?WT=QyRMhDt>X1+U822V+1BiS
zZQ?rD7*O1!q9DgrJR55!bDJk_vwo;3$iaNjtYa<|4psk}5zEB2T-M@Qp3h@$bNOdw
zV=RxYX`!KpZ}=G(ovK&~#9g$hxM_>A^FAiK$T@NsFIRKord?6c$ZRnXIr>FhePZz@
zR#DKjYt$1ND~Bw;AQCFpl!&}EQLu#s8ge`{Z#J&#Tg6Jm=T#k}He8q44$o*SNH!i7
z1v%Q{RW4bd68mUlD@t5rU(`06tA>|r!$s1~foK=kNC5Q`ZsjqO+E5g#Rc&mNO;NL^
zE%^;Op3hw|HhJcd74xMz_ow2uC?YnrC@?m(C^$A;&|(v?#n`#q?&GAyX5nH?igBsR
z%X)#eGVc=Zxja_=7v4GC<xz3ryl~HQD5!Cbe&LTIpBh*r%O(D-@K|CU`BYr&X+jmt
z4n#r4BBzXkiiKZBK}C|+f{cP1ZTV#sR4i7@XzEv@hW4O9M{Bvp`-ROuFR;7DI62Nm
zLQV5%SZn2}yd}#!`wnFJx<^B4?$IED#|#JHF~_$e`)0t*YJ-csk>#GF#(WlMCOfai
zx53fn;LAeKtGzC2w{T2RSM|%@zZ~Bf=W+8AH{X&NusNrj!KSva?v0TUZ|BJzZmkge
z9p_RfYdf)?#Q<L!#0kH|zOB9=!FI8(x=kyUv_L~tl?e}c0kapddg)rcc=1BU{QAvo
z`2O<!w{KJZ^i4hIzu~vzz<!>|B|^i`5Fg@0e0UJux_Ecf#k+VHkD-V7A%18a;)l4)
zxr^`OyZA1!i~D~j@g$zalXyy>mi0R<G)y{7Fm#?Oeg>bxXYd((rXHWcXYd((2A`?S
zXYd((2A{!arom_M8GHtx!6#B1d<LJvXYd((*iDn}xAW<II-gkrKAk|fST}Ju$t;V9
z-A(7y`E)+BRD3$0&ZqO~d}jIhbUvL==hOK_Njsm;r}OE2I-gnQS(&hjza8RHdOioA
zgU`X|;4`;_&%x&)aaiy$`P?Fd4jm4SgU`WdZX2J2&%x*5^UW7;=2jkj4n7B;gU`Wd
zZtvWss7%<zpLlFJpPkRnXXmr?na6<7&S&Sd^V#{#qrqqAv-8=B?0n{NG1+e5uG22C
zt4|!EozKo^=d<(K`OITAPfYAmR3>cv#Zlvv_#{4wPx?<hjvt@IC-F&te0`?BzC6?4
zpP%U;&-o-iiBIBV8R*X^@kx9V8B0Ulgo#hm@m25z&v?QE?s11(+~6AN6)$+k6CQAn
zJKW+1*GR8;!84xlfP38G7B{#)UteF(mzS6G`T6;LdU`q^9v;s7`}_0m?(V$3y*+Pk
MZqDoLYkgDt9}l3BRR910

literal 2360
zcmXZcy>2Eo6o6sR*q)!T5=w_e0}*#HqN7<9gi-(!C}`P^W^N%RCDB(>Ao&);C8VbF
zE#wwb(GSm=-ORq@&*%8(_3>zb{psBof2WjwczgGwCVjQ0^vm7*@7_em-zOgtPVatu
zfA?RBXiDD<Ddn6lGfGL931!kE&*G?Qn949r6%)pBm@*0~Cd^ncX1P54TeLL~mq|P8
zFWRBVBcqhzQeolCtiNDIs>WeNuEV9E!seG5i};Ew#4{qJOvZuWW!7J?Vw~k?KH56V
zYiIpMJ1%l4sF*NgL0QExMSF!|bmq~SM`s?Ld35H{dBsssVUY8V(}J<cp`gO#X~u$~
z$|Iwo!ot&x1uNpoD5$XMG-JUy%b}oxjC08$FXE_hDbD2giZS!dJTuSCO&=8!-0W7x
zQBYwpr_4#*Q&3?6F8Z@R9NK<JMhr#0ic&Kl^-)lvC{znAH<sm*QBXn3Qu0_a7I_p@
z_`y>isagXgG72gT<ZKL9Tp_9$_VH9$h`%uyW_e^3RM<p4<*{O1<WW#TKwagLS24`d
zUSUw7u{v*cRyUXRQBXnF8LKmj7jaZLfNg!n)f{9LRCqa)Iam?5V5jqubQW`FaTHXT
z;0)#<FJhRZUG+a)d0cN?Wn5pBKFS;Ai}FMXLN&Bv``9LyjNy@v?)f)+XRm@99nA52
zRAGr4Nn`^GY7E4T(S(eG8j~?&L409xOL4kbG@fGN8jDA}AiKe`SaY%FVl91C7+|fq
zVSTtXbC>Do@4tPUKK}oAoPXWBVaIkHNfV*&)y2Db7w-}=tcf>2ns^g$;xTm>-^F*G
zU3?eU9GmzizKL%Fo49{R5>MhuJc+0DVO#HRqi)e|fo|}r;??<dKAlhJbL#Qwd^(@b
zr}H_L`E)*=Pv_J5oX6nP`E)*=Pv;Xy>wG$&&ZqO~eAt~P&Aahwd>Ws#1biBSX0vAD
zW|6ZjlFg6Cr}1fg&QkGdd>Ws|r|~(<$EWdWd>Ws|CraA*G(L?_<J0(@Wj-qtHt}o_
zkJ9tm`RsglK0BZDI{55-b`rY{cZ;7_WYTWHuCw#m`JC6rXXmr?+4+3^*_-n!cRo9x
zozKo^=W|}~c}r25u!%=JuAI-tXXCT++4!8F0iTV}#%JTR@i{*YJ{zBn&qie9bAB!s
z+f3XH+5|TBiBD+bv+>#ZY<xC8=Vx_(F>y;#nXvK1r^YAoNqiEY^pALaetZ(2#3%j!
z<&pmQ{78R(dZfSP`6NDxPvT=67|$p1NqiC+TSMG}iBB@{RqzGRc)}wdaF1Ku;2P-_
zFL=fi9`S&C+~Nk;NUwOoGoJ8>2i)TpH@H4tUtf=xmzU%D`T2NydO98-ACHHJhvWYK
T{<yupJ#KDpj_d1dV^jJcX-SH;

diff --git a/assets/world/shrub/jungle-bush-1.vox b/assets/world/shrub/jungle-bush-1.vox
index 5da37d5e63a0ac720c1792782422cca4280a2b81..31911ff47d8be973b31e2079a1b54362f119bec5 100644
GIT binary patch
literal 2192
zcmYk+O>QMM6hL8D*{*s>Euk<%VglKM#R3`yp_cfOKtWB<nA8?BL1IYsh76Frg|LKd
z!CS}{vW4Qih5@NQ<*Msj_OX3m|NO)I&;Lp(efRd=_nP$EC8eL<efauKy!iX*KZMi!
zUp~D1wnQ|gPnMLHQn#A-E$8)Gk*gME#>7+J3MzKF>yo#Of{HELvTw_pw-p&>&DW~k
zup{LxO+PY9*01%l?YJNnIao`+W)xINzV6}|q$&q1GD?-BwSaBM1<R%%ag|NK)<m0?
zY=!5#>p?*Ufh~*Yix_IO$(Kv9#$t`dy1b*Hf~56`Bcq_gK!z*Uq8}?V3MxF<!(uJ^
ztA1n@R7kQ8@i0eR6+Yzb4K><}oYl%uP+>4WVkoFEI0rG5IA@qlsu&6?+{`I9XA^S?
z>bEbePf!s@8pq}+V#{M&ImH}v>9M?6f}qy7p%of2ZA=rx#%GZduUSr6VxFisbyw6M
z3Tj={;-XHpsGAmb)xyDCS2(Ea8m#HMVcoRB|HN0%t3|99kypEmil~&>?O6RTXP2|f
zSv)VEm&jk_pd#;{QQ-jm)A}~99P3!DE81iSqlU1mpCvMUlP|tUg&&5RjQLgUz8H5g
zt^sEDqAzNps_CdHZ5)EJc9ZNCHocU^zS)y#W51$ZclBo%VjXf<Eb@u)GY3jMCm!&_
zHP-4ksLhdEeH&Klm|wC>qTAwkvT$D2Uv}m>YS3?GwU(9lkKcUtHvRYi$~pgrd&hxx
zo=Fp-;WosF_z)jDBCU&e4_&;Ack%f25I@8ZFNgRct~r}{6K~>8po#l;Ch;Vm#FKbR
z|4!>ZOf(ES3@{{56}Q1>@ELptpQ*=Z@ELptpTTD;^BH^wpTTGFnakia_zXUS&)^eF
z8+-<z!DsLpeArEs?%w%yKAq3p0zREUH(57uH^|%;o!vv{)A@8hbF27tKAlhJ)A`Kp
z<J0+cKAlhJ6I<H(bUvL==hOMjZJs+5HgPqG$JX;X_#Au=J_nz99DEKw2Z_Ukhr#C&
z`RI^vcsckSeCDz7IrtoW4nALg`eq*G!RO#}@HzM#eCF}aQ;MAlo4CZ|$oVurjZfp#
z_{=ik)A%$#jZfn<OM_42)A%$Zjn6C>gEb#ENll>HpD3Zmr}1fg8lT2zmes77IHlN`
zuyIAH@kx9VpTsBqEgt2^C-F&q(yw2f>G#jh^vB0%`cprj#3%7dd`tuRd=j6;Cy_BV
z#0{AEB#EzrFL=fi9`S&C+~F2CNUwOoGoJ8>2i)Thx41!i#S5PCghxE!9(TCK&H4KJ
pdcM58oX^kC=hM^E`S|#FK0G{}_xJbb-QC@JdwYA{+}y}b=^qh7itzvd

delta 777
zcmXZaJB}1F5CBkjee6bpfE#d?MM7u-KmrLZdzsERKpSxjA`*_oAqaS0F`j34l|6R3
zHBYbqzPi4Cx_|RyjPc>__R%o@%rU;)9^Sp&fzONoq{scYhuiPi*)e_+F&-zG<FUy$
z5>uWW$1IxTIA)L(jpQ|#ha*gq6pht$G15FiQZ#m&i<42-5F|z8q`5d5Z4E(EbYB*E
zSe)z@Bt@glxj2?NlA=-lT;wT7?{S3M!r5W#a4|7OBjG~w<fSVbtK7)TD+>scqOpV9
zgxi>J^CU%McNdY@lA>{<qQ&$cPb(rFm-8xJqa0sJibkLaIf}-lgXJh1i}w-Ft@Mo_
zdjp~<b(b@glVXa-#+RF#ASoITZYtmM6phKf?Q`qhFT!ytqKOhyG=6LkF}+9SeSZJ;
MZq)u8|N5@De>KA%1poj5

diff --git a/assets/world/shrub/jungle-bush-2.vox b/assets/world/shrub/jungle-bush-2.vox
index 06abd3b5d2deb92f20f549bab270c9704c05ee5b..d277e6a74d77dfaf0ac8c9c85a2afd12c7aad48f 100644
GIT binary patch
literal 2012
zcmYk*L2e~A5XN!8w!8ZUjfAp8VgtE?#Q_Edp)3Fi6g13^jjxa;OP;c1f$$Z=5pn?*
zzCxC4bA{$to>}lZU%RVZuKK&|{QSeaFaAs^efRe6dqetXPwA(-_usq;!|#*->D@2y
z@BYfuo&GhHa(Y~;tVY_)wykAhFYM)Un|5YrHf=GM$8CNaxA-oPdyM-^;ak}hw%`8o
zwSWBB!^7CaabCBb&KvEkrEHoHdp`?_u!sY<p9{N~_xliT5U|R}7Cv80qgWeQW8LaI
z^2)PaSwUA;Ud5uqZ!WTysL3`dChE>lagk3AI;(fa9;tSPRx#_`+??SwlGe#b`kAAr
zIr^#BCA0N3lc=1No+iCddP&A*qa{6Nc6Kf~TSwXYMa`n;YbkP3j&U^?-^LJoiE-H|
zd>fm>&il4dUW}CUnSEv(DWA4&p;M-1+p>);RM>^RoOXVSxMgLpY`u$|He5oHugK^7
z6n<+;)QZ?FHrDC$De}sblU$V4NKrG6#oWqXqb55iymXQ)$(d$8HBM(a3HwRCMcp#%
zVaQkZc4coyTCH1SUG$J$V*X^FPV7_Ig-vDVkyHLObE}nn$NsUNu%zgdJq2ub4h!Xl
zob76V#l6aL?_xvqe@9)PuA@ESqgCz|e~G(<|Hp5?ew)gN|IuUqhIgk%^*E9tT*GVd
z5B|YFOhj1c?>;(z=kNTnwDC9o#%TPF-*8m^%3t{_N9Ff-B>u#o_!EChAIf?Ug@&X<
zf+2XKcnv%Q&%iVAOguaT&%iVA3_KGV&%iVA3_JtR+y<V3XW$ul2A<g3z%%d+JOj_b
zgKm;^?~bSA>3C)f@N@uOu`Y3!WVXd*_tEimJRQ$$6`qc#<LP)hp4mP;9Z$#8@pL@V
z(vGL&>3BMxj%T)cb|z@zsl*?x$J6jMJPl97GmisL!_z=C1)Jpah%9OX8l&N9c;>O;
zX?Pl*hUcr#-pr$Hcp9FDr{QUM=JC!`ip~U0Jp6Iwcq*QXr{bx2<~6`m@l-q&PsKB@
z2A+zi;;BF?o_Sp)s}@#4m80rUT%n4m;;DElo{DE)t9fJMl%g|1<B6+=C*etW5}x!o
ze_TI22~Wb4e*N-DzkPnB-#<OlALj8SJPA+2qYR11lkg-w35?RjFJZ!y1io^<&@(;J
zg&ydhZs~@uDZSDQJ<}6i=z;F(mTu^p(ks2tGd<CT9_XHK>4vV4*VotM<>lpgettfl
fo}P}&<#IecJRJA;_s8w+?QwH+b6j6vi%sc2c=49+

literal 2456
zcmXBUL2l+W6u@yOwqxg;kx+L?Y@k<&IKZGHGz&n2DH>+SCRgZ^4H8wCERcMKa)hpD
zR=z^7&?|(WGhg~o?Dt;czh9#M_VfF%{|zDh_~z|TF5#~=gkRr&`2O{n_>JqJ;Qj9(
z-oDEQe($CbVhj%%3o23y4+SxsBQCB;MI5oJ$AUV>)3hvz^Ry&nEGVd$qg<RmCD$CM
zj|+-%6<b~BB#)G)PdQBw3ks^(iYco>%+tq|r-zIM1yyX7yI>qM;-YR*2VxHeRcw{J
zjGCebsaUV5K|vK;F<1G@*ELtZD8^N69l6!L$XHNN$NXZB9Oh*~oMu~@shXppVxHxY
zkRhN~a#%4%HHb*aaKlnivEqU$sY66UhKDW%6)P?XSuJKnBxG28DX3U+!7GHbi|QQ_
z2^mC}f{GOvyuwseA|fHfhL(bg6&FlZ9U>AkY<elESaHF;szE}Ars%O6tcVvmWGpDC
zWB$q<d5ZcSwJd5!v`upqRLoHh2^l7OD~A<xl1D;@LOqqoiYco>L_&rK>7^R1xL|yV
zY|kS(XIM-R)nUa2b5VnY3^IDB1}o+&kAw`OdM1w*ag{@c4d|8Jm|x5hW1^QVo!px2
z%Nz#w#Vm^<L&84P!Bfv8J1gcbJ|aae+{{y5HHQXqGM=-3yDMhv8lxa4F=SZK?b$89
ztSpCw3?~k9SmBLw85Z&m1zhB@A{IGhxRH|_QWb*->6h_p46kOqhOzyz-LbW?m7zJb
z#`0r{@u+d@C><pubpDESMKZ`^f-=S<h+lsA?oCLa|GysRuRAyF*p4H(j8J##;$6Ip
zcZpHf#G64AZ{kgS+`5bJ;=9Q%zKgpYoA@TaiEjd%xW6Na2k{^t#6$SJtaG<e_t5SE
zUGb^n)cJHioloa;>hbA(I-ky`^Es9IbUvL==hOL|+u+mrbUvL==QFm}`E)*=Pv_J5
zuscnfbK}$aG(Kkw_%s5|V$Fk_hn#JZYzB=_<J0(@t>V-8G(L?_<8!u;Pvg`0G(L^b
zXldiq_%uF^Pvdj8`RvTF8OH|k(Rw~RpPkRnXXkUi4n8}doy2az-NVmU<fdK0ZnE>)
z`JAtf&(3G(v-A1(%h%_t-1+Q$c0N0wozMAt&$l!>Gi=5oK3+MWjnBqs<FoNOKLb7+
zpN-GPXXA5z8hkcB8=sBH#^?N8JZy90rf3t`^k;lR8=sBO#%JTR@i{-M^NSg8X>?}T
zIL4>OC-4b;0-x}o`1t(z1U`XJ_~V-+{Q1=p{{G?!|H$(Rd;*`q$1+gQC-4b;0vSs~
z+yeujpzuZT8Bch`J??Oe8(iZG;RVll!Xxf+hg;m>8dnG}c*YYRagRIP;s)2aI$mC0
pj_2p+<LT+?czk?3?(gr9ySuyN_V)I;xw$#6udk1*t1Go3{14@=n63Z-

diff --git a/assets/world/shrub/jungle-bush-3.vox b/assets/world/shrub/jungle-bush-3.vox
index 933aafb5f7bf791fbfaa693772ebf8d0ed175700..6adf8bd05559aa4358b4e5336246870b044616a4 100644
GIT binary patch
literal 1968
zcmXxjJ#H;E9EV|#KjtLiN+=x?4P*-z3%Do<-2#w62VHJQ<BC2dCDAD<kSwu+u!L;E
zD?rK?vW4NXft<YK@ozl#JAcpo_}%-@{s<v_^Y-1hn(*f-gdg60`0CB<_`CX#kF@W9
z`ta_TG}93NMvU8~AjfzqDPD5X=6H!kj+D|RBV{d8%KBMfixkS9k)jqMl|3RMqu_*)
z<w(dVIL&_1M>=V-ZTp^(u_H!(WE5;khJ=iQ9b1+oA){aiC2Kf^W#*J~_`J0K;&$2#
zws^AE$yz6C$*?0P88QlD)<;IcR%A%XDA*Bq=h(}Y_R8E>=DsqwK6b<;Lq@?i$8Pd0
zM@B)M_q&#m=NLreHglxyTCJ|lt;LqE&8v@$f*o6yBO#+;pZ%hbv}=*fn~~Cu`)`cb
zA|jO=1)O`Nke+Ho@{AcuWB+!0jal6PgIV`k>A8P%Ke5ey6l$#H-brwd&3&7Rf_Z{@
zl4sA@)nT7CnmA997vl8fRkVd;@hn9h;>39{U+_Yt({!9-=C@upc?z?gYhUp`L2K=k
z@nz1b9{a3~Zz9fb!uOGUC)<44d>i`~oMR6cwigd~Dcg35*qm?1#9fB(zy9)V$m_EU
z$NC$N9S!w3W;&zcFyuo%<imwItjoKTF7NU#pSL!7lQ*3vZ*t91<yBtgRZ!*rk01~7
zAP@2o{$18_SZJ7Zm|z&ZR2&AM!DsLpe3l-c!DsLpd<LJT%xCZ!d<LJvXFUd=!DsLp
zd<LKSXoJt-Gx!WXgAco9(j7aW&ZqNPCE(Kubc=NpcayBLxY(U^KAlhJvr5IM^XYs#
zpU!8Mk5A{*`E)*=&n#)@)A@8holobp%DgHwZRW2+K1<K1@o9V-pT=ix2cO2Lk!Tid
zCSP0Rre;9XX?z-=wQYPFpT?*0`Qno|YbzU{#;5UVd>Ws%y=#|dWv0#i$>)~yseCG*
z%BS*KuK}ORr}C+MDxdXg@Tq(%pGu_iS+9%9svE08RZ!JuzCx8x<x}}oK9$dUt=1be
zcWG8;+W5^^jZfec_yj)TFZq1^_yj(IPx$%sBmDa55q|sl2*10|C-4b;0w2r3cs_wo
z;1kGL8gdf`KEc3O;R~MeghxE!jC<VS7U2~yc*YYR@qjb#afe%kSG?dEPk6)w&bY@N
tZjaa3*W=~o<#>L6KAxVQj>pHx<Kf}qIG@kQ{r&xMcXxN(-rgD;!aog?hBg2I

delta 651
zcmXZZO>Pu15C%}Ye%v!r5Le(TNU)d%WDzL}IS2dRqO7vw1RMZ~3-XMZ)|=}3+HHG0
zzu*6OcRoElfA~4Z`10}gRT<yc7>~D?&-c6Wx%_vhK7V_;eTtoq@kYdWZ8FDek);wX
zCv(cDTqQH~p;yU~=c<t_BUdppSCACV!6-RN(Hy&PJ$b0iSt}_P5qgSdri`TMJPmX+
z%L9_4akHXj6wO?E_GQ3|*{hk+7Hf;O#bkKdVls**N>9<uvxOu@<7>ro@5*5rBJ7i*
zacCx&;UG-DoRr+Y{LuZI_Wms*XYa@Q*7!HQ6LZg*^Ke{;$yKH&K~gk(^fWq1ie}G{
jt;ZkYJdBBp4PLx|@xEFr(Q-1c@~d2}>s)_+<$e7Hb0{8I

diff --git a/assets/world/shrub/jungle-bush-4.vox b/assets/world/shrub/jungle-bush-4.vox
index d702d6772300e9888f7da5b561647bf3933850e8..d968f989bffcf36a0d4dc2e908461d9e1881264b 100644
GIT binary patch
literal 2020
zcmXxjJ8mvD9ENd^FZ1PwP&y<U$QCRXa8M9R0Z5>r!|7;d3n?jyQc@tfqYg{R7F@7_
z)O6Xx@cR#tFVBqqj>mp{nIFG<|Jm;;rElKdee0I~I;Hf(-G{HPqT=uDKR$AQ|I>%N
zKT4!2{f(T{Q$uOXQ!dL>&C63kZgP~!P^vphUe}6T*0rFbAy;)&v?w=alyq7vaz3pE
z6%DD#P*BluLaK5UR5YBBn+z2#$|q&y<!mjeXjt-@v1F)dSg{m23Mv{_ELDzziiQ<S
zlcS)bVMShLsA$Of+*s$vIyct2G1O7fkgGZ>8gf%dMT_!s!TmxX?pVr&KGadsuwtol
z6jU^<QE%#Kt3KCw=gN93=Syv)9CN;uU+U{pACar0MLC`~^+5X^eFa=H%4(g_uv+)k
z-dTKO$J*NmR5UD}EuJl&E!t-9ltoiyXJ&Cu7H1>Jxme|B%KulIHmfyTW6c(Gz@omy
z`k7xri_E$udzb7}ingaSXC&syKjw{Wt|hBS7Vp@bMYfnzOv8lyMIrX}d_4(I_P3Pg
zyf^3F9i<fYqVA4Ts(Mv-4~*TM!xZ1ashP9+#cIVomv$`GF_gTN?A`2L_aH@^<Aq~U
zn(r&ecjjAczPaze{_<U_$ETY1<8QhSZ0P$QX++ay%BOtFrw7q&$cMs^5BZSCtDAh2
zZz`L7le_I*-sN511zqlcPx2&B@+42`-(g*+fu>HU4yMM3ip%6P`Aj~O&!NX>@|k=l
zpULM?<}>+BK9kSnb4-KJ<TLq9K9f&OZSt9XCZEY?@?m$F4A;SD@ELrLCEzm%41*0F
z51ky#;^9yjd<LJv=U6H}gU{eI_zXVB^6?pb2A{!a@QEcId<LJvXYd((j%7YpCT!x@
zA&;f!v+>#ZY<xC8$9C}9_-rIL18zD$w#ZAH2Aj&pXXA5h8=sBO#%JU6#V1$CR&IPY
zJ{zBn&&KE2-eZ?yWx^(Y^4M}dolob}`E)+VG2qkrbUvL==W`qlKAlhJ(}{FG$8phF
z_hQ$m3%d1*Bh>kHKAlhJ)A=07>Nqj6OR+Lx;}=JbPvVpKBtGd+c^p4JiBIB_e*Sz<
zzkIr<Uq9Z{Z=Ul>d=j6;$1u>IPvVpKBr=AET!)EI((q0AiWfZN5f8Y>EpBj)^oCcw
z;2Dp2z&&npgKMNWyy6AVc*Fzlaf=&V?{9B!`|IoL{_^s&KR-Y3kB^W0!^6XVe}BK<
R-rnvvH#htB^|iJs{R6q|h?4*S

delta 602
zcmXZYJ#JG$5CGua`Pt`4meOzl3a*iYg2Dx%0HKh}xJBt`xJWKTi$uXO_}0SK=bf2n
z&CI?(_kYjVub-aY{v2a`e1Ca#j4x}9&zI*9=biYR{=0KNeS5yVi(MV#I}zih$s8|5
zmXm08GN<}fcajmSh>Vp~#&xwIN`azx++uR%Dk5?vMKe;3q-YLCsgo4VL9`l0@AwcC
z^I9ust)iJxhN)3BI<A@OBt>J&nx#%sG=eo-oup_yT&}f@zJ1$oT%!#W(nQKBnkYF%
z6D_Cc9Z&P{67^UXwJ%<V9%f>qMQ``mJMaDWE`qfl%+T!ipPjq?q1mC?VWC4aIYkpC
Ur|2KQ-`wZPvy+;W*I#+Af3gT1(f|Me

diff --git a/assets/world/shrub/jungle-bush-5.vox b/assets/world/shrub/jungle-bush-5.vox
index 0a5dfcc67f50baf6c9824809d7230e6fa03b8d99..9e2aaca683c2139ab54c1964dd7b8ed790913f5f 100644
GIT binary patch
literal 3784
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

literal 2664
zcmXZdOK#;v6oBEf>tXw*C6pNw6NuP>#R3`yp$q^C2x@x9#9PRaAyI}5ki3PkglwU<
zkS$~j<~we#^V?OY%BTK%+?(Hi`tapHDWxCY-~H&3e!Zmh%iYKC-bKad>VKmC;rEYs
zU$=;+^f;uHb9$OkN_whjC{-B^r75E!Px_*iLEk~&L0@Gwl%|Xp&tYsik8MIJqyD4*
z<I_;pt2!E%s5f;q<jFgzi};YG&C+GLaw|}fGq<6Lp_D9lmODR9>I;S{Ud7R{s1Hql
zS83vq=xI`4B07mfVq+^W#zjLJ3Wvg>&{sx7$;u$1$qbNDP@&K!%vdl~eUMR5p<|mc
zW5EzB5r&AXLZUWd#)2}5L-JN;Wf+9BG7QGoYL4DUg@N0QoW)Q<#B}v5;wY#fC$;_<
zs&-@)RJd{0js<p#uXe<x17GdPlQ=58WNr1I#ZVzho1?rS(Hv>Pk!X$pXR%LP&RZM?
zi*0H%V)-p?EMqKFEJ;h!#*|}<F&&C-=kPIHyCBlUE726638Py^L5%<=%ot~FsF*NE
z`J!(!Q?z&vc1e;NiI62LsF4&ClH?;Y3Myj22{SH81|KjYqo5+BCd^oHK_cnfVm|sI
zRzAeznsGrkiGmuF!4!3qsxh&6F6tLgw0I^bZLoW2C?;QH0gx?1L5;=0grUslqzwfX
z1~8}DoMy*yHYfcsBBP)p7Ieal1s4p=M`XmQkCR07oROZs1KMmtL5<D86m^?YV`ESj
zWwdx+Ff7iNZx1RO=BQ_NG>pYB0SYQ4F$euHRPD$ps4xI`?N~6Lza-i{eKR;~M;Mn$
z3=QL~j*5mk%8T5i-NKkJ*7?HC0mFnDxrm{{hH+DO2x}ZfWV>BZVI$AoA184XG)$P0
zXJzDkCI6MYS8`s-rQDQ}CvEuo`)}W;^6CG@aelh{jt%Q^B##Jnw=UkryLi_S-FER^
zVHe-Ucky_26W_!)l}&sT_c&JZReTj+1y*r?M-orsNj!<C^l4c4ZlEq{m!Ru>s<?GN
zolob}`J8%uI-ky`^XYs}Wj>ux=hOLgKIb&}bUvL==hOMb)H<Ker}OE2Iv;kY$?m@M
z+4<~z&L!Zp6W9&5OT0^RE{n!pVdt~++4-DH#b@WU^V#|Ae9q<Lv-8>c?0j}Uv7|en
zozKo^=d<%Um-$?ou!(Dhcq~1ijnBqs<FoNOw}a2dXCtv0aFhJpA}?(^Y$_X{jnBDl
zd^SECpN-EqpT9e|a^th{+4yXHHa_R}p1Tw)6E<;)$CmS1`K)|aJ}aN|81Py7tbA5J
zE1&ad@LBn+d{!bWpYym#wt8{ZX%$$lPaL6@&&p@zv+`N_oX6@sF|kXrGGXJ2qsAxk
zNqiEY^sjgvKR$_1;*<XP>PUZnaiqUKJJR3U`6NDxPvT=3=+7tdNqiC+LqlA`#3$+a
zCisdMJmV1$xW_GSaE<haSG?dEk9fd6ZgGQaq&K|c1<!cI1MYE)8(bf6Z*Rxz>+A9I
j@^U;sKOc{ekH^Eq!*PFqf85^Q9yd2P$MyBKzA60&goc{U

diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index d09d78b460..45982c3557 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -854,6 +854,7 @@ impl Body {
             Body::Ship(ship) => match ship {
                 ship::Body::DefaultAirship => [0.0, 0.0, 10.0],
                 ship::Body::AirBalloon => [0.0, 0.0, 5.0],
+                ship::Body::SailBoat => [-2.0, -5.0, 4.0],
             },
             _ => [0.0, 0.0, 0.0],
         }
diff --git a/common/src/comp/body/ship.rs b/common/src/comp/body/ship.rs
index 09bae038e0..375645db08 100644
--- a/common/src/comp/body/ship.rs
+++ b/common/src/comp/body/ship.rs
@@ -1,13 +1,13 @@
 use crate::{
     comp::{Density, Mass},
-    consts::AIR_DENSITY,
+    consts::{AIR_DENSITY, WATER_DENSITY},
     make_case_elim,
 };
 use rand::prelude::SliceRandom;
 use serde::{Deserialize, Serialize};
 use vek::Vec3;
 
-pub const ALL_BODIES: [Body; 2] = [Body::DefaultAirship, Body::AirBalloon];
+pub const ALL_BODIES: [Body; 3] = [Body::DefaultAirship, Body::AirBalloon, Body::SailBoat];
 
 make_case_elim!(
     body,
@@ -16,6 +16,7 @@ make_case_elim!(
     pub enum Body {
         DefaultAirship = 0,
         AirBalloon = 1,
+        SailBoat = 2,
     }
 );
 
@@ -35,6 +36,7 @@ impl Body {
         match self {
             Body::DefaultAirship => "airship_human.structure",
             Body::AirBalloon => "air_balloon.structure",
+            Body::SailBoat => "sail_boat.structure",
         }
     }
 
@@ -42,15 +44,21 @@ impl Body {
         match self {
             Body::DefaultAirship => Vec3::new(25.0, 50.0, 40.0),
             Body::AirBalloon => Vec3::new(25.0, 50.0, 40.0),
+            Body::SailBoat => Vec3::new(13.0, 31.0, 6.0),
         }
     }
 
     fn balloon_vol(&self) -> f32 {
-        let spheroid_vol = |equat_d: f32, polar_d: f32| -> f32 {
-            (std::f32::consts::PI / 6.0) * equat_d.powi(2) * polar_d
-        };
-        let dim = self.dimensions();
-        spheroid_vol(dim.z, dim.y)
+        match self {
+            Body::DefaultAirship | Body::AirBalloon => {
+                let spheroid_vol = |equat_d: f32, polar_d: f32| -> f32 {
+                    (std::f32::consts::PI / 6.0) * equat_d.powi(2) * polar_d
+                };
+                let dim = self.dimensions();
+                spheroid_vol(dim.z, dim.y)
+            },
+            _ => 0.0,
+        }
     }
 
     fn hull_vol(&self) -> f32 {
@@ -66,15 +74,25 @@ impl Body {
         Density(ratio * oak_density + (1.0 - ratio) * AIR_DENSITY)
     }
 
-    pub fn density(&self) -> Density { Density(AIR_DENSITY) }
+    pub fn density(&self) -> Density {
+        match self {
+            Body::DefaultAirship | Body::AirBalloon => Density(AIR_DENSITY),
+            _ => Density(AIR_DENSITY * 0.75 + WATER_DENSITY * 0.25), // Most boats should be buoyant
+        }
+    }
 
     pub fn mass(&self) -> Mass { Mass((self.hull_vol() + self.balloon_vol()) * self.density().0) }
 
     pub fn can_fly(&self) -> bool {
         match self {
             Body::DefaultAirship | Body::AirBalloon => true,
+            _ => false,
         }
     }
+
+    pub fn has_water_thrust(&self) -> bool {
+        !self.can_fly() // TODO: Differentiate this more carefully
+    }
 }
 
 /// Terrain is 11.0 scale relative to small-scale voxels,
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index 9d1d4ffb69..5f7b20790f 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -200,6 +200,8 @@ impl Body {
             Body::QuadrupedLow(_) => Some(300.0 * self.mass().0),
             Body::QuadrupedMedium(_) => Some(300.0 * self.mass().0),
             Body::QuadrupedSmall(_) => Some(300.0 * self.mass().0),
+            Body::Ship(ship) if ship.has_water_thrust() => Some(500.0 * self.mass().0),
+            _ => None,
         }
     }
 
diff --git a/voxygen/anim/src/ship/mod.rs b/voxygen/anim/src/ship/mod.rs
index afecb5e600..a1afe338fa 100644
--- a/voxygen/anim/src/ship/mod.rs
+++ b/voxygen/anim/src/ship/mod.rs
@@ -31,7 +31,9 @@ impl Skeleton for ShipSkeleton {
         buf: &mut [FigureBoneData; super::MAX_BONE_COUNT],
         body: Self::Body,
     ) -> Offsets {
-        let bone0_mat = base_mat * Mat4::scaling_3d(1.0 / 11.0) * Mat4::<f32>::from(self.bone0);
+        let scale_mat = Mat4::scaling_3d(1.0 / 11.0);
+
+        let bone0_mat = base_mat * scale_mat * Mat4::<f32>::from(self.bone0);
 
         *(<&mut [_; Self::BONE_COUNT]>::try_from(&mut buf[0..Self::BONE_COUNT]).unwrap()) = [
             make_bone(bone0_mat),
@@ -43,10 +45,12 @@ impl Skeleton for ShipSkeleton {
             lantern: None,
             // TODO: see quadruped_medium for how to animate this
             mount_bone: Transform {
-                position: common::comp::Body::Ship(body)
-                    .mountee_offset()
-                    .into_tuple()
-                    .into(),
+                position: (base_mat * scale_mat).mul_point(
+                    common::comp::Body::Ship(body)
+                        .mountee_offset()
+                        .into_tuple()
+                        .into(),
+                ),
                 ..Default::default()
             },
         }
@@ -89,18 +93,22 @@ impl<'a> From<&'a Body> for SkeletonAttr {
             bone0: match body {
                 DefaultAirship => (0.0, 0.0, 0.0),
                 AirBalloon => (0.0, 0.0, 0.0),
+                SailBoat => (0.0, 0.0, 0.0),
             },
             bone1: match body {
                 DefaultAirship => (-13.0, -25.0, 10.0),
                 AirBalloon => (0.0, 0.0, 0.0),
+                SailBoat => (0.0, 0.0, 0.0),
             },
             bone2: match body {
                 DefaultAirship => (13.0, -25.0, 10.0),
                 AirBalloon => (0.0, 0.0, 0.0),
+                SailBoat => (0.0, 0.0, 0.0),
             },
             bone3: match body {
                 DefaultAirship => (0.0, -27.5, 8.5),
                 AirBalloon => (0.0, -9.0, 8.0),
+                SailBoat => (0.0, 0.0, 0.0),
             },
         }
     }