From 270b1763f3f458f3ae02a6737e5e4155519ea6af Mon Sep 17 00:00:00 2001 From: ineedbots Date: Fri, 3 Sep 2021 10:56:14 -0600 Subject: [PATCH] Added vscode settings, deploy when clone --- .gitignore | 1 + .vscode/settings.json | 8 ++++++++ deploy.js | 3 +++ raw/maps/mp/bots/_bot_utility.gsc | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 1967b33..5a0dcd5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # Files to not ignore !/.gitignore +!/.vscode # Folder to not ignore !/raw diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..ef0aeab --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "astyle.astylerc": "${workspaceRoot}/.astylerc", + "astyle.additional_languages": [ + "gsc" + ], + "editor.defaultFormatter": "chiehyu.vscode-astyle", + "editor.formatOnSave": true +} \ No newline at end of file diff --git a/deploy.js b/deploy.js index 33ac044..e87fdab 100644 --- a/deploy.js +++ b/deploy.js @@ -40,6 +40,9 @@ async function doDeploy() { await exec(`git clone ${repo_url} && cd ${repo_name} && git submodule update --init --recursive`) printToConsole('Cloned!') + printToConsole('Deploying...') + await exec('deploy.bat') + printToConsole('Deployed!') } catch (f) { printToConsole(f, true) } diff --git a/raw/maps/mp/bots/_bot_utility.gsc b/raw/maps/mp/bots/_bot_utility.gsc index 648d498..577d7b5 100644 --- a/raw/maps/mp/bots/_bot_utility.gsc +++ b/raw/maps/mp/bots/_bot_utility.gsc @@ -1062,7 +1062,7 @@ load_waypoints() case "mp_hillside_ss": level.waypoints = maps\mp\bots\waypoints\getaway::Getaway(); break; - + case "mp_terminal_cls": level.waypoints = maps\mp\bots\waypoints\terminal::Terminal(); break;