deploy: 88018f698d14ec549006dc253354db81de84180a

This commit is contained in:
Ewpratten 2022-04-04 02:52:29 +00:00
parent e20423b74f
commit 079b01aaab

View File

@ -691,7 +691,7 @@
<span class="kw">if</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op">&lt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span> <span class="kw">if</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op">&lt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
<span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span> <span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
<span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op">&lt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span> <span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op">&lt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span>
<span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span> <span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span>
{ {
<span class="comment">// if player.velocity.x &lt; 0.0 {</span> <span class="comment">// if player.velocity.x &lt; 0.0 {</span>
<span class="comment">// player.position.x = i.position.x + i.size.x / 2.0 + player_size;</span> <span class="comment">// player.position.x = i.position.x + i.size.x / 2.0 + player_size;</span>
@ -722,13 +722,13 @@
<span class="kw">if</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op">&lt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span> <span class="kw">if</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op">&lt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
<span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span> <span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">x</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span>
<span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op">&lt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span> <span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span> <span class="ident">player_size</span> <span class="op">&lt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span>
<span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">x</span> <span class="op">/</span> <span class="number">2.0</span> <span class="op">&amp;&amp;</span> <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">player_size</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span>
{ {
<span class="kw">if</span> <span class="ident">player</span>.<span class="ident">velocity</span>.<span class="ident">y</span> <span class="op">&lt;</span> <span class="number">0.0</span> { <span class="comment">// if player.velocity.y &lt; 0.0 {</span>
<span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">+</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span> <span class="op">+</span> <span class="ident">player_size</span>; <span class="comment">// player.position.y = i.position.y + i.size.y / 2.0 + player_size;</span>
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">player</span>.<span class="ident">velocity</span>.<span class="ident">y</span> <span class="op">&gt;</span> <span class="number">0.0</span> { <span class="comment">// } else if player.velocity.y &gt; 0.0 {</span>
<span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">=</span> <span class="ident">i</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span> <span class="ident">i</span>.<span class="ident">size</span>.<span class="ident">y</span> <span class="op">/</span> <span class="number">2.0</span> <span class="op">-</span> <span class="ident">player_size</span>; <span class="comment">// player.position.y = i.position.y - i.size.y / 2.0 - player_size;</span>
} <span class="comment">// }</span>
<span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span><span class="op">=</span> <span class="ident">velocity_modifier</span>.<span class="ident">y</span>; <span class="ident">player</span>.<span class="ident">position</span>.<span class="ident">y</span> <span class="op">-</span><span class="op">=</span> <span class="ident">velocity_modifier</span>.<span class="ident">y</span>;
<span class="ident">player</span>.<span class="ident">velocity</span>.<span class="ident">y</span> <span class="op">=</span> <span class="number">0.0</span>; <span class="ident">player</span>.<span class="ident">velocity</span>.<span class="ident">y</span> <span class="op">=</span> <span class="number">0.0</span>;