From 2a952955bfb3955afa5d69640946807b2552cb21 Mon Sep 17 00:00:00 2001 From: Nicole Collings <100Toby1@gmail.com> Date: Thu, 6 Aug 2020 22:19:49 -0700 Subject: [PATCH] Fix a gross hack related to big refactor. --- src/game/scene/world/LocalPlayer.cpp | 3 +- src/game/scene/world/LocalWorld.cpp | 35 ------------------ src/world/DimensionBase.cpp | 14 ------- src/world/DimensionBase.h | 4 +- src/world/LocalDimension.cpp | 11 ++---- src/world/ServerDimension.cpp | 2 - .../zeus_default/textures/painting/16x_d1.png | Bin 0 -> 3439 bytes .../zeus_default/textures/painting/16x_d2.png | Bin 0 -> 866 bytes .../textures/painting/32x16_d1.png | Bin 0 -> 1410 bytes .../zeus_default/textures/painting/32x_d1.png | Bin 0 -> 2755 bytes .../zeus_default/textures/painting/32x_d2.png | Bin 0 -> 2710 bytes .../zeus_default/textures/painting/32x_d3.png | Bin 0 -> 2705 bytes 12 files changed, 5 insertions(+), 64 deletions(-) create mode 100644 subgames/zeus/mods/zeus_default/textures/painting/16x_d1.png create mode 100644 subgames/zeus/mods/zeus_default/textures/painting/16x_d2.png create mode 100644 subgames/zeus/mods/zeus_default/textures/painting/32x16_d1.png create mode 100644 subgames/zeus/mods/zeus_default/textures/painting/32x_d1.png create mode 100644 subgames/zeus/mods/zeus_default/textures/painting/32x_d2.png create mode 100644 subgames/zeus/mods/zeus_default/textures/painting/32x_d3.png diff --git a/src/game/scene/world/LocalPlayer.cpp b/src/game/scene/world/LocalPlayer.cpp index 23a6c064..649fdda8 100644 --- a/src/game/scene/world/LocalPlayer.cpp +++ b/src/game/scene/world/LocalPlayer.cpp @@ -164,8 +164,7 @@ void LocalPlayer::drawMenu(Renderer &renderer) { } // -// Private uncategorized. -// TODO: Categorize and optimize. +// Physics, camera, and player specific functionality. // bool LocalPlayer::getKey(Input& input, LocalPlayer::PlayerControl control) { diff --git a/src/game/scene/world/LocalWorld.cpp b/src/game/scene/world/LocalWorld.cpp index b690b930..9647f26b 100644 --- a/src/game/scene/world/LocalWorld.cpp +++ b/src/game/scene/world/LocalWorld.cpp @@ -108,38 +108,3 @@ void LocalWorld::renderEntities(Renderer &renderer) { activeDimension->renderEntities(renderer); player.l()->draw(renderer); } - -//void LocalWorld::updateBlockDamages(double delta) { -// auto it = crackEntities.cbegin(); -// while (it != crackEntities.cend()) { -// bool deleteMe = false; -// -// auto curr = it++; -// auto block = curr->second; -// -// block->time += delta; -// -// if (block->damage >= block->maxHealth) { -// //Todo: Lua callback~ -// setBlock(block->getPos(), DefinitionAtlas::AIR); -// setBlockDamage(block->getPos(), 0); -// deleteMe = true; -// } -// -// if (block->time > 2) { -// block->update(); -// block->addDamage(-1); -// block->time = 0; -// } -// -// if (block->damage < 0 || block->def.index != getBlock(block->getPos())) { -// deleteMe = true; -// } -// -// if (deleteMe) { -// delete block; -// it = crackEntities.erase(curr); -// } -// else block->update(); -// } -//} diff --git a/src/world/DimensionBase.cpp b/src/world/DimensionBase.cpp index eb1ada70..64b37555 100644 --- a/src/world/DimensionBase.cpp +++ b/src/world/DimensionBase.cpp @@ -22,10 +22,6 @@ unsigned int DimensionBase::getInd() { return ind; } -void DimensionBase::update(double delta) { - updateBlockDamage(delta); -} - std::shared_ptr DimensionBase::getRegion(glm::ivec3 regionPosition) const { auto l = getReadLock(); if (!regions.count(regionPosition)) return nullptr; @@ -146,16 +142,6 @@ World& DimensionBase::getWorld() { return world; } -void DimensionBase::updateBlockDamage(double delta) { -// for (auto it = blockDamages.begin(); it != blockDamages.end();) { -// if (it->second.curr > it->second.max) { -// setBlock(it->first, DefinitionAtlas::AIR); -// it = blockDamages.erase(it); -// } -// else it++; -// } -} - std::shared_ptr DimensionBase::combinePartials(std::shared_ptr a, std::shared_ptr b) { std::shared_ptr src; std::shared_ptr res; diff --git a/src/world/DimensionBase.h b/src/world/DimensionBase.h index f41c2726..c5e5a51d 100644 --- a/src/world/DimensionBase.h +++ b/src/world/DimensionBase.h @@ -26,7 +26,7 @@ public: std::string getIdentifier() const; unsigned int getInd(); - virtual void update(double delta); + virtual void update(double delta) = 0; std::shared_ptr getRegion(glm::ivec3 regionPosition) const; void removeRegion(glm::ivec3 pos); @@ -53,8 +53,6 @@ public: World& getWorld(); protected: - virtual void updateBlockDamage(double delta); - // Combine two chunk partials, or a chunk and a chunk partial. // If both are partials `b` takes preference, if one is a fully generated chunk the partial takes preference. // TODO: Make this more efficient using proper RIE traversal. diff --git a/src/world/LocalDimension.cpp b/src/world/LocalDimension.cpp index 16b9ba12..183e18fe 100644 --- a/src/world/LocalDimension.cpp +++ b/src/world/LocalDimension.cpp @@ -21,8 +21,6 @@ LocalDimension::LocalDimension(SubgamePtr game, LocalWorld& world, const std::st Dimension(game, static_cast(world), identifier, ind), meshGenStream(std::make_shared(game, *this)) {} void LocalDimension::update(double delta) { - Dimension::update(delta); - finishMeshes(); for (auto& entity : localEntities ) entity.entity.l()->update(delta); @@ -168,8 +166,7 @@ void LocalDimension::removeLocalEntity(Api::Usertype::Entity entity) { void LocalDimension::serverEntitiesInfo(Deserializer& d) { std::string type, a, b; - - unsigned int dim = d.read(); + d.read(); std::shared_ptr activeEntity = nullptr; @@ -179,8 +176,7 @@ void LocalDimension::serverEntitiesInfo(Deserializer& d) { unsigned int id = d.read(); if (serverEntityRefs.count(id)) activeEntity = serverEntityRefs.at(id)->entity.l(); else { - //TODO BEFORE COMMIT: *oh my god, please don't do this* - auto ent = std::make_shared(game, DimensionPtr(std::shared_ptr(this, [](LocalDimension*){}))); + auto ent = std::make_shared(game, world.getDimension(getInd())); auto entity = Api::Usertype::Entity(ent); ent->setId(id); serverEntities.push_back(entity); @@ -200,8 +196,7 @@ void LocalDimension::serverEntitiesInfo(Deserializer& d) { } void LocalDimension::serverEntitiesRemoved(Deserializer& d) { - unsigned int dim = d.read(); - + d.read(); while (!d.atEnd()) { unsigned int id = d.read(); if (!serverEntityRefs.count(id)) continue; diff --git a/src/world/ServerDimension.cpp b/src/world/ServerDimension.cpp index e078e251..43819409 100644 --- a/src/world/ServerDimension.cpp +++ b/src/world/ServerDimension.cpp @@ -19,8 +19,6 @@ ServerDimension::ServerDimension(SubgamePtr game, ServerWorld& world, const std: Dimension(game, static_cast(world), identifier, ind) {} void ServerDimension::update(double delta) { - Dimension::update(delta); - //TODO: Thiss // for (const auto& region : regions) { // for (unsigned short i = 0; i < 64; i++) { diff --git a/subgames/zeus/mods/zeus_default/textures/painting/16x_d1.png b/subgames/zeus/mods/zeus_default/textures/painting/16x_d1.png new file mode 100644 index 0000000000000000000000000000000000000000..7f1b815293b947fce8c7d5b64c80e190bee4f251 GIT binary patch literal 3439 zcmV-#4UqDQP)EX>4Tx0C?J+Q+HUC_ZB|i_hk=OLfG)Jmu!ImA|tE_$Pihg5Rw34gb)%y#f69p zRumNxoJdu~g4GI0orvO~D7a@qiilc^Ra`jkAKa(4eR}Wh?fcjJyyu+f{LXpL4}cL8 zCXwc%Y5+M>g*-agACFH+#L2yY0u@N$1RxOR%fe>`#Q*^C19^CUbg)1C0k3ZW0swH; zE+i7i;s1lWP$pLZAdvvzA`<5d0gzGv$SzdK6adH=0I*ZDWC{S3003-xd_p1ssto|_ z^hrJi0NAOM+!p}Yq8zCR0F40vnJ7mj0zkU}U{!%qECRs70HCZuA}$2Lt^t5qwlYTo zfV~9(c8*w(4?ti5fSE!p%m5%b0suoE6U_r4Oaq`W(!b!TUvP!ENC5!A%azTSOVTqG zxRuZvck=My;vwR~Y_URN7by^C3FIQ2mzyIKNaq7g&I|wm8u`(|{y0C7=jP<$=4R(? z@ASo@{%i1WB0eGU-~POe0t5gMPS5Y!U*+Z218~Oyuywy{sapWrRsd+<`CT*H37}dE z(0cicc{uz)9-g64$UGe!3JVMEC1RnyFyo6p|1;rl;ER6t{6HT5+j{T-ahgDxt-zy$ z{c&M#cCJ#6=gR~_F>d$gBmT#QfBlXr(c(0*Tr3re@mPttP$EsodAU-NL?OwQ;u7h9 zGVvdl{RxwI4FIf$Pry#L2er#=z<%xl0*ek<(slqqe)BDi8VivC5N9+pdG`PSlfU_o zKq~;2Moa!tiTSO!5zH77Xo1hL_iEAz&sE_ z2IPPo3ZWR5K^auQI@koYumc*P5t`u;w81er4d>tzT!HIw7Y1M$p28Tsh6w~g$Osc* zAv%Z=Vvg7%&IlKojszlMNHmgwq#)^t6j36@$a16tsX}UzT}UJHEpik&ja)$bklV;0 zGK&0)yhkyVfwEBp)B<%txu_o+ipHRG(R4HqU4WLNYtb6C9zB4zqNmYI=yh}eeTt4_ zfYC7yW{lZkT#ScBV2M~7CdU?I?5=ix(HVZgM=}{CnA%mPqZa^68Xe5gFH?u96Et<2 zCC!@_L(8Nsqt(!wX=iEoXfNq>x(VHb9z~bXm(pwK2kGbOgYq4YG!XMxcgB zqf}$J#u<$v7REAV@mNCEa#jQDENhreVq3EL>`ZnA`x|yIdrVV9bE;;nW|3x{=5fsd z4#u(I@HyF>O3oq94bFQl11&!-vDRv>X03j$H`;pIzS?5#a_tuF>)P*iaGgM%ES>c_ zZ94aL3A#4AQM!e?+jYlFJ5+DSzi0S9#6BJCZ5(XZOGfi zTj0IRdtf>~J!SgN=>tB-J_4V5pNGDtz9Qc}z9W9tewls;{GR(e`pf-~_`l(K@)q$< z1z-We0p$U`ff|9c18V~x1epY-2Q>wa1-k|>3_cY?3<(WcA99m#z!&lx`C~KOXDpi0 z70L*m6G6C?@k ziR8rC#65}Qa{}jVnlqf_npBo_W3J`gqPZ95>CVfZcRX1&S&)1jiOPpx423?lIEROmG(H@JAFg?XogQlb;dIZPf{y+kr|S? zBlAsGMAqJ{&)IR=Ejg5&l$@hd4QZCNE7vf$D7Q~$D=U)?Nn}(WA6du22pZOfRS_cv~1-c(_QtNLti0-)8>m`6CO07JR*suu!$(^sg%jf zZm#rNxnmV!m1I@#YM0epR(~oNm0zrItf;Q|utvD%;#W>z)qM4NZQ9!2O1H}G>qzUQ z>u#*~S--DJy=p<#(1!30tsC);y-IHSJr>wyfLop*ExT zdYyk=%U1oZtGB+{Cfe4&-FJKQ4uc&PJKpb5^_C@dOYIJXG+^@gCvI%WcHjN%gI&kHifN$EH?V5MBa9S!3!a?Q1 zC*P)gd*e{(q0YnH!_D8Bf4B7r>qvPk(mKC&tSzH$pgp0z@92!9ogH2sN4~fJe(y2k zV|B+hk5`_cohUu=`Q(C=R&z?UQbnZ;IU-!xL z-sg{9@Vs#JBKKn3CAUkhJ+3`ResKNaNUvLO>t*-L?N>ambo5Q@JJIjcfBI^`)pOVQ z*DhV3dA;w(>>IakCfyvkCA#(acJ}QTcM9%I++BK)c(44v+WqPW`VZ=VwEnSWz-{38 zV8CF{!&wjS4he^z{*?dIhvCvk%tzHDMk9@nogW_?4H~`jWX_Y}r?RIL&&qyQ|9R_k ztLNYS;`>X_Sp3-V3;B!Bzpi7oA|p)U0sr-f~U`y~n-n!6dq5ysq0Uibvj> zm!t`lfMQ#9nIqW~qJt)~1%cDc`Q+j*iORF5pVI=RH^tK@CyQim>V_paUJ$zLYxcUMhZtxb2LJ%d>SQrRGC&w(te~HN`Y}1aJv)B(^7Stei_?=2 z%c|~VFk8&xX#^FlYKCbW@~0mkshSRj{BAT7T)3`%6-B0L4u{VMyN`oltKZ+ZY;T^f z2qA65U|u)NqTCtmagP2QP13Y_w0|@_I>E>i3?tcGE!w(-!zX74yT_{Rqnd$W;{jCs zufKVoFRFvRgFIWfu9>YG-9|!!s%-Qh>{H(E^$*YgyhKp72akpwQChY0T}Y_pxItAH zX3MI1YI;tVWdZ`MVn)~}AAN>4HXkBvHB|CKdvTXmWwy+6AyKu0d6kC}y-Q+*P&~Un zI^3PluaFFtcslc~U~>JAl*Rkeg{}k3(x-oqHA7bo`OWXITUt$`(Tf+gZeUdAt2e*B zbS$g4vlYc}{Se!Z_UhHI=jRtK>ozyH7-Kcbb{}q~%e$uGsJFe&ITxIt|MLeB?eu0w znw&IM2OB^1(`DlOerS0OYdX#~T}I0^PSf<}Djtu=lIR@Ah;J`v2LLP($RPWM0000PbVXQnLvL+uWo~o;Lvm$dbY)~9 zcWHEJAV*0}P*;Ht7XSbP+(|@1R4C5{!CQ~iQ~&_rp7!*5+UaFFw_Rs;Sr8Qr1d|O4 z;b9^A;+rJ!XylnU|AiXu2Yy9x6`5RbUSU&>E-x+ z;M0#kxqRi~V6!7Pco{*;v685#8G%5o>-uQo3Oq|I90rRx2>15(;9#)cwDhVXI4?Xu z*f_C;vs_>WoRcSyADM>6sRGGYriK)rlcjUq?OQh$l~+}MGI4)<@T-bcL$d${Nf`Zd z|L1#mzbtXmP#}_FLy;u#)d*I5dgg4%lX#`TZRzOiO#ut?)9WR6LRBpLkq!)F;T z;v`{tv|7=3-@A4klVudQnnsrR-qFaLjBH&t8;a|=nu1{9xrW(Ft)q{t>kH-ITqEZx@*>3Dyy@ZSwjus_lSPqGj&bI7s zRRV@#tBTHMvyH72dece?7LnTDJUR6iq-I6McZ(CFC|GR z2o`t_Fty`2I4`F&FU?5J!lNKMaHrgdSKdi-5~q0P`OD)B@b|bSqN&#R0n%Q zT}8_{W@<2U4&WdEj9CsyNQ%?Ukn!-@Q-3loNDU~nqWIzcqqe1W+nx1pXW`8|{T@8@ z;=07Wo^|%zc~DpTPyb#w^@eJInktGkIv8I1;A*dBukuwSLQ$5$ci((v=rUKQ{>)_x zJafiBe*aU)YH#*W&KDjp(Cy3HtjJildHB+Ot=|W`e?4K!yvTy*yN@)EOM`Ina{j`3 sQIopavb$@x-D^^@mNg}(rD0kB1Lo3z@KC0aUjP6A07*qoM6N<$f)D7M9smFU literal 0 HcmV?d00001 diff --git a/subgames/zeus/mods/zeus_default/textures/painting/32x16_d1.png b/subgames/zeus/mods/zeus_default/textures/painting/32x16_d1.png new file mode 100644 index 0000000000000000000000000000000000000000..a0e158e9d532eceb6a9e477c2bdf832c7a6dc841 GIT binary patch literal 1410 zcmV-|1%3L7P)v2LLZQp}#OG0000PbVXQnLvL+uWo~o;Lvm$dbY)~9 zcWHEJAV*0}P*;Ht7XSbR{7FPXR5;58!AoykR{;Rv^FHUkXFQ%eZjySEN!(blsMV5E zqq=2*#F8Jtq7qvqeogn4+De55C}M+HumT}f6>X%paluaFWE^{DJTrIZKF_`9#rMJA z{QeIrFM`_mrW(fP=)LF2es=N6r+-!s ze(>JW`|rJ-Z5D?I`!c&B)?khP@$YZHe!iX-E%pT#j6h=r!IbKqB>eFBC!?VNxb?%R zEaBtFkH7loe~fl_@7@z~ORv6%49+&%b-HpC*0Ll*LYxrCmKo56FSbaE4sbY73)YNPhb8t$v8_q>f;RD5}bBCyfP;A$RuU_mlgF zhz0<`uG5`^ozzUbUK|BcsB3|Gp&)R1lZk#j8tga(y(nDO4XrEZ0$^cNNRp<*P#6e{ zb+$!qg@JXt2!a5a_EtJ*yZXVs2YKE6=`VlHrF?xo(^~)fS0A0c|BiJ!P9j-sI3Wl? zA$-6o_56O|Rgkn*tF2JhA%H<^Y+k8Wp~Z4zI@J^_-EQ;M%;zNEY?Zd3fBEH;A5Par zheW*GHlKd+$N6H32zxcX%r<$eby+o1yWSx6dIJ)~McGKD5Ea%T0tmpAgD&o@`+tfZ$EGtZT`+H(M-9@ciiL z=pZV^BCj*{?8QaUOE0sg zl#U6{q1v#-VMcTA>~xOn}N5?9x_E(`1xTL~{0btzr1A3IDGsgwg`vshZ^07U?5Z1h~qc_5Ig3Gx8p zt310|7k)4*vy~~zPJv=3JqF#DSXE|qaq`RK;jRzUT>x2Lg1S<(`FfLOkV4CaCXifT zOc4c|8RIm?%+zvC1P3|}VKmsS+UDNm&AMfpilC3Mm(aK)W8IOUv-8VYY|9@H|Qt(G0(Qe{k!8P zmwQnf1rb8X>elzkkI$;R<4KhCR5=erAL9)oZ2ZP}eD`3dAF>cDjseI22bL=HhJ&4e QF#rGn07*qoM6N<$f~10{MF0Q* literal 0 HcmV?d00001 diff --git a/subgames/zeus/mods/zeus_default/textures/painting/32x_d1.png b/subgames/zeus/mods/zeus_default/textures/painting/32x_d1.png new file mode 100644 index 0000000000000000000000000000000000000000..3ec7c7bbdca8b1a5a78e6eefbe65110fec0ed34c GIT binary patch literal 2755 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 JPDHLkV1h()K;-}c literal 0 HcmV?d00001 diff --git a/subgames/zeus/mods/zeus_default/textures/painting/32x_d2.png b/subgames/zeus/mods/zeus_default/textures/painting/32x_d2.png new file mode 100644 index 0000000000000000000000000000000000000000..6bbe1dbbe59d54d55ecc45e65a2192336921d052 GIT binary patch literal 2710 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 Q)Bpeg07*qoM6N<$f)$}Xn*aa+ literal 0 HcmV?d00001 diff --git a/subgames/zeus/mods/zeus_default/textures/painting/32x_d3.png b/subgames/zeus/mods/zeus_default/textures/painting/32x_d3.png new file mode 100644 index 0000000000000000000000000000000000000000..3178653e56c6a94b114d0413165f561f8990e8cd GIT binary patch literal 2705 zcmV;C3U2j@P)v2LLVx4#F%|0000PbVXQnLvL+uWo~o;Lvm$dbY)~9 zcWHEJAV*0}P*;Ht7XSbX3rR#lR7l4K!AXo{=RpAAe|!5xkA>e?-9f%TxiQ>eEI3!MNY|nUR(#!PT zT~+VZd#~Q|?|dKp*MI(to!vW9xmlI|=>7j-vZNKBPB&h9X-HtbxQsmum*tg#&DUP} zhUZ5gKl*uceX$cwITeK=GsQkXIZU%_IzN~WMqm8GgN@-VD@(_(}HfU8^wz55dA3PYe+u?LN zzFr)+I{5Y1??sX6drr62M=DgJHNUD%!?T@0YHfPfvx_52b$nf$R%bMQuHC(n=G?NZ z{U@I|7H&ro#)$JZV>!Yij2u$3Cm()1U)LuZlrO)u<5=M0GMfVGh)Qp^*$E!4*ZbcA!0MR%}1+U{3a9pHeO$Z|04F_YD<dv2I}a$OmN%dUOx9^x3fFINt|nVM>EiK| zCkGZ{QOmJ?n3qXK*QDFssH)l|$_$(`OV_KEmURZ!St{F|W^F0d$!XI zf`fwtB@u$wa5VM&RKDe2{f(#RB06BG9a?M|;*hB`XIjdPsOstjATH20t zd+#>Xf{IK7nXHy+x@tyI=!C4|hHn|bCycSGsFr^OgJGv~g2I zztI}xc`iU9B{xiub6S-t)J$oKi3tG#qJ+rsU9YemL@f z!;#NE`9XI25V7pPzyF^>6n47(es^+x6_dpxrj%pD^uor*psSINlj?FQiA^O$lnF?T zI9{0qH~fY~=;-O^fBV;eGwJoDhHwArpX4lK5=EXn+!&vI_F-~zOrYaBjlge01)Zb^4fCHIt0%lCFRH!B5UF_KWq(Le^xk^~<0BA_|-| zzP!3V7Md+rOIoqTWn8W0=3q-ne0+Q+n0)^3UGn(zhZsO4l#;SQXc@0hE)wJn8eYVy z(9mG4#87pb{*Qn7{kL9yb$)iKYC7s})ag2pS7zW6Lt6&cm^8Z^!=0Vo*|@RMG)=PE z8!D~{=EOD#kd;fkK=@bl6y-!R4H<$O)b$Es18Lc72W30_=Id{K^>=>z=kNb4%j5Zc z_vN?V`tI+){g3be4_6GDcO7lh;S{X-E_QOczAVqaB)P6O1Q2KEHt_?Y!7?g zVefQ)Jn64K#A}NI9IIiPzp!>tky}K{A z+oLB>Ps!$PRDqPSqMXF zp$H(M-+)MmL9=sjLvd~qlVBSlqBS6vX_+P=SSc<6cy@d`o6TI;Lkt8asq=)Ct9hCi zt#;ow$SPagjsQ&DTJ z4-b#Fw|DAFaLxp)Nh1h7HxLRN(3*_44-QWT-SK$v!bWG)Go!jo+tD9JMaCwWrMOx zEgO@Aqcf?^qU4t0&2D@NNf)YWZ|}=YVIjDHT0kkZ$kLKhS{J2jx~}giix7ge2CiXX z!^9ZXn$@xvfbSnadGCXF+ig3|&o}yQlGk9lNa{khn+;l}4<5Yy=9{-L@g)R>C>dW@ zbPX{~in*XHzMgmePOm)+hdpeQ>+=fKi&VR(RKQxaIe#=>Wmnu zb$e&~*6i+V>rTVp%-7ts+((~1><)LO)(WsVyQQsbm+8r`PmWC2Gk}q-uC9)b0TE~EnGxcn^IvONVhEu| z@zvVGO>+Om*RC&C%B{uKX`Ci!iwiC*O2usY{N9~gAN}lCM~^?B zPW#eCF{Se~|Is@?#8MAi(RF+wZ058q=%_4Rb{c_gxL2p=mSz1v@i5O*;Klu~00000 LNkvXXu0mjf;-x-f literal 0 HcmV?d00001