Skip to content

Commit

Permalink
Brak masek na radiach /r /ro /f /fo
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mrucznik
Mrucznik committed Mar 31, 2020
1 parent afa8734 commit b6d58f7
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 30 deletions.
20 changes: 9 additions & 11 deletions gamemodes/commands/cmd/fooc.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
YCMD:fooc(playerid, params[], help)
{
new string[256];
new sendername[MAX_PLAYER_NAME];

if(IsPlayerConnected(playerid))
{
Expand All @@ -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]");
Expand All @@ -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
Expand All @@ -62,41 +60,41 @@ 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);
}
else if(GetPlayerOrg(playerid) != 0)
{
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);
}
Expand All @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions gamemodes/commands/cmd/r.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,21 @@ 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);
}
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);
Expand Down
28 changes: 13 additions & 15 deletions gamemodes/commands/cmd/rodzinny.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
YCMD:rodzinny(playerid, params[], help)
{
new string[256];
new sendername[MAX_PLAYER_NAME];

if(IsPlayerConnected(playerid))
{
Expand All @@ -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]");
Expand All @@ -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
Expand All @@ -67,62 +65,62 @@ 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);
}
else if(GetPlayerOrg(playerid) != 0)
{
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;
}
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
Expand Down

0 comments on commit b6d58f7

Please sign in to comment.