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
1c4e870e
Commit
1c4e870e
authored
10 years ago
by
Eric Wykoff
Browse files
Options
Downloads
Patches
Plain Diff
warden weapon swaps no longer make shuffling sounds
parent
472c8e6a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!191
More fixes
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/modules/tome/class/Actor.lua
+4
-4
4 additions, 4 deletions
game/modules/tome/class/Actor.lua
game/modules/tome/data/talents/chronomancy/other.lua
+2
-0
2 additions, 0 deletions
game/modules/tome/data/talents/chronomancy/other.lua
with
6 additions
and
4 deletions
game/modules/tome/class/Actor.lua
+
4
−
4
View file @
1c4e870e
...
...
@@ -3612,7 +3612,7 @@ end
--- Call when an object is worn
-- This doesnt call the base interface onWear, it copies the code because we need some tricky stuff
function
_M
:
onWear
(
o
,
inven_id
,
bypass_set
)
function
_M
:
onWear
(
o
,
inven_id
,
bypass_set
,
silent
)
o
.
wielded
=
{}
if
self
.
player
then
o
:
forAllStack
(
function
(
so
)
so
.
__transmo
=
false
end
)
end
...
...
@@ -3749,11 +3749,11 @@ function _M:onWear(o, inven_id, bypass_set)
self
:
checkTwoHandedPenalty
()
self
:
updateModdableTile
()
if
self
==
game
.
player
and
not
bypass_set
then
game
:
playSound
(
"actions/wear"
)
end
if
self
==
game
.
player
and
not
bypass_set
and
not
self
:
attr
(
"no_sound"
)
then
game
:
playSound
(
"actions/wear"
)
end
end
--- Call when an object is taken off
function
_M
:
onTakeoff
(
o
,
inven_id
,
bypass_set
)
function
_M
:
onTakeoff
(
o
,
inven_id
,
bypass_set
,
silent
)
engine
.
interface
.
ActorInventory
.
onTakeoff
(
self
,
o
,
inven_id
)
if
o
.
talent_on_spell
then
...
...
@@ -3849,7 +3849,7 @@ function _M:onTakeoff(o, inven_id, bypass_set)
self
:
checkTwoHandedPenalty
()
self
:
updateModdableTile
()
if
self
==
game
.
player
and
not
bypass_set
then
game
:
playSound
(
"actions/takeoff"
)
end
if
self
==
game
.
player
and
not
bypass_set
and
not
self
:
attr
(
"no_sound"
)
then
game
:
playSound
(
"actions/takeoff"
)
end
end
function
_M
:
checkTwoHandedPenalty
()
...
...
This diff is collapsed.
Click to expand it.
game/modules/tome/data/talents/chronomancy/other.lua
+
2
−
0
View file @
1c4e870e
...
...
@@ -103,7 +103,9 @@ doWardenWeaponSwap = function(self, t, type, silent)
if
swap
==
true
then
local
old_inv_access
=
self
.
no_inventory_access
-- Make sure clones can swap
self
.
no_inventory_access
=
nil
self
:
attr
(
"no_sound"
,
1
)
self
:
quickSwitchWeapons
(
true
,
"warden"
,
silent
)
self
:
attr
(
"no_sound"
,
-
1
)
self
.
no_inventory_access
=
old_inv_access
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