From 2bb25ef2d6067b32f8d23f11c1891160bc66b849 Mon Sep 17 00:00:00 2001 From: uramer Date: Sun, 13 Oct 2024 13:22:29 +0200 Subject: [PATCH 1/4] Use current cyan commit --- CI/teal_ci.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CI/teal_ci.sh b/CI/teal_ci.sh index b5b9b1b8e6..c3ff77c4aa 100755 --- a/CI/teal_ci.sh +++ b/CI/teal_ci.sh @@ -7,8 +7,7 @@ pushd . echo "Install Teal Cyan" git clone https://github.com/teal-language/cyan.git cd cyan -git checkout 51649e4a814c05deaf5dde929ba82803f5170bbc -sed -i 's/"tl"/"tl ~> 0.15"/' cyan-dev-1.rockspec +git checkout 71eaea271bff489d82a9fb575b823b161b996162 luarocks make cyan-dev-1.rockspec popd From bef9fc0a4b5c2997a8c2f73429630568f4c6ef1d Mon Sep 17 00:00:00 2001 From: uramer Date: Sun, 13 Oct 2024 17:36:29 +0200 Subject: [PATCH 2/4] Upload Teal artifacts on failure, avoid nested archives --- .gitlab-ci.yml | 3 ++- CI/teal_ci.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67a227bca7..1ceda268ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -196,8 +196,9 @@ Teal: script: - CI/teal_ci.sh artifacts: + when: always paths: - - teal_declarations.zip + - teal_declarations Ubuntu_GCC_Debug: extends: .Ubuntu diff --git a/CI/teal_ci.sh b/CI/teal_ci.sh index c3ff77c4aa..10af4854c8 100755 --- a/CI/teal_ci.sh +++ b/CI/teal_ci.sh @@ -12,4 +12,3 @@ luarocks make cyan-dev-1.rockspec popd scripts/generate_teal_declarations.sh ./teal_declarations -zip teal_declarations.zip -r teal_declarations From 7f886f184090420ebc38881b19bb3a4040026096 Mon Sep 17 00:00:00 2001 From: uramer Date: Sat, 19 Oct 2024 17:51:06 +0200 Subject: [PATCH 3/4] Use stable cyan, print teal versions in CI --- CI/teal_ci.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CI/teal_ci.sh b/CI/teal_ci.sh index 10af4854c8..6f5953f1be 100755 --- a/CI/teal_ci.sh +++ b/CI/teal_ci.sh @@ -7,8 +7,9 @@ pushd . echo "Install Teal Cyan" git clone https://github.com/teal-language/cyan.git cd cyan -git checkout 71eaea271bff489d82a9fb575b823b161b996162 -luarocks make cyan-dev-1.rockspec +git checkout v0.4.0 +luarocks make cyan-0.4.0-1.rockspec popd +cyan version scripts/generate_teal_declarations.sh ./teal_declarations From 244c4b4376eaee012e399a8c776395a13823adc8 Mon Sep 17 00:00:00 2001 From: uramer Date: Sun, 13 Oct 2024 13:27:32 +0200 Subject: [PATCH 4/4] Dono't use self as a type name, as it's reserved in Teal --- files/lua_api/openmw/self.lua | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/files/lua_api/openmw/self.lua b/files/lua_api/openmw/self.lua index c01174c1b4..4da5fa3ee9 100644 --- a/files/lua_api/openmw/self.lua +++ b/files/lua_api/openmw/self.lua @@ -1,7 +1,7 @@ --- -- `openmw.self` provides full access to the object the script is attached to. -- Can be used only from local scripts. All fields and function of `GameObject` are also available for `openmw.self`. --- @module self +-- @module Self -- @extends openmw.core#GameObject -- @usage local self = require('openmw.self') -- local types = require('openmw.types') @@ -14,18 +14,26 @@ --- -- Returns true if the script isActive (the object it is attached to is in an active cell). -- If it is not active, then `openmw.nearby` can not be used. --- @function [parent=#self] isActive --- @param self +-- @function [parent=#Self] isActive +-- @param Self -- @return #boolean --- -- The object the script is attached to (readonly) --- @field [parent=#self] openmw.core#GameObject object +-- @field [parent=#Self] openmw.core#GameObject object --- -- Movement controls (only for actors) --- @field [parent=#self] #ActorControls controls +-- @field [parent=#Self] #ActorControls controls + +--- +-- @type ATTACK_TYPE +-- @field #number NoAttack +-- @field #number Any +-- @field #number Chop +-- @field #number Slash +-- @field #number Thrust --- -- Allows to view and/or modify controls of an actor. All fields are mutable. @@ -37,20 +45,12 @@ -- @field [parent=#ActorControls] #boolean run true - run, false - walk -- @field [parent=#ActorControls] #boolean sneak If true - sneak -- @field [parent=#ActorControls] #boolean jump If true - initiate a jump --- @field [parent=#ActorControls] #ATTACK_TYPE use Activates the readied weapon/spell according to a provided value. For weapons, keeping this value modified will charge the attack until set to @{#ATTACK_TYPE.NoAttack}. If an @{#ATTACK_TYPE} not appropriate for a currently equipped weapon provided - an appropriate @{#ATTACK_TYPE} will be used instead. - ---- --- @type ATTACK_TYPE --- @field #number NoAttack --- @field #number Any --- @field #number Chop --- @field #number Slash --- @field #number Thrust +-- @field [parent=#ActorControls] #ATTACK_TYPE use Activates the readied weapon/spell according to a provided value. For weapons, keeping this value modified will charge the attack until set to @{#ATTACK_TYPE.NoAttack}. If an @#ATTACK_TYPE} not appropriate for a currently equipped weapon provided - an appropriate @{#ATTACK_TYPE} will be used instead. --- -- Enables or disables standard AI (enabled by default). --- @function [parent=#self] enableAI --- @param self +-- @function [parent=#Self] enableAI +-- @param Self -- @param #boolean v return nil