yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More refactoring of GameObject -> scenery

Browse Source
This commit is contained in:
Ceikry
2021-06-22 13:27:59 -05:00
parent 99b62d0fb5
commit ac45d6f1de
21 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/content/activity/gnomecopter/GnomeCopterActivity.java
+2 -2
View File
@@ -127,14 +127,14 @@ public final class GnomeCopterActivity extends ActivityPlugin {
player.getAppearance().setStandTurnAnimation(8963);
} else if (stage == 4) {
object.setCharge(88);
player.getPacketDispatch().sendObjectAnimation(object, new Animation(5));
player.getPacketDispatch().sendSceneryAnimation(object, new Animation(5));
} else if (stage == 16) {
player.getWalkingQueue().reset();
player.getWalkingQueue().addPath(object.getLocation().getX(), object.getLocation().getY() + 16, true);
Graphics.send(Graphics.create(1579), object.getLocation());
} else if (stage == 20) {
object.setCharge(1000);
player.getPacketDispatch().sendObjectAnimation(object, new Animation(8941));
player.getPacketDispatch().sendSceneryAnimation(object, new Animation(8941));
} else if (stage == 33) {
player.unlock();
landGnomeCopter(player);
Server/src/main/java/core/game/content/activity/gwd/GodwarsEntranceHandler.java
+2 -2
View File
@@ -70,7 +70,7 @@ public final class GodwarsEntranceHandler extends OptionHandler {
player.getPacketDispatch().sendMessage("You need a Strength level of 60 to move this boulder.");
return true;
}
player.getPacketDispatch().sendObjectAnimation(object, Animation.create(6980));
player.getPacketDispatch().sendSceneryAnimation(object, Animation.create(6980));
if (player.getLocation().getY() < 3716) {
ForceMovement.run(player, Location.create(2898, 3715, 0), Location.create(2898, 3719, 0), new Animation(6978), 3);
} else {
@@ -79,7 +79,7 @@ public final class GodwarsEntranceHandler extends OptionHandler {
GameWorld.getPulser().submit(new Pulse(12, player) {
@Override
public boolean pulse() {
player.getPacketDispatch().sendObjectAnimation(RegionManager.getObject(0, 2898, 3716), Animation.create(6981));
player.getPacketDispatch().sendSceneryAnimation(RegionManager.getObject(0, 2898, 3716), Animation.create(6981));
return true;
}
});
Server/src/main/java/core/game/content/cutscene/OrganCutScene.java
+1 -1
View File
@@ -53,7 +53,7 @@ public final class OrganCutScene extends CutscenePlugin {
GameWorld.getPulser().submit(new Pulse(3) {
@Override
public boolean pulse() {
player.getPacketDispatch().sendObjectAnimation(RegionManager.getObject(base.transform(42, 14, 0)), new Animation(9841));
player.getPacketDispatch().sendSceneryAnimation(RegionManager.getObject(base.transform(42, 14, 0)), new Animation(9841));
PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.POSITION, player.getLocation().getX() + 2, player.getLocation().getY() - 3, 400, 1, 1));
PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.ROTATION, player.getLocation().getX() + 1, player.getLocation().getY(), 400, 1, 1));
return true;
Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java
+9 -9
View File
@@ -189,7 +189,7 @@ public class DeathMansionEvent extends HolidayEvent {
continue;
}
if (!o.getLocation().withinDistance(player.getLocation(), 1)) {
player.getPacketDispatch().sendObjectAnimation(o, Animation.create(7286));
player.getPacketDispatch().sendSceneryAnimation(o, Animation.create(7286));
}
}
}
@@ -320,7 +320,7 @@ public class DeathMansionEvent extends HolidayEvent {
if (buttonId == 1) {
item.search(player, target.asObject());
} else {
player.getPacketDispatch().sendObjectAnimation(target.asObject(), Animation.create(7278));
player.getPacketDispatch().sendSceneryAnimation(target.asObject(), Animation.create(7278));
player.animate(Animation.create(7272));
player.getDialogueInterpreter().sendDialogues(player, FacialExpression.DISGUSTED, "That wasn't such a good idea.");
}
@@ -359,7 +359,7 @@ public class DeathMansionEvent extends HolidayEvent {
});
}
player.getPacketDispatch().sendObjectAnimation(target.asObject(), Animation.create(7296));
player.getPacketDispatch().sendSceneryAnimation(target.asObject(), Animation.create(7296));
AgilityHandler.walk(player, -1, player.getLocation(), target.getLocation(), null, 0.0, null);
GameWorld.getPulser().submit(new Pulse(1, player) {
@@ -437,7 +437,7 @@ public class DeathMansionEvent extends HolidayEvent {
if (o != null && o.getId() == 27241) {
objs.add(o);
p.setAttribute("objs", objs);
p.getPacketDispatch().sendObjectAnimation(o, Animation.create(7289));
p.getPacketDispatch().sendSceneryAnimation(o, Animation.create(7289));
}
}
}
@@ -446,7 +446,7 @@ public class DeathMansionEvent extends HolidayEvent {
continue;
}
if (!o.getLocation().withinDistance(p.getLocation(), 1)) {
p.getPacketDispatch().sendObjectAnimation(o, Animation.create(7286));
p.getPacketDispatch().sendSceneryAnimation(o, Animation.create(7286));
}
}
if (loc.getX() >= 1630 && loc.getX() <= 1646 && loc.getY() >= 4844 && loc.getY() <= 4852) {
@@ -466,7 +466,7 @@ public class DeathMansionEvent extends HolidayEvent {
p.teleport(object.getLocation());
}
p.lock();
p.getPacketDispatch().sendObjectAnimation(object, Animation.create(1939));
p.getPacketDispatch().sendSceneryAnimation(object, Animation.create(1939));
break;
case 2:
p.animate(Animation.create(4366));
@@ -570,7 +570,7 @@ public class DeathMansionEvent extends HolidayEvent {
player.sendMessage("You cannot pass through this particular web - try another.");
return;
}
player.getPacketDispatch().sendObjectAnimation(object, Animation.create(7280));
player.getPacketDispatch().sendSceneryAnimation(object, Animation.create(7280));
player.lock(3);
AgilityHandler.forceWalk(player, -1, player.getLocation(), player.getLocation().transform(Direction.getDirection(player.getLocation(), object.getLocation()), 2), Animation.create(2240), 8, 0.0, null);
}
@@ -613,8 +613,8 @@ public class DeathMansionEvent extends HolidayEvent {
Scenery first = RegionManager.getObject(object.getLocation().transform(x, y, 0));
Scenery second = RegionManager.getObject(object.getLocation().transform(x2, y2, 0));
if (first != null && second != null) {
player.getPacketDispatch().sendObjectAnimation(first, Animation.create(7285));
player.getPacketDispatch().sendObjectAnimation(second, Animation.create(7285));
player.getPacketDispatch().sendSceneryAnimation(first, Animation.create(7285));
player.getPacketDispatch().sendSceneryAnimation(second, Animation.create(7285));
}
player.sendMessage("You fail to pass through the gargoyles' judgement");
GameWorld.getPulser().submit(new Pulse(1, player) {
Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayer.java
+3 -3
View File
@@ -326,7 +326,7 @@ public final class DragonSlayer extends Quest {
player.getPacketDispatch().sendMessage("The door opens...");
final Scenery object = RegionManager.getObject(new Location(3050, 9839, 0));
player.faceLocation(object.getLocation());
player.getPacketDispatch().sendObjectAnimation(object, new Animation(6636));
player.getPacketDispatch().sendSceneryAnimation(object, new Animation(6636));
GameWorld.getPulser().submit(new Pulse(1, player) {
int counter = 0;
@@ -337,10 +337,10 @@ public final class DragonSlayer extends Quest {
AgilityHandler.walk(player, 0, player.getLocation(), player.getLocation().getX() == 3051 ? Location.create(3049, 9840, 0) : Location.create(3051, 9840, 0), null, 0, null);
break;
case 5:
player.getPacketDispatch().sendObjectAnimation(object, new Animation(6637));
player.getPacketDispatch().sendSceneryAnimation(object, new Animation(6637));
break;
case 6:
player.getPacketDispatch().sendObjectAnimation(object, new Animation(6635));
player.getPacketDispatch().sendSceneryAnimation(object, new Animation(6635));
return true;
}
return false;
Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GDiplomacyCutscene.java
+2 -2
View File
@@ -658,11 +658,11 @@ public final class GDiplomacyCutscene extends CutscenePlugin {
case 7:
grubfoot.transform(grubFoot.getId());
grubfoot.getProperties().setTeleportLocation(grubfoot.getLocation().transform(-1, 0, 0));
player.getPacketDispatch().sendObjectAnimation(RegionManager.getObject(cutscene.getBase().transform(9, 55, 0)), new Animation(24));
player.getPacketDispatch().sendSceneryAnimation(RegionManager.getObject(cutscene.getBase().transform(9, 55, 0)), new Animation(24));
break;
case 11:
grubfoot.getProperties().setTeleportLocation(grubfoot.getLocation().transform(1, 0, 0));
player.getPacketDispatch().sendObjectAnimation(RegionManager.getObject(cutscene.getBase().transform(9, 55, 0)), new Animation(24));
player.getPacketDispatch().sendSceneryAnimation(RegionManager.getObject(cutscene.getBase().transform(9, 55, 0)), new Animation(24));
break;
case 12:
player.getDialogueInterpreter().sendPlainMessage(true, "...And emerges wearing " + type.name().toLowerCase() + " armour.");
Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java
+1 -1
View File
@@ -82,7 +82,7 @@ public final class LumbridgeNodePlugin extends OptionHandler {
case 0:
player.lock();
player.sendMessage("You start cranking the lever.");
player.getPacketDispatch().sendObjectAnimation(((Scenery) node), new Animation(9979));
player.getPacketDispatch().sendSceneryAnimation(((Scenery) node), new Animation(9979));
player.animate(new Animation(9977));
break;
case 8:
Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class JangerBerryPlugin extends OptionHandler {
return true;
}
Location end = node.getId() == 2325 ? new Location(2505, 3087, 0) : new Location(2511, 3096, 0);
player.getPacketDispatch().sendObjectAnimation(node.asObject(), Animation.create(497), true);
player.getPacketDispatch().sendSceneryAnimation(node.asObject(), Animation.create(497), true);
AgilityHandler.forceWalk(player, 0, player.getLocation(), end, Animation.create(751), 50, 22, "You skillfully swing across.", 1);
return true;
}
Server/src/main/java/core/game/interaction/object/MossGiantRopePlugin.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class MossGiantRopePlugin extends OptionHandler {
return true;
}
Location end = node.getId() == 2322 ? Location.create(2704, 3209, 0) : Location.create(2709, 3205, 0);
player.getPacketDispatch().sendObjectAnimation(node.asObject(), Animation.create(497), true);
player.getPacketDispatch().sendSceneryAnimation(node.asObject(), Animation.create(497), true);
AgilityHandler.forceWalk(player, 0, player.getLocation(), end, Animation.create(751), 50, 22, "You skillfully swing across.", 1);
player.getAchievementDiaryManager().finishTask(player, DiaryType.KARAMJA, 0, 1);
return true;
Server/src/main/java/core/game/interaction/object/dmc/DMCHandler.java
+1 -1
View File
@@ -107,7 +107,7 @@ public final class DMCHandler {
player.getPacketDispatch().sendMessage("Your cannon has run out of ammo!");
return true;
}
player.getPacketDispatch().sendObjectAnimation(cannon, Animation.create(direction.getAnimationId()));
player.getPacketDispatch().sendSceneryAnimation(cannon, Animation.create(direction.getAnimationId()));
Location l = cannon.getLocation().transform(1, 1, 0);
direction = DMCRevolution.values()[(direction.ordinal() + 1) % DMCRevolution.values().length];
for (NPC npc : RegionManager.getLocalNpcs(l, 10)) {
Server/src/main/java/core/game/node/entity/player/link/PacketDispatch.java
+3 -3
View File
@@ -351,7 +351,7 @@ public final class PacketDispatch {
* @param object the object.
* @param animation the animation.
*/
public void sendObjectAnimation(Scenery object, Animation animation) {
public void sendSceneryAnimation(Scenery object, Animation animation) {
animation = new Animation(animation.getId(), animation.getDelay(), animation.getPriority());
animation.setObject(object);
RegionManager.getRegionChunk(object.getLocation()).flag(new AnimateObjectUpdateFlag(animation));
@@ -363,9 +363,9 @@ public final class PacketDispatch {
* @param animation the animation.
* @param global if the animation is global or not.
*/
public void sendObjectAnimation(Scenery object, Animation animation, boolean global) {
public void sendSceneryAnimation(Scenery object, Animation animation, boolean global) {
if (global) {
sendObjectAnimation(object, animation);
sendSceneryAnimation(object, animation);
return;
}
animation.setObject(object);
Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenCourse.java
+2 -2
View File
@@ -46,11 +46,11 @@ public final class BrimhavenCourse extends OptionHandler {
@Override
public boolean pulse() {
if (!finish) {
player.getPacketDispatch().sendObjectAnimation(object, Animation.create(1052));
player.getPacketDispatch().sendSceneryAnimation(object, Animation.create(1052));
finish = true;
return false;
}
player.getPacketDispatch().sendObjectAnimation(object, Animation.create(-1));
player.getPacketDispatch().sendSceneryAnimation(object, Animation.create(-1));
return true;
}
});
Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/FloorSpikes.java
+1 -1
View File
@@ -30,7 +30,7 @@ public final class FloorSpikes implements MovementHook {
GameWorld.getPulser().submit(new Pulse(3, e) {
@Override
public boolean pulse() {
player.getPacketDispatch().sendObjectAnimation(RegionManager.getObject(l), Animation.create(1111));
player.getPacketDispatch().sendSceneryAnimation(RegionManager.getObject(l), Animation.create(1111));
if (AgilityHandler.hasFailed(player, 20, 0.25)) {
if (player.getSkills().getLevel(Skills.AGILITY) < 20) {
player.getPacketDispatch().sendMessage("You need an agility of at least 20 to get past this trap!");
Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/SpinningBlades.java
+1 -1
View File
@@ -62,6 +62,6 @@ public final class SpinningBlades implements MovementHook {
} else if (l.equals(Location.create(2778, 9557, 3))) {
l = Location.create(2777, 9556, 3);
}
player.getPacketDispatch().sendObjectAnimation(RegionManager.getObject(l), Animation.create(1107));
player.getPacketDispatch().sendSceneryAnimation(RegionManager.getObject(l), Animation.create(1107));
}
}
Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class RopeSwing extends UseWithHandler {
player.sendMessage("I can't reach that.");
return true;
}
player.getPacketDispatch().sendObjectAnimation(object, Animation.create(497), true);
player.getPacketDispatch().sendSceneryAnimation(object, Animation.create(497), true);
AgilityHandler.forceWalk(player, 0, player.getLocation(), Location.create(2505, 3087, 0), Animation.create(751), 50, 22, "You skillfully swing across.", 1);
return true;
}
Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreator.java
+3 -3
View File
@@ -149,17 +149,17 @@ public final class SummoningCreator {
@Override
public void stop() {
super.stop();
player.getPacketDispatch().sendObjectAnimation(object, new Animation(8510));
player.getPacketDispatch().sendSceneryAnimation(object, new Animation(8510));
}
@Override
public boolean reward() {
if (getDelay() == 1) {
setDelay(4);
player.getPacketDispatch().sendObjectAnimation(object, Animation.create(8509));
player.getPacketDispatch().sendSceneryAnimation(object, Animation.create(8509));
return false;
}
player.getPacketDispatch().sendObjectAnimation(object, Animation.create(8510));
player.getPacketDispatch().sendSceneryAnimation(object, Animation.create(8510));
for (int i = 0; i < amount; i++) {
for (Item item : type.getRequired()) {
if (!player.getInventory().containsItem(item)) {
Server/src/main/kotlin/api/ContentAPI.kt
+3 -3
View File
@@ -251,7 +251,7 @@ object ContentAPI {
* @param for_ticks the number of ticks the object should be replaced for. Use -1 for permanent.
*/
@JvmStatic
fun replaceObject(toReplace: Scenery, with: Int, for_ticks: Int) {
fun replaceScenery(toReplace: Scenery, with: Int, for_ticks: Int) {
if (for_ticks == -1) {
SceneryBuilder.replace(toReplace, toReplace.transform(with))
} else {
@@ -341,8 +341,8 @@ object ContentAPI {
* Send an object animation
*/
@JvmStatic
fun animateObject(player: Player, obj: Scenery, animationId: Int, global: Boolean = false) {
player.packetDispatch.sendObjectAnimation(obj, getAnimation(animationId), global)
fun animateScenery(player: Player, obj: Scenery, animationId: Int, global: Boolean = false) {
player.packetDispatch.sendSceneryAnimation(obj, getAnimation(animationId), global)
}
/**
Server/src/main/kotlin/rs09/game/interaction/object/canoestation/CanoeStationListener.kt
+2 -2
View File
@@ -52,7 +52,7 @@ class CanoeStationListener : InteractionListener() {
override fun pulse(): Boolean {
player.animator.stop()
player.varpManager.setVarbit(varbit,STAGE_LOG_CHOPPED)
player.packetDispatch.sendObjectAnimation(node.asObject().getChild(player), FALL, false)
player.packetDispatch.sendSceneryAnimation(node.asObject().getChild(player), FALL, false)
player.unlock()
return true
}
@@ -81,7 +81,7 @@ class CanoeStationListener : InteractionListener() {
player.pulseManager.run(object : Pulse(){
override fun pulse(): Boolean {
player.varpManager.setVarbit(varbit,CanoeUtils.getCraftValue(canoe,true))
player.packetDispatch.sendObjectAnimation(node.asObject(), FLOAT, false)
player.packetDispatch.sendSceneryAnimation(node.asObject(), FLOAT, false)
player.unlock()
return true
}
Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt
+1 -1
View File
@@ -92,7 +92,7 @@ class BarbarianOutpostCourse
return
}
ropeDelay = GameWorld.ticks + 2
player.packetDispatch.sendObjectAnimation(`object`, Animation.create(497), true)
player.packetDispatch.sendSceneryAnimation(`object`, Animation.create(497), true)
AgilityHandler.forceWalk(player, 0, player.location, Location.create(2551, 3549, 0), Animation.create(751), 50, 22.0, "You skillfully swing across.", 1)
}
Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt
+1 -1
View File
@@ -166,7 +166,7 @@ class WildernessCourse
return
}
ropeDelay = GameWorld.ticks + 2
player.packetDispatch.sendObjectAnimation(`object`, Animation.create(497), true)
player.packetDispatch.sendSceneryAnimation(`object`, Animation.create(497), true)
AgilityHandler.forceWalk(player, 1, player.location, Location.create(3005, 3958, 0), Animation.create(751), 50, 20.0, "You skillfully swing across.", 1)
}
Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt
+3 -3
View File
@@ -172,7 +172,7 @@ class VisualCommand : CommandPlugin() {
"objwithanim" -> {
val go = Scenery(toInteger(args!![1]!!), player!!.location, 0)
SceneryBuilder.add(go)
player.packetDispatch.sendObjectAnimation(go, Animation.create(toInteger(args[2]!!)))
player.packetDispatch.sendSceneryAnimation(go, Animation.create(toInteger(args[2]!!)))
return true
}
"oa", "object_anim", "obj_anim", "objectanim", "objanim" -> {
@@ -186,7 +186,7 @@ class VisualCommand : CommandPlugin() {
player!!.debug("error: object not found in region cache.")
return true
}
player!!.packetDispatch.sendObjectAnimation(`object`, Animation(toInteger(args[args.size - 1]!!)))
player!!.packetDispatch.sendSceneryAnimation(`object`, Animation(toInteger(args[args.size - 1]!!)))
return true
}
"inter", "component", "interface" -> {
@@ -314,7 +314,7 @@ class VisualCommand : CommandPlugin() {
player.debug("error: object not found in region cache.")
return true
}
player.packetDispatch.sendObjectAnimation(`object`, Animation(id))
player.packetDispatch.sendSceneryAnimation(`object`, Animation(id))
player.debug("Animation id: $id")
return ++id >= endId
}