Skip to content

Commit

Permalink
Update 1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@nexquery
nexquery committed Jun 3, 2022
1 parent db188a9 commit 3dfbc11
Show file tree
Hide file tree
Showing 12 changed files with 218 additions and 62 deletions.
4 changes: 4 additions & 0 deletions gamemodes/kutuphane/degiskenler-textdraw.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ enum textdraw_yapilandirmasi
new Textler[MAX_TEXT_LIMIT][textdraw_yapilandirmasi], Iterator: Text_List<MAX_TEXT_LIMIT>;
new Textler_TMP[textdraw_yapilandirmasi];

// Yeniden Sıralama
new TextRowShift[MAX_TEXT_LIMIT][textdraw_yapilandirmasi];

//
new
// Export alınırken değişken isimleri
Text_Global[MAX_GPLAYER_ISIM] = "Text_Global",
Expand Down
9 changes: 9 additions & 0 deletions gamemodes/kutuphane/dil-ve-spawn.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ enum DIL_YAPILANDIRMASI
sayfa_btn2[DIL_MAX_BUFFER],
sayfa_hata[DIL_MAX_BUFFER],

// [Indexleri Yeniden Sırala]
iys_baslik[DIL_MAX_BUFFER],
iys_icerik_1[DIL_MAX_BUFFER],
iys_icerik_2[DIL_MAX_BUFFER],
iys_buton_1[DIL_MAX_BUFFER],
iys_buton_2[DIL_MAX_BUFFER],
iys_bilgi[DIL_MAX_BUFFER],

// Proje
proje_baslik[DIL_MAX_BUFFER],
proje_icerik_1[DIL_MAX_BUFFER],
Expand Down Expand Up @@ -157,6 +165,7 @@ enum DIL_YAPILANDIRMASI
liste_header3[DIL_MAX_BUFFER],
liste_header4[DIL_MAX_BUFFER],
liste_icerik[DIL_MAX_BUFFER],
liste_icerik2[DIL_MAX_BUFFER],
liste_btn1[DIL_MAX_BUFFER],
liste_btn2[DIL_MAX_BUFFER],

Expand Down
225 changes: 168 additions & 57 deletions gamemodes/kutuphane/hud/liste.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Liste_Menu(playerid)
format(buffer, sizeof(buffer), "%s>>\t\t\t\n", buffer);
format(buffer, sizeof(buffer), "%s<<\t\t\t\n", buffer);
format(buffer, sizeof(buffer), "%s%s\t\t\t\n", buffer, Dil_Mesaji[liste_icerik]);
format(buffer, sizeof(buffer), "%s%s\t\t\t\n", buffer, Dil_Mesaji[liste_icerik2]);
format(buffer, sizeof(buffer), "%s\t\t\t\n", buffer);

// Sayfa içeriği
Expand Down Expand Up @@ -98,21 +99,106 @@ Dialog:LISTE_MENU(playerid, response, listitem, inputtext[])
Sayfa_Menu(playerid, SAYFA_HUD_LISTE);
}

case 3:
case 3: // Indexleri yeniden sırala
{
Liste_IndexleriYenidenSirala(playerid);
}

case 4:
{
Liste_Menu(playerid);
}

default:
{
liste_Listitem = listitem - 4;
liste_Listitem = listitem - 5;
Liste_Islem(playerid);
}
}
}
return 1;
}

/***
*
* 88 88 8b d8 ad88888ba 88 88
* 88 88 Y8, ,8P d8" "8b "" 88
* 88 88 Y8, ,8P Y8, 88
* 88 8b,dPPYba, ,adPPYb,88 ,adPPYba, 8b, ,d8 "8aa8" `Y8aaaaa, 88 8b,dPPYba, ,adPPYYba, 88 ,adPPYYba,
* 88 88P' `"8a a8" `Y88 a8P_____88 `Y8, ,8P' `88' `"""""8b, 88 88P' "Y8 "" `Y8 88 "" `Y8
* 88 88 88 8b 88 8PP""""""" )888( 88 `8b 88 88 ,adPPPPP88 88 ,adPPPPP88
* 88 88 88 "8a, ,d88 "8b, ,aa ,d8" "8b, 88 888 Y8a a8P 88 88 88, ,88 88 88, ,88
* 88 88 88 `"8bbdP"Y8 `"Ybbd8"' 8P' `Y8 88 888 "Y88888P" 88 88 `"8bbdP"Y8 88 `"8bbdP"Y8
*
*
*/

Liste_IndexleriYenidenSirala(playerid)
{
Dialog_Show(playerid, LISTE_INDEX_SIRALA, DIALOG_STYLE_MSGBOX, Dil_Mesaji[iys_baslik], "%s\n%s", Dil_Mesaji[iys_buton_1], Dil_Mesaji[iys_buton_2], Dil_Mesaji[iys_icerik_1], Dil_Mesaji[iys_icerik_2]);
return 1;
}

Dialog:LISTE_INDEX_SIRALA(playerid, response, listitem, inputtext[])
{
if(!response) return Liste_Menu(playerid);
if(response)
{
// Geçerli indexi sıfırla
gIndex = -1;

// ana veriyi sıfırlamak için
static const reset[textdraw_yapilandirmasi];

// Aktif olan textlerin kopyasını al ve textdrawları kaldır
new total_index = 0;
foreach(new id : Text_List)
{
if(Textler[id][text.id] != Text: -1)
{
TextDrawDestroy(Textler[id][text.id]);
}
TextRowShift[total_index] = Textler[id];
TextRowShift[total_index][text.id] = Text: -1;
total_index++;
}

// Textlerin bütün verilerini sıfırla
for(new i = 0; i < MAX_TEXT_LIMIT; i++)
{
Textler[i] = reset;
Textler[i][text.id] = Text: -1;
}

// Iteratoru temizle
Iter_Clear(Text_List);

// Kopyalanan verileri yeniden ekle
for(new i = 0; i < total_index; i++)
{
new id = Iter_Free(Text_List);
Textler[id] = TextRowShift[i];
Iter_Add(Text_List, id);
}

// Veritabanını sıfırla
db_free_result(db_query(proje_db, "DELETE FROM gerial"));
db_free_result(db_query(proje_db, "DELETE FROM textdrawlar"));

// Textdrawları yeniden göster ve veritabanına ekle
foreach(new id : Text_List)
{
Textdraw_Render(id, true), DB_Ekle(id);
}

// Alt hudu güncelle
Hud_Render(true), Hud_Goster(true), Mouse(playerid, true, TEXTMOD_NORMAL);

// Bilgi
Mesaj_Bilgi(playerid, Dil_Mesaji[iys_bilgi]);
}
return 1;
}

/***
* 888 d8b 888 8888888 888
Expand Down Expand Up @@ -265,7 +351,7 @@ Dialog:LISTE_ISLEM(playerid, response, listitem, inputtext[])
{
// Indexi kaydet
textdraw_swap_index = liste_Sayfa_Arr[liste_Listitem];
textdraw_swap_index_tmp = liste_Sayfa_Arr[liste_Listitem];
textdraw_swap_index_tmp = liste_Sayfa_Arr[liste_Listitem];

// Seçim işlemlerini aktif et
Textdraw_IndexDegistir(playerid);
Expand Down Expand Up @@ -310,6 +396,7 @@ Textdraw_IndexDegistir(playerid)
TextDrawBackgroundColor(Textler[textdraw_swap_index][text.id], RENK_SECILEN_TEXT);
TextDrawColor(Textler[textdraw_swap_index][text.id], RENK_SECILEN_TEXT);
TextDrawShowForAll(Textler[textdraw_swap_index][text.id]);
SetTimerEx("Textdraw_Normal_Select", TEXT_SECILEN_TIMER, false, "d", textdraw_swap_index);

// Index bilgisi
BilgiText_Update();
Expand Down Expand Up @@ -347,10 +434,8 @@ public Timer_IndexDegistiriliyor(playerid)
if(lr < -1)
{
tus = true;
TextDrawBoxColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.boxcolor]);
TextDrawBackgroundColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.bgcolor]);
TextDrawColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.color]);
TextDrawShowForAll(Textler[textdraw_swap_index][text.id]);

textdraw_swap_index_tmp = textdraw_swap_index;
if(Iter_Count(Text_List) > 1)
{
if(Iter_Contains(Text_List, textdraw_swap_index))
Expand All @@ -362,20 +447,39 @@ public Timer_IndexDegistiriliyor(playerid)
}
}
}
TextDrawBoxColor(Textler[textdraw_swap_index][text.id], RENK_SECILEN_TEXT);
TextDrawBackgroundColor(Textler[textdraw_swap_index][text.id], RENK_SECILEN_TEXT);
TextDrawColor(Textler[textdraw_swap_index][text.id], RENK_SECILEN_TEXT);
TextDrawShowForAll(Textler[textdraw_swap_index][text.id]);

if(textdraw_swap_index_tmp != -1)
{
new suan_secilen[textdraw_yapilandirmasi];
suan_secilen = Textler[textdraw_swap_index];
Textler[textdraw_swap_index] = Textler[textdraw_swap_index_tmp];
Textler[textdraw_swap_index_tmp] = suan_secilen;

TextDrawDestroy(Textler[textdraw_swap_index][text.id]);
Textler[textdraw_swap_index][text.id] = Text: -1;

TextDrawDestroy(Textler[textdraw_swap_index_tmp][text.id]);
Textler[textdraw_swap_index_tmp][text.id] = Text: -1;

if(textdraw_swap_index >= textdraw_swap_index_tmp)
{
Textdraw_Render(textdraw_swap_index_tmp, true);
Textdraw_Render(textdraw_swap_index, true);
}
else
{
Textdraw_Render(textdraw_swap_index, true);
Textdraw_Render(textdraw_swap_index_tmp, true);
}
}
}

// Sağ
if(lr > 1)
{
tus = true;
TextDrawBoxColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.boxcolor]);
TextDrawBackgroundColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.bgcolor]);
TextDrawColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.color]);
TextDrawShowForAll(Textler[textdraw_swap_index][text.id]);

textdraw_swap_index_tmp = textdraw_swap_index;
if(Iter_Count(Text_List) > 1)
{
if(Iter_Contains(Text_List, textdraw_swap_index))
Expand All @@ -387,10 +491,31 @@ public Timer_IndexDegistiriliyor(playerid)
}
}
}
TextDrawBoxColor(Textler[textdraw_swap_index][text.id], RENK_SECILEN_TEXT);
TextDrawBackgroundColor(Textler[textdraw_swap_index][text.id], RENK_SECILEN_TEXT);
TextDrawColor(Textler[textdraw_swap_index][text.id], RENK_SECILEN_TEXT);
TextDrawShowForAll(Textler[textdraw_swap_index][text.id]);

if(textdraw_swap_index_tmp != -1)
{
new suan_secilen[textdraw_yapilandirmasi];
suan_secilen = Textler[textdraw_swap_index];
Textler[textdraw_swap_index] = Textler[textdraw_swap_index_tmp];
Textler[textdraw_swap_index_tmp] = suan_secilen;

TextDrawDestroy(Textler[textdraw_swap_index][text.id]);
Textler[textdraw_swap_index][text.id] = Text: -1;

TextDrawDestroy(Textler[textdraw_swap_index_tmp][text.id]);
Textler[textdraw_swap_index_tmp][text.id] = Text: -1;

if(textdraw_swap_index >= textdraw_swap_index_tmp)
{
Textdraw_Render(textdraw_swap_index_tmp, true);
Textdraw_Render(textdraw_swap_index, true);
}
else
{
Textdraw_Render(textdraw_swap_index, true);
Textdraw_Render(textdraw_swap_index_tmp, true);
}
}
}

// Güncelle
Expand All @@ -417,35 +542,8 @@ hook OnPlayerKeyStateChange(playerid, newkeys, oldkeys)
{
Bilgi_Text_Kaldir(), KillTimer(timer_IndexDegistir), timer_IndexDegistir = -1;

TextDrawBoxColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.boxcolor]);
TextDrawBackgroundColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.bgcolor]);
TextDrawColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.color]);
TextDrawShowForAll(Textler[textdraw_swap_index][text.id]);

if(textdraw_swap_index != textdraw_swap_index_tmp)
if(textdraw_swap_index != -1)
{
new suan_secilen[textdraw_yapilandirmasi];
suan_secilen = Textler[textdraw_swap_index];
Textler[textdraw_swap_index] = Textler[textdraw_swap_index_tmp];
Textler[textdraw_swap_index_tmp] = suan_secilen;

TextDrawDestroy(Textler[textdraw_swap_index][text.id]);
Textler[textdraw_swap_index][text.id] = Text: -1;

TextDrawDestroy(Textler[textdraw_swap_index_tmp][text.id]);
Textler[textdraw_swap_index_tmp][text.id] = Text: -1;

if(textdraw_swap_index >= textdraw_swap_index_tmp)
{
Textdraw_Render(textdraw_swap_index_tmp, true);
Textdraw_Render(textdraw_swap_index, true);
}
else
{
Textdraw_Render(textdraw_swap_index, true);
Textdraw_Render(textdraw_swap_index_tmp, true);
}

DB_Guncelle(textdraw_swap_index_tmp), DB_Guncelle(textdraw_swap_index);

gIleri_Sil(textdraw_swap_index_tmp), gIleri_Sil(textdraw_swap_index);
Expand Down Expand Up @@ -484,17 +582,30 @@ Dialog:MANUEL_INDEX_SWAP(playerid, response, listitem, inputtext[])
return Mesaj_Hata(playerid, Dil_Mesaji[idgstr_hata]), TIndex_Manuel(playerid);
}

TextDrawBoxColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.boxcolor]);
TextDrawBackgroundColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.bgcolor]);
TextDrawColor(Textler[textdraw_swap_index][text.id], Textler[textdraw_swap_index][text.color]);
TextDrawShowForAll(Textler[textdraw_swap_index][text.id]);

textdraw_swap_index_tmp = textdraw_swap_index;
textdraw_swap_index = deger;

TextDrawBoxColor(Textler[textdraw_swap_index][text.id], RENK_SECILEN_TEXT);
TextDrawBackgroundColor(Textler[textdraw_swap_index][text.id], RENK_SECILEN_TEXT);
TextDrawColor(Textler[textdraw_swap_index][text.id], RENK_SECILEN_TEXT);
TextDrawShowForAll(Textler[textdraw_swap_index][text.id]);
new suan_secilen[textdraw_yapilandirmasi];
suan_secilen = Textler[textdraw_swap_index];
Textler[textdraw_swap_index] = Textler[textdraw_swap_index_tmp];
Textler[textdraw_swap_index_tmp] = suan_secilen;

TextDrawDestroy(Textler[textdraw_swap_index][text.id]);
Textler[textdraw_swap_index][text.id] = Text: -1;

TextDrawDestroy(Textler[textdraw_swap_index_tmp][text.id]);
Textler[textdraw_swap_index_tmp][text.id] = Text: -1;

if(textdraw_swap_index >= textdraw_swap_index_tmp)
{
Textdraw_Render(textdraw_swap_index_tmp, true);
Textdraw_Render(textdraw_swap_index, true);
}
else
{
Textdraw_Render(textdraw_swap_index, true);
Textdraw_Render(textdraw_swap_index_tmp, true);
}

BilgiText_Update();
TextDrawSetString(Bilgi_Text, fex("~g~~h~Index: ~w~~h~%d / %d", textdraw_swap_index, Iter_Count(Text_List) - 1));
Expand Down Expand Up @@ -702,7 +813,7 @@ hook OnPlayerKeyStateChange(playerid, newkeys, oldkeys)
forward Textdraw_Normal_Select(index);
public Textdraw_Normal_Select(index)
{
TextDrawBoxColor(Textler[gIndex][text.id], Textler[gIndex][text.boxcolor]);
TextDrawBoxColor(Textler[index][text.id], Textler[index][text.boxcolor]);
TextDrawBackgroundColor(Textler[index][text.id], Textler[index][text.bgcolor]);
TextDrawColor(Textler[index][text.id], Textler[index][text.color]);
TextDrawShowForAll(Textler[index][text.id]);
Expand Down
Binary file modified gamemodes/textdraw-editor.amx
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions gamemodes/textdraw-editor.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@
* Textdrawları içe aktarmak için renklere hex desteği eklendi.
* Textdrawların index sıralamasını değiştirmek için yeni bir işlev yazıldı.
* Preview models de yüksek kimlikli bir nesne varsa ve renk değiştirilirse ortaya çıkan bir hata düzeltildi.
*
* (03.06.2022) v1.5:
* Textdrawı seçince belirgin olmasını engelleyen bir hata düzeltildi.
* Textdraw indexlerini eşzamanlı değiştirebilir ve görebilirsiniz.
* Index kaydırma özelliği eklendi, artık 0, 1, 2, 4 gibi indexleriniz 0, 1, 2, 3 olarak sıralanabilir.
*/

// Kütüphaneler
Expand Down
2 changes: 1 addition & 1 deletion scriptfiles/export/TestAll.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ TextDrawFont(Text_Global[16], 1);
TextDrawSetProportional(Text_Global[16], 1);
TextDrawSetSelectable(Text_Global[16], 1);

Text_Global[17] = TextDrawCreate(310.000, 80.000, "Textdraw Editor 1.4");
Text_Global[17] = TextDrawCreate(310.000, 80.000, "Textdraw Editor 1.5");
TextDrawLetterSize(Text_Global[17], 0.400, 2.500);
TextDrawAlignment(Text_Global[17], 2);
TextDrawColor(Text_Global[17], -1);
Expand Down
2 changes: 1 addition & 1 deletion scriptfiles/import/TestAll.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ TextDrawFont(Text_Global[16], 1);
TextDrawSetProportional(Text_Global[16], 1);
TextDrawSetSelectable(Text_Global[16], 1);

Text_Global[17] = TextDrawCreate(310.000, 80.000, "Textdraw Editor 1.4");
Text_Global[17] = TextDrawCreate(310.000, 80.000, "Textdraw Editor 1.5");
TextDrawLetterSize(Text_Global[17], 0.400, 2.500);
TextDrawAlignment(Text_Global[17], 2);
TextDrawColor(Text_Global[17], 0xFFFFFFFF);
Expand Down
Loading

0 comments on commit 3dfbc11

Please sign in to comment.