Added rogues' castle chest functionality

more object -> scenery renaming
This commit is contained in:
ceikry
2021-06-28 09:28:48 -05:00
parent b8e29d3281
commit c2857fc5af
303 changed files with 1560 additions and 1560 deletions
@@ -3,7 +3,7 @@ package core.net.packet.in;
import core.cache.Cache;
import core.cache.def.impl.ItemDefinition;
import core.cache.def.impl.NPCDefinition;
import core.cache.def.impl.ObjectDefinition;
import core.cache.def.impl.SceneryDefinition;
import core.cache.def.impl.VarbitDefinition;
import core.game.node.entity.player.Player;
import core.net.packet.IncomingPacket;
@@ -26,7 +26,7 @@ public final class ExaminePacket implements IncomingPacket {
if (id < 0 || id > Cache.getObjectDefinitionsSize()) {
break;
}
ObjectDefinition d = ObjectDefinition.forId(id);
SceneryDefinition d = SceneryDefinition.forId(id);
name = d.getExamine();
//String coords = id + ", " + player.getLocation().getX() + ", " + player.getLocation().getY() + ", " + player.getLocation().getZ();
player.debug("Object id: " + id + ", models: " + (d.getModelIds() != null ? Arrays.toString(d.getModelIds()) : null) + ", anim: " + d.animationId + ", config: " + (d.getVarbitID() != -1 ? d.getVarbitID() + " (file)" : d.getConfigId()) + ".");
@@ -1,6 +1,6 @@
package core.net.packet.in;
import core.cache.def.impl.ObjectDefinition;
import core.cache.def.impl.SceneryDefinition;
import core.cache.def.impl.VarbitDefinition;
import core.game.content.quest.PluginInteractionManager;
import core.game.interaction.Interaction;
@@ -264,7 +264,7 @@ public final class InteractionPacket implements IncomingPacket {
}
player.debug(object + ", original=" + objectId + ", option=" + option.getName() + "");
player.debug("dir=" + object.getDirection());
VarbitDefinition def = VarbitDefinition.forObjectID(ObjectDefinition.forId(objectId).getVarbitID());
VarbitDefinition def = VarbitDefinition.forObjectID(SceneryDefinition.forId(objectId).getVarbitID());
player.debug("Varp ID=" + def.getConfigId() + " Offset=" + def.getBitShift() + " Size=" + def.getBitSize());
if (option.getHandler() != null) {
player.debug("Object handler: " + option.getHandler().getClass().getSimpleName());