|
|
@@ -9,6 +9,19 @@ UiContainer.BattleUi = {
|
|
|
--- Enemies
|
|
|
enemies = {},
|
|
|
|
|
|
+ --- Battle action queue.
|
|
|
+ --
|
|
|
+ -- Every battle action gets added to this queue, sorted by priority, and the actions are
|
|
|
+ -- executed in order. Actions for enemies and allies are stored here.
|
|
|
+ action_queue = {},
|
|
|
+
|
|
|
+ --- Party command selection queue.
|
|
|
+ --
|
|
|
+ -- When a party member ATB is filled, the character is added to this queue. Command selection
|
|
|
+ -- windows are show in this order. If a character is dismissed (triangle in PSX), the character
|
|
|
+ -- gets moved to the end of the queue.
|
|
|
+ command_queue = {},
|
|
|
+
|
|
|
--- Run when the menu is creaded.
|
|
|
--
|
|
|
-- It does nothing.
|
|
|
@@ -28,12 +41,22 @@ UiContainer.BattleUi = {
|
|
|
--- Current position for the cursor in the list window.
|
|
|
cursor_list = 1,
|
|
|
|
|
|
+ --- First visible item in the list window
|
|
|
+ first_list = 1,
|
|
|
+
|
|
|
--- Current position for the cursor in the target window.
|
|
|
cursor_target = 1,
|
|
|
|
|
|
--- ID of the character the cursor is for.
|
|
|
current_character_window = -1,
|
|
|
|
|
|
+ --- Indicates the currently opened menu
|
|
|
+ --
|
|
|
+ -- Possible values are none, magic, wmagic1, wmagic2, summon, wsummon1, wsummon2, item, witem1,
|
|
|
+ -- witem2, eskill, throw, limit, coin.
|
|
|
+ current_list = "none",
|
|
|
+
|
|
|
+
|
|
|
--- Handles button events.
|
|
|
--
|
|
|
-- For the current submenu, handles directional keys, enter and escape events.
|
|
|
@@ -49,38 +72,40 @@ UiContainer.BattleUi = {
|
|
|
-- Handle command cursors
|
|
|
if self.window_state == "command" then
|
|
|
local command_count = #self.party[self.current_character_window].command
|
|
|
+ local cursor = ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor")
|
|
|
if button == "Down" then
|
|
|
if self.cursor_command < 4 then
|
|
|
-- If on the first three ones, always alow to go down to reach "Item"
|
|
|
self.cursor_command = self.cursor_command + 1
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
audio_manager:play_sound("Cursor")
|
|
|
elseif self.cursor_command % 4 == 0 then
|
|
|
-- If on a multiple of 4, go to the top of the column
|
|
|
self.cursor_command = self.cursor_command - 3
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
audio_manager:play_sound("Cursor")
|
|
|
elseif command_count > self.cursor_command then
|
|
|
-- If there is a command below, allow one position down.
|
|
|
self.cursor_command = self.cursor_command + 1
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
audio_manager:play_sound("Cursor")
|
|
|
else
|
|
|
-- Back to the first row
|
|
|
self.cursor_command = 4 * math.floor(self.cursor_command / 4) + 1
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
audio_manager:play_sound("Cursor")
|
|
|
end
|
|
|
elseif button == "Up" then
|
|
|
if self.cursor_command == 1 then
|
|
|
-- If on "Attack, always go to item
|
|
|
self.cursor_command = 4
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
audio_manager:play_sound("Cursor")
|
|
|
elseif self.cursor_command > 1 and self.cursor_command < 5 then
|
|
|
- -- If on the second, third, or fourth, always alwow to go down to reach "Attack" from "Item"
|
|
|
+ -- If on the second, third, or fourth, always alwow to go down to
|
|
|
+ -- reach "Attack" from "Item"
|
|
|
self.cursor_command = self.cursor_command - 1
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
audio_manager:play_sound("Cursor")
|
|
|
elseif self.cursor_command % 4 == 1 and command_count > self.cursor_command then
|
|
|
-- If on the first row, go to the last where there is a command
|
|
|
@@ -88,27 +113,27 @@ UiContainer.BattleUi = {
|
|
|
while self.cursor_command > command_count do
|
|
|
self.cursor_command = self.cursor_command - 1
|
|
|
end
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
audio_manager:play_sound("Cursor")
|
|
|
else
|
|
|
-- Else, always allow to go one up.
|
|
|
self.cursor_command = self.cursor_command - 1
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
audio_manager:play_sound("Cursor")
|
|
|
end
|
|
|
elseif button == "Left" then
|
|
|
if command_count > 4 then
|
|
|
if self.cursor_command > 4 then
|
|
|
self.cursor_command = self.cursor_command - 4
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
audio_manager:play_sound("Cursor")
|
|
|
else
|
|
|
- local new_position = self.cursor_command + 4 * math.floor(command_count / 4)
|
|
|
- while new_position > command_count do
|
|
|
- new_position = new_position - 4
|
|
|
+ local new_pos = self.cursor_command + 4 * math.floor(command_count / 4)
|
|
|
+ while new_pos > command_count do
|
|
|
+ new_pos = new_pos - 4
|
|
|
end
|
|
|
- self.cursor_command = new_position
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
+ self.cursor_command = new_pos
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
audio_manager:play_sound("Cursor")
|
|
|
end
|
|
|
end
|
|
|
@@ -116,50 +141,238 @@ UiContainer.BattleUi = {
|
|
|
if command_count > 4 then
|
|
|
self.cursor_command = self.cursor_command + 4
|
|
|
if self.cursor_command > command_count then
|
|
|
- self.cursor_command = self.cursor_command - 4 * math.floor(self.cursor_command / 4)
|
|
|
+ self.cursor_command
|
|
|
+ = self.cursor_command - 4 * math.floor(self.cursor_command / 4)
|
|
|
if self.cursor_command < 1 then
|
|
|
self.cursor_command = self.cursor_command + 4
|
|
|
end
|
|
|
end
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
audio_manager:play_sound("Cursor")
|
|
|
end
|
|
|
- -- TODO: elseif accept, skip buttons...
|
|
|
+ elseif button == "Escape" then
|
|
|
+ -- Push the current character to the end of the command queue, and show the first.
|
|
|
+ local new_queue = {}
|
|
|
+ for i = 1, #self.command_queue do
|
|
|
+ if self.command_queue[i + 1] ~= nil then
|
|
|
+ table.insert(new_queue, self.command_queue[i + 1])
|
|
|
+ end
|
|
|
+ end
|
|
|
+ table.insert(new_queue, self.command_queue[1])
|
|
|
+ self.command_queue = new_queue
|
|
|
+ audio_manager:play_sound("Cursor")
|
|
|
+ self:show_commands(self.command_queue[1])
|
|
|
+ elseif button == "Enter" then
|
|
|
+ -- Check if a menu must be shown
|
|
|
+ local cmd = Game.Commands[
|
|
|
+ self.party[self.current_character_window].command[self.cursor_command]
|
|
|
+ ]
|
|
|
+ if cmd.menu == Battle.Menu.NONE then
|
|
|
+ print("DIRECT COMMAND")
|
|
|
+ elseif cmd.menu == Battle.Menu.TARGET then
|
|
|
+ print("TARGET COMMAND")
|
|
|
+ else
|
|
|
+ self:show_list(cmd.menu)
|
|
|
+ end
|
|
|
+ end
|
|
|
+ -- Handle menu list cursor
|
|
|
+ elseif self.window_state == "list" then
|
|
|
+ local total = 0
|
|
|
+ if
|
|
|
+ self.current_list == "magic"
|
|
|
+ or self.current_list == "wmagic1" or self.current_list == "wmagic2"
|
|
|
+ then
|
|
|
+ total = #self.party[self.current_character_window].magic
|
|
|
+ elseif
|
|
|
+ self.current_list == "summon"
|
|
|
+ or self.current_list == "wsummon1" or self.current_list == "wsummon2"
|
|
|
+ then
|
|
|
+ total = #self.party[self.current_character_window].summon
|
|
|
+ -- TODO: Rest of cases
|
|
|
end
|
|
|
+ local cursor = ui_manager:get_widget("BattleUi.Container.Bottom.List.Cursor")
|
|
|
+ if button == "LCtrl" then
|
|
|
+ self:close_list()
|
|
|
+ elseif button == "Down" then
|
|
|
+ if total <= self.cursor_list + self.first_list - 1 then
|
|
|
+ do return 0 end
|
|
|
+ end
|
|
|
+ if self.cursor_list < 4 then
|
|
|
+ -- Move cursor down
|
|
|
+ audio_manager:play_sound("Cursor")
|
|
|
+ self.cursor_list = self.cursor_list + 1
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_list))
|
|
|
+ else
|
|
|
+ -- Scroll down
|
|
|
+ audio_manager:play_sound("Cursor")
|
|
|
+ self.first_list = self.first_list + 1
|
|
|
+ self:repopulate_list()
|
|
|
+ end
|
|
|
+ elseif button == "Up" then
|
|
|
+ if self.cursor_list == 1 and self.first_list == 1 then
|
|
|
+ do return 0 end
|
|
|
+ end
|
|
|
+ if self.cursor_list > 1 then
|
|
|
+ -- Move cursor up
|
|
|
+ audio_manager:play_sound("Cursor")
|
|
|
+ self.cursor_list = self.cursor_list - 1
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_list))
|
|
|
+ else
|
|
|
+ -- Scroll up
|
|
|
+ audio_manager:play_sound("Cursor")
|
|
|
+ self.first_list = self.first_list - 1
|
|
|
+ self:repopulate_list()
|
|
|
+ end
|
|
|
+ end
|
|
|
end
|
|
|
return 0
|
|
|
end,
|
|
|
|
|
|
+ repopulate_list = function(self)
|
|
|
+ if self.current_list == "magic"
|
|
|
+ or self.current_list == "wmagic1" or self.current_list == "wmagic2"
|
|
|
+ then
|
|
|
+ self:populate_magic_list()
|
|
|
+ elseif self.current_list == "magic"
|
|
|
+ or self.current_list == "wmagic1" or self.current_list == "wmagic2"
|
|
|
+ then
|
|
|
+ self:populate_summon_list()
|
|
|
+ -- TODO: all other cases
|
|
|
+ end
|
|
|
+ end,
|
|
|
+
|
|
|
tick = function(self)
|
|
|
- --print("CALLED BattleUI:tick()")
|
|
|
- if self.window_state ~= "wait" then
|
|
|
+ if System:is_paused() == true then
|
|
|
do return end
|
|
|
end
|
|
|
+ --print("CALLED BattleUI:tick()")
|
|
|
+ --if self.window_state ~= "wait" then
|
|
|
+ -- do return end
|
|
|
+ --end
|
|
|
+ -- Advance party ATBs
|
|
|
for i = 1, #self.party do
|
|
|
if self.party[i].dead == false then -- TODO: Or stopped
|
|
|
- if self.party[i].atb < 100 then
|
|
|
+ if self.party[i].atb < 255 then
|
|
|
-- TODO: Consider haste/slow
|
|
|
- self.party[i].atb = self.party[i].atb + 0.01 * Characters[self.party[i].character].stats.dex.total -- TODO
|
|
|
- if self.party[i].atb >= 100 then
|
|
|
+ self.party[i].atb
|
|
|
+ = self.party[i].atb
|
|
|
+ + 0.04 * Characters[self.party[i].character].stats.dex.total -- TODO
|
|
|
+ if self.party[i].atb >= 255 then
|
|
|
print(Characters[self.party[i].character].name .. " ATB full")
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(i) .. ".Right.AtbFill"):set_colour(0, 1, 0)
|
|
|
- self:show_commands(i)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(i) .. ".Right.AtbFill"
|
|
|
+ ):set_colour(0, 1, 0)
|
|
|
+ --self:show_commands(i)
|
|
|
+ table.insert(self.command_queue, i)
|
|
|
end
|
|
|
-- Fill ATB UI bar
|
|
|
-- 0 -> 0%
|
|
|
- -- 100 -> 18%-6
|
|
|
- local width_percent = math.min(18, 18 * self.party[i].atb / 100)
|
|
|
+ -- 255 -> 18%-6
|
|
|
+ local width_percent = math.min(18, 18 * self.party[i].atb / 255)
|
|
|
local width_fixed = math.max(-6, -6 * width_percent / 18)
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(i) .. ".Right.AtbFill"):set_width(width_percent, width_fixed)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(i) .. ".Right.AtbFill"
|
|
|
+ ):set_width(width_percent, width_fixed)
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
+ -- TODO: Advance enemy ATBs
|
|
|
+ -- Show a command window if required
|
|
|
+ if self.window_state == "wait" and #self.command_queue > 0 then
|
|
|
+ self:show_commands(self.command_queue[1])
|
|
|
+ end
|
|
|
--print("ENDED BattleUI:tick()")
|
|
|
end,
|
|
|
|
|
|
+ show_list = function(self, menu)
|
|
|
+ local cursor = ui_manager:get_widget("BattleUi.Container.Bottom.List.Cursor")
|
|
|
+ if (menu == Battle.Menu.MAGIC) then
|
|
|
+ audio_manager:play_sound("Cursor")
|
|
|
+ self.cursor_list = 1
|
|
|
+ self.first_list = 1
|
|
|
+ self.current_list = "magic"
|
|
|
+ self:populate_magic_list()
|
|
|
+ self.window_state = "list"
|
|
|
+ ui_manager:get_widget("BattleUi.Container.Bottom.List"):set_visible(true)
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_list))
|
|
|
+ cursor:set_visible(true)
|
|
|
+ elseif (menu == Battle.Menu.SUMMON) then
|
|
|
+ audio_manager:play_sound("Cursor")
|
|
|
+ self.cursor_list = 1
|
|
|
+ self.first_list = 1
|
|
|
+ self.current_list = "summon"
|
|
|
+ self:populate_summon_list()
|
|
|
+ self.window_state = "list"
|
|
|
+ ui_manager:get_widget("BattleUi.Container.Bottom.List"):set_visible(true)
|
|
|
+ cursor:set_default_animation("Position" .. tostring(self.cursor_list))
|
|
|
+ cursor:set_visible("Position" .. tostring(self.cursor_list))
|
|
|
+ elseif (menu == Battle.Menu.ITEM) then
|
|
|
+ print("Show item menu: Not implemented")
|
|
|
+ elseif (menu == Battle.Menu.E_SKILL) then
|
|
|
+ print("Show e. skill menu: Not implemented")
|
|
|
+ elseif (menu == Battle.Menu.THROW) then
|
|
|
+ print("Show throw menu: Not implemented")
|
|
|
+ elseif (menu == Battle.Menu.LIMIT) then
|
|
|
+ print("Show magic menu: Not implemented")
|
|
|
+ elseif (menu == Battle.Menu.W_MAGIC) then
|
|
|
+ print("Show w-magic menu: Not implemented")
|
|
|
+ elseif (menu == Battle.Menu.W_SUMMON) then
|
|
|
+ print("Show w-summon menu: Not implemented")
|
|
|
+ elseif (menu == Battle.Menu.W_ITEM) then
|
|
|
+ print("Show w-magic menu: Not implemented")
|
|
|
+ elseif (menu == Battle.Menu.COIN) then
|
|
|
+ print("Show coin menu: Not implemented")
|
|
|
+ end
|
|
|
+ end,
|
|
|
+
|
|
|
+ close_list = function(self, menu)
|
|
|
+ self.current_list = "none"
|
|
|
+ self.window_state = "command"
|
|
|
+ ui_manager:get_widget("BattleUi.Container.Bottom.List"):set_visible(false)
|
|
|
+ end,
|
|
|
+
|
|
|
+ populate_magic_list = function(self)
|
|
|
+ local magic = self.party[self.current_character_window].magic
|
|
|
+ for pos = 1, 4 do
|
|
|
+ if magic[pos + self.first_list - 1] == nil then
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.List.List" .. tostring(pos)
|
|
|
+ ):set_visible(false)
|
|
|
+ else
|
|
|
+ print("ADDING MAGIC " .. tostring(magic[pos + self.first_list - 1].id))
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.List.List" .. tostring(pos)
|
|
|
+ ):set_text(Game.Attacks[magic[pos + self.first_list - 1].id].name)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.List.List" .. tostring(pos)
|
|
|
+ ):set_visible(true)
|
|
|
+ end
|
|
|
+ end
|
|
|
+ end,
|
|
|
+
|
|
|
+ populate_summon_list = function(self)
|
|
|
+ local summon = self.party[self.current_character_window].summon
|
|
|
+ for pos = 1, 4 do
|
|
|
+ if summon[pos + self.first_list - 1] == nil then
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.List.List" .. tostring(pos)
|
|
|
+ ):set_visible(false)
|
|
|
+ else
|
|
|
+ print("ADDING SUMMON " .. tostring(summon[pos + self.first_list - 1].id))
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.List.List" .. tostring(pos)
|
|
|
+ ):set_text(Game.Attacks[summon[pos + self.first_list - 1].id].name)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.List.List" .. tostring(pos)
|
|
|
+ ):set_visible(true)
|
|
|
+ end
|
|
|
+ end
|
|
|
+ end,
|
|
|
+
|
|
|
--- Loads party character data
|
|
|
--
|
|
|
-- Reads materia, calculates stats, computes attacks...
|
|
|
+ -- TODO: Move most of this code to Characters.recalculate_stats()
|
|
|
load_party_members = function(self)
|
|
|
for i = 1, Party.MAX do
|
|
|
if Party[i] ~= nil then
|
|
|
@@ -169,8 +382,10 @@ UiContainer.BattleUi = {
|
|
|
-- TODO: Consider battle layouts.
|
|
|
-- TODO: Check random seed
|
|
|
self.party[i].dead = false
|
|
|
- self.party[i].atb = math.random(0, 100)
|
|
|
+ self.party[i].atb = math.random(0, 255)
|
|
|
self.party[i].command = {}
|
|
|
+ -- Set default "Attack" command.
|
|
|
+ self.party[i].command[1] = 1
|
|
|
self.party[i].magic = {}
|
|
|
self.party[i].summon = {}
|
|
|
self.party[i].cover = 0
|
|
|
@@ -181,9 +396,13 @@ UiContainer.BattleUi = {
|
|
|
-- Fill Limit UI bar
|
|
|
-- 0 -> 0%
|
|
|
-- 255 -> 18%-6
|
|
|
- local width_percent = math.min(18, 18 * Characters[self.party[i].character].limit.bar / 255)
|
|
|
+ local width_percent = math.min(
|
|
|
+ 18, 18 * Characters[self.party[i].character].limit.bar / 255
|
|
|
+ )
|
|
|
local width_fixed = math.max(-6, -6 * width_percent / 18)
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(i) .. ".Right.LimitFill"):set_width(width_percent, width_fixed)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(i) .. ".Right.LimitFill"
|
|
|
+ ):set_width(width_percent, width_fixed)
|
|
|
-- Read materia
|
|
|
local w_magic = false
|
|
|
local w_item = false
|
|
|
@@ -195,6 +414,7 @@ UiContainer.BattleUi = {
|
|
|
else
|
|
|
equip = Characters[Party[i]].armor
|
|
|
end
|
|
|
+
|
|
|
for m = 1, 8 do -- lop for materia in weapon/armor
|
|
|
if equip.materia[m - 1] ~= nil then
|
|
|
local materia = Game.Materia[equip.materia[m - 1].id]
|
|
|
@@ -249,19 +469,21 @@ UiContainer.BattleUi = {
|
|
|
end
|
|
|
if command_id ~= nil then
|
|
|
if
|
|
|
- command_id ~= 1 and command_id ~= 20 and command_id ~= 24
|
|
|
- and command_id ~= 25 and command_id ~= 26
|
|
|
- and command_id ~= 26 and #self.party[i].command + 1 == 1
|
|
|
+ command_id == 1 or command_id == 20 or command_id == 24
|
|
|
+ or command_id == 25 or command_id == 26 or command_id == 26
|
|
|
then
|
|
|
- -- Leave command index 1 available for atgtack and substitutes
|
|
|
- -- 1: Attack, 20: Limit, 24: Slash-all, 25: 2x-Cut, 26: Flash, 27: 4x-Cut
|
|
|
- self.party[i].command[#self.party[i].command + 2] = command_id
|
|
|
- elseif command_id ~= 23 and #self.party[i].command + 1 == 4 then
|
|
|
- -- Leave command index 4 available for item
|
|
|
- self.party[i].command[#self.party[i].command + 2] = command_id
|
|
|
+ -- Attack substitutes, index 1
|
|
|
+ -- TODO: Handle priorities
|
|
|
+ -- 1: Attack, 20: Limit, 24: Slash-all,
|
|
|
+ -- 25: 2x-Cut, 26: Flash, 27: 4x-Cut
|
|
|
+ self.party[i].command[1] = command_id
|
|
|
else
|
|
|
- self.party[i].command[#self.party[i].command + 1] = command_id
|
|
|
+ self.party[i].command[#self.party[i].command + 1]
|
|
|
+ = command_id
|
|
|
end
|
|
|
+ if command_id == 21 then w_magic = true end
|
|
|
+ if command_id == 22 then w_summon = true end
|
|
|
+ if command_id == 23 then w_item = true end
|
|
|
end
|
|
|
end
|
|
|
-- TODO: Independent materia
|
|
|
@@ -269,51 +491,40 @@ UiContainer.BattleUi = {
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
- -- Set default "Attack" command.
|
|
|
- if self.party[i].command[1] == nil then
|
|
|
- self.party[i].command[1] = 1
|
|
|
- end
|
|
|
- -- Command in slot 4 is reserved for "Item" or "W-Item"
|
|
|
- if self.party[i].command[4] == nil then
|
|
|
- self.party[i].command[4] = 4
|
|
|
- end
|
|
|
+
|
|
|
+ -- Enable Item command if W-Item is disabled
|
|
|
+ if w_item == false then self.party[i].command[#self.party[i].command + 1] = 4 end
|
|
|
+
|
|
|
-- Enable Magic command if any magic is available and W-Magic is disabled.
|
|
|
- if #self.party[i].magic > 0 then
|
|
|
- local w = false
|
|
|
- for x = 1, #self.party[i].command do
|
|
|
- if self.party[i].command[x] == 21 then
|
|
|
- w = true
|
|
|
- end
|
|
|
- end
|
|
|
- if w == false then
|
|
|
- if #self.party[i].command + 1 == 1 or #self.party[i].command + 1 == 4 then
|
|
|
- -- Leave command index 1 available for attack or substitutes, and
|
|
|
- -- index 4 available for item
|
|
|
- self.party[i].command[#self.party[i].command + 2] = 2
|
|
|
- else
|
|
|
- self.party[i].command[#self.party[i].command + 1] = 2
|
|
|
- end
|
|
|
- end
|
|
|
+ if #self.party[i].magic > 0 and w_magic == false then
|
|
|
+ self.party[i].command[#self.party[i].command + 1] = 2
|
|
|
end
|
|
|
-- Enable Summon command if any magic is available and W-Summon is disabled.
|
|
|
- if #self.party[i].summon > 0 then
|
|
|
- local w = false
|
|
|
- for x = 1, #self.party[i].command do
|
|
|
- if self.party[i].command[x] == 22 then
|
|
|
- w = true
|
|
|
- end
|
|
|
- end
|
|
|
- if w == false then
|
|
|
- if #self.party[i].command + 1 == 1 or #self.party[i].command + 1 == 4 then
|
|
|
- -- Leave command index 1 available for attack or substitutes, and
|
|
|
- -- index 4 available for item
|
|
|
- self.party[i].command[#self.party[i].command + 2] = 3
|
|
|
- else
|
|
|
- self.party[i].command[#self.party[i].command + 1] = 3
|
|
|
- end
|
|
|
- end
|
|
|
+ if #self.party[i].summon > 0 and w_summon == false then
|
|
|
+ self.party[i].command[#self.party[i].command + 1] = 3
|
|
|
end
|
|
|
-- TODO: Sort commands/magic/summons
|
|
|
+ table.sort(
|
|
|
+ self.party[i].command,
|
|
|
+ function(l, r)
|
|
|
+ -- Attack substitutes always go first
|
|
|
+ if l == 1 or l == 20 or l == 24 or l == 25 or l == 26 or l == 26 then
|
|
|
+ return true
|
|
|
+ else
|
|
|
+ return l < r
|
|
|
+ end
|
|
|
+ end
|
|
|
+ )
|
|
|
+
|
|
|
+ if #self.party[i].magic > 1 then
|
|
|
+ print("SORT MAGIC " .. tostring(i))
|
|
|
+ table.sort(self.party[i].magic, function(l, r) return l.id < r.id end)
|
|
|
+ end
|
|
|
+ if #self.party[i].summon > 1 then
|
|
|
+ print("SORT SUMMON " .. tostring(i))
|
|
|
+ table.sort(self.party[i].summon, function(l, r) return l.id < r.id end)
|
|
|
+ end
|
|
|
+ print("ALL SORTED " .. tostring(i))
|
|
|
end
|
|
|
end
|
|
|
end,
|
|
|
@@ -360,28 +571,47 @@ UiContainer.BattleUi = {
|
|
|
-- Colour the character name
|
|
|
for c = 1, #self.party do
|
|
|
if c == party_id then
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Left.Name"):set_colour(1, 1, 0)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Left.Name"
|
|
|
+ ):set_colour(1, 1, 0)
|
|
|
else
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Left.Name"):set_colour(1, 1, 1)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Left.Name"
|
|
|
+ ):set_colour(1, 1, 1)
|
|
|
end
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Left.Name"):set_text(Characters[Party[c]].name)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Left.Name"
|
|
|
+ ):set_text(Characters[Party[c]].name)
|
|
|
end
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands"):set_visible(true)
|
|
|
- -- Resize the window
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands"):set_width(
|
|
|
- 40 + 40 * (1 + math.floor(#self.party[party_id].command / 4))
|
|
|
- )
|
|
|
-- Show command names
|
|
|
+ ui_manager:get_widget("BattleUi.Container.Bottom.Commands"):set_visible(false)
|
|
|
+ local total_commands = 0
|
|
|
for c = 1, 12 do
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cmd" .. tostring(c)):set_visible(false)
|
|
|
- end
|
|
|
- for pos, cmd in ipairs(self.party[party_id].command) do
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cmd" .. tostring(pos)):set_text(Game.Commands[cmd].name)
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cmd" .. tostring(pos)):set_visible(true)
|
|
|
+ if self.party[party_id].command[c] == nil then
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Commands.Cmd" .. tostring(c)
|
|
|
+ ):set_visible(false)
|
|
|
+ else
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Commands.Cmd" .. tostring(c)
|
|
|
+ ):set_text(Game.Commands[self.party[party_id].command[c]].name)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Commands.Cmd" .. tostring(c)
|
|
|
+ ):set_visible(true)
|
|
|
+ total_commands = total_commands + 1
|
|
|
+ end
|
|
|
end
|
|
|
+ -- Resize the window
|
|
|
+ ui_manager:get_widget("BattleUi.Container.Bottom.Commands"):set_visible(false)
|
|
|
+ ui_manager:get_widget("BattleUi.Container.Bottom.Commands"):set_width(
|
|
|
+ 60 * (1 + math.floor(total_commands / 4))
|
|
|
+ )
|
|
|
+ ui_manager:get_widget("BattleUi.Container.Bottom.Commands"):set_visible(true)
|
|
|
-- Set and show cursor
|
|
|
+ ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation(
|
|
|
+ "Position" .. tostring(self.cursor_command)
|
|
|
+ )
|
|
|
ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_visible(true)
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Commands.Cursor"):set_default_animation("Position" .. tostring(self.cursor_command))
|
|
|
self.window_state = "command"
|
|
|
|
|
|
end,
|
|
|
@@ -413,13 +643,25 @@ UiContainer.BattleUi = {
|
|
|
|
|
|
for c = 1, 3 do
|
|
|
if Party[c] ~= nil then
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(c)):set_visible(true)
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Left.Name"):set_text(Characters[Party[c]].name)
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Right.Hp.HpCurrent"):set_text(space_pad(Characters[Party[c]].stats.hp.current, 5))
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Right.Hp.HpMax"):set_text(space_pad(Characters[Party[c]].stats.hp.base, 5))
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Right.Mp.MpCurrent"):set_text(space_pad(Characters[Party[c]].stats.mp.current, 5))
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(c)
|
|
|
+ ):set_visible(true)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Left.Name"
|
|
|
+ ):set_text(Characters[Party[c]].name)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Right.Hp.HpCurrent"
|
|
|
+ ):set_text(space_pad(Characters[Party[c]].stats.hp.current, 5))
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Right.Hp.HpMax"
|
|
|
+ ):set_text(space_pad(Characters[Party[c]].stats.hp.base, 5))
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(c) .. ".Right.Mp.MpCurrent"
|
|
|
+ ):set_text(space_pad(Characters[Party[c]].stats.mp.current, 5))
|
|
|
else
|
|
|
- ui_manager:get_widget("BattleUi.Container.Bottom.Character" .. tostring(c)):set_visible(false)
|
|
|
+ ui_manager:get_widget(
|
|
|
+ "BattleUi.Container.Bottom.Character" .. tostring(c)
|
|
|
+ ):set_visible(false)
|
|
|
end
|
|
|
end
|
|
|
return 0
|
