diff --git a/USAGE.md b/USAGE.md index cd32e12..6a15c57 100644 --- a/USAGE.md +++ b/USAGE.md @@ -116,7 +116,6 @@ These special debug commands start with `!` and are custom to Kawari. * `!finishevent`: Forcefully finishes the current event, useful if the script has an error and you're stuck talking to something. * `!item `: Gives you an item matching by name. * `!inspect`: Prints info about the player. -* `!collect `: Subtracts `amount` gil from the player. ### GM commands @@ -133,3 +132,4 @@ These GM commands are implemented in the FFXIV protocol, but only some of them a * `//gm exp `: Adds the specified amount of EXP to the current class/job. * `//gm teri_info`: Displays information about the current zone. Currently displays zone id, weather, internal zone name, parent region name, and place/display name. * `//gm gil `: Adds the specified amount of gil to the player +* `//gm collect `: Subtracts `amount` gil from the targeted player (yourself only for now). diff --git a/resources/scripts/commands/Commands.lua b/resources/scripts/commands/Commands.lua index bd635c1..6480494 100644 --- a/resources/scripts/commands/Commands.lua +++ b/resources/scripts/commands/Commands.lua @@ -29,8 +29,7 @@ registerGMCommand(GM_EXP, GM_DIR.."Exp.lua") registerGMCommand(GM_ORCHESTRION, GM_DIR.."Orchestrion.lua") registerGMCommand(GM_GIVE_ITEM, GM_DIR.."GiveItem.lua") registerGMCommand(GM_GIL, GM_DIR.."Gil.lua") --- TODO: Figure out how the //gm collect command works ingame, its parameters are not the same as //gm gil ---registerGMCommand(GM_COLLECT, GM_DIR.."Collect.lua") +registerGMCommand(GM_COLLECT, GM_DIR.."Collect.lua") registerGMCommand(GM_WIREFRAME, GM_DIR.."ToggleWireframe.lua") registerGMCommand(GM_TERRITORY, GM_DIR.."ChangeTerritory.lua") registerGMCommand(GM_TERRITORY_INFO, GM_DIR.."TerritoryInfo.lua") @@ -39,7 +38,6 @@ registerGMCommand(GM_TERRITORY_INFO, GM_DIR.."TerritoryInfo.lua") -- Please keep these in alphabetical order! registerCommand("classjob", DBG_DIR.."ClassJob.lua") -registerCommand("collect", GM_DIR.."Collect.lua") -- TODO: remove this once we figure out the //gm collect command's parameters (see comments above) registerCommand("festival", DBG_DIR.."Festival.lua") registerCommand("inspect", GM_DIR.."InspectPlayer.lua") -- TODO: remove this once we figure out the GMInspect IPC opcode registerCommand("nudge", DBG_DIR.."Nudge.lua") diff --git a/resources/scripts/commands/gm/InspectPlayer.lua b/resources/scripts/commands/gm/InspectPlayer.lua index 27ddb91..5069480 100644 --- a/resources/scripts/commands/gm/InspectPlayer.lua +++ b/resources/scripts/commands/gm/InspectPlayer.lua @@ -44,7 +44,7 @@ function onCommand(args, player) local lring = player.inventory.equipped.left_ring local scrystal = player.inventory.equipped.soul_crystal - printf(player, info, + printf(player, info, player.zone.region_name, player.zone.place_name, player.zone.internal_name, player.zone.id, player.position.x, player.position.y, player.position.z, player.rotation, player.gil,