diff --git a/scripts/npc/1012007.js b/scripts/npc/1012007.js index 8702b3d042..f16786c7be 100644 --- a/scripts/npc/1012007.js +++ b/scripts/npc/1012007.js @@ -43,7 +43,7 @@ function action(mode, type, selection) { cm.sendNextPrev("Hmmm ... did you really get here with your pet? These obstacles are for pets. What are you here for without it?? Get outta here!"); } else { cm.gainItem(4031035, -1); - cm.gainCloseness(2, 0); + cm.gainTameness(2); cm.sendNextPrev("What do you think? Don't you think you have gotten much closer with your pet? If you have time, train your pet again on this obstacle course...of course, with my brother's permission."); } cm.dispose(); diff --git a/scripts/npc/2040033.js b/scripts/npc/2040033.js index b0ca42641e..2e2330d0f5 100644 --- a/scripts/npc/2040033.js +++ b/scripts/npc/2040033.js @@ -45,7 +45,7 @@ function action(mode, type, selection) { cm.sendNextPrev("Hmmm ... did you really get here with your pet? These obstacles are for pets. What are you here for without it?? Get outta here!"); } else { cm.gainItem(4031128, -1); - cm.gainCloseness(4); + cm.gainTameness(4); cm.sendNextPrev("What do you think? Don't you think you have gotten much closer with your pet? If you have time, train your pet again on this obstacle course...of course, with my brother's permission."); } cm.dispose(); diff --git a/scripts/npc/waterOfLife.js b/scripts/npc/waterOfLife.js index 62aa82158e..bc393237ae 100644 --- a/scripts/npc/waterOfLife.js +++ b/scripts/npc/waterOfLife.js @@ -65,7 +65,7 @@ function action(mode, type, selection) { while (dIter.hasNext()) { var dPet = dIter.next(); - listStr += "#b#L" + i + "# " + dPet.getName() + " #k - Lv " + dPet.getLevel() + " Closeness " + dPet.getCloseness(); + listStr += "#b#L" + i + "# " + dPet.getName() + " #k - Lv " + dPet.getLevel() + " Closeness " + dPet.getTameness(); listStr += "#l\r\n"; i++; diff --git a/src/main/java/client/inventory/Pet.java b/src/main/java/client/inventory/Pet.java index f54138592a..b9cf98ecfa 100644 --- a/src/main/java/client/inventory/Pet.java +++ b/src/main/java/client/inventory/Pet.java @@ -184,15 +184,15 @@ public class Pet extends Item { return level; } - public void gainClosenessFullness(Character owner, int incTameness, int incFullness, int type) { - gainClosenessFullness(owner, incTameness, incFullness, type, false); + public void gainTamenessFullness(Character owner, int incTameness, int incFullness, int type) { + gainTamenessFullness(owner, incTameness, incFullness, type, false); } - public void gainClosenessFullness(Character owner, int incTameness, int incFullness, int type, boolean forceEnjoy) { + public void gainTamenessFullness(Character owner, int incTameness, int incFullness, int type, boolean forceEnjoy) { byte slot = owner.getPetIndex(this); boolean enjoyed; - //will NOT increase pet's closeness if tried to feed pet with 100% fullness + //will NOT increase pet's tameness if tried to feed pet with 100% fullness // unless forceEnjoy == true (cash shop) if (fullness < 100 || incFullness == 0 || forceEnjoy) { //incFullness == 0: command given int newFullness = fullness + incFullness; diff --git a/src/main/java/net/server/channel/handlers/PetCommandHandler.java b/src/main/java/net/server/channel/handlers/PetCommandHandler.java index 1c7510bb12..ecd931e97e 100644 --- a/src/main/java/net/server/channel/handlers/PetCommandHandler.java +++ b/src/main/java/net/server/channel/handlers/PetCommandHandler.java @@ -53,7 +53,7 @@ public final class PetCommandHandler extends AbstractPacketHandler { } if (Randomizer.nextInt(100) < petCommand.getProbability()) { - pet.gainClosenessFullness(chr, petCommand.getIncrease(), 0, command); + pet.gainTamenessFullness(chr, petCommand.getIncrease(), 0, command); chr.getMap().broadcastMessage(PacketCreator.commandResponse(chr.getId(), petIndex, false, command, false)); } else { chr.getMap().broadcastMessage(PacketCreator.commandResponse(chr.getId(), petIndex, true, command, false)); diff --git a/src/main/java/net/server/channel/handlers/PetFoodHandler.java b/src/main/java/net/server/channel/handlers/PetFoodHandler.java index 4c44e65fc2..6d79c16fc2 100644 --- a/src/main/java/net/server/channel/handlers/PetFoodHandler.java +++ b/src/main/java/net/server/channel/handlers/PetFoodHandler.java @@ -81,7 +81,7 @@ public final class PetFoodHandler extends AbstractPacketHandler { return; } - pet.gainClosenessFullness(chr, (pet.getFullness() <= 75) ? 1 : 0, 30, 1); // 25+ "emptyness" to get +1 closeness + pet.gainTamenessFullness(chr, (pet.getFullness() <= 75) ? 1 : 0, 30, 1); // 25+ "emptyness" to get +1 tameness InventoryManipulator.removeFromSlot(c, InventoryType.USE, pos, (short) 1, false); } finally { useInv.unlockInventory(); diff --git a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java index 2a0975bc79..258a75ff43 100644 --- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java @@ -419,7 +419,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { Pair pair = pet.canConsume(itemId); if (pair.getRight()) { - pet.gainClosenessFullness(player, pair.getLeft(), 100, 1, true); + pet.gainTamenessFullness(player, pair.getLeft(), 100, 1, true); remove(c, position, itemId); break; } diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java index 9c7e1f04a7..0fc4f94efe 100644 --- a/src/main/java/scripting/npc/NPCConversationManager.java +++ b/src/main/java/scripting/npc/NPCConversationManager.java @@ -340,10 +340,10 @@ public class NPCConversationManager extends AbstractPlayerInteraction { getClient().getChannelServer().getMapFactory().getMap(mapid).resetReactors(); } - public void gainCloseness(int closeness) { + public void gainTameness(int tameness) { for (Pet pet : getPlayer().getPets()) { if (pet != null) { - pet.gainClosenessFullness(getPlayer(), closeness, 0, 0); + pet.gainTamenessFullness(getPlayer(), tameness, 0, 0); } } } diff --git a/src/main/java/server/quest/actions/PetTamenessAction.java b/src/main/java/server/quest/actions/PetTamenessAction.java index 0a177a79cf..d1ababdc54 100644 --- a/src/main/java/server/quest/actions/PetTamenessAction.java +++ b/src/main/java/server/quest/actions/PetTamenessAction.java @@ -56,7 +56,7 @@ public class PetTamenessAction extends AbstractQuestAction { c.lockClient(); try { - pet.gainClosenessFullness(chr, tameness, 0, 0); + pet.gainTamenessFullness(chr, tameness, 0, 0); } finally { c.unlockClient(); } diff --git a/src/main/java/server/quest/requirements/MinTamenessRequirement.java b/src/main/java/server/quest/requirements/MinTamenessRequirement.java index dc5695041a..3625f8c11f 100644 --- a/src/main/java/server/quest/requirements/MinTamenessRequirement.java +++ b/src/main/java/server/quest/requirements/MinTamenessRequirement.java @@ -51,18 +51,18 @@ public class MinTamenessRequirement extends AbstractQuestRequirement { @Override public boolean check(Character chr, Integer npcid) { - int curCloseness = 0; + int curTameness = 0; for (Pet pet : chr.getPets()) { if (pet == null) { continue; } - if (pet.getTameness() > curCloseness) { - curCloseness = pet.getTameness(); + if (pet.getTameness() > curTameness) { + curTameness = pet.getTameness(); } } - return curCloseness >= minTameness; + return curTameness >= minTameness; } } diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index 54629626b3..c5e352bfe8 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -2706,7 +2706,7 @@ public class PacketCreator { p.writeInt(pets[i].getItemId()); // petid p.writeString(pets[i].getName()); p.writeByte(pets[i].getLevel()); // pet level - p.writeShort(pets[i].getTameness()); // pet closeness + p.writeShort(pets[i].getTameness()); // pet tameness p.writeByte(pets[i].getFullness()); // pet fullness p.writeShort(0); p.writeInt(inv != null ? inv.getItemId() : 0);