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

Redwings Drop III: Ceikry GE, Job, Slayer, Achievement Diary rewrites

Browse Source
This commit is contained in:
skelsoft
2022-03-18 23:35:19 +00:00
committed by Ceikry
parent 37a503746b
commit 0b9d540d45
147 changed files with 3488 additions and 2996 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt
+6 -2
View File
@@ -4,14 +4,14 @@ import api.*
import core.cache.Cache
import core.game.container.access.InterfaceContainer
import core.game.content.quest.tutorials.tutorialisland.CharacterDesign
import core.game.node.scenery.Scenery
import core.game.node.scenery.SceneryBuilder
import core.game.node.entity.combat.ImpactHandler.HitsplatType
import core.game.node.entity.impl.Projectile
import core.game.node.entity.npc.NPC
import core.game.node.entity.player.Player
import core.game.node.entity.player.link.audio.Audio
import core.game.node.item.Item
import core.game.node.scenery.Scenery
import core.game.node.scenery.SceneryBuilder
import core.game.system.command.CommandSet
import core.game.system.task.Pulse
import core.game.world.map.Location
@@ -25,6 +25,8 @@ import core.plugin.Initializable
import core.plugin.Plugin
import rs09.game.system.command.CommandPlugin
import rs09.game.world.GameWorld
import java.awt.Toolkit
import java.awt.datatransfer.StringSelection
/**
* Represents the the command plugin used for visual commands.
@@ -131,6 +133,8 @@ class VisualCommand : CommandPlugin() {
npc.init()
npc.isWalks = if (args.size > 2) true else false
val npcString = "{" + npc.location.x + "," + npc.location.y + "," + npc.location.z + "," + (if (npc.isWalks) "1" else "0") + "," + npc.direction.ordinal + "}"
val clpbrd = Toolkit.getDefaultToolkit().systemClipboard
clpbrd.setContents(StringSelection(npcString), null)
println(npcString)
return true
}
Server/src/main/kotlin/rs09/game/system/command/sets/DevelopmentCommandSet.kt
+21
View File
@@ -1,10 +1,14 @@
package rs09.game.system.command.sets
import core.cache.def.impl.NPCDefinition
import core.game.node.entity.combat.ImpactHandler.HitsplatType
import core.game.node.entity.npc.drop.NPCDropTables
import core.game.node.entity.player.Player
import core.game.node.entity.player.link.SpellBookManager
import core.game.node.item.Item
import core.plugin.Initializable
import org.rs09.consts.Items
import rs09.game.content.global.NPCDropTable
import rs09.game.system.command.Command
@Initializable
@@ -35,5 +39,22 @@ class DevelopmentCommandSet : CommandSet(Command.Privilege.ADMIN) {
player.impactHandler.manualHit(player, player.skills.lifepoints, HitsplatType.NORMAL)
}
define("rolldrops") { player: Player, args: Array<String> ->
if(args.size < 2){
reject(player,"Usage: ::rolldrops npcid amount")
}
val container = player.dropLog
val npcId = args[1].toInt()
val amount = args[2].toInt()
for(i in 0..amount)
{
val drops = NPCDefinition.forId(npcId).dropTables.table.roll()
for(drop in drops) container.add(drop)
}
container.open(player)
}
}
}
Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt
+164 -90
View File
@@ -1,12 +1,11 @@
package rs09.game.system.command.sets
import api.*
import core.cache.def.impl.ItemDefinition
import api.InputType
import core.cache.def.impl.NPCDefinition
import core.cache.def.impl.SceneryDefinition
import core.cache.def.impl.VarbitDefinition
import core.game.component.Component
import core.game.ge.OfferState
import core.game.node.entity.npc.NPC
import core.game.node.entity.player.Player
import core.game.node.entity.player.info.Rights
@@ -24,13 +23,16 @@ import org.rs09.consts.Components
import rs09.ServerConstants
import rs09.game.content.activity.fishingtrawler.TrawlerLoot
import rs09.game.content.ame.RandomEvents
import rs09.game.ge.OfferManager
import rs09.game.ge.GrandExchange
import rs09.game.node.entity.state.newsys.states.FarmingState
import rs09.game.system.SystemLogger
import rs09.game.system.command.Command
import rs09.game.system.command.CommandMapping
import rs09.game.world.repository.Repository
import rs09.tools.stringtools.colorize
import java.awt.Toolkit
import java.awt.datatransfer.StringSelection
import java.util.*
@Initializable
class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){
@@ -72,6 +74,9 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){
SystemLogger.logInfo("Viewport: " + l.getSceneX(player.playerFlags.lastSceneGraph) + "," + l.getSceneY(player.playerFlags.lastSceneGraph))
val loc = "Location.create(" + l.x + ", " + l.y + ", " + l.z + ")"
SystemLogger.logInfo(loc + "; " + player.playerFlags.lastSceneGraph + ", " + l.localX + ", " + l.localY)
val stringSelection = StringSelection(loc)
val clpbrd = Toolkit.getDefaultToolkit().systemClipboard
clpbrd.setContents(stringSelection, null)
}
/**
@@ -150,7 +155,7 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){
*/
define("ge", Command.Privilege.STANDARD) { player, args ->
if(args.size < 2){
reject(player, "Usage: ::ge mode", "Available modes: buying, selling, search")
reject(player, "Usage: ::ge mode", "Available modes: buying, selling, search, bots, botsearch")
}
val mode = args[1]
@@ -160,6 +165,10 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){
"search" -> sendInputDialogue(player, InputType.STRING_LONG, "Enter search term:"){value ->
showOffers(player, value as String)
}
"bots" -> showGeBots(player)
"botsearch" -> sendInputDialogue(player, InputType.STRING_LONG, "Enter search term:"){value ->
showGeBotsearch(player, value as String)
}
else -> reject(player, "Invalid mode used. Available modes are: buying, selling, search")
}
}
@@ -281,6 +290,10 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){
first = false
}
val stringSelection = StringSelection(sb.toString())
val clpbrd = Toolkit.getDefaultToolkit().systemClipboard
clpbrd.setContents(stringSelection, null)
log.clear()
player.setAttribute("loc-log",log)
}
@@ -447,10 +460,15 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){
}
define("testlady",Command.Privilege.ADMIN){player,_ ->
player.antiMacroHandler.event = RandomEvents.EVIL_CHICKEN.npc.create(player,null,"sexam")
player.antiMacroHandler.event = RandomEvents.RIVER_TROLL.npc.create(player)
player.antiMacroHandler.event!!.init()
}
define("revent",Command.Privilege.ADMIN){player,_ ->
println(player.pulseManager.current)
player.antiMacroHandler.fireEvent()
}
define("addcredits",Command.Privilege.ADMIN){player,_ ->
player.details.credits += 100
}
@@ -510,37 +528,84 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){
}
}
fun showGeBotsearch(player: Player, searchTerm: String)
{
val offerAmounts = HashMap<Int,Int>()
val offerPrice = HashMap<Int,Int>()
val offers = GrandExchange.getBotOffers().filter { getItemName(it.itemID).contains(searchTerm, true) }
for(offer in offers)
{
offerAmounts[offer.itemID] = offer.amount
offerPrice[offer.itemID] = offer.offeredValue
}
val entries = offerAmounts.entries
var lineId = 11
setScrollTitle(player, "Bot Stock - \"$searchTerm\"")
for(i in 0..299) {
val offer = entries.elementAtOrNull(i)
if (offer != null)
setInterfaceText(player, "${getItemName(offer.key)} (<col=6bff89>x${offer.value}</col>) -> Price: <col=e8d151>${offerPrice[offer.key]}</col>gp", Components.QUESTJOURNAL_SCROLL_275, lineId++)
else
setInterfaceText(player, "", Components.QUESTJOURNAL_SCROLL_275, lineId++)
}
openInterface(player, Components.QUESTJOURNAL_SCROLL_275)
}
fun showGeBots(player: Player)
{
val offerAmounts = HashMap<Int,Int>()
val offerPrice = HashMap<Int,Int>()
val offers = GrandExchange.getBotOffers()
for(offer in offers)
{
offerAmounts[offer.itemID] = offer.amount
offerPrice[offer.itemID] = offer.offeredValue
}
val entries = offerAmounts.entries
var lineId = 11
setScrollTitle(player, "Bot Stock")
for(i in 0..299) {
val offer = entries.elementAtOrNull(i)
if (offer != null)
setInterfaceText(player, "${getItemName(offer.key)} (<col=6bff89>x${offer.value}</col>) -> Price: <col=e8d151>${offerPrice[offer.key]}</col>gp", Components.QUESTJOURNAL_SCROLL_275, lineId++)
else
setInterfaceText(player, "", Components.QUESTJOURNAL_SCROLL_275, lineId++)
}
openInterface(player, Components.QUESTJOURNAL_SCROLL_275)
}
fun showGeSell(player: Player){
val offers = HashMap<Int,Int>()
for (offerIDs in OfferManager.OFFERS_BY_ITEMID) {
var totalOffered = 0
for (offer in offerIDs.value) {
if (offer.offerState != OfferState.PENDING && offer.sell) {
totalOffered += offer.amountLeft
}
}
if (totalOffered != 0) {
offers[offerIDs.key] = totalOffered
}
}
for (offerIDs in OfferManager.BOT_OFFERS) {
if (offerIDs.value > 0) {
if (offers[offerIDs.key] == null) {
offers[offerIDs.key] = offerIDs.value
} else {
offers[offerIDs.key] = offers[offerIDs.key]!! + offerIDs.value
}
}
val offerAmounts = HashMap<Int,Int>()
val lowestPrice = HashMap<Int,Int>()
val offers = GrandExchange.getValidOffers()
for(offer in offers)
{
if(!offer.sell) continue
var amount = offerAmounts[offer.itemID] ?: 0
amount += offer.amountLeft
var price = lowestPrice[offer.itemID] ?: Integer.MAX_VALUE
if(offer.offeredValue < price) price = offer.offeredValue
offerAmounts[offer.itemID] = amount
lowestPrice[offer.itemID] = price
}
val offerList = offers.keys.map { "${ItemDefinition.forId(it).name} - ${offers[it]}" }.sorted()
val entries = offerAmounts.entries
var lineId = 11
setScrollTitle(player, "Active Sell Offers")
for(i in 0..299) {
val offer = offerList.elementAtOrNull(i)
val offer = entries.elementAtOrNull(i)
if (offer != null)
setInterfaceText(player, offer, Components.QUESTJOURNAL_SCROLL_275, lineId++)
setInterfaceText(player, "${getItemName(offer.key)} (<col=6bff89>x${offer.value}</col>) -> Lowest: <col=e8d151>${lowestPrice[offer.key]}</col>gp", Components.QUESTJOURNAL_SCROLL_275, lineId++)
else
setInterfaceText(player, "", Components.QUESTJOURNAL_SCROLL_275, lineId++)
}
@@ -548,26 +613,31 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){
}
fun showGeBuy(player: Player){
val offers = HashMap<Int,Int>()
for (offerIDs in OfferManager.OFFERS_BY_ITEMID) {
var totalOffered = 0
for (offer in offerIDs.value) {
if (offer.offerState != OfferState.PENDING && !offer.sell) {
totalOffered += offer.amountLeft
}
}
if (totalOffered != 0) {
offers[offerIDs.key] = totalOffered
}
}
val offerList = offers.keys.map { "${itemDefinition(it).name} - ${offers[it]}" }.sorted()
val offerAmounts = HashMap<Int,Int>()
val highestPrice = HashMap<Int,Int>()
val offers = GrandExchange.getValidOffers()
for(offer in offers)
{
if(offer.sell) continue
var amount = offerAmounts[offer.itemID] ?: 0
amount += offer.amountLeft
var price = highestPrice[offer.itemID] ?: 0
if(offer.offeredValue > price) price = offer.offeredValue
offerAmounts[offer.itemID] = amount
highestPrice[offer.itemID] = price
}
val entries = offerAmounts.entries
var lineId = 11
setScrollTitle(player, "Active Buy Offers")
for(i in 0..299) {
val offer = offerList.elementAtOrNull(i)
val offer = entries.elementAtOrNull(i)
if (offer != null)
setInterfaceText(player, offer, Components.QUESTJOURNAL_SCROLL_275, lineId++)
setInterfaceText(player, "${getItemName(offer.key)} (<col=6bff89>x${offer.value}</col>) -> Highest: <col=e8d151>${highestPrice[offer.key]}</col>gp", Components.QUESTJOURNAL_SCROLL_275, lineId++)
else
setInterfaceText(player, "", Components.QUESTJOURNAL_SCROLL_275, lineId++)
}
@@ -575,59 +645,64 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){
}
fun showOffers(player: Player, searchTerm: String){
val fakeOffers = ArrayList<FakeOffer>()
val offers = GrandExchange.getValidOffers().filter { getItemName(it.itemID).contains(searchTerm, true) }
val buyingAmount = HashMap<Int, Int>()
val buyingHighest = HashMap<Int, Int>()
val sellingAmount = HashMap<Int,Int>()
val sellingLowest = HashMap<Int,Int>()
OfferManager.OFFERS_BY_ITEMID.forEach { (id, offers) ->
if(searchTerm.toLowerCase().contains(itemDefinition(id).name.toLowerCase()) || itemDefinition(id).name.toLowerCase().contains(searchTerm.toLowerCase())){
offers.forEach {
fakeOffers.add(FakeOffer(it.sell, itemDefinition(id).name, it.amount))
}
for(offer in offers)
{
if(offer.sell)
{
var price = sellingLowest[offer.itemID] ?: Int.MAX_VALUE
if(offer.offeredValue < price) price = offer.offeredValue
var amount = sellingAmount[offer.itemID] ?: 0
amount += offer.amountLeft
sellingAmount[offer.itemID] = amount
sellingLowest[offer.itemID] = price
}
else
{
var price = buyingHighest[offer.itemID] ?: 0
if(offer.offeredValue > price) price = offer.offeredValue
var amount = buyingAmount[offer.itemID] ?: 0
amount += offer.amountLeft
buyingAmount[offer.itemID] = amount
buyingHighest[offer.itemID] = price
}
}
OfferManager.BOT_OFFERS.forEach{ (id, amount) ->
val name = getItemName(id)
if(searchTerm.toLowerCase().contains(name) || name.toLowerCase().contains(searchTerm.toLowerCase()))
fakeOffers.add(FakeOffer(true, getItemName(id), amount))
}
val buyingList = fakeOffers.filter { !it.sell }
val sellingList = fakeOffers.filter { it.sell }
val buyingMap = HashMap<String, Int>()
val sellingMap = HashMap<String, Int>()
buyingList.forEach {
if(buyingMap[it.name] == null) buyingMap[it.name] = it.amount
else buyingMap[it.name] = buyingMap[it.name]?.plus(it.amount) ?: 0
}
sellingList.forEach {
if(sellingMap[it.name] == null) sellingMap[it.name] = it.amount
else sellingMap[it.name] = sellingMap[it.name]?.plus(it.amount) ?: 0
}
val buyList = buyingMap.map { (name,amount) -> "[Buying] $name - $amount" }.sortedBy { it.length }.toMutableList()
val sellList = sellingMap.map { (name, amount) -> "[Selling] $name - $amount" }.sortedBy { it.length }.toMutableList()
sellList.reverse()
sellList.add("<str> </str>")
sellList.reverse()
SystemLogger.logInfo("bl: ${buyList.size} sl: ${sellList.size}")
setScrollTitle(player, "Results for \"$searchTerm\"")
if(buyList.isEmpty()){
buyList.add("[Buying] Nothing!")
}
if(sellList.size == 1){
sellList.add("[Selling] Nothing!")
}
var lineId = 11
for(i in 0..299) {
val offer = if(i < buyList.size) buyList.getOrNull(i) else sellList.getOrNull(i - (buyList.size))
setInterfaceText(player, offer ?: "", Components.QUESTJOURNAL_SCROLL_275, lineId++)
if(i > buyingAmount.keys.size)
{
val offer = sellingAmount.entries.elementAtOrNull(i - buyingAmount.keys.size)
if(offer != null) {
setInterfaceText(player, "[SELLING] ${getItemName(offer.key)} (<col=6bff89>x${offer.value}</col>) -> Lowest: <col=e8d151>${sellingLowest[offer.key]}</col>gp", Components.QUESTJOURNAL_SCROLL_275, lineId++)
continue
}
}
else if(i < buyingAmount.keys.size)
{
val offer = buyingAmount.entries.elementAtOrNull(i)
if(offer != null) {
setInterfaceText(player, "[BUYING] ${getItemName(offer.key)} (<col=6bff89>x${offer.value}</col>) -> Highest: <col=e8d151>${buyingHighest[offer.key]}</col>gp", Components.QUESTJOURNAL_SCROLL_275, lineId++)
continue
}
}
else {
setInterfaceText(player, "<str> </str>", Components.QUESTJOURNAL_SCROLL_275, lineId++)
continue
}
setInterfaceText(player, "", Components.QUESTJOURNAL_SCROLL_275, lineId++)
}
openInterface(player, Components.QUESTJOURNAL_SCROLL_275)
}
@@ -636,5 +711,4 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){
setInterfaceText(player, text, Components.QUESTJOURNAL_SCROLL_275, 2)
}
class FakeOffer(val sell: Boolean,val name: String,val amount: Int)
}
Server/src/main/kotlin/rs09/game/system/command/sets/SlayerCommandSet.kt
+1 -1
View File
@@ -13,7 +13,7 @@ class SlayerCommandSet : CommandSet(Command.Privilege.ADMIN){
define("finishtask"){player,_ ->
notify(player, "Kill the npc that spawned to finish your task.")
player.slayer.amount = 1
val finisher = NPC(player.slayer.task.npcs[0], player.location)
val finisher = NPC(player.slayer.task?.npcs?.get(0) ?: 0, player.location)
finisher.isRespawn = false
finisher.init()
}
Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt
+8 -4
View File
@@ -1,14 +1,16 @@
package rs09.game.system.command.sets
import core.cache.Cache
import core.game.node.entity.npc.NPC
import core.game.node.item.Item
import core.game.node.scenery.Scenery
import core.game.node.scenery.SceneryBuilder
import core.plugin.Initializable
import core.game.node.entity.npc.NPC
import core.game.node.item.Item
import rs09.game.system.SystemLogger
import rs09.game.system.command.Command
import rs09.game.system.command.CommandPlugin
import core.plugin.Initializable
import java.awt.Toolkit
import java.awt.datatransfer.StringSelection
@Initializable
class SpawnCommandSet : CommandSet(Command.Privilege.ADMIN){
@@ -27,7 +29,9 @@ class SpawnCommandSet : CommandSet(Command.Privilege.ADMIN){
npc.direction = player.direction
npc.init()
npc.isWalks = args.size > 2
val npcString = "{" + player!!.username + "," + npc.id + "," + npc.location.x + "," + npc.location.y + "," + npc.location.z + "}"
val npcString = "{" + npc.location.x + "," + npc.location.y + "," + npc.location.z + "," + (if (npc.isWalks) "1" else "0") + "," + npc.direction.ordinal + "}"
val clpbrd = Toolkit.getDefaultToolkit().systemClipboard
clpbrd.setContents(StringSelection(npcString), null)
println(npcString)
}