crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix type error by converting explicitely to int. 

Display message only if the wielder is a player.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@22059 282e977c-c81d-0410-88c4-b93c2d0d6712
master
ryo_saeba 2021-04-07 18:35:48 +00:00
parent faf3b3b81e
commit f07e438d1b
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2021-04-07 Nicolas Weeger
* python/events/gkill/sword_of_souls.py: Fix type error by converting explicitely to int.
* python/items/curse_on_apply.py,
* python/items/lose_buffs_on_drop.py: Display message only if the wielder is a player.
2021-03-17 Nicolas Weeger 2021-03-17 Nicolas Weeger
* quests/peterm/DragonQuest/ElectricHatchery, * quests/peterm/DragonQuest/ElectricHatchery,
* quests/peterm/DragonQuest/FireHatchery, * quests/peterm/DragonQuest/FireHatchery,

2
python/events/gkill/sword_of_souls.py
View File

@ -24,7 +24,7 @@ if killer.Owner is None and killer.Type == Crossfire.Type.PLAYER:
# Add experience to the weapon (though we only care about the total_exp field) # Add experience to the weapon (though we only care about the total_exp field)
# As the weapon gets stronger, it takes a larger share of the exp, # As the weapon gets stronger, it takes a larger share of the exp,
# with a baseline of half at level 0, and taking all of it at level 115. # with a baseline of half at level 0, and taking all of it at level 115.
weap.AddExp((victim.Exp * (1.0 + weap.ItemPower / 115.0)) // 2) weap.AddExp(int(victim.Exp * (1.0 + weap.ItemPower / 115.0)) // 2)
# Determine the change in XP # Determine the change in XP
delta_exp = weap.TotalExp - old_xp delta_exp = weap.TotalExp - old_xp

2
python/items/curse_on_apply.py
View File

@ -4,7 +4,7 @@ me = Crossfire.WhoAmI()
ac = Crossfire.WhoIsActivator() ac = Crossfire.WhoIsActivator()
# Since this checks before equipping actually occurs, Applied will be 0 when we apply # Since this checks before equipping actually occurs, Applied will be 0 when we apply
if me.Applied == 0: if me.Applied == 0 and ac.Type == Crossfire.Type.PLAYER:
ac.Write("You feel the "+me.Name+" bind to you.") ac.Write("You feel the "+me.Name+" bind to you.")
me.Cursed = 1 me.Cursed = 1
me.KnownCursed = 1 me.KnownCursed = 1

5
python/items/lose_buffs_on_drop.py
View File

@ -4,7 +4,7 @@ me = Crossfire.WhoAmI()
ac = Crossfire.WhoIsActivator() ac = Crossfire.WhoIsActivator()
# It is assumed that this buffed weapon uses PermExp to denote how much it has been used. # It is assumed that this buffed weapon uses PermExp to denote how much it has been used.
if me.PermExp > 0: if me.PermExp() > 0:
me.Str = me.Archetype.Clone.Str me.Str = me.Archetype.Clone.Str
me.Dex = me.Archetype.Clone.Dex me.Dex = me.Archetype.Clone.Dex
me.Con = me.Archetype.Clone.Con me.Con = me.Archetype.Clone.Con
@ -25,4 +25,5 @@ if me.PermExp > 0:
# Experience should be affected before Item Power, since it affects that field # Experience should be affected before Item Power, since it affects that field
me.AddExp(-me.TotalExp) me.AddExp(-me.TotalExp)
me.ItemPower = me.Archetype.Clone.ItemPower me.ItemPower = me.Archetype.Clone.ItemPower
ac.Write("The "+me.Name+" shudders and looks almost like a normal weapon again.") if ac.Type == Crossfire.Type.PLAYER:
ac.Write("The "+me.Name+" shudders and looks almost like a normal weapon again.")