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
K'van
Tales of MajEyal
Commits
a36247b1
Commit
a36247b1
authored
10 years ago
by
Alex Ksandra
Browse files
Options
Downloads
Patches
Plain Diff
Made friendlyfire more consistent.
parent
ed1fd9b4
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/engines/default/engine/Target.lua
+1
-1
1 addition, 1 deletion
game/engines/default/engine/Target.lua
game/modules/tome/data/talents/spells/explosives.lua
+1
-1
1 addition, 1 deletion
game/modules/tome/data/talents/spells/explosives.lua
with
2 additions
and
2 deletions
game/engines/default/engine/Target.lua
+
1
−
1
View file @
a36247b1
...
...
@@ -459,7 +459,7 @@ _M.defaults.block_path = function(typ, lx, ly, for_highlights)
-- Reduce the nb blocking for friendlies
if
not
typ
.
friendlyblock
and
typ
.
source_actor
and
typ
.
source_actor
.
reactionToward
then
local
a
=
game
.
level
.
map
(
lx
,
ly
,
engine
.
Map
.
ACTOR
)
if
a
and
typ
.
source_actor
:
reactionToward
(
a
)
>
0
then
if
a
and
typ
.
source_actor
:
reactionToward
(
a
)
>
=
0
then
nb
=
nb
-
1
end
end
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/data/talents/spells/explosives.lua
+
1
−
1
View file @
a36247b1
...
...
@@ -106,7 +106,7 @@ newTalent{
self
:
callTalent
(
self
.
T_DYNAMIC_RECHARGE
,
"applyEffect"
,
golem
)
end
else
-- reduced damage to friendly npcs (could make random chance like friendlyfire instead)
if
target
and
self
:
reactionToward
(
target
)
>
0
then
d
=
dam
*
(
1
-
prot
)
end
if
target
and
self
:
reactionToward
(
target
)
>
=
0
then
d
=
dam
*
(
1
-
prot
)
end
end
if
d
<=
0
then
return
end
...
...
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