Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tome
Tales of MajEyal
Commits
87964a30
There was a problem fetching the pipeline summary.
Commit
87964a30
authored
4 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
fix
parent
ca9ea578
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
game/engines/default/engine/Chat.lua
+17
-1
17 additions, 1 deletion
game/engines/default/engine/Chat.lua
with
17 additions
and
1 deletion
game/engines/default/engine/Chat.lua
+
17
−
1
View file @
87964a30
...
...
@@ -125,7 +125,7 @@ function _M:chatFormatActions(nodes, answer, node, stop_at)
end
---------------------------------------------------------------------------
if
node
.
name
==
"chat"
then
if
node
.
name
==
"chat"
or
node
.
name
==
"entry-selector"
then
answer
.
jump
=
node
.
data
.
chatid
---------------------------------------------------------------------------
elseif
node
.
name
==
"lua-code"
then
...
...
@@ -170,6 +170,22 @@ function _M:chatFormatActions(nodes, answer, node, stop_at)
end
return
self
:
chatFormatActions
(
nodes
,
answer
,
getnext
(),
stop_at
)
---------------------------------------------------------------------------
elseif
node
.
name
==
"object-has"
then
add_cond
(
function
(
npc
,
player
)
local
actor
=
node
.
data
.
who
==
"player"
and
player
or
npc
if
node
.
data
[
'in'
]
==
"all-inventories"
then
return
actor
:
findInAllInventoriesBy
(
node
.
data
.
search_by
,
node
.
data
.
search
)
elseif
node
.
data
[
'in'
]
==
"worn-inventories"
then
return
actor
:
findInAllWornInventoriesBy
(
true
,
node
.
data
.
search_by
,
node
.
data
.
search
)
elseif
node
.
data
[
'in'
]
==
"nonworn-inventories"
then
return
actor
:
findInAllWornInventoriesBy
(
false
,
node
.
data
.
search_by
,
node
.
data
.
search
)
else
return
actor
:
findInInventoryBy
(
actor
:
getInven
(
node
.
data
[
'in'
]),
node
.
data
.
search_by
,
node
.
data
.
search
)
end
return
end
)
return
self
:
chatFormatActions
(
nodes
,
answer
,
getnext
(),
stop_at
)
---------------------------------------------------------------------------
elseif
node
.
name
==
"attr-inc"
then
if
not
node
.
data
.
value
:
find
(
"return "
)
then
node
.
data
.
value
=
"return "
..
node
.
data
.
value
end
local
a
,
err
=
loadstring
(
node
.
data
.
value
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment