Refactored a lot of things

Signed-off-by: Ceikry <ironceikry@gmail.com>
This commit is contained in:
Ceikry 2020-03-20 09:36:05 -05:00
parent 3ba0c9dbc9
commit 5097ff46fb
86 changed files with 88 additions and 88 deletions

View file

@ -391,4 +391,7 @@ public final class PacketDispatch {
return context;
}
public void sendScriptConfigs(int id, int value, String type, Object... params) {
PacketRepository.send(CSConfigPacket.class, new CSConfigContext(player, id, value, type, params));
}
}

View file

@ -116,7 +116,7 @@ public final class CyclopesRoom extends MapZone implements Plugin<Object> {
public boolean death(Entity e, Entity killer) {
if (killer instanceof Player && e instanceof NPC && (e.getId() == 4292 || e.getId() == 4291)) {
int defenderId = getDefenderIndex((Player) killer);
if (RandomFunction.randomize(32) == 1) {
if (RandomFunction.randomize(32) == 10) {
if (++defenderId == DEFENDERS.length) {
defenderId--;
}

View file

@ -21,7 +21,7 @@ public final class BurnMeatPlugin extends UseWithHandler {
/**
* Represents the objects allowed to cook {@code Food} on.
*/
private static final int[] OBJECTS = new int[] { 2728, 2729, 2730, 2731, 2732, 2859, 3038, 3039, 3769, 3775, 4265, 4266, 5249, 5499, 5631, 5632, 5981, 9682, 10433, 11404, 11405, 11406, 12102, 12796, 13337, 13881, 14169, 14919, 15156, 20000, 20001, 21620, 21792, 22713, 22714, 23046, 24283, 24284, 25155, 25156, 25465, 25730, 27297, 29139, 30017, 32099, 33500, 34495, 34546, 36973, 37597, 37629, 37726, 114, 4172, 5275, 8750, 16893, 22154, 34410, 34565, 114, 9085, 9086, 9087, 12269, 15398, 25440, 25441, 2724, 2725, 2726, 4618, 4650, 5165, 6093, 6094, 6095, 6096, 8712, 9439, 9440, 9441, 10824, 17640, 17641, 17642, 17643, 18039, 21795, 24285, 24329, 27251, 33498, 35449, 36815, 36816, 37426 };
private static final int[] OBJECTS = new int[] { 21302, 13528, 13529, 13533, 13531, 13536, 13539, 13542, 2728, 2729, 2730, 2731, 2732, 2859, 3038, 3039, 3769, 3775, 4265, 4266, 5249, 5499, 5631, 5632, 5981, 9682, 10433, 11404, 11405, 11406, 12102, 12796, 13337, 13881, 14169, 14919, 15156, 20000, 20001, 21620, 21792, 22713, 22714, 23046, 24283, 24284, 25155, 25156, 25465, 25730, 27297, 29139, 30017, 32099, 33500, 34495, 34546, 36973, 37597, 37629, 37726, 114, 4172, 5275, 8750, 16893, 22154, 34410, 34565, 114, 9085, 9086, 9087, 12269, 15398, 25440, 25441, 2724, 2725, 2726, 4618, 4650, 5165, 6093, 6094, 6095, 6096, 8712, 9439, 9440, 9441, 10824, 17640, 17641, 17642, 17643, 18039, 21795, 24285, 24329, 27251, 33498, 35449, 36815, 36816, 37426, 40110 };
/**
* Represents the animation used when cooking over a range.

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.bosses;
import org.crandor.cache.def.impl.ObjectDefinition;
import org.crandor.game.component.Component;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.bosses;
import java.util.ArrayList;
import java.util.List;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.bosses;
import java.util.concurrent.TimeUnit;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.bosses;
import org.crandor.cache.def.impl.NPCDefinition;
import org.crandor.game.content.dialogue.DialogueInterpreter;

View file

@ -1,4 +1,4 @@
package plugin.npc.corp;
package plugin.npc.bosses.corp;
import java.util.ArrayList;
import java.util.List;

View file

@ -1,4 +1,4 @@
package plugin.npc.corp;
package plugin.npc.bosses.corp;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.combat.ImpactHandler.HitsplatType;

View file

@ -1,4 +1,4 @@
package plugin.npc.kraken;
package plugin.npc.bosses.kraken;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.combat.BattleState;

View file

@ -1,4 +1,4 @@
package plugin.npc.kraken;
package plugin.npc.bosses.kraken;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.combat.CombatPulse;

View file

@ -1,4 +1,4 @@
package plugin.npc.kraken;
package plugin.npc.bosses.kraken;
import org.crandor.game.content.global.BossKillCounter;
import org.crandor.game.node.entity.Entity;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.bosses.wilderness;
import org.crandor.game.content.global.BossKillCounter;
import org.crandor.game.node.entity.Entity;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.bosses.wilderness;
import java.util.ArrayList;
import java.util.List;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.bosses.wilderness;
import org.crandor.game.content.global.BossKillCounter;
import org.crandor.game.node.entity.Entity;

View file

@ -1,4 +1,4 @@
package plugin.npc.callisto;
package plugin.npc.bosses.wilderness.callisto;
import org.crandor.game.content.global.BossKillCounter;
import org.crandor.game.content.skill.Skills;

View file

@ -1,4 +1,4 @@
package plugin.npc.venenatis;
package plugin.npc.bosses.wilderness.venenatis;
import org.crandor.game.content.global.BossKillCounter;
import org.crandor.game.node.entity.Entity;

View file

@ -1,4 +1,4 @@
package plugin.npc.zulrah;
package plugin.npc.bosses.zulrah;
import org.crandor.game.node.entity.combat.CombatStyle;
import org.crandor.game.node.entity.combat.equipment.SwitchAttack;

View file

@ -1,4 +1,4 @@
package plugin.npc.zulrah;
package plugin.npc.bosses.zulrah;
import org.crandor.game.content.activity.ActivityPlugin;
import org.crandor.game.content.activity.CutscenePlugin;

View file

@ -1,4 +1,4 @@
package plugin.npc.zulrah;
package plugin.npc.bosses.zulrah;
import org.crandor.game.content.global.BossKillCounter;
import org.crandor.game.node.entity.Entity;

View file

@ -1,4 +1,4 @@
package plugin.npc.zulrah;
package plugin.npc.bosses.zulrah;
import java.util.ArrayList;
import java.util.List;

View file

@ -1,4 +1,4 @@
package plugin.npc.zulrah;
package plugin.npc.bosses.zulrah;
import org.crandor.cache.def.impl.ObjectDefinition;
import org.crandor.game.content.activity.ActivityManager;

View file

@ -1,4 +1,4 @@
package plugin.npc.zulrah;
package plugin.npc.bosses.zulrah;
import org.crandor.game.world.map.Direction;
import org.crandor.game.world.map.Location;

View file

@ -1,4 +1,4 @@
package plugin.npc.zulrah;
package plugin.npc.bosses.zulrah;
/**
* Represents the Zulrah Type.

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.nardah;
package plugin.npc.city.nardah;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.node.entity.npc.NPC;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.nardah;
package plugin.npc.city.nardah;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.node.entity.npc.NPC;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.nardah;
package plugin.npc.city.nardah;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.node.entity.player.Player;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.nardah;
package plugin.npc.city.nardah;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.node.entity.player.Player;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.nardah;
package plugin.npc.city.nardah;
import org.crandor.cache.def.impl.NPCDefinition;
import org.crandor.game.content.dialogue.DialoguePlugin;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.nardah;
package plugin.npc.city.nardah;
import org.crandor.cache.def.impl.NPCDefinition;
import org.crandor.game.content.dialogue.DialoguePlugin;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.nardah;
package plugin.npc.city.nardah;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.node.entity.npc.NPC;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.pollnivneach;
package plugin.npc.city.pollnivneach;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.content.dialogue.FacialExpression;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.pollnivneach;
package plugin.npc.city.pollnivneach;
import org.crandor.cache.def.impl.NPCDefinition;
import org.crandor.game.content.dialogue.DialoguePlugin;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.pollnivneach;
package plugin.npc.city.pollnivneach;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.content.dialogue.FacialExpression;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.pollnivneach;
package plugin.npc.city.pollnivneach;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.node.entity.player.Player;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.pollnivneach;
package plugin.npc.city.pollnivneach;
import org.crandor.cache.def.impl.NPCDefinition;
import org.crandor.game.content.dialogue.DialoguePlugin;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.pollnivneach;
package plugin.npc.city.pollnivneach;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.content.dialogue.FacialExpression;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.pollnivneach;
package plugin.npc.city.pollnivneach;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.node.entity.player.Player;

View file

@ -1,7 +1,6 @@
package plugin.interaction.city.sophanem;
package plugin.npc.city.sophanem;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.node.entity.npc.NPC;
import org.crandor.game.node.entity.player.Player;
import org.crandor.plugin.InitializablePlugin;

View file

@ -1,6 +1,5 @@
package plugin.interaction.city.sophanem;
package plugin.npc.city.sophanem;
import org.crandor.cache.def.impl.NPCDefinition;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.content.dialogue.FacialExpression;
import org.crandor.game.node.entity.npc.NPC;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.sophanem;
package plugin.npc.city.sophanem;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.node.entity.player.Player;

View file

@ -1,4 +1,4 @@
package plugin.interaction.city.sophanem;
package plugin.npc.city.sophanem;
import org.crandor.cache.def.impl.ObjectDefinition;
import org.crandor.game.content.skill.Skills;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.cache.def.impl.NPCDefinition;
import org.crandor.game.interaction.OptionHandler;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.world.map.Location;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.node.object.GameObject;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.combat.BattleState;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.world.map.Location;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import java.util.ArrayList;
import java.util.List;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.combat.CombatSpell;
import org.crandor.game.node.entity.combat.CombatStyle;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.combat.CombatStyle;
import org.crandor.game.node.entity.combat.CombatSwingHandler;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.content.skill.Skills;
import org.crandor.game.node.entity.npc.AbstractNPC;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.world.map.Location;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.combat.BattleState;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import java.util.List;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.world.map.Location;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import java.util.List;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.content.dialogue.DialoguePlugin;
import org.crandor.game.content.skill.Skills;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.content.skill.free.fishing.FishSpots;
import org.crandor.game.node.entity.npc.AbstractNPC;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import java.util.List;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import java.util.List;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.plugin.InitializablePlugin;

View file

@ -1,8 +1,7 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.world.map.Location;
import org.crandor.plugin.InitializablePlugin;
import org.crandor.plugin.Plugin;
/**

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.npc.AbstractNPC;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.npc.AbstractNPC;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.world.map.Location;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.node.entity.player.Player;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.world.map.Location;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.combat.CombatStyle;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.combat.BattleState;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.npc.AbstractNPC;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.content.global.tutorial.TutorialSession;
import org.crandor.game.content.global.tutorial.TutorialStage;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.combat.BattleState;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.world.map.Location;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.world.map.Location;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.combat.DeathTask;
import org.crandor.game.node.entity.npc.AbstractNPC;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.plugin.InitializablePlugin;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.world.map.Location;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import java.util.ArrayList;
import java.util.List;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.cache.def.impl.NPCDefinition;
import org.crandor.game.interaction.OptionHandler;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.combat.CombatStyle;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.npc.AbstractNPC;
import org.crandor.game.system.mysql.impl.NPCConfigSQLHandler;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.content.global.tutorial.TutorialSession;
import org.crandor.game.content.global.tutorial.TutorialStage;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.content.skill.Skills;
import org.crandor.game.node.entity.Entity;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.npc.AbstractNPC;

View file

@ -1,4 +1,4 @@
package plugin.npc;
package plugin.npc.other;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.npc.AbstractNPC;

View file

@ -30,7 +30,7 @@ public final class CookingPlugin extends UseWithHandler {
* Constructs a new {@code CookingPlugin} {@code Object}.
*/
public CookingPlugin() {
super(10816, 2138, 2142, 2134, 3142, 2136, 1859, 3226, 7518, 3150, 327, 321, 345, 353, 335, 341, 349, 331, 3379, 359, 10138, 5001, 377, 363, 371, 2148, 7944, 383, 395, 389, 3363, 3365, 3367, 5986, 401, 1942, 4237, 2001, 7076, 1871, 7080, 2307, 1889, 2132, 2132, 2132, 2132, 2321, 2319, 7168, 2317, 7176, 7186, 7196, 7206, 7216, 2287, 317, 9986, 2876, 7566, 9984, 7224);
super(2142, 4293, 10816, 2138, 2142, 2134, 3142, 2136, 1859, 3226, 7518, 3150, 327, 321, 345, 353, 335, 341, 349, 331, 3379, 359, 10138, 5001, 377, 363, 371, 2148, 7944, 383, 395, 389, 3363, 3365, 3367, 5986, 401, 1942, 4237, 2001, 7076, 1871, 7080, 2307, 1889, 2132, 2132, 2132, 2132, 2321, 2319, 7168, 2317, 7176, 7186, 7196, 7206, 7216, 2287, 317, 9986, 2876, 7566, 9984, 7224);
}
@Override