lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed pet food.

Browse Source 
Contributed by manax182.
This commit is contained in:
MobiusDevelopment 2021-06-11 01:28:47 +00:00
parent d66d2a5b90
commit 767ce5b2ed
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Pet.java vendored
View File

@ -36,7 +36,7 @@ public class Pet implements ITargetTypeHandler
@Override
public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{
if (creature.isPet())
if ((creature.isPet()) || creature.hasPet())
{
return creature.getPet();
}

16
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93900-93999.xml vendored
View File

@ -893,16 +893,16 @@
<!-- Pet's satiety +1000. -->
<set name="icon" val="BranchSys3.icon1.g_studentenfutter_germany" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="etcitem_type" val="SCROLL" />
<set name="material" val="PAPER" />
<set name="is_stackable" val="true" />
<set name="is_tradable" val="false" />
<set name="is_dropable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_oly_restricted" val="true" />
<set name="immediate_effect" val="true" />
<set name="etcitem_type" val="POTION" />
<set name="commissionItemType" val="POTION" />
<set name="handler" val="ItemSkills" />
<set name="material" val="PAPER" />
<set name="weight" val="1" />
<set name="price" val="30" />
<set name="is_sellable" val="false" />
<set name="is_stackable" val="true" />
<set name="reuse_delay" val="60000"/>
<set name="commissionItemType" val="SCROLL_OTHER" />
<cond addName="1" msgId="113">
<player flyMounted="false" />
</cond>

8
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -662,6 +662,8 @@
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<item>32</item>
<item>33</item>
<item>36</item>
<item>37</item>
<item>38</item>
@ -695,10 +697,7 @@
<skill id="2048" toLevel="1" name="Pet Food">
<isMagic>2</isMagic> <!-- Static Skill -->
<magicLevel>1</magicLevel>
<abnormalTime>300</abnormalTime>
<operateType>A1</operateType>
<magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime>
<targetType>PET</targetType>
<affectScope>SINGLE</affectScope>
<itemConsumeCount>1</itemConsumeCount>
@ -965,10 +964,11 @@
<skill id="2060" toLevel="1" name="Healing Medicine">
<isMagic>2</isMagic> <!-- Static Skill -->
<magicLevel>1</magicLevel>
<abnormalTime>300</abnormalTime>
<operateType>A1</operateType>
<magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime>
<targetType>SELF</targetType>
<targetType>PET</targetType>
<affectScope>SINGLE</affectScope>
<effects>
<effect name="DispelBySlot">

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/targethandlers/Pet.java vendored
View File

@ -36,7 +36,7 @@ public class Pet implements ITargetTypeHandler
@Override
public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{
if (creature.isPet())
if ((creature.isPet()) || creature.hasPet())
{
return creature.getPet();
}

16
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93900-93999.xml vendored
View File

@ -893,16 +893,16 @@
<!-- Pet's satiety +1000. -->
<set name="icon" val="BranchSys3.icon1.g_studentenfutter_germany" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="etcitem_type" val="SCROLL" />
<set name="material" val="PAPER" />
<set name="is_stackable" val="true" />
<set name="is_tradable" val="false" />
<set name="is_dropable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_oly_restricted" val="true" />
<set name="immediate_effect" val="true" />
<set name="etcitem_type" val="POTION" />
<set name="commissionItemType" val="POTION" />
<set name="handler" val="ItemSkills" />
<set name="material" val="PAPER" />
<set name="weight" val="1" />
<set name="price" val="30" />
<set name="is_sellable" val="false" />
<set name="is_stackable" val="true" />
<set name="reuse_delay" val="60000"/>
<set name="commissionItemType" val="SCROLL_OTHER" />
<cond addName="1" msgId="113">
<player flyMounted="false" />
</cond>

8
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@ -662,6 +662,8 @@
<condition name="CanSummonPet" />
<condition name="OpCheckResidence">
<residencesId>
<item>32</item>
<item>33</item>
<item>36</item>
<item>37</item>
<item>38</item>
@ -695,10 +697,7 @@
<skill id="2048" toLevel="1" name="Pet Food">
<isMagic>2</isMagic> <!-- Static Skill -->
<magicLevel>1</magicLevel>
<abnormalTime>300</abnormalTime>
<operateType>A1</operateType>
<magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime>
<targetType>PET</targetType>
<affectScope>SINGLE</affectScope>
<itemConsumeCount>1</itemConsumeCount>
@ -965,10 +964,11 @@
<skill id="2060" toLevel="1" name="Healing Medicine">
<isMagic>2</isMagic> <!-- Static Skill -->
<magicLevel>1</magicLevel>
<abnormalTime>300</abnormalTime>
<operateType>A1</operateType>
<magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime>
<targetType>SELF</targetType>
<targetType>PET</targetType>
<affectScope>SINGLE</affectScope>
<effects>
<effect name="DispelBySlot">