Aktualizace komponenty combat

- Útok může zasáhnout libovolný počet předmětů.
- Opraveny chyby v rendrování animace / skutečný konec útoku.

Author: lofcz

SimplexRPGEngine/Engine source/DragonRise3.project.gmx

@@ -912,6 +912,8 @@
         <script>scripts\combatHandle.gml</script>
         <script>scripts\combatSetUp.gml</script>
         <script>scripts\combatGetParry.gml</script>
+        <script>scripts\combatCanBeHit.gml</script>
+        <script>scripts\combatMarkAsHit.gml</script>
         <script>scripts\combatGetCriticalHit.gml</script>
       </scripts>
       <scripts name="MapIntro">

SimplexRPGEngine/Engine source/objects/oAdvancedCollision.object.gmx

@@ -172,14 +172,14 @@ if (tA == 1 && hp != -1)
 
 if (string_count("breakable", hitType) > 0)
 {
-if (other.attack && other.can_damage = -1 && mode == 0) 
+if (other.attack && combatCanBeHit() && mode == 0) 
 {
 dmg = 0;
 dmg += oPlayer.vlastnost[vlastnost_poskozeni];   
 if (hitType == "breakableStone") {dmg = round(dmg / 3);}
 
 hp -= dmg;
-other.can_damage = -2;
+combatMarkAsHit();
 global.tX = x;
 global.tY = y;
 with(oPlayer) {effectShardDrop(global.tX, global.tY, irandom_range(3,6));}

SimplexRPGEngine/Engine source/objects/oNonsolidCollision.object.gmx

@@ -200,15 +200,16 @@ if (hp < 0.5 && flag2) {flag2 = false; event_user(3);}
             <kind>1</kind>
             <string>/// Handle onHit event
 
+
 if (hitType == "breakableGrass")
 {
-if (other.attack &amp;&amp; other.can_damage = -1 &amp;&amp; mode == 0) 
+if (other.attack &amp;&amp; combatCanBeHit() &amp;&amp; mode == 0) 
 {
 dmg = 0;
 dmg += oPlayer.vlastnost[vlastnost_poskozeni];   
 
 hp -= dmg;
-other.can_damage = -2;
+combatMarkAsHit();
 global.tX = x;
 global.tY = y;
 with(oPlayer) {effectGrass(global.tX, global.tY, irandom_range(3,6));}

SimplexRPGEngine/Engine source/objects/oSwordSwing.object.gmx

@@ -89,7 +89,10 @@ else
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>instance_destroy();
+            <string>// Destroy self
+
+oPlayerCombat.tick = 1;
+instance_destroy();
 </string>
           </argument>
         </arguments>

SimplexRPGEngine/Engine source/scripts/combatCanBeHit.gml

@@ -0,0 +1,5 @@
+/// combatCanBeHit()
+
+var z = ds_list_find_index(oPlayerCombat.hitList, id);
+if (z == -1) {return true;}
+return false;

SimplexRPGEngine/Engine source/scripts/combatHandle.gml

@@ -1,15 +1,14 @@
 /// combatHandle()
 
-x           = oPlayer.x;
-y           = oPlayer.y;
-image_speed = 0;
-
 if (instance_number(oPlayer) > 0)
 {     
 sprite_index = sWeaponCollision;
+image_index  = 0;
 
-//sprite = oPlayer.draw_equ[id_Mec,0];
-//index  = oPlayer.draw_equ[id_Mec,1];
+if (oPlayer.last_dir == "d") {x = oPlayer.x + 16; y = oPlayer.y - 16;}
+if (oPlayer.last_dir == "a") {x = oPlayer.x - 64; y = oPlayer.y - 16;}
+if (oPlayer.last_dir == "w") {x = oPlayer.x - 24; y = oPlayer.y - 64;}
+if (oPlayer.last_dir == "s") {x = oPlayer.x - 24; y = oPlayer.y + 32;}
 
 if (sprite != 0)
 {
@@ -41,7 +40,7 @@ if ((keyboard_check_released(vk_space) && chargeMode) || (keyboard_check_pressed
         k = 0;  
         can_damage = -1;
         oPlayer.vlastnost[vlastnost_stamina] -= oPlayer.vlastnost[vlastnost_stamina_cost];
-        ss = instance_create(x, y, oSwordSwing);
+        ss = instance_create(xx, yy, oSwordSwing);
         ss.dir = oPlayer.last_dir;
         attackMode = "attack";
         oPlayer.currentAnimation = animationEnum.slash;
@@ -74,7 +73,7 @@ if (tick > 0)
    {
     tick -= tick_rate;
    }   
-   else {if (untick = 1) {attack = 0; untick = 0;}}
+   else {if (untick = 1) {attack = 0; untick = 0; ds_list_clear(hitList);}}
 }
 }
 

SimplexRPGEngine/Engine source/scripts/combatMarkAsHit.gml

@@ -0,0 +1,11 @@
+/// combatMarkAsHit(hit)
+
+var h;
+h = true;
+
+if (argument_count > 0) {h = argument[0];}
+
+if (h) {ds_list_add(oPlayerCombat.hitList, id); return true}
+
+ds_list_delete(oPlayerCombat.hitList, ds_list_find_index(oPlayerCombat.hitList, id));
+return true;

SimplexRPGEngine/Engine source/scripts/combatSetUp.gml

@@ -43,3 +43,4 @@ maxCharge          = 100;
 chargeMode         = 0;
 sprite_index       = sprite;
 image_speed        = 0;
+hitList            = ds_list_create();

SimplexRPGEngine/Engine source/scripts/enemyAPI.gml

@@ -238,13 +238,12 @@ return false;
 #define scrEnemyGetDamage
 /// scrEnemyGetDamage()
 
-
-if (other.attack && other.can_damage = -1) 
+if (other.attack && combatCanBeHit()) 
 {
 //forcedBaseX = 50;
 //forcedX = 50;
 
-
+combatMarkAsHit();
 text = choose("Ve jménu Demacie!", "Odporná zhoubo!", "Prolomím jejich řady!", "Nemějte slitování!", "Přímo do černého!", "Překvapení, jsem zpátky!", "Za krále a Demacii!", "Valore, na ně!");
 apiPlayerSay(text);
 apiPlayerSayNext();

SimplexRPGEngine/Engine source/scripts/scrItemInstantiate.gml

@@ -51,9 +51,9 @@ else
 
 if (p)
     {
-       p.drawDrop  = true;
-       p.direction = random(360);
-       p.speed     = random_range(2, 4);
-       p.friction  = 0.15;
+       b.drawDrop  = true;
+       b.direction = random(360);
+       b.speed     = random_range(2, 4);
+       b.friction  = 0.15;
     }
 }