From 06d56375c26b929c9af920165835d2403413935e Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Wed, 12 Apr 2023 18:41:03 +0200 Subject: [PATCH] obsolete scriptstate removal --- .../CameraPlacementHelper.cecc3e.json | 2 +- .../jaqenZannsNavigationOverlayTile.9f2481.json | 2 +- ...nZannsNavigationOverlayTile.9f2481.luascriptstate | 1 - .../jaqenZannsNavigationOverlayTile.9f2481.ttslua | 12 ++++-------- 4 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.luascriptstate diff --git a/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/CameraPlacementHelper.cecc3e.json b/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/CameraPlacementHelper.cecc3e.json index 88e21fe4..f3ff8eb3 100644 --- a/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/CameraPlacementHelper.cecc3e.json +++ b/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/CameraPlacementHelper.cecc3e.json @@ -28,7 +28,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": false, - "LuaScriptState": "{\"distance\":\"12\",\"pitch\":\"74\"}", + "LuaScriptState": "", "LuaScript_path": "OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/CameraPlacementHelper.cecc3e.ttslua", "MeasureMovement": false, "Name": "Custom_Assetbundle", diff --git a/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.json b/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.json index e6816fe0..4e7766d6 100644 --- a/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.json +++ b/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.json @@ -33,7 +33,7 @@ "IgnoreFoW": false, "LayoutGroupSortIndex": 0, "Locked": false, - "LuaScriptState_path": "OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.luascriptstate", + "LuaScriptState": "", "LuaScript_path": "OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.ttslua", "MeasureMovement": false, "Name": "Custom_Tile", diff --git a/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.luascriptstate b/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.luascriptstate deleted file mode 100644 index 923cb1c5..00000000 --- a/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.luascriptstate +++ /dev/null @@ -1 +0,0 @@ -{"cameras":[[{"distance":17.844,"pitch":74,"position":[-1.626,-2.5,0],"yaw":90},{"distance":-1,"pitch":74,"position":[-27.822,-2.5,0.424],"yaw":90},{"distance":-1,"pitch":74,"position":[-31.592,-2.5,26.392],"yaw":180},{"distance":-1,"pitch":74,"position":[-55.026,-2.5,12.052],"yaw":90},{"distance":-1,"pitch":74,"position":[-55.026,-2.5,-11.479],"yaw":90},{"distance":-1,"pitch":74,"position":[-31.592,-2.5,-26.392],"yaw":0},{"distance":16,"pitch":74,"position":[-3.029,1.652,24.296],"yaw":90},{"distance":16,"pitch":74,"position":[-2.936,1.552,-26.757],"yaw":90},{"distance":10,"pitch":74,"position":[-11.833,1.491,-0.145],"yaw":90},{"distance":10,"pitch":74,"position":[-48.352,1.552,-0.055],"yaw":90},{"distance":35,"pitch":74,"position":[12.56,1.912,0.458],"yaw":90},{"distance":22,"pitch":74,"position":[57.835,1.552,75.385],"yaw":90},{"distance":10,"pitch":74,"position":[60.377,1.552,55.941],"yaw":90},{"distance":35,"pitch":74,"position":[27.482,1.48,71.057],"yaw":90},{"distance":22,"pitch":74,"position":[-19.481,1.552,70.88],"yaw":90},{"distance":42,"pitch":74,"position":[-52.918,1.478,70.899],"yaw":90},{"distance":60,"pitch":60,"position":[24.551,2.222,-71.284],"yaw":90},{"distance":27,"pitch":74,"position":[-59.077,1.462,-85.472],"yaw":90}],[{"distance":17.844,"pitch":74,"position":[-1.626,-2.5,0],"yaw":90},{"distance":-1,"pitch":74,"position":[-27.822,-2.5,0.424],"yaw":90},{"distance":-1,"pitch":74,"position":[-31.592,-2.5,26.392],"yaw":180},{"distance":-1,"pitch":74,"position":[-55.026,-2.5,12.052],"yaw":90},{"distance":-1,"pitch":74,"position":[-55.026,-2.5,-11.479],"yaw":90},{"distance":-1,"pitch":74,"position":[-31.592,-2.5,-26.392],"yaw":0},{"distance":16,"pitch":74,"position":[-3.029,1.652,24.296],"yaw":90},{"distance":16,"pitch":74,"position":[-2.936,1.552,-26.757],"yaw":90},{"distance":10,"pitch":74,"position":[-11.833,1.491,-0.145],"yaw":90},{"distance":10,"pitch":74,"position":[-48.352,1.552,-0.055],"yaw":90},{"distance":35,"pitch":74,"position":[12.56,1.912,0.458],"yaw":90},{"distance":22,"pitch":74,"position":[57.835,1.552,75.385],"yaw":90},{"distance":10,"pitch":74,"position":[60.377,1.552,55.941],"yaw":90},{"distance":35,"pitch":74,"position":[27.482,1.48,71.057],"yaw":90},{"distance":22,"pitch":74,"position":[-19.481,1.552,70.88],"yaw":90},{"distance":42,"pitch":74,"position":[-52.918,1.478,70.899],"yaw":90},{"distance":60,"pitch":60,"position":[24.551,2.222,-71.284],"yaw":90},{"distance":27,"pitch":74,"position":[-59.077,1.462,-85.472],"yaw":90}],[{"distance":17.844,"pitch":74,"position":[-1.626,-2.5,0],"yaw":90},{"distance":-1,"pitch":74,"position":[-27.822,-2.5,0.424],"yaw":90},{"distance":-1,"pitch":74,"position":[-31.592,-2.5,26.392],"yaw":180},{"distance":-1,"pitch":74,"position":[-55.026,-2.5,12.052],"yaw":90},{"distance":-1,"pitch":74,"position":[-55.026,-2.5,-11.479],"yaw":90},{"distance":-1,"pitch":74,"position":[-31.592,-2.5,-26.392],"yaw":0},{"distance":16,"pitch":74,"position":[-3.029,1.652,24.296],"yaw":90},{"distance":16,"pitch":74,"position":[-2.936,1.552,-26.757],"yaw":90},{"distance":10,"pitch":74,"position":[-11.833,1.491,-0.145],"yaw":90},{"distance":10,"pitch":74,"position":[-48.352,1.552,-0.055],"yaw":90},{"distance":35,"pitch":74,"position":[12.56,1.912,0.458],"yaw":90},{"distance":22,"pitch":74,"position":[57.835,1.552,75.385],"yaw":90},{"distance":10,"pitch":74,"position":[60.377,1.552,55.941],"yaw":90},{"distance":35,"pitch":74,"position":[27.482,1.48,71.057],"yaw":90},{"distance":22,"pitch":74,"position":[-19.481,1.552,70.88],"yaw":90},{"distance":42,"pitch":74,"position":[-52.918,1.478,70.899],"yaw":90},{"distance":60,"pitch":60,"position":[24.551,2.222,-71.284],"yaw":90},{"distance":27,"pitch":74,"position":[-59.077,1.462,-85.472],"yaw":90}],[{"distance":17.844,"pitch":74,"position":[-1.626,-2.5,0],"yaw":90},{"distance":-1,"pitch":74,"position":[-27.822,-2.5,0.424],"yaw":90},{"distance":-1,"pitch":74,"position":[-31.592,-2.5,26.392],"yaw":180},{"distance":-1,"pitch":74,"position":[-55.026,-2.5,12.052],"yaw":90},{"distance":-1,"pitch":74,"position":[-55.026,-2.5,-11.479],"yaw":90},{"distance":-1,"pitch":74,"position":[-31.592,-2.5,-26.392],"yaw":0},{"distance":16,"pitch":74,"position":[-3.029,1.652,24.296],"yaw":90},{"distance":16,"pitch":74,"position":[-2.936,1.552,-26.757],"yaw":90},{"distance":10,"pitch":74,"position":[-11.833,1.491,-0.145],"yaw":90},{"distance":10,"pitch":74,"position":[-48.352,1.552,-0.055],"yaw":90},{"distance":35,"pitch":74,"position":[12.56,1.912,0.458],"yaw":90},{"distance":22,"pitch":74,"position":[57.835,1.552,75.385],"yaw":90},{"distance":10,"pitch":74,"position":[60.377,1.552,55.941],"yaw":90},{"distance":35,"pitch":74,"position":[27.482,1.48,71.057],"yaw":90},{"distance":22,"pitch":74,"position":[-19.481,1.552,70.88],"yaw":90},{"distance":42,"pitch":74,"position":[-52.918,1.478,70.899],"yaw":90},{"distance":60,"pitch":60,"position":[24.551,2.222,-71.284],"yaw":90},{"distance":27,"pitch":74,"position":[-59.077,1.462,-85.472],"yaw":90}]],"claims":[[true,true,true,false],[true,true,true,false],[true,true,true,false],[false,false,false,true]],"fullVis":[false,false,false,false],"playVis":[false,false,false,false]} diff --git a/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.ttslua b/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.ttslua index 906d5572..248d4b09 100644 --- a/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.ttslua +++ b/objects/OptionPanelSource.830bd0/jaqenZannsNavigationOverlay.a8affa/jaqenZannsNavigationOverlayTile.9f2481.ttslua @@ -207,10 +207,8 @@ function onLoad(saved_data) cameraParams = loaded_data.cameras fullVisibility = loaded_data.fullVis playVisibility = loaded_data.playVis - - local allclaims = loaded_data.claims for i = 1, 4 do - playermatData[i].claims = allclaims[i] + playermatData[i].claims = loaded_data.claims[i] end resetOverlay() @@ -698,7 +696,7 @@ function loadCamera(player, _, idValue) local minZ = playermatData[newMatIndex].minZ local maxZ = playermatData[newMatIndex].maxZ - for i, v in pairs(matObjects) do + for _, v in pairs(matObjects) do local obj = v.hit_object if obj.type == 'Card' or obj.type == 'Infinite' then local bounds = obj.getBounds() @@ -809,10 +807,8 @@ function getPlayerCount() playerColors[i] = color end - local playerList = getSeatedPlayers() - - for i, v in ipairs(playerList) do - for ii, vv in ipairs(playerColors) do + for _, v in ipairs(getSeatedPlayers()) do + for _, vv in ipairs(playerColors) do if v == vv then playerCount = playerCount + 1 end