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
87137567
Commit
87137567
authored
10 years ago
by
Alex Ksandra
Browse files
Options
Downloads
Patches
Plain Diff
Tight grip round 2, thank you running game not reloading files.
parent
5d88e341
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!223
Small fixes
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/modules/tome/data/birth/classes/psionic.lua
+1
-11
1 addition, 11 deletions
game/modules/tome/data/birth/classes/psionic.lua
game/modules/tome/resolvers.lua
+6
-2
6 additions, 2 deletions
game/modules/tome/resolvers.lua
with
7 additions
and
13 deletions
game/modules/tome/data/birth/classes/psionic.lua
+
1
−
11
View file @
87137567
...
...
@@ -103,23 +103,13 @@ newBirthDescriptor{
resolvers
.
equipbirth
{
id
=
true
,
{
type
=
"armor"
,
subtype
=
"cloth"
,
name
=
"linen robe"
,
autoreq
=
true
,
ego_chance
=-
1000
},
{
type
=
"weapon"
,
subtype
=
"greatsword"
,
name
=
"iron greatsword"
,
autoreq
=
true
,
ego_chance
=-
1000
},
{
type
=
"weapon"
,
subtype
=
"greatsword"
,
name
=
"iron greatsword"
,
autoreq
=
true
,
ego_chance
=-
1000
,
force_inven
=
"PSIONIC_FOCUS"
}
},
resolvers
.
inventorybirth
{
id
=
true
,
{
type
=
"weapon"
,
subtype
=
"mindstar"
,
name
=
"mossy mindstar"
,
autoreq
=
true
,
ego_chance
=-
1000
},
{
type
=
"weapon"
,
subtype
=
"mindstar"
,
name
=
"mossy mindstar"
,
autoreq
=
true
,
ego_chance
=-
1000
},
{
type
=
"gem"
,},
},
resolvers
.
generic
(
function
(
self
)
-- Make and wield some alchemist gems
local
gs
=
game
.
zone
:
makeEntity
(
game
.
level
,
"object"
,
{
type
=
"weapon"
,
subtype
=
"greatsword"
,
name
=
"iron greatsword"
,
ego_chance
=-
1000
},
nil
,
true
)
if
gs
then
local
pf
=
self
:
getInven
(
"PSIONIC_FOCUS"
)
if
pf
then
self
:
addObject
(
pf
,
gs
)
gs
:
identify
(
true
)
end
end
end
),
},
copy_add
=
{
life_rating
=
-
2
,
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/resolvers.lua
+
6
−
2
View file @
87137567
...
...
@@ -76,8 +76,12 @@ function resolvers.calc.equip(t, e)
end
end
if
e
:
wearObject
(
o
,
true
,
false
)
==
false
then
e
:
addObject
(
e
.
INVEN_INVEN
,
o
)
if
e
:
wearObject
(
o
,
true
,
false
,
filter
.
force_inven
or
nil
,
filter
.
force_item
or
nil
)
==
false
then
if
filter
.
force_inven
then
-- we just really want it
e
:
addObject
(
filter
.
force_inven
,
o
,
true
,
filter
.
force_item
)
else
e
:
addObject
(
e
.
INVEN_INVEN
,
o
)
end
end
-- Do not drop it unless it is an ego or better
...
...
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