Skip to content
Browse files

Merge branch 'master' of https://github.com/Meridian59/Meridian59

  • Loading branch information...
2 parents 8b09aee + 2795342 commit bf323f96ab894731a87b0b5eadfefefa0dbbd7ee @Meridian59 committed Oct 25, 2012
View
2 kod/object/active/holder/nomoveon/battler/monster/cow.kod
@@ -36,7 +36,7 @@ resources:
cow_dung = "Startled, the poor cow deposits a steaming heap of dung onto the ground."
classvars:
- vrName = cow_koc_name_rsc
+ vrKocName = cow_koc_name_rsc
vrName = cow_name_rsc
vrIcon = cow_icon_rsc
vrDesc = cow_desc_rsc
View
2 kod/object/item.kod
@@ -392,7 +392,7 @@ messages:
{
lData = Send(self,@GetAttributeData,#ItemAtt=IA_BONDED);
Send(Send(SYS,@FindSpellByNum,#num=SID_BOND),@BondedItemReport,
- #BondedItem=self,#BondedPlayer=Nth(lData,3),
+ #BondedItem=self,#BondedPlayer=Nth(lData,2),
#BondedItemOwner=what);
}
View
2 kod/object/passive/spell/cursewp.kod
@@ -22,7 +22,7 @@ resources:
curseweapon_name_rsc = "curse weapon"
- curseweapon_icon_rsc = iunholyw.bgf
+ curseweapon_icon_rsc = icurswpn.bgf
curseweapon_desc_rsc = \
"Makes the target weapon nearly ineffective for a time, "
"and curses the user to wield it until he or she gains "
View
2 kod/object/passive/spell/dement.kod
@@ -129,7 +129,7 @@ messages:
}
Send(oDementia,@MakeSick,#who=oTarget,#iAmount=(iSpellPower/3+1),
- #duration=send(self,@GetDuration,#iSpellPower=iSpellPower));
+ #iDuration=send(self,@GetDuration,#iSpellPower=iSpellPower));
propagate;
}
View
2 kod/object/passive/spell/enfeeble.kod
@@ -129,7 +129,7 @@ messages:
}
Send(oPalsy,@MakeSick,#who=oTarget,#iAmount=(iSpellPower/3+1),
- #duration=send(self,@GetDuration,#iSpellPower=iSpellPower));
+ #iDuration=send(self,@GetDuration,#iSpellPower=iSpellPower));
propagate;
}

0 comments on commit bf323f9

Please sign in to comment.
Something went wrong with that request. Please try again.