Skip to content

Commit

Permalink
v1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@nexquery
nexquery committed Mar 25, 2022
1 parent b6293db commit c674c2c
Show file tree
Hide file tree
Showing 12 changed files with 206 additions and 30 deletions.
7 changes: 5 additions & 2 deletions gamemodes/kutuphane/ayarlar.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ DEFINE_HOOK_REPLACEMENT__(Downloading, Dwn);

// Sunucu ayarları
#define TDE_HOSTNAME "Textdraw Editor"
#define TDE_VERSION "1.1"
#define TDE_VERSION "1.2"

// Timestamp verileri hangi saat diliminde hesaplansın?
#define GMT_TIME 3
Expand Down Expand Up @@ -48,4 +48,7 @@ DEFINE_HOOK_REPLACEMENT__(Downloading, Dwn);
#define DOSYA_ICE_AKTAR "import/%s"

// Dışa Aktar
#define DOSYA_DISA_AKTAR "export/%s.txt"
#define DOSYA_DISA_AKTAR "export/%s.txt"

// Seçilen Textdrawın Kaybolma Süresi
#define TEXT_SECILEN_TIMER 650
3 changes: 3 additions & 0 deletions gamemodes/kutuphane/degiskenler-oyuncu.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ new
// Geri İleri
timer_undo = -1,

// Textdrawı seç
timer_textdraw_sec = -1,

// Mouse
bool: pMouse = false
;
1 change: 1 addition & 0 deletions gamemodes/kutuphane/dil-ve-spawn.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ enum DIL_YAPILANDIRMASI
lislem_icerik4[DIL_MAX_BUFFER],
lislem_icerik5[DIL_MAX_BUFFER],
lislem_icerik6[DIL_MAX_BUFFER],
lislem_icerik7[DIL_MAX_BUFFER],
lislem_btn1[DIL_MAX_BUFFER],
lislem_btn2[DIL_MAX_BUFFER],

Expand Down
12 changes: 11 additions & 1 deletion gamemodes/kutuphane/fonksiyonlar-textdraw.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,17 @@ Textdraw_Render(id, bool: goster)
TextDrawLetterSize(Textler[id][text.id], Textler[id][text.lettersize][0], Textler[id][text.lettersize][1]);
}

if(Textler[id][text.textsize][0] != 0.0 || Textler[id][text.textsize][1] != 0.0) {
if(Textler[id][text.selectable] == 1)
{
TextDrawTextSize(Textler[id][text.id], Textler[id][text.textsize][0], Textler[id][text.textsize][1]);
}
else
{
if(Textler[id][text.textsize][0] != 0.0 || Textler[id][text.textsize][1] != 0.0)
{
TextDrawTextSize(Textler[id][text.id], Textler[id][text.textsize][0], Textler[id][text.textsize][1]);
}
}

TextDrawAlignment(Textler[id][text.id], Textler[id][text.alignment]);
TextDrawColor(Textler[id][text.id], Textler[id][text.color]);
Expand All @@ -92,6 +100,8 @@ Textdraw_Render(id, bool: goster)
TextDrawSetPreviewVehCol(Textler[id][text.id], Textler[id][text.preview_vc][0], Textler[id][text.preview_vc][1]);
}

TextDrawSetSelectable(Textler[id][text.id], Textler[id][text.selectable]);

if(goster)
{
TextDrawShowForAll(Textler[id][text.id]);
Expand Down
160 changes: 153 additions & 7 deletions gamemodes/kutuphane/hud/liste.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,15 @@ Dialog:LISTE_MENU(playerid, response, listitem, inputtext[])
Liste_Islem(playerid)
{
Dialog_Show(playerid, LISTE_ISLEM, DIALOG_STYLE_LIST, Dil_Mesaji[lislem_baslik], "\
%s\n%s\n%s\n%s\n%s\n%s", Dil_Mesaji[lislem_btn1], Dil_Mesaji[lislem_btn2]
%s\n%s\n%s\n%s\n%s\n%s\n%s", Dil_Mesaji[lislem_btn1], Dil_Mesaji[lislem_btn2]
,
Dil_Mesaji[lislem_icerik1],
Dil_Mesaji[lislem_icerik2],
Dil_Mesaji[lislem_icerik3],
Dil_Mesaji[lislem_icerik4],
Dil_Mesaji[lislem_icerik5],
Dil_Mesaji[lislem_icerik6]
Dil_Mesaji[lislem_icerik6],
Dil_Mesaji[lislem_icerik7]
);
return 1;
}
Expand All @@ -160,10 +161,25 @@ Dialog:LISTE_ISLEM(playerid, response, listitem, inputtext[])

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

if(gIndex != -1)
{
TextDrawColor(Textler[gIndex][text.id], RENK_SECILEN_TEXT);
TextDrawShowForAll(Textler[gIndex][text.id]);
SetTimerEx("Textdraw_Normal_Select", TEXT_SECILEN_TIMER, false, "d", gIndex);
}
}

// Textdrawı sil
// Textdrawı seç (Yön Tuşlarıyla)
case 1:
{
// Textdrawı seç
gIndex = liste_Sayfa_Arr[liste_Listitem];
Textdraw_Sec_Yon_Tusu(playerid);
}

// Textdrawı sil
case 2:
{
Textler[liste_Sayfa_Arr[liste_Listitem]][text.grup] = 0;
Textler[liste_Sayfa_Arr[liste_Listitem]][text.grup_temp] = 0;
Expand Down Expand Up @@ -199,7 +215,7 @@ Dialog:LISTE_ISLEM(playerid, response, listitem, inputtext[])
}

// Textdrawı kopyala
case 2:
case 3:
{
// Textdrawı kopyala
new id = Textdraw_List_Kopyala(liste_Sayfa_Arr[liste_Listitem]);
Expand All @@ -219,7 +235,7 @@ Dialog:LISTE_ISLEM(playerid, response, listitem, inputtext[])
}

// Textdrawı kopyala ve seç
case 3:
case 4:
{
// Textdrawı kopyala
new id = Textdraw_List_Kopyala(liste_Sayfa_Arr[liste_Listitem]);
Expand All @@ -243,7 +259,7 @@ Dialog:LISTE_ISLEM(playerid, response, listitem, inputtext[])
}

// Index Değiştir
case 4:
case 5:
{
// Geçerli sayfaların verilerini al
index_degistir_Sayfa = liste_Sayfa;
Expand All @@ -256,7 +272,7 @@ Dialog:LISTE_ISLEM(playerid, response, listitem, inputtext[])
}

// Değişken adını düzenle
case 5:
case 6:
{
Liste_Degisken_Adi(playerid);
}
Expand Down Expand Up @@ -513,4 +529,134 @@ Dialog:LISTE_DEGISKEN_ADI(playerid, response, listitem, inputtext[])
Liste_Islem(playerid);
}
return 1;
}

/***
* 88888888888 888 888 .d8888b.
* 888 888 888 d88P Y88b
* 888 888 888 Y88b.
* 888 .d88b. 888 888 888888 .d88888 888d888 8888b. 888 888 888 "Y888b. .d88b. .d8888b
* 888 d8P Y8b `Y8bd8P' 888 d88" 888 888P" "88b 888 888 888 "Y88b. d8P Y8b d88P"
* 888 88888888 X88K 888 888 888 888 .d888888 888 888 888 "888 88888888 888
* 888 Y8b. .d8""8b. Y88b. Y88b 888 888 888 888 Y88b 888 d88P Y88b d88P Y8b. Y88b.
* 888 "Y8888 888 888 "Y888 "Y88888 888 "Y888888 "Y8888888P" "Y8888P" "Y8888 "Y8888P
*
*/

#include <YSI_Coding\y_hooks>

Textdraw_Sec_Yon_Tusu(playerid)
{
// Ön veriler
if(timer_textdraw_sec != -1) KillTimer(timer_textdraw_sec), timer_textdraw_sec = -1;
Hud_Oncelik_Textdraw();
Hud_Goster(false);

// İlk işlemleri uygula
TextDrawColor(Textler[gIndex][text.id], RENK_SECILEN_TEXT), TextDrawShowForAll(Textler[gIndex][text.id]);
//SetTimerEx("Textdraw_Normal_Select", TEXT_SECILEN_TIMER, false, "d", gIndex);

// Index bilgisi
BilgiText_Update();
TextDrawSetString(Bilgi_Text, fex("~g~~h~Index: ~w~~h~%d / %d", gIndex, Iter_Count(Text_List) - 1));

// Bilgi
Mesaj_Bilgi(playerid, Dil_Mesaji[kisayollar]);

// Timeri çalıştır
timer_textdraw_sec = SetTimerEx("Textdraw_Index_Yon", 85, true, "d", playerid);
return 1;
}


forward Textdraw_Index_Yon(playerid);
public Textdraw_Index_Yon(playerid)
{
new keys, ud, lr, bool: tus = false;
GetPlayerKeys(playerid, keys, ud, lr);
if(timer_textdraw_sec != -1)
{
tus = false;
BilgiText_Gizle();

// Sol
if(lr < -1)
{
tus = true;
TextDrawColor(Textler[gIndex][text.id], Textler[gIndex][text.color]);
TextDrawShowForAll(Textler[gIndex][text.id]);
if(Iter_Count(Text_List) > 1)
{
if(Iter_Contains(Text_List, gIndex))
{
gIndex = Iter_Prev(Text_List, gIndex);
if (gIndex == Iter_Begin(Text_List))
{
gIndex = Iter_Last(Text_List);
}
}
}
TextDrawColor(Textler[gIndex][text.id], RENK_SECILEN_TEXT);
TextDrawShowForAll(Textler[gIndex][text.id]);
}

// Sağ
if(lr > 1)
{
tus = true;
TextDrawColor(Textler[gIndex][text.id], Textler[gIndex][text.color]);
TextDrawShowForAll(Textler[gIndex][text.id]);
if(Iter_Count(Text_List) > 1)
{
if(Iter_Contains(Text_List, gIndex))
{
gIndex = Iter_Next(Text_List, gIndex);
if(gIndex == Iter_End(Text_List))
{
gIndex = Iter_First(Text_List);
}
}
}
TextDrawColor(Textler[gIndex][text.id], RENK_SECILEN_TEXT);
TextDrawShowForAll(Textler[gIndex][text.id]);
}

// Güncelle
if(tus == true)
{
BilgiText_Update();
//TextDrawColor(Textler[gIndex][text.id], RENK_SECILEN_TEXT), TextDrawShowForAll(Textler[gIndex][text.id]);
//SetTimerEx("Textdraw_Normal_Select", TEXT_SECILEN_TIMER, false, "d", gIndex);
TextDrawSetString(Bilgi_Text, fex("~g~~h~Index: ~w~~h~%d / %d", gIndex, Iter_Count(Text_List) - 1));
}
}
}

hook OnPlayerDisconnect(playerid, reason)
{
if(timer_textdraw_sec != -1)
{
KillTimer(timer_textdraw_sec), timer_textdraw_sec = -1;
}
return 1;
}

hook OnPlayerKeyStateChange(playerid, newkeys, oldkeys)
{
if(PRESSED(KEY_SECONDARY_ATTACK) && timer_textdraw_sec != -1)
{
Bilgi_Text_Kaldir(), KillTimer(timer_textdraw_sec), timer_textdraw_sec = -1;
TextDrawColor(Textler[gIndex][text.id], Textler[gIndex][text.color]);
TextDrawShowForAll(Textler[gIndex][text.id]);
Mesaj_Bilgi(playerid, fmt(Dil_Mesaji[tdraw_sec]), gIndex);
Hud_Render(true), Hud_Goster(true), Mouse(playerid, true, TEXTMOD_NORMAL);
}
return 1;
}

forward Textdraw_Normal_Select(index);
public Textdraw_Normal_Select(index)
{
TextDrawColor(Textler[index][text.id], Textler[index][text.color]);
TextDrawShowForAll(Textler[index][text.id]);
}
1 change: 1 addition & 0 deletions gamemodes/kutuphane/hud/selectable.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Selectable()
gIleri_Ekle(gIndex);
Textler[gIndex][text.selectable] = (Textler[gIndex][text.selectable] == 0) ? (1) : (0);
DB_Guncelle(gIndex);
Textdraw_Render(gIndex, true);
Hud_Render(true), Hud_Goster(true);
return 1;
}
7 changes: 5 additions & 2 deletions gamemodes/kutuphane/renkler.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@
#define RENK_MESAJ_BILGI 0x70A1FFFF

// Mouse Renkleri
#define RENK_MOUSE_DEFAULT 0xFFFFFF90
#define RENK_MOUSE_DEFAULT 0x9980FAFF // 0xFFFFFF90

// Hud
#define RENK_HUD_ALTBAR 724249599
#define RENK_HUD_DISABLE 0x3D3D3DFF
#define RENK_HUD_DISABLE 0x3D3D3DFF

// Seçilen Textdraw Rengi
#define RENK_SECILEN_TEXT 0xFFFA65FF
Binary file modified gamemodes/textdraw-editor.amx
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions gamemodes/textdraw-editor.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
* Araç oluşturma komutu eklendi.
* Dışa aktarma ile ilgili bir sorun düzeltildi.
* Silme ve geri getirmeyle ilgili bir sorun düzeltildi.
*
* (25.03.2022) v1.2:
* Hangi textdrawı seçtiğinizi daha iyi anlamak için renk değiştirip orijinal hale dönen bir özellik eklendi.
* Selectable aktif olan textdrawlarda tıklayabileceğiniz alanı görme özelliği eklendi.
* Textdrawları hızlıca seçmek için yön tuşlarıyla seçim aracı eklendi.
* Editör sürümü 1.2 olarak ayarlandı.
*/

// Kütüphaneler
Expand Down
13 changes: 7 additions & 6 deletions scriptfiles/languages/translations/en.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Language: English
# Author: root
# Version: 1.1
# Version: 1.2
# Encoding: UTF-8
###############################################

Expand Down Expand Up @@ -152,11 +152,12 @@
[Liste Islem]
.lislem_baslik = Options
.lislem_icerik1 = Choose textdraw
.lislem_icerik2 = Delete textdraw
.lislem_icerik3 = Clone textdraw
.lislem_icerik4 = Clone textdraw and select
.lislem_icerik5 = Change textdraw index
.lislem_icerik6 = Change variable name
.lislem_icerik2 = Choose textdraw (Arrow Keys)
.lislem_icerik3 = Delete textdraw
.lislem_icerik4 = Clone textdraw
.lislem_icerik5 = Clone textdraw and select
.lislem_icerik6 = Change textdraw index
.lislem_icerik7 = Change variable name
.lislem_btn1 = Choose
.lislem_btn2 = Back

Expand Down
13 changes: 7 additions & 6 deletions scriptfiles/languages/translations/ro.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Language: Romanian
# Author: shaw
# Version: 1.1
# Version: 1.2
# Encoding: Romanian (Windows 1254)
###############################################

Expand Down Expand Up @@ -152,11 +152,12 @@
[Lista de operatiuni]
.lislem_baslik = Alegeti o Tranzactie
.lislem_icerik1 = Selectati textdraw
.lislem_icerik2 = sterge textdraw
.lislem_icerik3 = Copie textdraw
.lislem_icerik4 = Copiati si selectati textdraw
.lislem_icerik5 = Schimbati ordinea indexului
.lislem_icerik6 = Editati numele variabilei
.lislem_icerik2 = Selectati textdraw (Taste sageti)
.lislem_icerik3 = sterge textdraw
.lislem_icerik4 = Copie textdraw
.lislem_icerik5 = Copiati si selectati textdraw
.lislem_icerik6 = Schimbati ordinea indexului
.lislem_icerik7 = Editati numele variabilei
.lislem_btn1 = Selectati
.lislem_btn2 = Inapoi

Expand Down
Loading

0 comments on commit c674c2c

Please sign in to comment.