redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-07-24 21:47:45 +00:00
Code Activity

Address review

Browse source 
-Removed commented line
-Reduced copy paste in Events.lua
-Moved some comments from SolutionNineTeleporter.lua to Events.lua since they're better served there and less redundant
This commit is contained in:
The Dax 2025-07-22 12:18:23 -04:00
parent 80214ef5a0
commit dd98d99e53
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
resources/scripts/events/Events.lua
View file

@ -376,12 +376,12 @@ generic_currency_exchange = {
}
solution_nine_teleporters = {
[4194305] = "SolutionNineTeleporter.lua",
[4194306] = "SolutionNineTeleporter.lua",
[4194307] = "SolutionNineTeleporter.lua",
[4194308] = "SolutionNineTeleporter.lua",
[4194309] = "SolutionNineTeleporter.lua",
[4194310] = "SolutionNineTeleporter.lua",
4194305, -- Teleporter from eastern Aetheryte Plaza to Recreation Zone
4194306, -- Teleporter from Recreation Zone to eastern Aetheryte Plaza
4194307, -- Teleporter from northern Aetheryte Plaza to Government Sector
4194308, -- Teleporter from Government Sector to northern Aetheryte Plaza
4194309, -- Teleporter from Nexus Arcade ground floor to upper balcony
4194310, -- Teleporter from upper balcony to Nexus Arcade ground floor
}
-- Not custom in the sense of non-SQEX content, just going based off the directory name
@ -452,6 +452,6 @@ for event_id, script_file in pairs(quests) do
registerEvent(event_id, OPENING_DIR..script_file)
end
for event_id, script_file in pairs(solution_nine_teleporters) do
registerEvent(event_id, TRIGGER_DIR..script_file)
for _, event_id in pairs(solution_nine_teleporters) do
registerEvent(event_id, TRIGGER_DIR.."SolutionNineTeleporter.lua")
end

12
resources/scripts/events/walkin_trigger/SolutionNineTeleporter.lua
View file

@ -10,12 +10,12 @@ TELEPORTER_INFO = {
}
EVENT_ARG = {
[4194305] = 10611851, -- Teleporter from eastern Aetheryte Plaza to Recreation Zone
[4194306] = 10611861, -- Teleporter from Recreation Zone to eastern Aetheryte Plaza
[4194307] = 10611862, -- Teleporter from northern Aetheryte Plaza to Government Sector
[4194308] = 10611864, -- Teleporter from Government Sector to northern Aetheryte Plaza
[4194309] = 10611868, -- Teleporter from Nexus Arcade ground floor to upper balcony
[4194310] = 10611881, -- Teleporter from upper balcony to Nexus Arcade ground floor
[4194305] = 10611851,
[4194306] = 10611861,
[4194307] = 10611862,
[4194308] = 10611864,
[4194309] = 10611868,
[4194310] = 10611881,
}
function onEnterTrigger(player)

1
src/world/event.rs
View file

@ -62,7 +62,6 @@ impl Event {
let mut run_script = || {
self.lua.scope(|scope| {
let player = scope.create_userdata_ref_mut(player)?;
//let zone = scope.create_userdata_ref(zone)?;
let func: Function = self.lua.globals().get("onEnterTrigger")?;