Skip to content

Convert /ww to JavaScript #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FreakinsPL wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Convert /ww to JavaScript #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
144ade6
Create walkweapon.json
FreakinsPL Sep 21, 2020
9ff7299
Update playerHandler.pwn
FreakinsPL Sep 21, 2020
fc4783c
Update OnPlayerCommandText.pwn
FreakinsPL Sep 21, 2020
0396795
Update OnDialogResponse.pwn
FreakinsPL Sep 21, 2020
49f5ac2
Update DeathmatchHandler.pwn
FreakinsPL Sep 21, 2020
bfd30a0
Update MinigamesHandler.pwn
FreakinsPL Sep 21, 2020
35c6e96
Delete walkweapon.pwn
FreakinsPL Sep 21, 2020
00c052a
Update lvp.ppr
FreakinsPL Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions data/fights/walkweapon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "WalkWeapon",
"command": "ww",
"goal": "Last man standing.",

"settings": {
"deathmatch/map_markers": "Disabled",
"deathmatch/spawn_armour": false,
"deathmatch/spawn_weapons": [
{ "weapon": 24, "ammo": 1000 },
{ "weapon": 27, "ammo": 1000 },
{ "weapon": 31, "ammo": 1000 },
{ "weapon": 34, "ammo": 1000 }
],
"fights/location": "San Fierro Harbour",
"fights/pickups": false
}
}
2 changes: 1 addition & 1 deletion pawn/Elements/Player/playerHandler.pwn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define STATUS_MINIGUN 14 // Converted
#define STATUS_SHIPTDM 15 // TODO: Needs the ability to have team-specific skins
#define STATUS_SAWNOFF 16 // Converted
#define STATUS_WALKWEAPON 17
#define STATUS_WALKWEAPON 17 // Converted
#define STATUS_RANDOMDM 18
#define STATUS_ISLANDDM 19 // TODO: Needs the ability to have team-specific skins

Expand Down
12 changes: 0 additions & 12 deletions pawn/Resources/Callbacks/OnPlayer/OnPlayerCommandText.pwn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,18 +584,6 @@ public OnPlayerCommandText(playerid, cmdtext[]) {
return 1;
}

if(!strcmp(cmd, "/ww", true))
{
if(GetPlayerInterior(playerid) != 0)
{
ShowBoxForPlayer(playerid, "You cannot use this command while you're in an interior!");
return 1;
}

MiniGamesSignup(playerid, STATUS_WALKWEAPON);
return 1;
}

if(!strcmp(cmd, "/random", true))
{
if(GetPlayerInterior(playerid) != 0)
Expand Down
5 changes: 2 additions & 3 deletions pawn/Resources/Callbacks/Others/OnDialogResponse.pwn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,9 +419,8 @@ deprecated_OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
case 1: MiniGamesSignup(playerid, STATUS_DILDO);
case 2: MiniGamesSignup(playerid, STATUS_KNOCKOUT);
case 3: MiniGamesSignup(playerid, STATUS_SHIPTDM);
case 4: MiniGamesSignup(playerid, STATUS_WALKWEAPON);
case 5: MiniGamesSignup(playerid, STATUS_RANDOMDM);
case 6: MiniGamesSignup(playerid, STATUS_ISLANDDM);
case 4: MiniGamesSignup(playerid, STATUS_RANDOMDM);
case 5: MiniGamesSignup(playerid, STATUS_ISLANDDM);
}

return 1;
Expand Down
4 changes: 1 addition & 3 deletions pawn/Resources/Minigames/Core/DeathmatchHandler.pwn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
#include Resources/Minigames/Deathmatch/dildo_spanking.pwn
#include Resources/Minigames/Deathmatch/knockout.pwn
#include Resources/Minigames/Deathmatch/ShipTDM.pwn
#include Resources/Minigames/Deathmatch/walkweapon.pwn
#include Resources/Minigames/Deathmatch/RandomDeathmatch.pwn
#include Resources/Minigames/Deathmatch/IslandDM.pwn

ShowDeathmatchDialog(playerId) {
ShowPlayerDialog(playerId, DIALOG_MINIGAME_DM, DIALOG_STYLE_LIST, "Deathmatch Minigames",
"Hidden Massacre\nDildo Spanking\nFist Fight Knockout\nShip TDM\nWalkweapon Fights\nRandom DM\nIsland DM",
"Hidden Massacre\nDildo Spanking\nFist Fight Knockout\nShip TDM\nRandom DM\nIsland DM",
"Select", "Cancel");
}

Expand Down Expand Up @@ -72,7 +71,6 @@ public DeathmatchStartFunc() {
case STATUS_DILDO: SetPlayerUpForDildoSpanking(contestant);
case STATUS_KNOCKOUT: SetPlayerUpForKnockout(contestant);
case STATUS_SHIPTDM: SetupPlayerForShipTDM(contestant);
case STATUS_WALKWEAPON: SetPlayerUpForWalkWeapon(contestant);
case STATUS_RANDOMDM: SetPlayerUpForRandomDeathmatch(contestant);
case STATUS_ISLANDDM: SetupPlayerForIslandDM(contestant);
}
Expand Down
3 changes: 0 additions & 3 deletions pawn/Resources/Minigames/Core/MinigamesHandler.pwn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,6 @@ ReturnMinigameName(minigame) {
case STATUS_DILDO: minigameName = "Dildo Spanking";
case STATUS_KNOCKOUT: minigameName = "Knockout";
case STATUS_SHIPTDM: minigameName = "Ship Team Deathmatch";
case STATUS_WALKWEAPON: minigameName = "Walkweapon War";
case STATUS_RANDOMDM: minigameName = "Random Deathmatch";
case STATUS_ISLANDDM: minigameName = "Island Deathmatch";
}
Expand All @@ -431,7 +430,6 @@ ReturnMinigameCmd(minigame) {
case STATUS_DILDO: command = "/spankme";
case STATUS_KNOCKOUT: command = "/knockout";
case STATUS_SHIPTDM: command = "/shiptdm";
case STATUS_WALKWEAPON: command = "/ww";
case STATUS_RANDOMDM: command = "/random";
case STATUS_ISLANDDM: command = "/islanddm";
}
Expand All @@ -447,7 +445,6 @@ ReturnMinigameMaxPlayers(minigame) {
case STATUS_DILDO: maxPlayers = 10;
case STATUS_KNOCKOUT: maxPlayers = 2;
case STATUS_SHIPTDM: maxPlayers = 100;
case STATUS_WALKWEAPON: maxPlayers = 100;
case STATUS_RANDOMDM: maxPlayers = 20;
case STATUS_ISLANDDM: maxPlayers = 100;
}
Expand Down
22 changes: 0 additions & 22 deletions pawn/Resources/Minigames/Deathmatch/walkweapon.pwn
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion pawn/lvp.ppr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,6 @@
<DiskObject>\Resources\Minigames\Deathmatch\knockout.pwn</DiskObject>
<DiskObject>\Resources\Minigames\Deathmatch\RandomDeathmatch.pwn</DiskObject>
<DiskObject>\Resources\Minigames\Deathmatch\ShipTDM.pwn</DiskObject>
<DiskObject>\Resources\Minigames\Deathmatch\walkweapon.pwn</DiskObject>
<DiskObject>\Resources\Minigames\Deliver\</DiskObject>
<DiskObject>\Resources\Minigames\Deliver\Deliver.pwn</DiskObject>
</FileList>
Expand Down