Aktualizován skript apiPlayerSay

- Nově obsahuje optionální parametr "onlyOnEmptyFront"

Author: lofcz

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

@@ -131,8 +131,7 @@ if (animate = 2) {image_index = 0; image_speed = 0; animate = 0;}
             <kind>1</kind>
             <string>/// Draw chest
 
-scrShaderDrawColor()
-scrChestDraw()
+scrChestDraw();
 </string>
           </argument>
         </arguments>

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

@@ -71,6 +71,10 @@ craftingMenuIndex[6] = "Opravit předmět";
 craftingTitleHelper  = "";
 activeComponent      = false;
 tempComponent        = false;
+tempSpr              = 0;
+drawTip              = -1;
+drawTipAlpha         = 0;
+drawTipTempIndex     = -1;
 
 drawCraftingMenu = 1;
 craftingSelectedIndex = -1;
@@ -204,6 +208,11 @@ hotslot[i, 3] = 0;
 }
 
 
+for (i = 0; i < 10; i++)
+    {
+    spellAlpha[i] = 0;
+    }
+
 </string>
           </argument>
         </arguments>
@@ -313,13 +322,18 @@ temp    = false;
 
 for (z = 0; z &lt; 9; z++)
      {
+     clr(c_black, hudAlpha);
      draw_sprite(sSpellsUI, 4, qx, qy);
 
      // Adjust slot alpha effect
-     if (hotslot[z, 3] == 1 || hotslot[z, 3] == 2) {hotslot[z, 2] = lerp(hotslot[z, 2], 1, 0.1);} 
+     if (hotslot[z, 3] == 1 || hotslot[z, 3] == 2 || hotslot[z, 1] == 2) {hotslot[z, 2] = lerp(hotslot[z, 2], 1, 0.1);} 
      else {hotslot[z, 2] = lerp(hotslot[z, 2], 0, 0.1); if (hotslot[z, 2] &lt; 0.05) {hotslot[z, 1] = 0;}}
 
-     if (hotslot[z, 2] &gt; 0) {if (hotslot[z, 1] == 1) {clr(-1, hotslot[z, 2]); draw_sprite(sSpellsUI, 2, qx, qy); clr();}}
+     if (hotslot[z, 2] &gt; 0 || hotslot[z, 1] == 2) 
+        {
+         if (hotslot[z, 1] == 1) {clr(-1, min(hotslot[z, 2],hudAlpha)); draw_sprite(sSpellsUI, 2, qx, qy); clr();}
+         if (hotslot[z, 1] == 2) {clr(-1, min(hotslot[z, 2],hudAlpha)); draw_sprite(hotslot[z, 3], 0, qx, qy); draw_sprite(sSpellsUI, 1, qx, qy); clr();}
+        }
 
      if (mouse_in(qx, qx + 48, qy, qy + 48) &amp;&amp; canBind)
         {
@@ -341,11 +355,21 @@ for (z = 0; z &lt; 9; z++)
                       hotslot[z, 3] = 1;
                       temp          = true;
                     }
-          else if (mouse_check_button_pressed(mb_left))
+          else 
+          {
+          if (mouse_check_button_pressed(mb_left))
                     {
                      hotslot[z, 0] = 0;
                      hotslot[z, 3] = 0;
-                    }                    
+                     if (hotslot[z, 1] == 2) {hotslot[z, 1] = 0;}
+                    }
+          if (mouse_check_button_pressed(mb_right))
+                    {
+                     drawTip = z;
+                     drawTipTempIndex = z;
+                    }
+             
+          }                  
         }
 
      if (hotslot[z, 0] != 0)
@@ -354,9 +378,9 @@ for (z = 0; z &lt; 9; z++)
         }    
 
      // Check if item still exists in the inventory &amp;&amp; draw it's count   
-     clr();
+     clr(-1, hudAlpha);
      var number = -1;
-     if (hotslot[z, 3] != 0 &amp;&amp; !temp) 
+     if (hotslot[z, 3] != 0 &amp;&amp; !temp &amp;&amp; hotslot[z, 1] != 2) 
         {
 
         number = inventoryNumber(hotslot[z, 0]);
@@ -378,6 +402,50 @@ for (z = 0; z &lt; 9; z++)
 
      qx += 48;
     }
+qx      = 184 + view_xview + 4;
+qy      = 548 + view_yview - 36;
+    
+if (drawTip != -1) {if (mouse_check_button_released(mb_right)) {drawTip = -1;}}
+
+if (drawTip != -1) {drawTipAlpha = lerp(drawTipAlpha, 1, 0.1);}
+else               {drawTipAlpha = lerp(drawTipAlpha, 0, 0.1);}
+
+if (drawTipAlpha &gt; 0.02)
+   {
+    spells = array_length_1d(oSpellMenu.spellUnlocked);
+    tx = 0;
+    
+    for (i = 0; i &lt; spells; i++)
+        {
+         if (!oSpellMenu.spellUnlocked[i]) {continue;}
+         
+         clr(c_black, drawTipAlpha / 2 + spellAlpha[i]);
+         draw_sprite_stretched(sSpells, oSpellMenu.spellDetails[i,2], qx + (tx * 48), qy, 32, 32);
+         clr(c_black, drawTipAlpha);
+         draw_circle(qx + (tx * 48) + 15, qy + 15, 16, true);
+         
+         
+         if (mouse_in(qx + (tx * 48), qx + (tx * 48) + 32, qy, qy + 32))
+            {
+             if (drawTip != -1)
+                {
+                 spellAlpha[i] = lerp(spellAlpha[i], 0.5, 0.1);                   
+                } 
+             else {spellAlpha[i] = lerp(spellAlpha[i], 0, 0.1);}
+             
+             if (mouse_check_button_released(mb_right))
+                {
+                 hotslot[drawTipTempIndex, 1] = 2;
+                 
+                 if (tx == SpellEnum.spellFlash) {hotslot[drawTipTempIndex, 3] = sSpellFlash;}
+                }
+          
+            }
+         else {spellAlpha[i] = lerp(spellAlpha[i], 0, 0.1);}
+         tx++;
+        }
+   }
+
 /*
 // Draw binded spells
 alg("default", fntPixelHuge);

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

@@ -126,11 +126,11 @@ draw_set_alpha(image_alpha);
 if (mode = "normal") {draw_text_colored(x-(string_width(text) / 2),y -yy,text);}
 if (mode = "combat") {scrCenterText(); draw_text_transformed(x-(string_width(text)/2),y-(string_height(text)/2),text,scale,scale,0); scrCenterText(0);}
 
-if (sprite != -1) 
+if (sprite > 0) 
    {
    if (a < sprite_get_number(sprite)) {a += ani;} else {a = 0;}
    draw_sprite(sprite,a,x+(string_width(text)/2) + 16,y + 16);
-   
+  
    }
 draw_set_color(c_black);
 draw_set_alpha(1);

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

@@ -31,6 +31,7 @@ image_xscale = random_range(0.8,1.2);
 image_yscale = image_xscale;
 speed        = random_range(4,6);
 secure       = 6;
+tempSpr      = 0;
 </string>
           </argument>
         </arguments>

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

@@ -231,14 +231,21 @@ hover = false;
 
 if (mode == "in")
     {
-     if (bacAlpha < 1) {bacAlpha += 0.1;  oHUD.draw = false; scrSetActiveComponent(true);}
+     if (bacAlpha < 1) {bacAlpha = 1;  scrSetActiveComponent(true);}
+     push = 0;
+     pushValue = 0;
     }
 if (mode == "out")
     {
-     if (bacAlpha > 0) {bacAlpha -= 0.1;} else {draw = false; mode = ""; oHUD.draw = true; scrSetActiveComponent(false);}
+     if (bacAlpha > 0) {bacAlpha -= 0.1;} else {draw = false; mode = ""; scrSetActiveComponent(false);}
+    }
+if (mode == "outSlow")
+    {
+     if (bacAlpha > 0) {bacAlpha -= 0.05;} else {draw = false; mode = ""; scrSetActiveComponent(false);}
+     if (push == 1) {pushValue = lerp(pushValue, 800, 0.1);}
     }
 
-clr(c_black, bacAlpha / 2);
+clr(c_black, bacAlpha / 4 * 3);
 draw_rectangle(x, y, x + 800, y + 600, false);
 clr(c_black, bacAlpha);
 draw_sprite_ext(sTalentMenuIcons, 0, x + 768 + 16, y + 16, 1, 1, 0, c_white, 1);
@@ -255,12 +262,13 @@ if (point_in_rectangle(mouse_x, mouse_y, x + 768, y, x + 800, y + 32))
 // Hlavička
 clr(c_white, bacAlpha);
 alg("center", fntPixelHuge);
-draw_text(x + 496, y + 16, "Kouzla");
+draw_text(x + 400, y + 24, "Magie");
 alg("center", fntPixel);
 
 bs = "Nemáš žádné body magie";
-if (oPlayer.spellPoints > 0) {bs = "Máš " + string(oPlayer.spellPoints) + " " + scrInflect("bod", oPlayer.talentPoints) + " bodů magie";}
-draw_text(x + 496, y + 36, bs);
+fnt(fntPixel);
+if (oPlayer.spellPoints > 0) {bs = "Máš " + string(oPlayer.spellPoints) + " " + scrInflect("bod", oPlayer.talentPoints) + " bodů čarodějnictví.";}
+draw_text(x + 400, y + 42, bs);
 alg();
 
 // Vykreslování kouzel

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

@@ -40,6 +40,8 @@ hint                = "";
 hint2               = "";
 prevHit             = 0;
 prevHit2            = 0;
+push                = 0;
+pushValue           = 0;
 
 
 
@@ -60,6 +62,8 @@ for(i = 0; i < celkem_vlastnosti; i++)
 // consts    
 incHealth = 5;
 incMana = 3;
+
+drawMode = 0;
 </string>
           </argument>
         </arguments>
@@ -178,9 +182,11 @@ ti   = 0;
 hit  = false;
 
 // Lerp main alpha channel
-if (activated) {activatedAlpha = lerp(activatedAlpha, 1, 0.1);}
+if (activated) {activatedAlpha = lerp(activatedAlpha, 1, 0.1); push = false; pushValue = 0;}
 else           {activatedAlpha = lerp(activatedAlpha, 0, 0.1);}
 
+if (push) {pushValue = lerp(pushValue, 800, 0.1);}
+
 // Draw form
 if (activatedAlpha &gt; 0.05)
 {
@@ -191,10 +197,37 @@ clr(c_white, activatedAlpha)
 
 // Draw overall header
 alg("center", fntPixelHuge);
-draw_text_colored(view_xview + 400, view_yview + 24, oPlayer.name + ", úroveň " + string(oPlayer.vlastnost[vlastnost_level]) + " - " + apiPlayerGetRankName()); 
-fnt();
+s  = oPlayer.name + ", úroveň " + string(oPlayer.vlastnost[vlastnost_level]) + " - " + apiPlayerGetRankName();
+sW = string_width(s);
+draw_text_colored(view_xview + 400, view_yview + 24, s); 
+fnt(fntPixelSmall);
 alg();
 
+c1 = c_white;
+c2 = c_white;
+
+if (mouse_in(view_xview + 400 - (sW / 2) - string_width("&lt; Magie") - 16, view_xview + 400 - (sW / 2) - 16, view_yview + 10, view_yview + 24))
+   {
+    c1 = c_lime;
+    
+    if (mouse_check_button_pressed(mb_left))
+       {
+        activated = false;
+        oSpellMenu.mode      = "in"; 
+        oSpellMenu.draw      = true;       
+        push = true; 
+       }
+   }
+
+clr(c1, -1);
+draw_text(view_xview + 400 - (sW / 2) - string_width("&lt; Magie") - 16, view_yview + 4, "&lt; Magie");
+clr(c2, -1);
+draw_text(view_xview + 400 + (sW / 2) + 16, view_yview + 4, "Talenty &gt;");
+
+fnt();
+
+if (drawMode == 0)
+{
 // Draw attributes
 propertyPointsText = "";
 if (oPlayer.skillPoints &gt; 0) {propertyPointsText = "(" + scrColorflag(c_lime) + "+" + string(oPlayer.skillPoints) + scrEndColorflag() + ")";}
@@ -473,7 +506,7 @@ draw_text_colored(xx + xoffset, yy + yoffset + 64, "Obrana: " + string(round(oPl
 draw_text_colored(xx + xoffset, yy + yoffset + 96, "Šance na kritický úder: " + string(round(oPlayer.vlastnost[vlastnost_kriticka_sance])) + "%");
 fnt(fntPixelSmall); draw_text_colored(xx + xoffset + 16, yy + yoffset + 128, "- Kritické poškození: " + string(round(oPlayer.vlastnost[vlastnost_kriticka_nasobic] * 100)) + "%"); fnt();
 
-
+ }
 }
 </string>
           </argument>

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

@@ -43,6 +43,7 @@ splashMessageAlpha = 0;
 
 hp       = -1;
 affect   = "";
+tempSpr  = 0;
 
 canColide = true;
 particleSystem = false;

SimplexRPGEngine/Engine source/scripts/enemyAPI.gml

@@ -213,7 +213,7 @@ dmg                               += choose(-1, -2, 0, 1, 2);
 
 scrGoreFull(object.x,object.y);
 scrEnemyGetPosition();
-scrLog(dmg,c_black,-1,0,0,object.x,object.y-48,fntPixelHuge);
+scrLog(dmg,c_black,0,0,0,object.x,object.y-48,fntPixelHuge);
 can_damage = cd;
 if (sL != "") 
     {

SimplexRPGEngine/Engine source/scripts/hudAPI.gml

@@ -138,4 +138,4 @@ for (i = 0; i < 3; i++)
                 }
             }
         }
-    }
+    }

SimplexRPGEngine/Engine source/scripts/playerAPI.gml

@@ -715,14 +715,19 @@ if (oPlayer.last_dir == "w") {oPlayer.image_index = 0;}
 if (oPlayer.last_dir == "s") {oPlayer.image_index = 12;}
 
 #define apiPlayerSay
-/// apiPlayerSay(text)
+/// apiPlayerSay(text, [onlyOnEmptyFront])
 
-var t;
+var t, o;
 t = "Sample text";
+o = false;
 
 if (argument_count > 0) {t = argument[0];}
+if (argument_count > 1) {o = argument[1];}
+
+if (o) {if (ds_queue_size(oPlayer.speechQueue) > 0 || oPlayer.speechAlpha > 0.02) {return false;}}
 
 ds_queue_enqueue(oPlayer.speechQueue, t);
+return true;
 
 #define apiPlayerSayNext
 /// apiPlayerSayNext()