Skip to content

Teletablets #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mark7625 merged 5 commits into from
Oct 29, 2025
Merged

Teletablets #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7250cf
,
Mark7625 Oct 29, 2025
2d5b49d
.
Mark7625 Oct 29, 2025
7aabe53
Added dbFind and table
Mark7625 Oct 29, 2025
e5913a5
Working Teleport Tablets
Mark7625 Oct 29, 2025
06ea07f
Merge branch 'main' into teletablets
Mark7625 Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ allprojects {

val lib = rootProject.project.libs
dependencies {
implementation("dev.or2:all:2.2.6")
implementation("dev.or2:all:2.2.7")
implementation(lib.kotlin.logging)
implementation(lib.logback.classic)
implementation(lib.fastutil)
Expand Down
12 changes: 9 additions & 3 deletions cache/src/main/kotlin/org/alter/CacheTools.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import dev.openrune.filesystem.Cache
import dev.openrune.tools.PackServerConfig
import io.github.oshai.kotlinlogging.KotlinLogging
import org.alter.impl.PrayerTable
import org.alter.impl.TeleTabs
import java.io.File
import java.nio.file.Files
import java.nio.file.StandardCopyOption
Expand All @@ -39,7 +40,6 @@ fun downloadRev(type : TaskType) {
logger.error { "Using Revision: $rev" }

val tasks : List<CacheTask> = listOf(
PackConfig(File("../data/raw-cache/configs/")),
PackServerConfig(),
).toMutableList()

Expand All @@ -53,7 +53,10 @@ fun downloadRev(type : TaskType) {
builder.environment(CacheEnvironment.valueOf(rev.third))

val tasksNew = tasks.toMutableList()
tasksNew.add(PackDBTables(listOf(PrayerTable.skillTable())))
tasksNew.add(PackDBTables(listOf(
PrayerTable.skillTable(),
TeleTabs.teleTabs()
)))

builder.extraTasks(*tasksNew.toTypedArray()).build().initialize()

Expand All @@ -69,7 +72,10 @@ fun downloadRev(type : TaskType) {
builder.revision(rev.first)

val tasksNew = tasks.toMutableList()
tasksNew.add(PackDBTables(listOf(PrayerTable.skillTable())))
tasksNew.add(PackDBTables(listOf(
PrayerTable.skillTable(),
TeleTabs.teleTabs()
)))

builder.extraTasks(*tasksNew.toTypedArray()).build().initialize()

Expand Down
191 changes: 113 additions & 78 deletions cache/src/main/kotlin/org/alter/impl/PrayerTable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,189 +6,224 @@ import dev.openrune.definition.util.VarType
object PrayerTable {

fun skillTable() = dbTable("tables.skill_prayer") {
column("exp", 0, arrayOf(VarType.INT))
column("ashes", 1, arrayOf(VarType.BOOLEAN))

column("item", 0, arrayOf(VarType.OBJ))
column("exp", 1, arrayOf(VarType.INT))
column("ashes", 2, arrayOf(VarType.BOOLEAN))

row("dbrows.bones") {
column(0, arrayOf(5))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.bones"))
column(1, arrayOf(5))
column(2, arrayOf(false))
}

row("dbrows.wolfbones") {
column(0, arrayOf(5))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.wolf_bones"))
column(1, arrayOf(5))
column(2, arrayOf(false))
}

row("dbrows.burntbones") {
column(0, arrayOf(5))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.bones_burnt"))
column(1, arrayOf(5))
column(2, arrayOf(false))
}

row("dbrows.monkeybones") {
column(0, arrayOf(5))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.mm_normal_monkey_bones"))
column(1, arrayOf(5))
column(2, arrayOf(false))
}

row("dbrows.batbones") {
column(0, arrayOf(5))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.bat_bones"))
column(1, arrayOf(5))
column(2, arrayOf(false))
}

row("dbrows.bigbones") {
column(0, arrayOf(15))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.big_bones"))
column(1, arrayOf(15))
column(2, arrayOf(false))
}

row("dbrows.jogrebones") {
column(0, arrayOf(15))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.tbwt_jogre_bones"))
column(1, arrayOf(15))
column(2, arrayOf(false))
}

row("dbrows.wyrmlingbones") {
column(0, arrayOf(21))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.babywyrm_bones"))
column(1, arrayOf(21))
column(2, arrayOf(false))
}

row("dbrows.zogrebones") {
column(0, arrayOf(23))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.zogre_bones"))
column(1, arrayOf(23))
column(2, arrayOf(false))
}

row("dbrows.shaikahanbones") {
column(0, arrayOf(25))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.tbwt_beast_bones"))
column(1, arrayOf(25))
column(2, arrayOf(false))
}

row("dbrows.babydragonbones") {
column(0, arrayOf(30))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.babydragon_bones"))
column(1, arrayOf(30))
column(2, arrayOf(false))
}

row("dbrows.wyrmbones") {
column(0, arrayOf(50))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.wyrm_bones"))
column(1, arrayOf(50))
column(2, arrayOf(false))
}

row("dbrows.wyvernbones") {
column(0, arrayOf(72))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.wyvern_bones"))
column(1, arrayOf(72))
column(2, arrayOf(false))
}

row("dbrows.dragonbones") {
column(0, arrayOf(72))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.dragon_bones"))
column(1, arrayOf(72))
column(2, arrayOf(false))
}

row("dbrows.drakebones") {
column(0, arrayOf(80))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.drake_bones"))
column(1, arrayOf(80))
column(2, arrayOf(false))
}

row("dbrows.fayrgbones") {
column(0, arrayOf(84))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.zogre_ancestral_bones_fayg"))
column(1, arrayOf(84))
column(2, arrayOf(false))
}

row("dbrows.lavadragonbones") {
column(0, arrayOf(85))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.lava_dragon_bones"))
column(1, arrayOf(85))
column(2, arrayOf(false))
}

row("dbrows.raurgbones") {
column(0, arrayOf(96))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.zogre_ancestral_bones_raurg"))
column(1, arrayOf(96))
column(2, arrayOf(false))
}

row("dbrows.hydrabones") {
column(0, arrayOf(110))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.hydra_bones"))
column(1, arrayOf(110))
column(2, arrayOf(false))
}

row("dbrows.dagannothbones") {
column(0, arrayOf(125))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.dagannoth_king_bones"))
column(1, arrayOf(125))
column(2, arrayOf(false))
}

row("dbrows.ourgbones") {
column(0, arrayOf(140))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.zogre_ancestral_bones_ourg"))
column(1, arrayOf(140))
column(2, arrayOf(false))
}

row("dbrows.superiordragonbones") {
column(0, arrayOf(150))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.dragon_bones_superior"))
column(1, arrayOf(150))
column(2, arrayOf(false))
}

row("dbrows.alansbones") {
column(0, arrayOf(3))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.alan_bones"))
column(1, arrayOf(3))
column(2, arrayOf(false))
}

row("dbrows.bonesapeatoll") {
column(0, arrayOf(3))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.mm_skeleton_bones"))
column(1, arrayOf(3))
column(2, arrayOf(false))
}

row("dbrows.bleachedbones") {
column(0, arrayOf(5))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.shade_bleached_bones"))
column(1, arrayOf(5))
column(2, arrayOf(false))
}

row("dbrows.smallzombiemonkeybones") {
column(0, arrayOf(5))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.mm_small_zombie_monkey_bones"))
column(1, arrayOf(5))
column(2, arrayOf(false))
}

row("dbrows.largezombiemonkeybones") {
column(0, arrayOf(5))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.mm_large_zombie_monkey_bones"))
column(1, arrayOf(5))
column(2, arrayOf(false))
}

row("dbrows.smallninjamonkeybones") {
column(0, arrayOf(16))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.mm_small_ninja_monkey_bones"))
column(1, arrayOf(16))
column(2, arrayOf(false))
}

row("dbrows.mediumninjamonkeybones") {
column(0, arrayOf(18))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.mm_medium_ninja_monkey_bones"))
column(1, arrayOf(18))
column(2, arrayOf(false))
}

row("dbrows.gorillabones") {
column(0, arrayOf(18))
column(1, arrayOf(false))
columnRSCM(0, arrayOf("items.mm_normal_gorilla_monkey_bones"))
column(1, arrayOf(18))
column(2, arrayOf(false))
}

row("dbrows.beardedgorillabones") {
column(0, arrayOf(18))
column(1, arrayOf(true))
columnRSCM(0, arrayOf("items.mm_bearded_gorilla_monkey_bones"))
column(1, arrayOf(18))
column(2, arrayOf(true))
}

row("dbrows.fiendishashes") {
column(0, arrayOf(10))
column(1, arrayOf(true))
columnRSCM(0, arrayOf("items.fiendish_ashes"))
column(1, arrayOf(10))
column(2, arrayOf(true))
}

row("dbrows.vileashes") {
column(0, arrayOf(25))
column(1, arrayOf(true))
columnRSCM(0, arrayOf("items.vile_ashes"))
column(1, arrayOf(25))
column(2, arrayOf(true))
}

row("dbrows.maliciousashes") {
column(0, arrayOf(65))
column(1, arrayOf(true))
columnRSCM(0, arrayOf("items.malicious_ashes"))
column(1, arrayOf(65))
column(2, arrayOf(true))
}

row("dbrows.abyssalashes") {
column(0, arrayOf(85))
column(1, arrayOf(true))
columnRSCM(0, arrayOf("items.abyssal_ashes"))
column(1, arrayOf(85))
column(2, arrayOf(true))
}

row("dbrows.infernalashes") {
column(0, arrayOf(110))
column(1, arrayOf(true))
columnRSCM(0, arrayOf("items.infernal_ashes"))
column(1, arrayOf(110))
column(2, arrayOf(true))
}

}

}
}
Loading
Loading