diff --git a/gamemodes/Mrucznik-RP.pwn b/gamemodes/Mrucznik-RP.pwn index ed5a5319d..ede8a3e80 100644 --- a/gamemodes/Mrucznik-RP.pwn +++ b/gamemodes/Mrucznik-RP.pwn @@ -266,14 +266,18 @@ public OnGameModeInit() FabrykaMats_LoadLogic(); NowaWybieralka_Init(); LoadBusiness(); - LoadBusinessPickup(); - //LoadActors(); + LoadBusinessPickup(); //-------<[ actors ]>------- PushActors(); LoadActors(); - LoadConfig(); + + //Config + LoadConfig(); + + //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(); // @@ -1307,14 +1311,6 @@ public OnPlayerDisconnect(playerid, reason) KillTimer(saveMyAccountTimer[playerid]); } - //PAŹDZIOCH - lina SWAT - if(GetPVarInt(playerid,"roped") == 1) - { - for(new i=0;i 22) + if(DmvActorStatus && (shifthour < 16 || shifthour > 22)) { DestroyActorsInDMV(INVALID_PLAYER_ID); } @@ -5771,6 +5763,31 @@ 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) //NEXT + { + foreach(new i : Player) + { + if(i == playerid) continue; + 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; + } + } + } + return 1; } return 1; } @@ -5914,7 +5931,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); @@ -6228,7 +6245,6 @@ public OnPlayerKeyStateChange(playerid,newkeys,oldkeys) } } - //11.06.2014 if(PRESSED(KEY_JUMP) && Spectate[playerid] != INVALID_PLAYER_ID) { PlayerInfo[playerid][pInt] = Unspec[playerid][sPint]; @@ -6578,10 +6594,6 @@ public OnPlayerKeyStateChange(playerid,newkeys,oldkeys) ClearAnimations(playerid); SetPVarInt(playerid,"roped", 0); SetPVarInt(playerid,"chop_id",0); - for(new i=0;i 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/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)) { 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/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/lina.pwn b/gamemodes/commands/cmd/lina.pwn index 73128158e..626ba885a 100644 --- a/gamemodes/commands/cmd/lina.pwn +++ b/gamemodes/commands/cmd/lina.pwn @@ -30,7 +30,6 @@ CMD:lina(playerid, cmdtext[]) { - if(!DEVELOPMENT) return 0; if(AntySpam[playerid] == 1) { sendTipMessageEx(playerid, COLOR_GREY, "Odczekaj 10 sekund"); @@ -55,10 +54,6 @@ CMD:lina(playerid, cmdtext[]) format(string, sizeof(string), "* %s opuszcza się na linie z helikoptera.", sendername); ProxDetector(60.0, playerid, string, COLOR_PURPLE,COLOR_PURPLE,COLOR_PURPLE,COLOR_PURPLE,COLOR_PURPLE); for(new i=0;i!=10;i++) ApplyAnimation(playerid,"ped","abseil",2.0,0,0,0,1,0); - for(new i=0;i<=pl_pos[playerid][4];i++) - { - r0pes[playerid][i] = CreateDynamicObject(3004,pl_pos[playerid][0],pl_pos[playerid][1],floatadd(pl_pos[playerid][3],i),87.640026855469,342.13500976563, 350.07507324219); - } SetTimerEx("syncanim",DUR,0,"i",playerid); } else 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; 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/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); 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/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/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/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 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) { diff --git a/gamemodes/commands/cmd/sprzedajzestaw.pwn b/gamemodes/commands/cmd/sprzedajzestaw.pwn index 23b650df3..872ac6780 100644 --- a/gamemodes/commands/cmd/sprzedajzestaw.pwn +++ b/gamemodes/commands/cmd/sprzedajzestaw.pwn @@ -39,6 +39,12 @@ 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"); + return 1; + } new Float:x, Float:y, Float:z, tmp[128]; GetPlayerPos(id, x, y, z); if(!IsPlayerInRangeOfPoint(playerid, 3.0, x, y, z)) return sendTipMessageEx(playerid, 0xB52E2BFF, "Ten gracz nie jest koło ciebie"); @@ -48,6 +54,8 @@ YCMD:sprzedajzestaw(playerid, params[], help) format(tmp, sizeof tmp, "Mechanik %s proponuje Ci kupno zestawu za 15000$", GetNick(playerid)); SetPVarInt(id, "FixKitOffer", playerid); ShowPlayerDialogEx(id, D_MECH_SPRZEDAZ_FIXKIT, DIALOG_STYLE_MSGBOX, "Mechanik", tmp, "Kup", "Anuluj"); + SetTimerEx("AntySpamTimer",15000,0,"d",playerid); + AntySpam[playerid] = 1; } else { 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/wplac.pwn b/gamemodes/commands/cmd/wplac.pwn index d75f440b2..e6c6e8065 100644 --- a/gamemodes/commands/cmd/wplac.pwn +++ b/gamemodes/commands/cmd/wplac.pwn @@ -41,7 +41,7 @@ YCMD:wplac(playerid, params[], help) sendTipMessage(playerid, "Nie jesteś w Banku ani przy bankomacie !"); return 1; } - new cashdeposit, depo2 = 0; + new cashdeposit, bankomat_fee = 0; if( sscanf(params, "s[32]", string)) { sendTipMessage(playerid, "Użyj /wplac [kwota]"); @@ -52,6 +52,7 @@ YCMD:wplac(playerid, params[], help) } return 1; } + cashdeposit = FunkcjaK(string); if (cashdeposit > 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/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/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 { 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..72ec2d4ee 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"); @@ -964,9 +960,6 @@ static Aliases() //newbie Command_AddAltNamed("newbie", "n"); - //noa - Command_AddAltNamed("noa", "fdu"); - //nos Command_AddAltNamed("nos", "nitro"); diff --git a/gamemodes/dialogs/OnDialogResponse.pwn b/gamemodes/dialogs/OnDialogResponse.pwn index 139b4efe7..3e727c9e9 100644 --- a/gamemodes/dialogs/OnDialogResponse.pwn +++ b/gamemodes/dialogs/OnDialogResponse.pwn @@ -13979,22 +13979,18 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[]) if(dialogid == D_MECH_SPRZEDAZ_FIXKIT) { - new string[128]; 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, 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); PlayerInfo[playerid][pFixKit]++; @@ -14002,8 +13998,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, 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; 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/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; 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/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){ 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/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/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", 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..2a717e934 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; @@ -4787,8 +4793,8 @@ 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]); - SendClientMessage(playerid, COLOR_GRAD6,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_GREEN,"_______________________________________"); } } @@ -8350,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; @@ -10938,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]); diff --git a/gamemodes/system/zmienne.pwn b/gamemodes/system/zmienne.pwn index 65fbb769f..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]; @@ -713,7 +712,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 +1158,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; diff --git a/include b/include index ae6661353..0ccad8734 160000 --- a/include +++ b/include @@ -1 +1 @@ -Subproject commit ae666135311abf2ee88fd4e21532097ab27693c6 +Subproject commit 0ccad873467b2514c17cd3f5230fb138aba57b23