From 97be299856547167699b23b1e712e124aaa96e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Fri, 27 Mar 2020 01:42:33 +0100 Subject: [PATCH 01/28] right spec --- gamemodes/Mrucznik-RP.pwn | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index ed5a5319d..d07b7ab0e 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -5771,6 +5771,28 @@ public OnPlayerUpdate(playerid) GetPlayerKeys(playerid, keys, ud, lr); if(ud == KEY_DOWN) CruiseControl_SetSpeed(playerid, 10, false); else if(ud == KEY_UP) CruiseControl_SetSpeed(playerid, 10, true); + return 1; + } + if(Spectate[playerid] != INVALID_PLAYER_ID) + { + new keys, ud,lr, actualid = INVALID_PLAYER_ID; + GetPlayerKeys(playerid, keys, ud, lr); + if(lr == KEY_RIGHT) + { + foreach(new i : Player){ + if(actualid != INVALID_PLAYER_ID) //if is set + { + new str[6]; + valstr(str, i); + RunCommand(playerid, "/spec", str); + } + else if(i == Spectate[playerid]) //if not set and expect + { + actualid = i; + } + } + } + return 1; } return 1; } @@ -6228,7 +6250,6 @@ public OnPlayerKeyStateChange(playerid,newkeys,oldkeys) } } - //11.06.2014 if(PRESSED(KEY_JUMP) && Spectate[playerid] != INVALID_PLAYER_ID) { PlayerInfo[playerid][pInt] = Unspec[playerid][sPint]; From 000dff1eb9bc29fc474988a5dbafc38488f8d89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Fri, 27 Mar 2020 01:52:43 +0100 Subject: [PATCH 02/28] prev and next /spec --- gamemodes/Mrucznik-RP.pwn | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index d07b7ab0e..8923525ce 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -5777,19 +5777,35 @@ public OnPlayerUpdate(playerid) { new keys, ud,lr, actualid = INVALID_PLAYER_ID; GetPlayerKeys(playerid, keys, ud, lr); - if(lr == KEY_RIGHT) + if(lr == KEY_RIGHT) //NEXT { - foreach(new i : Player){ + foreach(new i : Player) + { if(actualid != INVALID_PLAYER_ID) //if is set { new str[6]; valstr(str, i); RunCommand(playerid, "/spec", str); + break; } else if(i == Spectate[playerid]) //if not set and expect { actualid = i; } + } + } + else if(lr == KEY_LEFT) //BACK + { + foreach(new i : Player) + { + actualid = i; + if(i == Spectate[playerid]) //if not set and expect + { + new str[6]; + valstr(str, actualid); + RunCommand(playerid, "/spec", str); + break; + } } } return 1; From 9198576d525bf4324b06c1648c3165c0070feed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Mon, 30 Mar 2020 02:28:15 +0200 Subject: [PATCH 03/28] mdc maski --- gamemodes/commands/cmd/mdc.pwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gamemodes/commands/cmd/mdc.pwn b/gamemodes/commands/cmd/mdc.pwn index 961f6a5c4..35a84c33d 100644 --- a/gamemodes/commands/cmd/mdc.pwn +++ b/gamemodes/commands/cmd/mdc.pwn @@ -54,6 +54,9 @@ YCMD:mdc(playerid, params[], help) { if(giveplayerid != INVALID_PLAYER_ID) { + new nick[32]; + if(GetPVarString(giveplayerid, "maska_nick", nick, 24)) return sendTipMessage(playerid, "Nie można namierzyć osoby zamaskowanej."); + new pZone[MAX_ZONE_NAME]; new pojazd = GetPlayerVehicleID(giveplayerid); GetPlayer2DZone(giveplayerid, pZone, MAX_ZONE_NAME); From fc3700e626cb31487ecd064e91535bf670e010ed Mon Sep 17 00:00:00 2001 From: Mrucznik Date: Mon, 30 Mar 2020 17:01:14 +0200 Subject: [PATCH 04/28] Hitman Agency news fix --- gamemodes/Mrucznik-RP.pwn | 15 +++++---------- gamemodes/system/zmienne.pwn | 3 +-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index ed5a5319d..a6bcd1662 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -6943,7 +6943,6 @@ public OnPlayerText(playerid, text[]) }//lets start if(strcmp(x_nr,"1",true) == 0) { - if(PlacedNews[playerid] == 1) { SendClientMessage(playerid, COLOR_GREY, "Ten numer jest zajęty, usuń wiadomość z tego numeru !"); return 0; } if(PlayerInfo[playerid][pRank] < 3) { SendClientMessage(playerid, COLOR_GREY, "Musisz miec 3 rangę aby pisać newsy Hitman Agency !"); return 0; } if(News[hTaken1] == 0) { @@ -6951,7 +6950,7 @@ public OnPlayerText(playerid, text[]) if(strlen(text)-(strlen(x_nr)) < 9) { SendClientMessage(playerid, COLOR_GREY, "Za krótki tekst newsa !"); return 0; } format(string, sizeof(string), "%s",rightStr(text,strlen(text)-7)); strmid(News[hAdd1], string, 0, strlen(string)); format(string, sizeof(string), "%s",sendername); strmid(News[hContact1], string, 0, strlen(string)); - News[hTaken1] = 1; PlacedNews[playerid] = 1; + News[hTaken1] = 1; SendClientMessage(playerid, COLOR_LIGHTBLUE, "* Umieściłeś news na kanale Hitman Agency."); return 0; } @@ -6963,7 +6962,6 @@ public OnPlayerText(playerid, text[]) } else if(strcmp(x_nr,"2",true) == 0) { - if(PlacedNews[playerid] == 1) { SendClientMessage(playerid, COLOR_GREY, "Ten numer jest zajęty, usuń wiadomość z tego numeru !"); return 0; } if(PlayerInfo[playerid][pRank] < 3) { SendClientMessage(playerid, COLOR_GREY, "Musisz mieć 3 rangę aby pisać newsy na kanale Hitman Agency !"); return 0; } if(News[hTaken2] == 0) { @@ -6971,7 +6969,7 @@ public OnPlayerText(playerid, text[]) if(strlen(text)-(strlen(x_nr)) < 9) { SendClientMessage(playerid, COLOR_GREY, "News jest za krótki !"); return 0; } format(string, sizeof(string), "%s",rightStr(text,strlen(text)-7)); strmid(News[hAdd2], string, 0, strlen(string)); format(string, sizeof(string), "%s",sendername); strmid(News[hContact2], string, 0, strlen(string)); - News[hTaken2] = 1; PlacedNews[playerid] = 1; + News[hTaken2] = 1; SendClientMessage(playerid, COLOR_LIGHTBLUE, "* Umieściłeś news na kanale Hitman Agency."); return 0; } @@ -6983,7 +6981,6 @@ public OnPlayerText(playerid, text[]) } else if(strcmp(x_nr,"3",true) == 0) { - if(PlacedNews[playerid] == 1) { SendClientMessage(playerid, COLOR_GREY, "Ten numer jest zajęty, usuń wiadomość z tego numeru !"); return 0; } if(PlayerInfo[playerid][pRank] < 3) { SendClientMessage(playerid, COLOR_GREY, "Musisz mieć 3 rangę aby pisać newsy na kanale Hitman Agency !"); return 0; } if(News[hTaken3] == 0) { @@ -6991,7 +6988,7 @@ public OnPlayerText(playerid, text[]) if(strlen(text)-(strlen(x_nr)) < 9) { SendClientMessage(playerid, COLOR_GREY, "News jest za krótki !"); return 0; } format(string, sizeof(string), "%s",rightStr(text,strlen(text)-7)); strmid(News[hAdd3], string, 0, strlen(string)); format(string, sizeof(string), "%s",sendername); strmid(News[hContact3], string, 0, strlen(string)); - News[hTaken3] = 1; PlacedNews[playerid] = 1; + News[hTaken3] = 1; SendClientMessage(playerid, COLOR_LIGHTBLUE, "* Umieściłeś news na kanale Hitman Agency."); return 0; } @@ -7003,7 +7000,6 @@ public OnPlayerText(playerid, text[]) } else if(strcmp(x_nr,"4",true) == 0) { - if(PlacedNews[playerid] == 1) { SendClientMessage(playerid, COLOR_GREY, "Ten numer jest zajęty, usuń wiadomość z tego numeru !"); return 0; } if(PlayerInfo[playerid][pRank] < 3) { SendClientMessage(playerid, COLOR_GREY, "Musisz mieć 3 rangę aby pisać newsy na kanale Hitman Agency !"); return 0; } if(News[hTaken4] == 0) { @@ -7011,7 +7007,7 @@ public OnPlayerText(playerid, text[]) if(strlen(text)-(strlen(x_nr)) < 9) { SendClientMessage(playerid, COLOR_GREY, "News jest za krótki !"); return 0; } format(string, sizeof(string), "%s",rightStr(text,strlen(text)-7)); strmid(News[hAdd4], string, 0, strlen(string)); format(string, sizeof(string), "%s",sendername); strmid(News[hContact4], string, 0, strlen(string)); - News[hTaken4] = 1; PlacedNews[playerid] = 1; + News[hTaken4] = 1; SendClientMessage(playerid, COLOR_LIGHTBLUE, "* Umieściłeś news na kanale Hitman Agency."); return 0; } @@ -7023,7 +7019,6 @@ public OnPlayerText(playerid, text[]) } else if(strcmp(x_nr,"5",true) == 0) { - if(PlacedNews[playerid] == 1) { SendClientMessage(playerid, COLOR_GREY, "Ten numer jest zajęty, usuń wiadomość z tego numeru !"); return 0; } if(PlayerInfo[playerid][pRank] < 3) { SendClientMessage(playerid, COLOR_GREY, "Musisz mieć 3 rangę aby pisać newsy na kanale Hitman Agency !"); return 0; } if(News[hTaken5] == 0) { @@ -7031,7 +7026,7 @@ public OnPlayerText(playerid, text[]) if(strlen(text)-(strlen(x_nr)) < 9) { SendClientMessage(playerid, COLOR_GREY, "News jest za krótki !"); return 0; } format(string, sizeof(string), "%s",rightStr(text,strlen(text)-7)); strmid(News[hAdd5], string, 0, strlen(string)); format(string, sizeof(string), "%s",sendername); strmid(News[hContact5], string, 0, strlen(string)); - News[hTaken5] = 1; PlacedNews[playerid] = 1; + News[hTaken5] = 1; SendClientMessage(playerid, COLOR_LIGHTBLUE, "* Umieściłeś news na kanale Hitman Agency."); return 0; } diff --git a/gamemodes/system/zmienne.pwn b/gamemodes/system/zmienne.pwn index 65fbb769f..2a235d603 100644 --- a/gamemodes/system/zmienne.pwn +++ b/gamemodes/system/zmienne.pwn @@ -713,7 +713,6 @@ new PlayerCuffed[MAX_PLAYERS]; new PlayerCuffedTime[MAX_PLAYERS]; new LiveOffer[MAX_PLAYERS]; new TalkingLive[MAX_PLAYERS]; -new PlacedNews[MAX_PLAYERS]; new SelectChar[MAX_PLAYERS]; new SelectCharID[MAX_PLAYERS]; new SelectCharPlace[MAX_PLAYERS]; @@ -1160,7 +1159,7 @@ ZerujZmienne(playerid) DrugPrice[playerid] = 0; OnCK[playerid] = 999; GettingCK[playerid] = 999; OdpalanieSpam[playerid] = 0; DrugGram[playerid] = 0; ConnectedToPC[playerid] = 0; OrderReady[playerid] = 0; JailPrice[playerid] = 0; MedicTime[playerid] = 0; NeedMedicTime[playerid] = 0; MedicBill[playerid] = 0; GotHit[playerid] = 0; - GoChase[playerid] = 999; GetChased[playerid] = 999; PlacedNews[playerid] = 0; + GoChase[playerid] = 999; GetChased[playerid] = 999; OnDuty[playerid] = 0; OnDutyCD[playerid] = 0; PoziomPoszukiwania[playerid] = 0; BoxWaitTime[playerid] = 0; SchoolSpawn[playerid] = 0; ChangePos2[playerid][1] = 0; iddialog[playerid] = -1; TransportDuty[playerid] = 0; PlayerTied[playerid] = 0; weryfikacja[playerid] = 0; From 874bec77b7c2eaeb50c0273245820f8ca8f89465 Mon Sep 17 00:00:00 2001 From: Mrucznik Date: Mon, 30 Mar 2020 18:01:06 +0200 Subject: [PATCH 05/28] /fo nick bez maski --- gamemodes/commands/cmd/fooc.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/commands/cmd/fooc.pwn b/gamemodes/commands/cmd/fooc.pwn index d71be7a5e..734f57ed4 100644 --- a/gamemodes/commands/cmd/fooc.pwn +++ b/gamemodes/commands/cmd/fooc.pwn @@ -40,7 +40,7 @@ YCMD:fooc(playerid, params[], help) sendTipMessageEx(playerid, TEAM_CYAN_COLOR, "Nie możesz pisać ponieważ jesteś wyciszony"); return 1; }*/ - GetPlayerName(playerid, sendername, sizeof(sendername)); + sendername = GetNickEx(playerid); if(isnull(params)) { sendTipMessage(playerid, "Użyj (/fo)oc [tekst]"); From 63f4b616f124fd9985803c862a4e0df218aa2562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Mon, 30 Mar 2020 18:25:05 +0200 Subject: [PATCH 06/28] ibiza --- gamemodes/modules/ibiza/ibiza_dialogs.pwn | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gamemodes/modules/ibiza/ibiza_dialogs.pwn b/gamemodes/modules/ibiza/ibiza_dialogs.pwn index 4ecd63635..99665c932 100644 --- a/gamemodes/modules/ibiza/ibiza_dialogs.pwn +++ b/gamemodes/modules/ibiza/ibiza_dialogs.pwn @@ -36,6 +36,7 @@ ibiza_OnDialogResponse(playerid, dialogid, response, listitem, inputtext[]) SetPlayerWeather(playerid, 27); SendClientMessage(playerid, -1, "Kasjerka mówi: Dziękujemy za zakup biletu!"); SejfR_Add(FAMILY_IBIZA, ibiza_priceNormal); + Log(payLog, INFO, "%s kupił bilet normalny (Ibiza) za $ %d", GetPlayerLogName(playerid), ibiza_priceNormal); }else{ SendClientMessage(playerid, -1, "Nie masz wystarczającej ilości pieniędzy!"); } @@ -47,6 +48,7 @@ ibiza_OnDialogResponse(playerid, dialogid, response, listitem, inputtext[]) SetPlayerWeather(playerid, 27); SendClientMessage(playerid, -1, "Kasjerka mówi: Dziękujemy za zakup biletu VIP!"); SejfR_Add(FAMILY_IBIZA, ibiza_priceVIP); + Log(payLog, INFO, "%s kupił bilet VIP (Ibiza) za $ %d", GetPlayerLogName(playerid), ibiza_priceNormal); }else{ SendClientMessage(playerid, -1, "Nie masz wystarczającej ilości pieniędzy!"); } @@ -113,30 +115,28 @@ ibiza_OnDialogResponse(playerid, dialogid, response, listitem, inputtext[]) } } case 6:{ - ShowPlayerDialogEx(playerid, DIALOG_IBIZA_NORMAL_TICKET, DIALOG_STYLE_INPUT, "IbizaClub - Normalny bilet", "Wpisz cenę biletu normalnego", "Zatwierdź", "Anuluj"); + ShowPlayerDialogEx(playerid, DIALOG_IBIZA_NORMAL_TICKET, DIALOG_STYLE_INPUT, "IbizaClub - Normalny bilet", "Wpisz cenę biletu normalnego\nMax 250000 $", "Zatwierdź", "Anuluj"); } case 7:{ - ShowPlayerDialogEx(playerid, DIALOG_IBIZA_VIP_TICKET, DIALOG_STYLE_INPUT, "IbizaClub - Normalny bilet", "Wpisz cenę biletu VIP", "Zatwierdź", "Anuluj"); + ShowPlayerDialogEx(playerid, DIALOG_IBIZA_VIP_TICKET, DIALOG_STYLE_INPUT, "IbizaClub - Normalny bilet", "Wpisz cenę biletu VIP\nMax 500000 $", "Zatwierdź", "Anuluj"); } } } } if(dialogid == DIALOG_IBIZA_NORMAL_TICKET){ if(response){ - ibiza_priceNormal = strval(inputtext); - if(ibiza_priceNormal < 0) - { - ibiza_priceNormal = 0; - } + new price = strval(inputtext); + if(price < 0) ibiza_priceNormal = 0; + else if(price > 250000) ibiza_priceNormal = 250000; + else ibiza_priceNormal = price; } } if(dialogid == DIALOG_IBIZA_VIP_TICKET){ if(response){ - ibiza_priceVIP = strval(inputtext); - if(ibiza_priceVIP < 0) - { - ibiza_priceVIP = 0; - } + new price = strval(inputtext); + if(price < 0) ibiza_priceVIP = 0; + else if(price > 500000) ibiza_priceVIP = 500000; + else ibiza_priceVIP = price; } } if(dialogid == DIALOG_IBIZA_TEXT_ONE){ From e14b9c630de53876ac46730be40926988db280af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Sun, 22 Mar 2020 18:58:44 +0100 Subject: [PATCH 07/28] lina, sprzedajzestaw, wplac --- gamemodes/Mrucznik-RP.pwn | 22 +--------------------- gamemodes/commands/cmd/lina.pwn | 5 ----- gamemodes/commands/cmd/sprzedajzestaw.pwn | 7 +++++++ gamemodes/commands/cmd/wplac.pwn | 22 +++++++++++++--------- gamemodes/system/zmienne.pwn | 1 - 5 files changed, 21 insertions(+), 36 deletions(-) diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index 8f1a080aa..b27b41f25 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -1306,15 +1306,7 @@ public OnPlayerDisconnect(playerid, reason) { KillTimer(saveMyAccountTimer[playerid]); } - - //PAŹDZIOCH - lina SWAT - if(GetPVarInt(playerid,"roped") == 1) - { - for(new i=0;i kaska[playerid] || cashdeposit < 1) @@ -59,25 +60,28 @@ YCMD:wplac(playerid, params[], help) sendTipMessage(playerid, "Nie masz tyle"); return 1; } - if(PlayerInfo[playerid][pAccount]+cashdeposit >=100000000) + + if(PlayerInfo[playerid][pAccount] + cashdeposit >=100000000) { sendTipMessage(playerid, "Maksymalnie w banku możesz trzymać 100 milionów!"); return 1; } + + if(GraczBankomat(playerid)) { + bankomat_fee = floatround(((cashdeposit/100) * 6), floatround_round); + } + ZabierzKase(playerid, cashdeposit); - //new poprowizji = $l * (1-$p*.01); - new curfunds = PlayerInfo[playerid][pAccount]; - if(GraczBankomat(playerid)) depo2 = floatround(((cashdeposit/100) * 6), floatround_round); - PlayerInfo[playerid][pAccount]=(cashdeposit-depo2)+PlayerInfo[playerid][pAccount]; + PlayerInfo[playerid][pAccount] += (cashdeposit - bankomat_fee); - Log(payLog, INFO, "%s wpłacił na swoje konto %d$. Koszt wpłaty %d, nowy stan %d$.", GetPlayerLogName(playerid), cashdeposit-depo2, depo2, PlayerInfo[playerid][pAccount]); + Log(payLog, INFO, "%s wpłacił na swoje konto %d$. Koszt wpłaty %d, nowy stan %d$.", GetPlayerLogName(playerid), cashdeposit-bankomat_fee, bankomat_fee, PlayerInfo[playerid][pAccount]); if(GraczBankomat(playerid)) { - format(string, sizeof(string), "Wpłaciłeś $%d na swoje konto, obecny stan to: $%d ", cashdeposit-depo2,PlayerInfo[playerid][pAccount]); + format(string, sizeof(string), "Wpłaciłeś $%d na swoje konto (prowizja %d), obecny stan to: $%d ", cashdeposit-bankomat_fee, bankomat_fee, PlayerInfo[playerid][pAccount]); SendClientMessage(playerid, COLOR_YELLOW, string); } else { SendClientMessage(playerid, COLOR_WHITE, "|___ STAN KONTA ___|"); - format(string, sizeof(string), " Poprzedni stan: $%d", curfunds); + format(string, sizeof(string), " Poprzedni stan: $%d", PlayerInfo[playerid][pAccount]); SendClientMessage(playerid, COLOR_GRAD2, string); format(string, sizeof(string), " Depozyt: $%d", cashdeposit); SendClientMessage(playerid, COLOR_GRAD4, string); diff --git a/gamemodes/system/zmienne.pwn b/gamemodes/system/zmienne.pwn index 2a235d603..9bdc7966a 100644 --- a/gamemodes/system/zmienne.pwn +++ b/gamemodes/system/zmienne.pwn @@ -135,7 +135,6 @@ new lastMsg[MAX_PLAYERS]; new PaniJanina; //PAŹDZIOCH -new r0pes[MAX_PLAYERS][ROPELENGTH]; new Float:pl_pos[MAX_PLAYERS][5]; //Podglad new TogPodglad[MAX_PLAYERS]; From aef91aa075d8eb7d5a470df673fdd568e219684d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Sun, 22 Mar 2020 19:12:08 +0100 Subject: [PATCH 08/28] git --- gamemodes/Mrucznik-RP.pwn | 4 ++-- gamemodes/mysql/mru_mysql.pwn | 2 +- gamemodes/system/forward.pwn | 3 ++- gamemodes/system/funkcje.pwn | 6 ++++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index b27b41f25..8e64ffbbc 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -1306,7 +1306,7 @@ public OnPlayerDisconnect(playerid, reason) { KillTimer(saveMyAccountTimer[playerid]); } - + //budki telefoniczne if(GetPVarInt(playerid, "budka-Mobile") != 999) { new caller = GetPVarInt(playerid, "budka-Mobile"); @@ -5940,7 +5940,7 @@ OnPlayerLogin(playerid, password[]) //Ładowanie konta i zmiennych: //---------------------------- - if( !MruMySQL_LoadAcocount(playerid) ) + if( !MruMySQL_LoadAccount(playerid) ) { SendClientMessage(playerid, COLOR_WHITE, "[SERVER] {FF0000}Krytyczny błąd konta. Zgłoś zaistniałą sytuację na forum."); Log(serverLog, ERROR, "Krytyczny błąd konta %s (pusty rekord?)", nick); diff --git a/gamemodes/mysql/mru_mysql.pwn b/gamemodes/mysql/mru_mysql.pwn index 9ee1cb0f3..fa4755109 100644 --- a/gamemodes/mysql/mru_mysql.pwn +++ b/gamemodes/mysql/mru_mysql.pwn @@ -555,7 +555,7 @@ MruMySQL_SaveAccount(playerid, bool:forcegmx = false, bool:forcequit = false) return fault; } -public MruMySQL_LoadAcocount(playerid) +public MruMySQL_LoadAccount(playerid) { if(!MYSQL_ON) return false; diff --git a/gamemodes/system/forward.pwn b/gamemodes/system/forward.pwn index 5743d6bde..7af7f2f27 100644 --- a/gamemodes/system/forward.pwn +++ b/gamemodes/system/forward.pwn @@ -54,6 +54,7 @@ forward spamujewl(playerid); forward AntySpamMechanik(playerid); forward PoscigTimer(playerid); forward AntySpamTimer(playerid); +forward AntySpamLowienie(playerid); forward AntyBusCzit(playerid); forward spamujebronia(playerid); forward odpalanie(playerid); @@ -127,7 +128,7 @@ forward Scena_ScreenEffect(); forward VehicleUpdate(); forward OnPlayerEnterOilSpot(playerid); // -forward MruMySQL_LoadAcocount(playerid); +forward MruMySQL_LoadAccount(playerid); //12.10 forward VendCheck(playerid); //30.10 diff --git a/gamemodes/system/funkcje.pwn b/gamemodes/system/funkcje.pwn index 54b6c2ad3..a03bb1d66 100644 --- a/gamemodes/system/funkcje.pwn +++ b/gamemodes/system/funkcje.pwn @@ -1123,6 +1123,12 @@ AntySpam[playerid] = 0; return 1; } +public AntySpamLowienie(playerid){ + PlayerInfo[playerid][pFishes] = 0; + DeletePVar(playerid, "AntySpamLowienie"); + return 1; +} + public AntyBusCzit(playerid){ BusCzit[playerid] = 0; return 1; From a0ec1c9dfd7c267aaf8a162e3a9a0bcee57ce9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Sun, 22 Mar 2020 19:19:38 +0100 Subject: [PATCH 09/28] chowane licznika po login --- gamemodes/commands/cmd/login.pwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gamemodes/commands/cmd/login.pwn b/gamemodes/commands/cmd/login.pwn index 30eef8e53..99dddffa5 100644 --- a/gamemodes/commands/cmd/login.pwn +++ b/gamemodes/commands/cmd/login.pwn @@ -75,6 +75,8 @@ YCMD:login(playerid, params[], help) format(reString, sizeof(reString), "SERWER: Gracz znajdujący się w pobliżu wyszedł z serwera (%s, powód: /login).", GetNick(playerid)); ProxDetector(25.0, playerid, reString, COLOR_GREY,COLOR_GREY,COLOR_GREY,COLOR_GREY,COLOR_GREY); //czynności + PlayerTextDrawHide(playerid, Kary[playerid]); + PlayerTextDrawHide(playerid, Licznik[playerid]); MruMySQL_SaveAccount(playerid); ZerujZmienne(playerid); gPlayerLogged[playerid] = 0; From a6ab1c51889e7f2e4e21e7378f4f65c61302847a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Sun, 22 Mar 2020 19:21:37 +0100 Subject: [PATCH 10/28] Poprawka do dajklucze --- gamemodes/commands/cmd/dajklucze.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/commands/cmd/dajklucze.pwn b/gamemodes/commands/cmd/dajklucze.pwn index 36770cbf3..144b26f9f 100644 --- a/gamemodes/commands/cmd/dajklucze.pwn +++ b/gamemodes/commands/cmd/dajklucze.pwn @@ -50,7 +50,7 @@ YCMD:dajklucze(playerid, params[], help) { if(playa != INVALID_PLAYER_ID) { - if(playerid == playa) return sendErrorMessage(playerid, "Sobie chcesz dać klucze? Pijany jesteś?"); + if(playa == playerid) return sendErrorMessage(playerid, "Sam sobie chcesz dać klucze, pijany jesteś? :D"); if(PlayerInfo[playa][pKluczeAuta] == 0) { if(PlayerInfo[playerid][pCars][numerp] == 0) return sendErrorMessage(playerid, "Nie masz wozu pod tym numerem"); From 6c223dcbbd873c07a7ab67d1b9e286e064ef74d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Sun, 22 Mar 2020 19:34:30 +0100 Subject: [PATCH 11/28] finfo & red NG --- gamemodes/commands/cmd/red.pwn | 2 +- gamemodes/system/enum.pwn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gamemodes/commands/cmd/red.pwn b/gamemodes/commands/cmd/red.pwn index e756b40e6..1c8e1500c 100644 --- a/gamemodes/commands/cmd/red.pwn +++ b/gamemodes/commands/cmd/red.pwn @@ -79,7 +79,7 @@ YCMD:red(playerid, params[], help) } else if(frac == FRAC_NG) { - frakcja = "SASD"; + frakcja = "NGSA"; } if(PDGPS == playerid) diff --git a/gamemodes/system/enum.pwn b/gamemodes/system/enum.pwn index 417e3813a..35e5c9205 100644 --- a/gamemodes/system/enum.pwn +++ b/gamemodes/system/enum.pwn @@ -477,7 +477,7 @@ new FractionNames[][40] = { "Brak", "Los Santos Police Department", "Federal Bureau of Investigation", - "San Andreas Sherrifs Department", + "National Guards San Andreas", "Emergency Rescue Service", "SA Bahamas", "Yakuza", From e2fbfac43b3df96fad7e3adec43279a1de98a182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Sun, 22 Mar 2020 20:15:10 +0100 Subject: [PATCH 12/28] poprawki cmd --- gamemodes/Mrucznik-RP.pwn | 2 +- gamemodes/commands/cmd/carhelp.pwn | 2 +- gamemodes/commands/cmd/kupbron.pwn | 66 ------------------- gamemodes/commands/cmd/pomoc2.pwn | 32 ++++----- gamemodes/commands/cmd/pomocdom.pwn | 2 +- gamemodes/commands/cmd/telefonpomoc.pwn | 2 +- gamemodes/commands/cmd/wynajempomoc.pwn | 4 +- gamemodes/commands/cmd/zbijwl.pwn | 2 +- gamemodes/commands/commands.pwn | 4 -- .../commands/biznespomoc/biznespomoc_impl.pwn | 2 +- .../commands/rybypomoc/rybypomoc_impl.pwn | 2 +- gamemodes/system/funkcje.pwn | 2 +- 12 files changed, 26 insertions(+), 96 deletions(-) delete mode 100644 gamemodes/commands/cmd/kupbron.pwn diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index 8e64ffbbc..49b631b7b 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -5570,7 +5570,7 @@ PayDay() SendRconCommand("reloadlog"); SendRconCommand("reloadbans"); - if(DmvActorStatus && shifthour < 16 || shifthour > 22) + if(DmvActorStatus && (shifthour < 16 || shifthour > 22)) { DestroyActorsInDMV(INVALID_PLAYER_ID); } diff --git a/gamemodes/commands/cmd/carhelp.pwn b/gamemodes/commands/cmd/carhelp.pwn index 7bc45f294..92f685c40 100644 --- a/gamemodes/commands/cmd/carhelp.pwn +++ b/gamemodes/commands/cmd/carhelp.pwn @@ -32,7 +32,7 @@ YCMD:carhelp(playerid, params[], help) { if(GUIExit[playerid] == 0) { - ShowPlayerDialogEx(playerid, 449, DIALOG_STYLE_MSGBOX, "Komendy auta", "/parkuj\n/auto\n/autoklucze\n/dajklucze\n/oddajklucze\n/dajauto\n/sprzedajlodz\n/sprzedajheli\n/lwymiana\n/hwymiana\n/garazuj\n/wywalklucze", "Wyjdź", "Wyjdz"); + ShowPlayerDialogEx(playerid, 449, DIALOG_STYLE_MSGBOX, "Komendy auta", "/parkuj\n/auto\n/autoklucze\n/dajklucze\n/oddajklucze\n/dajauto\n/sprzedajlodz\n/sprzedajheli\n/lwymiana\n/hwymiana\n/garazuj\n/wywalklucze\n/lock", "Wyjdź", "Wyjdz"); } return 1; } diff --git a/gamemodes/commands/cmd/kupbron.pwn b/gamemodes/commands/cmd/kupbron.pwn deleted file mode 100644 index ec445d2dc..000000000 --- a/gamemodes/commands/cmd/kupbron.pwn +++ /dev/null @@ -1,66 +0,0 @@ -//-----------------------------------------------<< Komenda >>-----------------------------------------------// -//------------------------------------------------[ kupbron ]------------------------------------------------// -//----------------------------------------------------*------------------------------------------------------// -//----[ ]----// -//----[ ||||| ||||| |||||||||| |||||||||| ]----// -//----[ ||| ||| ||| ||| ||| |||| ||| |||| ]----// -//----[ ||| ||| ||| ||| ||| ||| ||| ||| ]----// -//----[ || || || || ||| ||| ||| ||| ]----// -//----[ ||| ||| ||| ||| ||| |||| ||| |||| ]----// -//----[ || || || || __________ |||||||||| |||||||||| ]----// -//----[ ||| ||| ||| ||| ||| ||| ||| ]----// -//----[ || || || || ||| || ||| ]----// -//----[ ||| ||| ||| ||| ||| ||| ||| ]----// -//----[ || || || || ||| || ||| ]----// -//----[ ||| ||| ||| ||| ||| ||| ||| ]----// -//----[ ||| ||||| ||| ||| ||| ||| ]----// -//----[ ]----// -//----------------------------------------------------*------------------------------------------------------// - -// Opis: -/* - -*/ - - -// Notatki skryptera: -/* - -*/ - -YCMD:kupbron(playerid, params[], help) -{ - sendErrorMessage(playerid, "Sprzedaż broni została zakazana!"); - /*if(PlayerInfo[playerid][pConnectTime] >= 4) - { - if(PlayerInfo[playerid][pGunLic] == 1) - { - if(PlayerToPoint(7.0, playerid, 296.1448,-38.1248,1001.5156)) - { - if(kaska[playerid] < 1) - { - SendClientMessage(playerid, COLOR_GREY, " Nie masz przy sobie wystarczająco dużo pieniędzy !"); - return 1; - } - if(GUIExit[playerid] == 0) - { - ShowPlayerDialogEx(playerid, 80, DIALOG_STYLE_LIST, "Gun Shop", "Pistolety\t\t>>\nStrzelby\t\t>>\nPistolety Maszynowe\t>>\nKarabiny\t\t>>\nSnajperki\t\t>>\nBroń biała\t\t>>\nInne\t\t\t>>", "Wybierz", "Wyjdź"); - } - } - else - { - SendClientMessage(playerid, COLOR_WHITE,"*** Nie jesteś przy kasach Mrucznikowego GS***"); - } - } - else - { - SendClientMessage(playerid, COLOR_WHITE,"*** Nie możesz kupować w gun shopie bez licencji ***"); - } - } - else - { - SendClientMessage(playerid, COLOR_WHITE,"Musisz mieć przegrane 4h na serwerze aby móc kupować broń."); - return 1; - }*/ - return 1; -} diff --git a/gamemodes/commands/cmd/pomoc2.pwn b/gamemodes/commands/cmd/pomoc2.pwn index 5e2a86c77..19069b549 100644 --- a/gamemodes/commands/cmd/pomoc2.pwn +++ b/gamemodes/commands/cmd/pomoc2.pwn @@ -30,25 +30,25 @@ YCMD:pomoc2(playerid, params[], help) { - SendClientMessage(playerid, COLOR_GRAD1,"*** KONTO *** /zasady /stats /nextlevel /ulepszenia (/p)rzedmioty /naprawpojazd"); - SendClientMessage(playerid, COLOR_GRAD2,"*** CMD *** /plac /datek /czas /kup /wyrzucbronie /dajklucz /zmienklucz /id /pij /muzyka /pokazlicencje /ubranie"); - SendClientMessage(playerid, COLOR_GRAD2,"*** CMD *** /resetulepszen(100k) /kupbron /zamknij /skill /laptop /licencje /lotto /zmienspawn /stopani /pobij /wyscigi"); - SendClientMessage(playerid, COLOR_GRAD2,"*** CMD *** /report /anuluj /akceptuj /wywal /wezdragi /kontrakt /tankuj /kanister /oczysc /wezwij /rodziny /wepchnij"); + SendClientMessage(playerid, COLOR_GRAD1,"*** KONTO *** /stats /nextlevel /ulepszenia /ugotuj"); + SendClientMessage(playerid, COLOR_GRAD2,"*** CMD *** /plac /datek /czas /kup /wyrzucbronie /id /pij /muzyka /pokazlicencje /ubranie (/p)rzedmioty /naprawpojazd"); + SendClientMessage(playerid, COLOR_GRAD2,"*** CMD *** /resetulepszen(100k) /skill /licencje /lotto /zmienspawn /stopani /pobij /wyscigi /wywalmaterialy /wywaldragi"); + SendClientMessage(playerid, COLOR_GRAD2,"*** CMD *** /report /anuluj /akceptuj /wywal /kontrakt /tankuj /kanister /oczysc /wezwij /rodziny"); SendClientMessage(playerid, COLOR_GRAD3,"*** CHAT *** (/w)iadomosc (/o)oc (/k)rzyk (/s)zept (/l)ocal (/b) (/og)loszenie (/f)amily /me (/n)ewbie /sprobuj /apteczka"); - SendClientMessage(playerid, COLOR_GRAD3,"*** BLOKADY *** /togooc /tognews /togdepo /togfam /togw /togtel /toglicznik /tognewbie /togadmin"); + SendClientMessage(playerid, COLOR_GRAD3,"*** BLOKADY *** /togooc /togfam /togw /togtel /toglicznik /tognewbie /togadmin /togscroll"); SendClientMessage(playerid, COLOR_GRAD4,"*** BANK *** /stan /wyplac /bank /przelew"); if(PlayerInfo[playerid][pJob] == 1) { SendClientMessage(playerid,COLOR_GRAD5,"*** PRACA *** /namierz /wanted /poddajsie /zlecenie (/m)egafon"); } else if(PlayerInfo[playerid][pJob] == 2) { - SendClientMessage(playerid,COLOR_GRAD5,"*** PRACA *** /uwolnij /oczyscmdc /zbijwl /kamera-wiezienna /wanted /kuppozwolenie"); } + SendClientMessage(playerid,COLOR_GRAD5,"*** PRACA *** /uwolnij /oczyscmdc /zbijwl /wanted /kuppozwolenie"); } else if(PlayerInfo[playerid][pJob] == 3) { SendClientMessage(playerid,COLOR_GRAD5,"*** PRACA *** /sex"); } else if(PlayerInfo[playerid][pJob] == 4) { - SendClientMessage(playerid,COLOR_GRAD5,"*** PRACA *** /sprzedajdragi /get drugs /wywaldragi"); } + SendClientMessage(playerid,COLOR_GRAD5,"*** PRACA *** /sprzedajdragi /get drugs /wezdragi"); } else if(PlayerInfo[playerid][pJob] == 5) { SendClientMessage(playerid,COLOR_GRAD5,"*** PRACA *** /ukradnij"); } else if(PlayerInfo[playerid][pMember] == 9) { - SendClientMessage(playerid,COLOR_GRAD5,"*** SAN NEWS *** /napisz /gazety /wywiad /news [text] /reflektor /studia /glosnik /radiostacja"); + SendClientMessage(playerid,COLOR_GRAD5,"*** SAN NEWS *** /wywiad /news [text] /reflektor /studia /glosnik /radiostacja"); SendClientMessage(playerid,COLOR_GRAD5,"*** SAN NEWS *** Płatny numer SMS - /sms [od 100 do 150], dostajesz tyle stówek ile jest po 1 (nr. 125 to 25 * 100 = 2500$)"); SendClientMessage(playerid,COLOR_GRAD5,"*** SAN NEWS *** /zamknijlinie /otworzlinie /linie"); } else if(PlayerInfo[playerid][pJob] == 7) { @@ -57,7 +57,7 @@ YCMD:pomoc2(playerid, params[], help) else if(PlayerInfo[playerid][pJob] == 8) { SendClientMessage(playerid,COLOR_GRAD5,"*** PRACA *** /ochrona"); } else if(PlayerInfo[playerid][pJob] == 9) { - SendClientMessage(playerid,COLOR_GRAD5,"*** PRACA *** /materialy /wywalmaterialy /sprzedajbron"); } + SendClientMessage(playerid,COLOR_GRAD5,"*** PRACA *** /materialy /sprzedajbron"); } else if(PlayerInfo[playerid][pJob] == 12) { SendClientMessage(playerid,COLOR_GRAD5,"*** PRACA *** /walka /boxstats /naucz"); } else if(PlayerInfo[playerid][pJob] == JOB_TRUCKER) { @@ -75,7 +75,7 @@ YCMD:pomoc2(playerid, params[], help) if(PlayerInfo[playerid][pMember] == 15||PlayerInfo[playerid][pLider] == 15){ SendClientMessage(playerid,COLOR_GRAD5,"*** FDU *** /sprzedajneon /napraw /tankowanie /nitro /hydraulika /maluj /felga /zderzak"); SendClientMessage(playerid,COLOR_GRAD5,"*** FDU *** /kolory /malunki /felgi /sluzba"); - SendClientMessage(playerid,COLOR_GRAD5,"*** WYSCIGI *** /stworzwyscig /wyscigi /wyscig /wyscig-start /wyscig-stop /cp /cp-usun /meta"); } + SendClientMessage(playerid,COLOR_GRAD5,"*** WYSCIGI *** /stworzwyscig /wyscigi /wyscig /wyscig_start /wyscig_stop /cp /cp-usun /meta"); } if(IsAPrzestepca(playerid)){ SendClientMessage(playerid,COLOR_GRAD5,"*** Przestępcze *** /pobij /zwiaz /odwiaz /wepchnij /sprzedaja /maska /zabierzgps /graffiti"); SendClientMessage(playerid, COLOR_GRAD2, "*** Boombox *** /(boombox) off | /boombox on | /boombox url [URL] | /boombox znajdz");} @@ -83,14 +83,14 @@ YCMD:pomoc2(playerid, params[], help) if(GetPlayerOrg(playerid) == FAMILY_IBIZA) SendClientMessage(playerid,COLOR_GRAD5,"*** Klub *** /dajbilet /ibiza /konsola /sprzedajalkohol /wywalibiza /zabierzbilet /glosnik"); if (IsAPolicja(playerid)) { - SendClientMessage(playerid, COLOR_GRAD5, "*** Policja *** /przeszukaj /zabierz /mandat (/gov) /camera /wywaz /gps /odznaka /maska"); - SendClientMessage(playerid, COLOR_GRAD5, "*** Policja *** /pacholek /barierka /skuj /rozkuj /mdc /aresztuj /sluzba /poszukiwani /cywil"); + SendClientMessage(playerid, COLOR_GRAD5, "*** Policja *** /przeszukaj /zabierz /mandat /wywaz /gps /odznaka /maska /togdepo"); + SendClientMessage(playerid, COLOR_GRAD5, "*** Policja *** /barierka /skuj /rozkuj /mdc /aresztuj /sluzba /poszukiwani"); SendClientMessage(playerid, COLOR_GRAD5, "*** Policja *** (/r)adio (/d)epartment /ro(radiooc) /depo(departamentooc) (/m)egafon (/su)spect"); - SendClientMessage(playerid, COLOR_GRAD5, "*** Policja *** /cela /togcrime /pozwolenie /finfo /red /c /tablet /togro /fed /togglepozwo"); + SendClientMessage(playerid, COLOR_GRAD5, "*** Policja *** /paka /togcrime /pozwolenie /finfo /red /c /tablet /togro /fed /togglepozwo"); } if (PlayerInfo[playerid][pMember] == 2 || PlayerInfo[playerid][pLider] == 2) { - SendClientMessage(playerid, COLOR_GRAD5, "*** FBI *** /zmienskin /namierz /fbi /federalne /cela"); + SendClientMessage(playerid, COLOR_GRAD5, "*** FBI *** /zmienskin /namierz /federalne /paka"); } if (PlayerInfo[playerid][pMember] == 17 || PlayerInfo[playerid][pLider] == 17) { @@ -98,14 +98,14 @@ YCMD:pomoc2(playerid, params[], help) } if (gTeam[playerid] == 1 || PlayerInfo[playerid][pMember] == 4 || PlayerInfo[playerid][pLider] == 4) { - SendClientMessage(playerid, COLOR_GRAD5, "*** Lekarz *** (/r)adio (/d)epartment /sluzba /finfo /sprzedajapteczke /togbw"); + SendClientMessage(playerid, COLOR_GRAD5, "*** Lekarz *** (/r)adio (/d)epartment /sluzba /finfo /sprzedajapteczke /togbw /togdepo"); SendClientMessage(playerid, COLOR_GRAD5, "*** Lekarz ***/ulecz /apteczka /zastrzyk /diagnoza /zmienplec /kuracja /maseczka"); } if (PlayerInfo[playerid][pAdmin] >= 1) { SendClientMessage(playerid, COLOR_GRAD6, "*** ADMIN *** (/a)dmin (/ah)elp"); } - SendClientMessage(playerid, COLOR_GRAD6,"*** INNE *** /telefonpomoc /dompomoc /wynajempomoc /bizpomoc /liderpomoc /rybypomoc /gotowaniepomoc /ircpomoc /anim"); + SendClientMessage(playerid, COLOR_GRAD6,"*** INNE *** /telefonpomoc /dompomoc /wynajempomoc /bizpomoc /liderpomoc /rybypomoc /ircpomoc /anim"); SendClientMessage(playerid, COLOR_GRAD6,"*** INNE *** Pomoc od supportu: {FFFFFF}/zapytaj"); return 1; } diff --git a/gamemodes/commands/cmd/pomocdom.pwn b/gamemodes/commands/cmd/pomocdom.pwn index 372b437c3..35ddc8c9e 100644 --- a/gamemodes/commands/cmd/pomocdom.pwn +++ b/gamemodes/commands/cmd/pomocdom.pwn @@ -36,7 +36,7 @@ YCMD:pomocdom(playerid, params[], help) { SendClientMessage(playerid, COLOR_GREEN,"______________________________________________________________________________"); SendClientMessage(playerid, COLOR_WHITE,"*** DOM POMOC *** wpisz komende aby uzyskać więcej pomocy"); - SendClientMessage(playerid, COLOR_GRAD3,"*** DOM *** /wejdz /wyjdz /dom /zlomujdom /tv (off/gracz) /apteczka /pancerz /zbrojownia"); + SendClientMessage(playerid, COLOR_GRAD3,"*** DOM *** /wejdz /wyjdz /dom /zlomujdom (off/gracz) /apteczka /armor /zbrojownia"); SendClientMessage(playerid, COLOR_GRAD3,"*** DOM *** /sejf /dominfo /garazuj"); SendClientMessage(playerid, COLOR_GREEN,"______________________________________________________________________________"); } diff --git a/gamemodes/commands/cmd/telefonpomoc.pwn b/gamemodes/commands/cmd/telefonpomoc.pwn index 7785aab74..c8640617a 100644 --- a/gamemodes/commands/cmd/telefonpomoc.pwn +++ b/gamemodes/commands/cmd/telefonpomoc.pwn @@ -35,7 +35,7 @@ YCMD:telefonpomoc(playerid, params[], help) { SendClientMessage(playerid, COLOR_WHITE,"*** POMOC *** wpisz komende aby uzyskać więcej pomocy"); SendClientMessage(playerid, COLOR_GRAD3,"*** TELEFON *** /dzwon | na policje:'/dzwon 911' | /sms /resms (/p)odnies (/z)akoncz /numer /wizytowka /kontakty"); - SendClientMessage(playerid, COLOR_GRAD6,"*** INNE *** /pomoc /dompomoc /wynajempomoc /bizpomoc /liderpomoc /rybypomoc /gotowaniepomoc /ircpomoc"); + SendClientMessage(playerid, COLOR_GRAD6,"*** INNE *** /pomoc /dompomoc /wynajempomoc /bizpomoc /liderpomoc /rybypomoc /ircpomoc"); } else { diff --git a/gamemodes/commands/cmd/wynajempomoc.pwn b/gamemodes/commands/cmd/wynajempomoc.pwn index 35fe345f1..e2ad3d744 100644 --- a/gamemodes/commands/cmd/wynajempomoc.pwn +++ b/gamemodes/commands/cmd/wynajempomoc.pwn @@ -32,7 +32,7 @@ YCMD:wynajempomoc(playerid, params[], help) { SendClientMessage(playerid, COLOR_GREEN,"_______________________________________"); SendClientMessage(playerid, COLOR_WHITE,"*** WYNAJMOWANIE POMOC *** wpisz komende aby uzyskać więcej pomocy"); - SendClientMessage(playerid, COLOR_GRAD3,"*** RENT *** /unrent /wejdz /wyjdz /zamknij /dom /reentroom /wynajmijpokoj"); - SendClientMessage(playerid, COLOR_GRAD6,"*** INNE *** /telefonpomoc /dompomoc /pomoc /bizpomoc /liderpomoc /rybypomoc /gotowaniepomoc /ircpomoc"); + SendClientMessage(playerid, COLOR_GRAD3,"*** RENT *** /unrent /wejdz /wyjdz /dom /reentroom /wynajmijpokoj"); + SendClientMessage(playerid, COLOR_GRAD6,"*** INNE *** /telefonpomoc /dompomoc /pomoc /bizpomoc /liderpomoc /rybypomoc /ircpomoc"); return 1; } diff --git a/gamemodes/commands/cmd/zbijwl.pwn b/gamemodes/commands/cmd/zbijwl.pwn index 58fd7318a..25b443506 100644 --- a/gamemodes/commands/cmd/zbijwl.pwn +++ b/gamemodes/commands/cmd/zbijwl.pwn @@ -133,7 +133,7 @@ YCMD:zbijwl(playerid, params[], help) } else { - sendErrorMessage(playerid, "Jesteś zbyt blisko policjanta aby zić komuś WL!"); + sendErrorMessage(playerid, "Jesteś zbyt blisko policjanta aby zbić komuś WL!"); } } else diff --git a/gamemodes/commands/commands.pwn b/gamemodes/commands/commands.pwn index 7b161e441..948cc546f 100644 --- a/gamemodes/commands/commands.pwn +++ b/gamemodes/commands/commands.pwn @@ -236,7 +236,6 @@ #include "cmd/kup.pwn" #include "cmd/kuparmor.pwn" #include "cmd/kupbiletpociag.pwn" -#include "cmd/kupbron.pwn" #include "cmd/kupdildo.pwn" #include "cmd/kuphelikopter.pwn" #include "cmd/kupkredyty.pwn" @@ -852,9 +851,6 @@ static Aliases() //kup Command_AddAltNamed("kup", "buy"); - //kuparmor - Command_AddAltNamed("kupbron", "buygun"); - //kupbiletpociag Command_AddAltNamed("kupbiletpociag", "kbpo"); Command_AddAltNamed("kupbiletpociag", "kpociag"); diff --git a/gamemodes/modules/biznesy/commands/biznespomoc/biznespomoc_impl.pwn b/gamemodes/modules/biznesy/commands/biznespomoc/biznespomoc_impl.pwn index 45cbfbe1b..35a15f1cd 100644 --- a/gamemodes/modules/biznesy/commands/biznespomoc/biznespomoc_impl.pwn +++ b/gamemodes/modules/biznesy/commands/biznespomoc/biznespomoc_impl.pwn @@ -29,7 +29,7 @@ command_biznespomoc_Impl(playerid) SendClientMessage(playerid, COLOR_WHITE,"*** BIZNES POMOC *** wpisz komende aby uzyskać więcej pomocy"); SendClientMessage(playerid, COLOR_GRAD3,"*** BIZNES *** /bizinfo /wejdz /wyjdz /kupbiznes /sprzedajbiznes"); SendClientMessage(playerid, COLOR_GRAD3, "*** BIZNES *** /bizlock /biz /obiz /bizpanel"); - SendClientMessage(playerid, COLOR_GRAD6,"*** INNE *** /telefonpomoc /dompomoc /wynajempomoc /pomoc /liderpomoc /rybypomoc /gotowaniepomoc /ircpomoc"); + SendClientMessage(playerid, COLOR_GRAD6,"*** INNE *** /telefonpomoc /dompomoc /wynajempomoc /pomoc /liderpomoc /rybypomoc /ircpomoc"); return 1; } diff --git a/gamemodes/modules/fishing/commands/rybypomoc/rybypomoc_impl.pwn b/gamemodes/modules/fishing/commands/rybypomoc/rybypomoc_impl.pwn index 0b214437b..901a0dc5e 100644 --- a/gamemodes/modules/fishing/commands/rybypomoc/rybypomoc_impl.pwn +++ b/gamemodes/modules/fishing/commands/rybypomoc/rybypomoc_impl.pwn @@ -31,7 +31,7 @@ command_rybypomoc_Impl(playerid) SendClientMessage(playerid, COLOR_GRAD3,"*** WEDKOWANIE *** /wywalrybe (Wywala ostatnią złapaną rybe) /wywalryby"); SendClientMessage(playerid, COLOR_GRAD3,"*** WEDKOWANIE *** /wypuscrybe (Wypuszcza wybraną rybę)"); SendClientMessage(playerid, COLOR_GRAD3,"*** WEDKOWANIE *** [NOWE] /sprzedajrybe (sprzedajesz wybraną rybę w 24/7)"); - SendClientMessage(playerid, COLOR_GRAD6,"*** INNE *** /telefonpomoc /dompomoc /wynajempomoc /bizpomoc /liderpomoc /pomoc /gotowaniepomoc /ircpomoc"); + SendClientMessage(playerid, COLOR_GRAD6,"*** INNE *** /telefonpomoc /dompomoc /wynajempomoc /bizpomoc /liderpomoc /pomoc /ircpomoc"); return 1; } diff --git a/gamemodes/system/funkcje.pwn b/gamemodes/system/funkcje.pwn index a03bb1d66..344d9daa1 100644 --- a/gamemodes/system/funkcje.pwn +++ b/gamemodes/system/funkcje.pwn @@ -4793,7 +4793,7 @@ ShowStats(playerid,targetid) SendClientMessage(playerid, COLOR_GRAD5,coordsstring); format(coordsstring, sizeof(coordsstring), "Uniform[%d] JobSkin[%d] Apteczki[%d]", PlayerInfo[targetid][pUniform], PlayerInfo[targetid][pJobSkin], PlayerInfo[targetid][pHealthPacks]); SendClientMessage(playerid, COLOR_GRAD5, coordsstring); - format(coordsstring, sizeof(coordsstring), "Dom [%d] Klucz Wozu [%d]", housekey,PlayerInfo[targetid][pKluczeAuta]); + format(coordsstring, sizeof(coordsstring), "Dom [%d] Klucz Wozu [%d] MruCoins [%d]", housekey,PlayerInfo[targetid][pKluczeAuta], PremiumInfo[targetid][pMC]); SendClientMessage(playerid, COLOR_GRAD6,coordsstring); SendClientMessage(playerid, COLOR_GREEN,"_______________________________________"); } From 9855506ba22a24dda5494b1b0b4cba1fb4a45929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Sun, 22 Mar 2020 22:13:34 +0100 Subject: [PATCH 13/28] . --- gamemodes/system/funkcje.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/system/funkcje.pwn b/gamemodes/system/funkcje.pwn index 344d9daa1..db1bf8b50 100644 --- a/gamemodes/system/funkcje.pwn +++ b/gamemodes/system/funkcje.pwn @@ -4794,7 +4794,7 @@ ShowStats(playerid,targetid) format(coordsstring, sizeof(coordsstring), "Uniform[%d] JobSkin[%d] Apteczki[%d]", PlayerInfo[targetid][pUniform], PlayerInfo[targetid][pJobSkin], PlayerInfo[targetid][pHealthPacks]); SendClientMessage(playerid, COLOR_GRAD5, coordsstring); format(coordsstring, sizeof(coordsstring), "Dom [%d] Klucz Wozu [%d] MruCoins [%d]", housekey,PlayerInfo[targetid][pKluczeAuta], PremiumInfo[targetid][pMC]); - SendClientMessage(playerid, COLOR_GRAD6,coordsstring); + SendClientMessage(playerid, COLOR_GRAD6,coordsstring); SendClientMessage(playerid, COLOR_GREEN,"_______________________________________"); } } From 4720a47ff441e6a1aa2bed09ba764ce373bf6394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Sun, 22 Mar 2020 22:43:45 +0100 Subject: [PATCH 14/28] sprzedajzestaw fix --- gamemodes/commands/cmd/sprzedajzestaw.pwn | 1 + gamemodes/dialogs/OnDialogResponse.pwn | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gamemodes/commands/cmd/sprzedajzestaw.pwn b/gamemodes/commands/cmd/sprzedajzestaw.pwn index 650064951..872ac6780 100644 --- a/gamemodes/commands/cmd/sprzedajzestaw.pwn +++ b/gamemodes/commands/cmd/sprzedajzestaw.pwn @@ -39,6 +39,7 @@ YCMD:sprzedajzestaw(playerid, params[], help) { if(id != INVALID_PLAYER_ID) { + if(id == playerid) return sendTipMessage(playerid, "Nie możesz sprzedać sobie zestawu."); if(AntySpam[playerid] == 1) { sendTipMessageEx(playerid, COLOR_GREY, "Odczekaj 15 sekund"); diff --git a/gamemodes/dialogs/OnDialogResponse.pwn b/gamemodes/dialogs/OnDialogResponse.pwn index 139b4efe7..b365eda01 100644 --- a/gamemodes/dialogs/OnDialogResponse.pwn +++ b/gamemodes/dialogs/OnDialogResponse.pwn @@ -13983,18 +13983,15 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[]) new id = GetPVarInt(playerid, "FixKitOffer"); if(response) { - new hajs = kaska[playerid]; - if(hajs < 15000) + if(kaska[playerid] < 15000) { SendClientMessage(id, -1, "Ten gracz nie ma tyle kasy"); return SendClientMessage(playerid, -1, "Nie masz wystarczającej ilości pieniędzy"); } else { - format(string, sizeof string, "%s kupił od Ciebie zestaw naprawczy. Otrzymujesz 15000$", PlayerName(playerid)); - SendClientMessage(id, 0x0080D0FF, string); - format(string, sizeof string, "Kupiłeś zestaw od Mechanika za 15000$"); - SendClientMessage(playerid, 0x00FF00FF, string); + SendClientMessage(id, 0x0080D0FF, "%s kupił od Ciebie zestaw naprawczy. Otrzymujesz 15000$", GetNick(playerid)); + SendClientMessage(playerid, 0x00FF00FF, sprintf("Kupiłeś zestaw od mechanika %s za 15000$", GetNick(id))); ZabierzKase(playerid, 15000); DajKase(id, 15000); PlayerInfo[playerid][pFixKit]++; @@ -14002,8 +13999,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[]) } else { - format(string, sizeof string, "Gracz %s nie zgodził się na kupno zestawu.", PlayerName(playerid)); - SendClientMessage(id, 0xFF0030FF, string); + SendClientMessage(id, 0xFF0030FF, "Gracz %s nie zgodził się na kupno zestawu.", GetNick(playerid)); } DeletePVar(playerid, "FixKitOffer"); return 1; From 8ebe3f01e19e2c2c9a20fbad4253542815155773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Sun, 22 Mar 2020 22:56:35 +0100 Subject: [PATCH 15/28] . --- gamemodes/dialogs/OnDialogResponse.pwn | 5 ++--- gamemodes/modules/admin/admin.pwn | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gamemodes/dialogs/OnDialogResponse.pwn b/gamemodes/dialogs/OnDialogResponse.pwn index b365eda01..3e727c9e9 100644 --- a/gamemodes/dialogs/OnDialogResponse.pwn +++ b/gamemodes/dialogs/OnDialogResponse.pwn @@ -13979,7 +13979,6 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[]) if(dialogid == D_MECH_SPRZEDAZ_FIXKIT) { - new string[128]; new id = GetPVarInt(playerid, "FixKitOffer"); if(response) { @@ -13990,7 +13989,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[]) } else { - SendClientMessage(id, 0x0080D0FF, "%s kupił od Ciebie zestaw naprawczy. Otrzymujesz 15000$", GetNick(playerid)); + SendClientMessage(id, 0x0080D0FF, sprintf("%s kupił od Ciebie zestaw naprawczy. Otrzymujesz 15000$", GetNick(playerid))); SendClientMessage(playerid, 0x00FF00FF, sprintf("Kupiłeś zestaw od mechanika %s za 15000$", GetNick(id))); ZabierzKase(playerid, 15000); DajKase(id, 15000); @@ -13999,7 +13998,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[]) } else { - SendClientMessage(id, 0xFF0030FF, "Gracz %s nie zgodził się na kupno zestawu.", GetNick(playerid)); + SendClientMessage(id, 0xFF0030FF, sprintf("Gracz %s nie zgodził się na kupno zestawu.", GetNick(playerid))); } DeletePVar(playerid, "FixKitOffer"); return 1; diff --git a/gamemodes/modules/admin/admin.pwn b/gamemodes/modules/admin/admin.pwn index f6d76daf3..742f73762 100644 --- a/gamemodes/modules/admin/admin.pwn +++ b/gamemodes/modules/admin/admin.pwn @@ -561,8 +561,9 @@ SetPlayerPAdminJail(player[], adminid, timeVal, result[]) { iloscPozaDuty[adminid]++; } + new actual_aj_time = MruMySQL_GetAccInt("JailTime", nickOdbieracza); MruMySQL_SetAccInt("Jailed", nickOdbieracza, 3); - MruMySQL_SetAccInt("JailTime", nickOdbieracza, timeVal*60); + MruMySQL_SetAccInt("JailTime", nickOdbieracza, actual_aj_time + (timeVal * 60)); MruMySQL_SetAccString("AJreason", nickOdbieracza, result); SetTimerEx("AntySpamTimer",5000,0,"d",adminid); AntySpam[adminid] = 1; From 76e1cc52ac7ad088695dee40df20d89f5db45ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Fri, 27 Mar 2020 01:42:33 +0100 Subject: [PATCH 16/28] right spec --- gamemodes/Mrucznik-RP.pwn | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index 49b631b7b..1480c5829 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -5769,6 +5769,7 @@ public OnPlayerUpdate(playerid) { foreach(new i : Player) { + if(i == playerid) continue; if(actualid != INVALID_PLAYER_ID) //if is set { new str[6]; @@ -5780,20 +5781,6 @@ public OnPlayerUpdate(playerid) { actualid = i; } - } - } - else if(lr == KEY_LEFT) //BACK - { - foreach(new i : Player) - { - actualid = i; - if(i == Spectate[playerid]) //if not set and expect - { - new str[6]; - valstr(str, actualid); - RunCommand(playerid, "/spec", str); - break; - } } } return 1; From 7922a33328515f4ad694ccf931bf853e18499d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Sat, 28 Mar 2020 07:00:43 +0100 Subject: [PATCH 17/28] =?UTF-8?q?odebranie=20g=C5=82osnika=20ibizie,=20gro?= =?UTF-8?q?up=20wplac/wyplac,=20info,=20online,=20uprawnienia=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamemodes/Mrucznik-RP.pwn | 15 ++++++++++++--- gamemodes/commands/cmd/glosnik.pwn | 2 +- gamemodes/commands/commands.pwn | 3 --- gamemodes/system/funkcje.pwn | 2 ++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index 1480c5829..b71bd3481 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -266,14 +266,23 @@ public OnGameModeInit() FabrykaMats_LoadLogic(); NowaWybieralka_Init(); LoadBusiness(); - LoadBusinessPickup(); - //LoadActors(); + LoadBusinessPickup(); //-------<[ actors ]>------- PushActors(); LoadActors(); - LoadConfig(); + + //Config + LoadConfig(); + + //Groups + MruMySQL_LoadGroups(); + MruMySQL_LoadRanks(); + MruMySQL_LoadRanksPerms(); + + //Old Groups - to remove \/ WczytajRangi(); WczytajSkiny(); + //Konfiguracja ID skryptu dla rodzin - daj -1 w bazie aby wyłączyć korzystanie ze skryptu dla slotu Config_FamilyScript(); // diff --git a/gamemodes/commands/cmd/glosnik.pwn b/gamemodes/commands/cmd/glosnik.pwn index c4d5f0d7c..d4af95863 100644 --- a/gamemodes/commands/cmd/glosnik.pwn +++ b/gamemodes/commands/cmd/glosnik.pwn @@ -30,7 +30,7 @@ YCMD:glosnik(playerid, params[], help) { - if((PlayerInfo[playerid][pMember] == 9 && PlayerInfo[playerid][pRank] >= 3) || PlayerInfo[playerid][pLider] == 9 || (GetPlayerOrg(playerid) == 19 && IsPlayerInRangeOfPoint(playerid, 75.0 , 578.6193,-2195.7708,1.6288) && PlayerInfo[playerid][pRank] >= 3) || (GetPlayerOrg(playerid) == FAMILY_IBIZA && PlayerInfo[playerid][pRank] >= 6)) + if((PlayerInfo[playerid][pMember] == 9 && PlayerInfo[playerid][pRank] >= 3) || PlayerInfo[playerid][pLider] == 9 || (GetPlayerOrg(playerid) == 19 && IsPlayerInRangeOfPoint(playerid, 75.0 , 578.6193,-2195.7708,1.6288) && PlayerInfo[playerid][pRank] >= 3)) { if(SanDuty[playerid] == 0 && PlayerInfo[playerid][pMember] == 9) return sendErrorMessage(playerid, "Musisz być na służbie San News"); if(SANradio == 0) diff --git a/gamemodes/commands/commands.pwn b/gamemodes/commands/commands.pwn index 948cc546f..72ec2d4ee 100644 --- a/gamemodes/commands/commands.pwn +++ b/gamemodes/commands/commands.pwn @@ -960,9 +960,6 @@ static Aliases() //newbie Command_AddAltNamed("newbie", "n"); - //noa - Command_AddAltNamed("noa", "fdu"); - //nos Command_AddAltNamed("nos", "nitro"); diff --git a/gamemodes/system/funkcje.pwn b/gamemodes/system/funkcje.pwn index db1bf8b50..88d15add3 100644 --- a/gamemodes/system/funkcje.pwn +++ b/gamemodes/system/funkcje.pwn @@ -10944,6 +10944,8 @@ Oil_Destroy(lID) if(GetPVarInt(i, "oil_id") != lID) continue; Oil_UnloadPTXD(i); SetPVarInt(i, "oil_clear", 0); + ClearAnimations(i); + SetPlayerSpecialAction(i,SPECIAL_ACTION_NONE); TogglePlayerControllable(i, 1); TextDrawHideForPlayer(i, OilTXD_BG[0]); TextDrawHideForPlayer(i, OilTXD_BG[1]); From 3dfe5e3d1d310151b148a70fe5b581318748befb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Mon, 30 Mar 2020 18:40:21 +0200 Subject: [PATCH 18/28] . --- gamemodes/Mrucznik-RP.pwn | 5 ----- gamemodes/obiekty | 2 +- include | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index b71bd3481..8ff7a0c85 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -274,11 +274,6 @@ public OnGameModeInit() //Config LoadConfig(); - //Groups - MruMySQL_LoadGroups(); - MruMySQL_LoadRanks(); - MruMySQL_LoadRanksPerms(); - //Old Groups - to remove \/ WczytajRangi(); WczytajSkiny(); diff --git a/gamemodes/obiekty b/gamemodes/obiekty index a949e7ef7..9c4f80fd4 160000 --- a/gamemodes/obiekty +++ b/gamemodes/obiekty @@ -1 +1 @@ -Subproject commit a949e7ef7c5c6089bd2e50ebedce1d54c89e61fc +Subproject commit 9c4f80fd4e79b8bf27c47c5f4f3a8d11a6fd9801 diff --git a/include b/include index ae6661353..0ccad8734 160000 --- a/include +++ b/include @@ -1 +1 @@ -Subproject commit ae666135311abf2ee88fd4e21532097ab27693c6 +Subproject commit 0ccad873467b2514c17cd3f5230fb138aba57b23 From 2b9ae696d44dcf0597ce90cf4db91838e0622f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Mon, 30 Mar 2020 18:41:37 +0200 Subject: [PATCH 19/28] VER update --- gamemodes/VERSION.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/VERSION.pwn b/gamemodes/VERSION.pwn index 20b804e6b..2741ded90 100644 --- a/gamemodes/VERSION.pwn +++ b/gamemodes/VERSION.pwn @@ -1 +1 @@ -#define VERSION "v2.7.1" +#define VERSION "v2.7.1.1" From 6231b2340c37ada9f077710bd853faf028620050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Szyma=C5=84ski=20=28Creative=29?= <15707695+creative-pl@users.noreply.github.com> Date: Mon, 30 Mar 2020 18:46:59 +0200 Subject: [PATCH 20/28] mdc komunikat cywil --- gamemodes/Mrucznik-RP.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index 8ff7a0c85..a037ecf80 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -5089,7 +5089,7 @@ public OnPlayerStateChange(playerid, newstate, oldstate) SetPlayerPos(playerid, slx, sly, slz+0.2); ClearAnimations(playerid); } - if(IsACopCar(GetPlayerVehicleID(playerid))) sendTipMessageEx(playerid, COLOR_BLUE, "Połączyłeś się z komputerem policyjnym, wpisz /mdc aby zobaczyć kartotekę policyjną"); + if(IsACopCar(GetPlayerVehicleID(playerid)) && IsAPolicja(playerid)) sendTipMessageEx(playerid, COLOR_BLUE, "Połączyłeś się z komputerem policyjnym, wpisz /mdc aby zobaczyć kartotekę policyjną"); if(newstate == PLAYER_STATE_DRIVER) TJD_CallEnterVeh(playerid, GetPlayerVehicleID(playerid)); } else if(oldstate == PLAYER_STATE_DRIVER) From 78fc32e6c4f5d65dfbd5a75799144fe513938370 Mon Sep 17 00:00:00 2001 From: Mrucznik Date: Tue, 31 Mar 2020 12:02:23 +0200 Subject: [PATCH 21/28] logi zabierania matsow i dragow - pokazuja ile zabrano --- gamemodes/commands/cmd/zabierz.pwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gamemodes/commands/cmd/zabierz.pwn b/gamemodes/commands/cmd/zabierz.pwn index 2a11f8b10..fd0e6158b 100644 --- a/gamemodes/commands/cmd/zabierz.pwn +++ b/gamemodes/commands/cmd/zabierz.pwn @@ -129,7 +129,10 @@ YCMD:zabierz(playerid, params[], help) format(string, sizeof(string), "* Oficer %s zabrał twoje narkotyki.", sendername); SendClientMessage(giveplayerid, COLOR_LIGHTBLUE, string); format(string, sizeof(string), "* Oficer %s zabrał %s dragi %d.", sendername, giveplayer, PlayerInfo[giveplayerid][pDrugs]); + Log(serverLog, INFO, "%s zabrał %s %d %s", GetPlayerLogName(playerid), GetPlayerLogName(giveplayerid), PlayerInfo[giveplayerid][pDrugs], x_nr); PlayerInfo[giveplayerid][pDrugs] = 0; + SetPVarInt(playerid, "lic-timer", gettime() + 30); + return 1; } else if(strcmp(x_nr,"mats",true) == 0) { @@ -138,7 +141,10 @@ YCMD:zabierz(playerid, params[], help) format(string, sizeof(string), "* Oficer %s zabrał twoje Materiały.", sendername); SendClientMessage(giveplayerid, COLOR_LIGHTBLUE, string); format(string, sizeof(string), "* Oficer %s zabrał %s matsy %d.", sendername, giveplayer, PlayerInfo[giveplayerid][pMats]); + Log(serverLog, INFO, "%s zabrał %s %d %s", GetPlayerLogName(playerid), GetPlayerLogName(giveplayerid), PlayerInfo[giveplayerid][pMats], x_nr); PlayerInfo[giveplayerid][pMats] = 0; + SetPVarInt(playerid, "lic-timer", gettime() + 30); + return 1; } else { From 8d00b894f794cde2180e3663141beda158d03b9b Mon Sep 17 00:00:00 2001 From: Mrucznik Date: Tue, 31 Mar 2020 12:06:14 +0200 Subject: [PATCH 22/28] nieuprawniona zamiana --- gamemodes/commands/cmd/givegun.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/commands/cmd/givegun.pwn b/gamemodes/commands/cmd/givegun.pwn index af85e315c..e062e8ed8 100644 --- a/gamemodes/commands/cmd/givegun.pwn +++ b/gamemodes/commands/cmd/givegun.pwn @@ -47,7 +47,7 @@ YCMD:givegun(playerid, params[], help) if(ammo <1||ammo > 99999) { sendTipMessageEx(playerid, COLOR_GRAD1, "Amunicja może być od 1 do 99999 !"); return 1; } - if(PlayerInfo[playerid][pAdmin] >= 5000 || IsAScripter(playerid)) + if(PlayerInfo[playerid][pAdmin] >= 5000) { if(IsPlayerConnected(playa)) { From 771e8914dc2f0508e94c8dab578f4de6c3f1ee9c Mon Sep 17 00:00:00 2001 From: Mrucznik Date: Tue, 31 Mar 2020 12:17:32 +0200 Subject: [PATCH 23/28] =?UTF-8?q?Poprawki=20log=C3=B3w=20-=20frakcje?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamemodes/commands/cmd/makemember.pwn | 2 +- gamemodes/system/funkcje.pwn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gamemodes/commands/cmd/makemember.pwn b/gamemodes/commands/cmd/makemember.pwn index 2a0fb5977..40fca0b27 100644 --- a/gamemodes/commands/cmd/makemember.pwn +++ b/gamemodes/commands/cmd/makemember.pwn @@ -62,7 +62,7 @@ YCMD:makemember(playerid, params[], help) SendClientMessage(playerid, COLOR_LIGHTBLUE, string); //logi - Log(adminLog, INFO, "Admin %s dał graczowi %s członka frakcji %d", GetPlayerLogName(playerid), GetPlayerLogName(para1), level); + Log(adminLog, INFO, "Admin %s dał graczowi %s członka frakcji %s", GetPlayerLogName(playerid), GetPlayerLogName(para1), GetFractionLogName(level)); if(GetPlayerAdminDutyStatus(playerid) == 1) { iloscInne[playerid] = iloscInne[playerid]+1; diff --git a/gamemodes/system/funkcje.pwn b/gamemodes/system/funkcje.pwn index 88d15add3..2a717e934 100644 --- a/gamemodes/system/funkcje.pwn +++ b/gamemodes/system/funkcje.pwn @@ -8356,7 +8356,7 @@ UnFrakcja(playerid, para1, bool:respawn = true) SendClientMessage(para1, COLOR_LIGHTBLUE, string); SendClientMessage(para1, COLOR_LIGHTBLUE, "* Jesteś cywilem."); SetPlayerColor(para1,TEAM_HIT_COLOR); - Log(adminLog, INFO, "Admin %s usunął gracza %s z frakcji %d", GetPlayerLogName(playerid), GetPlayerLogName(para1), PlayerInfo[para1][pMember]); + Log(adminLog, INFO, "Admin %s usunął gracza %s z frakcji %s", GetPlayerLogName(playerid), GetPlayerLogName(para1), GetFractionLogName(PlayerInfo[para1][pMember])); PlayerInfo[para1][pMember] = 0; PlayerInfo[para1][pLider] = 0; PlayerInfo[para1][pJob] = 0; From 662e96c5d744b04566858a5633d55dbd580f6f3f Mon Sep 17 00:00:00 2001 From: Mrucznik Date: Tue, 31 Mar 2020 13:03:11 +0200 Subject: [PATCH 24/28] zjedz max 100hp --- gamemodes/modules/cooking/commands/zjedz/zjedz_impl.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/modules/cooking/commands/zjedz/zjedz_impl.pwn b/gamemodes/modules/cooking/commands/zjedz/zjedz_impl.pwn index 6c7a032d0..95cdbcf12 100644 --- a/gamemodes/modules/cooking/commands/zjedz/zjedz_impl.pwn +++ b/gamemodes/modules/cooking/commands/zjedz/zjedz_impl.pwn @@ -34,7 +34,7 @@ command_zjedz_Impl(playerid) { new Float:hp; GetPlayerHealth(playerid, hp); - if(hp >= 200.0) + if(hp >= 100.0) { sendErrorMessage(playerid, "Jesteś tak najedzony, że nie zmieścisz już więcej (masz pełne hp)."); return 1; From c648b122693a06de0a2f6f152609acedc2b13b53 Mon Sep 17 00:00:00 2001 From: Mrucznik Date: Tue, 31 Mar 2020 13:03:19 +0200 Subject: [PATCH 25/28] OnVehicleMod blokada --- gamemodes/Mrucznik-RP.pwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index a037ecf80..ede8a3e80 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -7817,6 +7817,11 @@ public OnPlayerStreamIn(playerid, forplayerid) return 1; } +public OnVehicleMod(playerid, vehicleid, componentid) +{ + return 0; //turn off singleplayer workshops +} + AntiDeAMX() //suprise motherfucker { new whack[][] = From afa8734be51891f83138e59e9488576ef0192be6 Mon Sep 17 00:00:00 2001 From: Mrucznik Date: Tue, 31 Mar 2020 13:26:43 +0200 Subject: [PATCH 26/28] selldom fix --- gamemodes/commands/cmd/selldom.pwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gamemodes/commands/cmd/selldom.pwn b/gamemodes/commands/cmd/selldom.pwn index 7e00ef2de..44c92bbe2 100644 --- a/gamemodes/commands/cmd/selldom.pwn +++ b/gamemodes/commands/cmd/selldom.pwn @@ -55,6 +55,11 @@ YCMD:selldom(playerid, params[], help) return 1; } money = FunkcjaK(string); + if(!IsPlayerConnected(giveplayerid)) + { + sendErrorMessage(playerid, "Nie ma takiego gracza"); + return 1; + } if(money <= 9999) { From b6d58f7900808ce336349298eeee0098aac9060c Mon Sep 17 00:00:00 2001 From: Mrucznik Date: Tue, 31 Mar 2020 21:44:41 +0200 Subject: [PATCH 27/28] Brak masek na radiach /r /ro /f /fo --- gamemodes/commands/cmd/fooc.pwn | 20 +++++++++----------- gamemodes/commands/cmd/r.pwn | 8 ++++---- gamemodes/commands/cmd/rodzinny.pwn | 28 +++++++++++++--------------- 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/gamemodes/commands/cmd/fooc.pwn b/gamemodes/commands/cmd/fooc.pwn index 734f57ed4..4c5369160 100644 --- a/gamemodes/commands/cmd/fooc.pwn +++ b/gamemodes/commands/cmd/fooc.pwn @@ -31,7 +31,6 @@ YCMD:fooc(playerid, params[], help) { new string[256]; - new sendername[MAX_PLAYER_NAME]; if(IsPlayerConnected(playerid)) { @@ -40,7 +39,6 @@ YCMD:fooc(playerid, params[], help) sendTipMessageEx(playerid, TEAM_CYAN_COLOR, "Nie możesz pisać ponieważ jesteś wyciszony"); return 1; }*/ - sendername = GetNickEx(playerid); if(isnull(params)) { sendTipMessage(playerid, "Użyj (/fo)oc [tekst]"); @@ -51,7 +49,7 @@ YCMD:fooc(playerid, params[], help) new member = GetPlayerFraction(playerid); if(member > 0 && PlayerInfo[playerid][pTajniak] == 0) { - format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[member][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], sendername, params); + format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[member][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], GetNickEx(playerid), params); SendFamilyMessage(member, TEAM_AZTECAS_COLOR, string); SendDiscordFracMessage(member, string); //Tajniacy @@ -62,31 +60,31 @@ YCMD:fooc(playerid, params[], help) } else if(PlayerInfo[playerid][pTajniak] == 1) { - format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[FRAC_GROOVE][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], sendername, params); + format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[FRAC_GROOVE][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], GetNickEx(playerid), params); SendFamilyMessage(FRAC_GROOVE, TEAM_AZTECAS_COLOR, string); SendTajniakMessage(1, TEAM_AZTECAS_COLOR, string); } else if(PlayerInfo[playerid][pTajniak] == 2) { - format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[FRAC_BALLAS][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], sendername, params); + format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[FRAC_BALLAS][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], GetNickEx(playerid), params); SendFamilyMessage(FRAC_BALLAS, TEAM_AZTECAS_COLOR, string); SendTajniakMessage(2, TEAM_AZTECAS_COLOR, string); } else if(PlayerInfo[playerid][pTajniak] == 3) { - format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[FRAC_LCN][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], sendername, params); + format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[FRAC_LCN][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], GetNickEx(playerid), params); SendFamilyMessage(FRAC_LCN, TEAM_AZTECAS_COLOR, string); SendTajniakMessage(3, TEAM_AZTECAS_COLOR, string); } else if(PlayerInfo[playerid][pTajniak] == 4) { - format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[FRAC_YKZ][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], sendername, params); + format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[FRAC_YKZ][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], GetNickEx(playerid), params); SendFamilyMessage(FRAC_YKZ, TEAM_AZTECAS_COLOR, string); SendTajniakMessage(4, TEAM_AZTECAS_COLOR, string); } else if(PlayerInfo[playerid][pTajniak] == 5) { - format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[FRAC_VAGOS][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], sendername, params); + format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[FRAC_VAGOS][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], GetNickEx(playerid), params); SendFamilyMessage(FRAC_VAGOS, TEAM_AZTECAS_COLOR, string); SendTajniakMessage(5, TEAM_AZTECAS_COLOR, string); } @@ -94,9 +92,9 @@ YCMD:fooc(playerid, params[], help) { member = GetPlayerOrg(playerid); //Przypisane rangi - if(strlen(FamRang[member][PlayerInfo[playerid][pRank]]) > 1) format(string, sizeof(string), "** (( %s [%d] %s: %s. )) **", FamRang[member][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], sendername, params); + if(strlen(FamRang[member][PlayerInfo[playerid][pRank]]) > 1) format(string, sizeof(string), "** (( %s [%d] %s: %s. )) **", FamRang[member][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], GetNickEx(playerid), params); //Rangi podstawowe - else format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FamRang[0][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], sendername, params); + else format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FamRang[0][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], GetNickEx(playerid), params); SendNewFamilyMessage(member, TEAM_AZTECAS_COLOR, string); SendDiscordOrgMessage(member, string); } @@ -106,7 +104,7 @@ YCMD:fooc(playerid, params[], help) else if(GetPlayerFraction(playerid) == FRAC_GOV || GetPlayerFraction(playerid) == FRAC_BOR|| GetPlayerOrg(playerid) == 1) //DMV i BOR połaczenie { new member = GetPlayerFraction(playerid); - format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[member][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], sendername, params); + format(string, sizeof(string), "** (( %s [%d] %s: %s )) **", FracRang[member][PlayerInfo[playerid][pRank]],PlayerInfo[playerid][pRank], GetNickEx(playerid), params); SendFamilyMessage(FRAC_GOV, TEAM_AZTECAS_COLOR, string); SendFamilyMessage(FRAC_BOR, TEAM_AZTECAS_COLOR, string); SendNewFamilyMessage(FAMILY_SAD, TEAM_BLUE_COLOR, string); diff --git a/gamemodes/commands/cmd/r.pwn b/gamemodes/commands/cmd/r.pwn index 0cf2d95ae..bb98f1e5a 100644 --- a/gamemodes/commands/cmd/r.pwn +++ b/gamemodes/commands/cmd/r.pwn @@ -52,9 +52,9 @@ YCMD:r(playerid, params[], help) new member = GetPlayerFraction(playerid); if(0 < member <= 4 || member == 11 || member == 7 || member == 17) { - format(string, sizeof(string), "** %s %s: %s **", FracRang[member][PlayerInfo[playerid][pRank]],GetNick(playerid), params); + format(string, sizeof(string), "** %s %s: %s **", FracRang[member][PlayerInfo[playerid][pRank]],GetNickEx(playerid), params); SendRadioMessage(member, TEAM_BLUE_COLOR, string); - format(string, sizeof(string), "%s mówi przez radio: %s", GetNick(playerid), params); + format(string, sizeof(string), "%s mówi przez radio: %s", GetNickEx(playerid), params); ProxDetector(10.0, playerid, string,COLOR_FADE1,COLOR_FADE2,COLOR_FADE3,COLOR_FADE4,COLOR_FADE5); format(string, sizeof(string), "Radio: %s", params); SetPlayerChatBubble(playerid,string,COLOR_YELLOW,10.0,8000); @@ -62,11 +62,11 @@ YCMD:r(playerid, params[], help) else if(GetPlayerOrg(playerid) == FAMILY_SAD) //SAD i BOR połaczenie+DMV { member = GetPlayerOrg(playerid); - format(string, sizeof(string), "** %s %s: %s **", FamRang[member][PlayerInfo[playerid][pRank]],GetNick(playerid), params); + format(string, sizeof(string), "** %s %s: %s **", FamRang[member][PlayerInfo[playerid][pRank]],GetNickEx(playerid), params); SendFamilyMessage(FRAC_BOR, TEAM_AZTECAS_COLOR, string); SendFamilyMessage(FRAC_GOV, TEAM_AZTECAS_COLOR, string); SendNewFamilyMessage(FAMILY_SAD, TEAM_BLUE_COLOR, string); - format(string, sizeof(string), "%s mówi przez radio: %s", GetNick(playerid), params); + format(string, sizeof(string), "%s mówi przez radio: %s", GetNickEx(playerid), params); ProxDetector(10.0, playerid, string,COLOR_FADE1,COLOR_FADE2,COLOR_FADE3,COLOR_FADE4,COLOR_FADE5); format(string, sizeof(string), "Radio: %s", params); SetPlayerChatBubble(playerid,string,COLOR_YELLOW,10.0,8000); diff --git a/gamemodes/commands/cmd/rodzinny.pwn b/gamemodes/commands/cmd/rodzinny.pwn index de33be5f1..cada590ec 100644 --- a/gamemodes/commands/cmd/rodzinny.pwn +++ b/gamemodes/commands/cmd/rodzinny.pwn @@ -31,7 +31,6 @@ YCMD:rodzinny(playerid, params[], help) { new string[256]; - new sendername[MAX_PLAYER_NAME]; if(IsPlayerConnected(playerid)) { @@ -45,7 +44,6 @@ YCMD:rodzinny(playerid, params[], help) sendErrorMessage(playerid, "Dobry admin nie powinien robić OOC w IC! Pisz poprzez /fo [treść]"); return 1; } - GetPlayerName(playerid, sendername, sizeof(sendername)); if(isnull(params)) { sendTipMessage(playerid, "Użyj (/f)amily [tekst]"); @@ -56,7 +54,7 @@ YCMD:rodzinny(playerid, params[], help) new member = GetPlayerFraction(playerid); if(member>0 && PlayerInfo[playerid][pTajniak] == 0) { - format(string, sizeof(string), "** %s %s: %s **", FracRang[member][PlayerInfo[playerid][pRank]],sendername, params); + format(string, sizeof(string), "** %s %s: %s **", FracRang[member][PlayerInfo[playerid][pRank]],GetNickEx(playerid), params); SendFamilyMessage(member, TEAM_AZTECAS_COLOR, string); //Tajniacy @@ -67,31 +65,31 @@ YCMD:rodzinny(playerid, params[], help) } else if(PlayerInfo[playerid][pTajniak] == 1) { - format(string, sizeof(string), "** %s %s: %s **", FracRang[FRAC_GROOVE][PlayerInfo[playerid][pRank]],sendername, params); + format(string, sizeof(string), "** %s %s: %s **", FracRang[FRAC_GROOVE][PlayerInfo[playerid][pRank]],GetNickEx(playerid), params); SendFamilyMessage(FRAC_GROOVE, TEAM_AZTECAS_COLOR, string); SendTajniakMessage(1, TEAM_AZTECAS_COLOR, string); } else if(PlayerInfo[playerid][pTajniak] == 2) { - format(string, sizeof(string), "** %s %s: %s **", FracRang[FRAC_BALLAS][PlayerInfo[playerid][pRank]],sendername, params); + format(string, sizeof(string), "** %s %s: %s **", FracRang[FRAC_BALLAS][PlayerInfo[playerid][pRank]],GetNickEx(playerid), params); SendFamilyMessage(FRAC_BALLAS, TEAM_AZTECAS_COLOR, string); SendTajniakMessage(2, TEAM_AZTECAS_COLOR, string); } else if(PlayerInfo[playerid][pTajniak] == 3) { - format(string, sizeof(string), "** %s %s: %s **", FracRang[FRAC_LCN][PlayerInfo[playerid][pRank]],sendername, params); + format(string, sizeof(string), "** %s %s: %s **", FracRang[FRAC_LCN][PlayerInfo[playerid][pRank]],GetNickEx(playerid), params); SendFamilyMessage(FRAC_LCN, TEAM_AZTECAS_COLOR, string); SendTajniakMessage(3, TEAM_AZTECAS_COLOR, string); } else if(PlayerInfo[playerid][pTajniak] == 4) { - format(string, sizeof(string), "** %s %s: %s **", FracRang[FRAC_YKZ][PlayerInfo[playerid][pRank]],sendername, params); + format(string, sizeof(string), "** %s %s: %s **", FracRang[FRAC_YKZ][PlayerInfo[playerid][pRank]],GetNickEx(playerid), params); SendFamilyMessage(FRAC_YKZ, TEAM_AZTECAS_COLOR, string); SendTajniakMessage(4, TEAM_AZTECAS_COLOR, string); } else if(PlayerInfo[playerid][pTajniak] == 5) { - format(string, sizeof(string), "** %s %s: %s **", FracRang[FRAC_VAGOS][PlayerInfo[playerid][pRank]],sendername, params); + format(string, sizeof(string), "** %s %s: %s **", FracRang[FRAC_VAGOS][PlayerInfo[playerid][pRank]],GetNickEx(playerid), params); SendFamilyMessage(FRAC_VAGOS, TEAM_AZTECAS_COLOR, string); SendTajniakMessage(5, TEAM_AZTECAS_COLOR, string); } @@ -99,14 +97,14 @@ YCMD:rodzinny(playerid, params[], help) { member = GetPlayerOrg(playerid); //Przypisane rangi - if(strlen(FamRang[member][PlayerInfo[playerid][pRank]]) > 1) format(string, sizeof(string), "** %s %s: %s **", FamRang[member][PlayerInfo[playerid][pRank]],sendername, params); + if(strlen(FamRang[member][PlayerInfo[playerid][pRank]]) > 1) format(string, sizeof(string), "** %s %s: %s **", FamRang[member][PlayerInfo[playerid][pRank]],GetNickEx(playerid), params); //Rangi podstawowe - else format(string, sizeof(string), "** %s %s: %s **", FamRang[0][PlayerInfo[playerid][pRank]],sendername, params); + else format(string, sizeof(string), "** %s %s: %s **", FamRang[0][PlayerInfo[playerid][pRank]],GetNickEx(playerid), params); SendNewFamilyMessage(member, TEAM_AZTECAS_COLOR, string); } - format(string, sizeof(string), "%s mówi przez radio: %s", sendername, params); + format(string, sizeof(string), "%s mówi przez radio: %s", GetNickEx(playerid), params); ProxDetector(10.0, playerid, string,COLOR_FADE1,COLOR_FADE2,COLOR_FADE3,COLOR_FADE4,COLOR_FADE5); - format(string, sizeof(string), "%s mówi przez radio: %s", sendername, params); + format(string, sizeof(string), "%s mówi przez radio: %s", GetNickEx(playerid), params); SetPlayerChatBubble(playerid,string,COLOR_YELLOW,10.0,8000); Log(chatLog, INFO, "%s radio rodziny %d IC: %s", GetPlayerLogName(playerid), GetPlayerOrg(playerid), params); return 1; @@ -114,15 +112,15 @@ YCMD:rodzinny(playerid, params[], help) else if(GetPlayerFraction(playerid) == FRAC_GOV || GetPlayerFraction(playerid) == FRAC_BOR|| GetPlayerOrg(playerid) == 1) //DMV i BOR połaczenie + Sąd { new member = GetPlayerFraction(playerid); - format(string, sizeof(string), "** %s %s: %s **", FracRang[member][PlayerInfo[playerid][pRank]],sendername, params); + format(string, sizeof(string), "** %s %s: %s **", FracRang[member][PlayerInfo[playerid][pRank]],GetNickEx(playerid), params); SendFamilyMessage(FRAC_GOV, TEAM_AZTECAS_COLOR, string); SendFamilyMessage(FRAC_BOR, TEAM_AZTECAS_COLOR, string); SendNewFamilyMessage(FAMILY_SAD, TEAM_BLUE_COLOR, string); Log(chatLog, INFO, "%s radio frakcji %d IC: %s", GetPlayerLogName(playerid), GetPlayerFraction(playerid), params); - format(string, sizeof(string), "%s mówi przez radio: %s", sendername, params); + format(string, sizeof(string), "%s mówi przez radio: %s", GetNickEx(playerid), params); ProxDetector(10.0, playerid, string,COLOR_FADE1,COLOR_FADE2,COLOR_FADE3,COLOR_FADE4,COLOR_FADE5); - format(string, sizeof(string), "%s mówi przez radio: %s", sendername, params); + format(string, sizeof(string), "%s mówi przez radio: %s", GetNickEx(playerid), params); SetPlayerChatBubble(playerid,string,COLOR_YELLOW,10.0,8000); } else From f04542e95dce4e444a20acd413d652cc1ff53eba Mon Sep 17 00:00:00 2001 From: Mrucznik Date: Tue, 31 Mar 2020 21:52:34 +0200 Subject: [PATCH 28/28] =?UTF-8?q?Nie=20dodawajmy=20wi=C4=99cej=20numerk?= =?UTF-8?q?=C3=B3w=20jednak?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamemodes/VERSION.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/VERSION.pwn b/gamemodes/VERSION.pwn index 2741ded90..559ea1b37 100644 --- a/gamemodes/VERSION.pwn +++ b/gamemodes/VERSION.pwn @@ -1 +1 @@ -#define VERSION "v2.7.1.1" +#define VERSION "v2.7.2"