From 788108c5b8262c9f771b728ae21728cdee86ec71 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Wed, 25 Oct 2023 15:34:06 +0200 Subject: [PATCH 1/5] Added check for dead links and fixed dead links --- .github/workflows/gh-pages.yml | 9 +++++++++ docs/_config.yml | 2 ++ docs/buildsystem/build-docs.md | 2 +- docs/buildsystem/build-includes.md | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index b4faa62c8..48870d12c 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -67,3 +67,12 @@ jobs: - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v1 + + check: + runs-on: ubuntu-latest + needs: deploy + steps: + - name: Setup Node + uses: actions/setup-node@v3 + - run: npm install linkinator + - run: npx linkinator https://flightcontrol-master.github.io/MOOSE/ --recurse diff --git a/docs/_config.yml b/docs/_config.yml index c557105bd..00c94761f 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,3 +1,5 @@ +baseurl: "" +url: "https://flightcontrol-master.github.io/MOOSE/" repository: FlightControl-Master/MOOSE title: MOOSE description: MOOSE is a Mission Object Oriented Scripting Environment for mission designers in DCS World diff --git a/docs/buildsystem/build-docs.md b/docs/buildsystem/build-docs.md index 8247e30bb..3ad52c993 100644 --- a/docs/buildsystem/build-docs.md +++ b/docs/buildsystem/build-docs.md @@ -56,7 +56,7 @@ Main build steps to create the class documentation are defined in [.github/workf - Copy build result to `MOOSE_DOCS` folder. - Push results to the target repository. -[tree]: https://www.cyberciti.biz/faq/linux-show-directory-structure-command-line/ +[tree]: https://wiki.ubuntuusers.de/tree/ [LuaDoc]: https://keplerproject.github.io/luadoc/ [LuaDocumentor]: https://luarocks.org/modules/luarocks/luadocumentor [Applevangelist/luadocumentor]: https://github.com/Applevangelist/luadocumentor/tree/patch-1 diff --git a/docs/buildsystem/build-includes.md b/docs/buildsystem/build-includes.md index a3e84c38b..bdd683a22 100644 --- a/docs/buildsystem/build-includes.md +++ b/docs/buildsystem/build-includes.md @@ -35,7 +35,7 @@ Main build steps to create the include files are defined in [.github/workflows/b - Push results to [MOOSE_INCLUDE] repository [.github/workflows/build-includes.yml]: https://github.com/FlightControl-Master/MOOSE/blob/master/.github/workflows/build-includes.yml -[tree]: https://www.cyberciti.biz/faq/linux-show-directory-structure-command-line/ +[tree]: https://wiki.ubuntuusers.de/tree/ [lua5.3]: https://www.lua.org/manual/5.3/ [LuaRocks]: https://luarocks.org/ [LuaCheck]: https://github.com/mpeterv/luacheck From 5681244941abc351db9326e1620ebb568a105d98 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Wed, 25 Oct 2023 15:45:20 +0200 Subject: [PATCH 2/5] Fix for canonical link --- docs/_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_config.yml b/docs/_config.yml index 00c94761f..f40d6a2bb 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,5 +1,5 @@ baseurl: "" -url: "https://flightcontrol-master.github.io/MOOSE/" +url: "https://flightcontrol-master.github.io" repository: FlightControl-Master/MOOSE title: MOOSE description: MOOSE is a Mission Object Oriented Scripting Environment for mission designers in DCS World From 6bf6b933cc000ccbfb7e9c212a51f340539f93fc Mon Sep 17 00:00:00 2001 From: kaltokri Date: Wed, 25 Oct 2023 15:52:11 +0200 Subject: [PATCH 3/5] Fixed last broken link --- docs/buildsystem/gh-pages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/buildsystem/gh-pages.md b/docs/buildsystem/gh-pages.md index 99277ed20..94ed78fa9 100644 --- a/docs/buildsystem/gh-pages.md +++ b/docs/buildsystem/gh-pages.md @@ -34,7 +34,7 @@ This can be displayed as follows: - You need a working installation of [Docker]. - Go to the `docs` subfolder. - Run `docker compose up`. -- Open a browser with the following URL: . +- Open a browser with the following URL: `http://127.0.0.1:4000/`. - After a change of the [Markdown] files, wait some seconds and press F5 in the browser. [GitHub Pages]: https://pages.github.com/ From 31075f7c04bc40832bdd0c6a5779ac9c4538db9c Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 26 Oct 2023 12:45:41 +0200 Subject: [PATCH 4/5] #UNIT * Typos in IsTanker, added some typenames --- Moose Development/Moose/Wrapper/Unit.lua | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 496e7cef1..0fc411ebd 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -20,8 +20,8 @@ -- @module Wrapper.Unit -- @image Wrapper_Unit.JPG - ---- @type UNIT +--- +-- @type UNIT -- @field #string ClassName Name of the class. -- @field #string UnitName Name of the unit. -- @field #string GroupName Name of the group the unit belongs to. @@ -179,9 +179,9 @@ function UNIT:GetDCSObject() return DCSUnit end - if self.DCSUnit then - return self.DCSUnit - end + --if self.DCSUnit then + --return self.DCSUnit + --end return nil end @@ -561,7 +561,7 @@ end --- Check if the unit is a tanker. Also retrieves the refuelling system (boom or probe) if applicable. -- @param #UNIT self --- @return #boolean If true, unit is refuelable (checks for the attribute "Refuelable"). +-- @return #boolean If true, unit is a tanker (checks for the attribute "Tankers"). -- @return #number Refueling system (if any): 0=boom, 1=probe. function UNIT:IsTanker() self:F2( self.UnitName ) @@ -582,7 +582,7 @@ function UNIT:IsTanker() -- Some hard coded data as this is not in the descriptors... if typename=="IL-78M" then system=1 --probe - elseif typename=="KC130" then + elseif typename=="KC130" or typename=="KC130J" then system=1 --probe elseif typename=="KC135BDA" then system=1 --probe @@ -590,6 +590,10 @@ function UNIT:IsTanker() system=1 --probe elseif typename=="S-3B Tanker" then system=1 --probe + elseif typename=="KC_10_Extender" then + system=1 --probe + elseif typename=="KC_10_Extender_D" then + system=0 --boom end end From d8c2b8b71973383999d68cf9f015d26cef810785 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Fri, 27 Oct 2023 09:09:36 +0200 Subject: [PATCH 5/5] #UTILS * Added new tanke callsigns --- Moose Development/Moose/Utilities/Utils.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index 9fc3dd055..ab607f1b7 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -100,7 +100,10 @@ CALLSIGN={ Texaco=1, Arco=2, Shell=3, - }, + Navy_One=4, + Mauler=5, + Bloodhound=6, + }, -- JTAC JTAC={ Axeman=1,