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
bf935ac0
Commit
bf935ac0
authored
10 years ago
by
Alex Ksandra
Browse files
Options
Downloads
Patches
Plain Diff
Made summons' reaction towards iced player more consistent/sensible.
parent
ab0e1946
No related branches found
No related tags found
1 merge request
!117
Ice reaction fix
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
game/modules/tome/class/Actor.lua
+3
-3
3 additions, 3 deletions
game/modules/tome/class/Actor.lua
with
3 additions
and
3 deletions
game/modules/tome/class/Actor.lua
+
3
−
3
View file @
bf935ac0
...
...
@@ -1510,8 +1510,8 @@ end
--- What is our reaction toward the target
-- This can modify faction reaction using specific actor to actor reactions
function _M:reactionToward(target, no_reflection)
if target == self and self:attr("
encased_in_ice
") then return -100 end
function _M:reactionToward(target, no_reflection
, not_actually_us
)
if target == self and self:attr("
encased_in_ice
")
and not_actually_us
then return -100 end
-- Neverending hatred
if self:attr("
hates_everybody
") and target ~= self then return -100 end
...
...
@@ -1519,7 +1519,7 @@ function _M:reactionToward(target, no_reflection)
if self:attr("
hates_antimagic
") and target:attr("
forbid_arcane
") then return -100 end
-- If self or target is a summon bound to a master's will, use the master instead
if self.summoner then return self.summoner:reactionToward(target, no_reflection) end
if self.summoner then return self.summoner:reactionToward(target, no_reflection
, true
) end
if target.summoner then target = target.summoner end
local v = engine.Actor.reactionToward(self, target)
...
...
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