Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
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
Otowa Kotori
Tales of MajEyal
Commits
9592d026
Commit
9592d026
authored
6 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
Increased escort tree masteries to 1.0
parent
facc274a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/modules/tome/data/chats/escort-quest.lua
+17
-17
17 additions, 17 deletions
game/modules/tome/data/chats/escort-quest.lua
game/modules/tome/data/quests/escort-duty.lua
+2
-0
2 additions, 0 deletions
game/modules/tome/data/quests/escort-duty.lua
with
19 additions
and
17 deletions
game/modules/tome/data/chats/escort-quest.lua
+
17
−
17
View file @
9592d026
...
@@ -23,7 +23,7 @@ local Stats = require("engine.interface.ActorStats")
...
@@ -23,7 +23,7 @@ local Stats = require("engine.interface.ActorStats")
local
reward_types
=
{
local
reward_types
=
{
warrior
=
{
warrior
=
{
types
=
{
types
=
{
[
"technique/conditioning"
]
=
0
.
8
,
[
"technique/conditioning"
]
=
1
.
0
,
},
},
talents
=
{
talents
=
{
[
Talents
.
T_VITALITY
]
=
1
,
[
Talents
.
T_VITALITY
]
=
1
,
...
@@ -37,7 +37,7 @@ local reward_types = {
...
@@ -37,7 +37,7 @@ local reward_types = {
},
},
divination
=
{
divination
=
{
types
=
{
types
=
{
[
"spell/divination"
]
=
0
.
8
,
[
"spell/divination"
]
=
1
.
0
,
},
},
talents
=
{
talents
=
{
[
Talents
.
T_ARCANE_EYE
]
=
1
,
[
Talents
.
T_ARCANE_EYE
]
=
1
,
...
@@ -50,7 +50,7 @@ local reward_types = {
...
@@ -50,7 +50,7 @@ local reward_types = {
},
},
antimagic
=
{
antimagic
=
{
types
=
{
types
=
{
[
"wild-gift/call"
]
=
0
.
8
,
[
"wild-gift/call"
]
=
1
.
0
,
},
},
saves
=
{
mental
=
4
},
saves
=
{
mental
=
4
},
talents
=
{
talents
=
{
...
@@ -65,8 +65,8 @@ local reward_types = {
...
@@ -65,8 +65,8 @@ local reward_types = {
},
},
alchemy
=
{
alchemy
=
{
types
=
{
types
=
{
[
"spell/staff-combat"
]
=
0
.
8
,
[
"spell/staff-combat"
]
=
1
.
0
,
[
"spell/stone-alchemy"
]
=
0
.
8
,
[
"spell/stone-alchemy"
]
=
1
.
0
,
},
},
talents
=
{
talents
=
{
[
Talents
.
T_CHANNEL_STAFF
]
=
1
,
[
Talents
.
T_CHANNEL_STAFF
]
=
1
,
...
@@ -79,7 +79,7 @@ local reward_types = {
...
@@ -79,7 +79,7 @@ local reward_types = {
},
},
antimagic
=
{
antimagic
=
{
types
=
{
types
=
{
[
"wild-gift/mindstar-mastery"
]
=
0
.
8
,
[
"wild-gift/mindstar-mastery"
]
=
1
.
0
,
},
},
talents
=
{
talents
=
{
[
Talents
.
T_PSIBLADES
]
=
1
,
[
Talents
.
T_PSIBLADES
]
=
1
,
...
@@ -94,7 +94,7 @@ local reward_types = {
...
@@ -94,7 +94,7 @@ local reward_types = {
},
},
survival
=
{
survival
=
{
types
=
{
types
=
{
[
"cunning/survival"
]
=
0
.
8
,
[
"cunning/survival"
]
=
1
.
0
,
},
},
talents
=
{
talents
=
{
[
Talents
.
T_HEIGHTENED_SENSES
]
=
1
,
[
Talents
.
T_HEIGHTENED_SENSES
]
=
1
,
...
@@ -108,7 +108,7 @@ local reward_types = {
...
@@ -108,7 +108,7 @@ local reward_types = {
},
},
sun_paladin
=
{
sun_paladin
=
{
types
=
{
types
=
{
[
"celestial/chants"
]
=
0
.
8
,
[
"celestial/chants"
]
=
1
.
0
,
},
},
talents
=
{
talents
=
{
[
Talents
.
T_CHANT_OF_FORTITUDE
]
=
1
,
[
Talents
.
T_CHANT_OF_FORTITUDE
]
=
1
,
...
@@ -119,9 +119,9 @@ local reward_types = {
...
@@ -119,9 +119,9 @@ local reward_types = {
[
Stats
.
STAT_MAG
]
=
5
,
[
Stats
.
STAT_MAG
]
=
5
,
},
},
antimagic
=
{
antimagic
=
{
--
types = {
types
=
{
--
["
technique/mobility"] = 0.8, --imagine a world where paradox mage/archmage etc could access trained reactions
[
"
psionic/augmented-mobility"
]
=
1
.
0
,
--
},
},
talents
=
{
talents
=
{
[
Talents
.
T_DISENGAGE
]
=
1
,
[
Talents
.
T_DISENGAGE
]
=
1
,
[
Talents
.
T_EVASION
]
=
1
,
[
Talents
.
T_EVASION
]
=
1
,
...
@@ -135,7 +135,7 @@ local reward_types = {
...
@@ -135,7 +135,7 @@ local reward_types = {
},
},
defiler
=
{
defiler
=
{
types
=
{
types
=
{
[
"corruption/curses"
]
=
0
.
8
,
[
"corruption/curses"
]
=
1
.
0
,
},
},
talents
=
{
talents
=
{
[
Talents
.
T_CURSE_OF_DEFENSELESSNESS
]
=
1
,
[
Talents
.
T_CURSE_OF_DEFENSELESSNESS
]
=
1
,
...
@@ -148,7 +148,7 @@ local reward_types = {
...
@@ -148,7 +148,7 @@ local reward_types = {
},
},
antimagic
=
{
antimagic
=
{
types
=
{
types
=
{
[
"psionic/feedback"
]
=
0
.
8
,
[
"psionic/feedback"
]
=
1
.
0
,
},
},
talents
=
{
talents
=
{
[
Talents
.
T_RESONANCE_FIELD
]
=
1
,
[
Talents
.
T_RESONANCE_FIELD
]
=
1
,
...
@@ -163,7 +163,7 @@ local reward_types = {
...
@@ -163,7 +163,7 @@ local reward_types = {
},
},
temporal
=
{
temporal
=
{
types
=
{
types
=
{
[
"chronomancy/chronomancy"
]
=
0
.
8
,
[
"chronomancy/chronomancy"
]
=
1
.
0
,
},
},
talents
=
{
talents
=
{
[
Talents
.
T_PRECOGNITION
]
=
1
,
[
Talents
.
T_PRECOGNITION
]
=
1
,
...
@@ -175,7 +175,7 @@ local reward_types = {
...
@@ -175,7 +175,7 @@ local reward_types = {
},
},
antimagic
=
{
antimagic
=
{
types
=
{
types
=
{
[
"psionic/dreaming"
]
=
0
.
8
,
[
"psionic/dreaming"
]
=
1
.
0
,
},
},
talents
=
{
talents
=
{
[
Talents
.
T_SLEEP
]
=
1
,
[
Talents
.
T_SLEEP
]
=
1
,
...
@@ -263,7 +263,7 @@ local function generate_rewards()
...
@@ -263,7 +263,7 @@ local function generate_rewards()
level
=
math.min
(
t
.
points
-
game
.
player
:
getTalentLevelRaw
(
tid
),
level
)
level
=
math.min
(
t
.
points
-
game
.
player
:
getTalentLevelRaw
(
tid
),
level
)
if
level
>
0
then
if
level
>
0
then
local
doit
=
function
(
npc
,
player
)
game
.
party
:
reward
(
"Select the party member to receive the reward:"
,
function
(
player
)
local
doit
=
function
(
npc
,
player
)
game
.
party
:
reward
(
"Select the party member to receive the reward:"
,
function
(
player
)
if
game
.
player
:
knowTalentType
(
t
.
type
[
1
])
==
nil
then
player
:
setTalentTypeMastery
(
t
.
type
[
1
],
0
.
8
)
end
if
game
.
player
:
knowTalentType
(
t
.
type
[
1
])
==
nil
then
player
:
setTalentTypeMastery
(
t
.
type
[
1
],
1
.
0
)
end
player
:
learnTalent
(
tid
,
true
,
level
,
{
no_unlearn
=
true
})
player
:
learnTalent
(
tid
,
true
,
level
,
{
no_unlearn
=
true
})
if
t
.
hide
then
player
.
__show_special_talents
=
player
.
__show_special_talents
or
{}
player
.
__show_special_talents
[
tid
]
=
true
end
if
t
.
hide
then
player
.
__show_special_talents
=
player
.
__show_special_talents
or
{}
player
.
__show_special_talents
[
tid
]
=
true
end
player
:
hasQuest
(
npc
.
quest_id
).
reward_message
=
(
"%s talent %s (+%d level(s))"
):
format
(
game
.
player
:
knowTalent
(
tid
)
and
"improved"
or
"learnt"
,
t
.
name
,
level
)
player
:
hasQuest
(
npc
.
quest_id
).
reward_message
=
(
"%s talent %s (+%d level(s))"
):
format
(
game
.
player
:
knowTalent
(
tid
)
and
"improved"
or
"learnt"
,
t
.
name
,
level
)
...
@@ -275,7 +275,7 @@ local function generate_rewards()
...
@@ -275,7 +275,7 @@ local function generate_rewards()
on_select
=
function
(
npc
,
player
)
on_select
=
function
(
npc
,
player
)
game
.
tooltip_x
,
game
.
tooltip_y
=
1
,
1
game
.
tooltip_x
,
game
.
tooltip_y
=
1
,
1
local
mastery
=
nil
local
mastery
=
nil
if
player
:
knowTalentType
(
t
.
type
[
1
])
==
nil
then
mastery
=
0
.
8
end
if
player
:
knowTalentType
(
t
.
type
[
1
])
==
nil
then
mastery
=
1
.
0
end
game
:
tooltipDisplayAtMap
(
game
.
w
,
game
.
h
,
"#GOLD#"
..
t
.
name
..
"#LAST#\n"
..
tostring
(
player
:
getTalentFullDescription
(
t
,
1
,
nil
,
mastery
)))
game
:
tooltipDisplayAtMap
(
game
.
w
,
game
.
h
,
"#GOLD#"
..
t
.
name
..
"#LAST#\n"
..
tostring
(
player
:
getTalentFullDescription
(
t
,
1
,
nil
,
mastery
)))
end
,
end
,
}
}
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/data/quests/escort-duty.lua
+
2
−
0
View file @
9592d026
...
@@ -349,6 +349,8 @@ on_grant = function(self, who)
...
@@ -349,6 +349,8 @@ on_grant = function(self, who)
end
end
end
end
for
i
,
pp
in
ipairs
(
possible_types
)
do
if
pp
.
name
==
"lost sun paladin"
then
self
.
kind
=
pp
end
end
escorts_seen
[
self
.
kind
.
name
]
=
(
escorts_seen
[
self
.
kind
.
name
]
or
0
)
+
1
escorts_seen
[
self
.
kind
.
name
]
=
(
escorts_seen
[
self
.
kind
.
name
]
or
0
)
+
1
if
self
.
kind
.
random
==
"player"
then
if
self
.
kind
.
random
==
"player"
then
...
...
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