2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-05 00:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove util:lookup plugin

Browse Source 
Behaviour moved into the api plugin.
This commit is contained in:
Major
2018-04-08 16:19:02 +01:00
parent fdabea8162
commit 8fe09880b7
11 changed files with 66 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/plugin/shops/src/dsl.kt
+3 -4
View File
@@ -1,9 +1,8 @@
package org.apollo.game.plugin.shops
import org.apollo.cache.def.NpcDefinition
import org.apollo.game.plugin.api.Definitions
import org.apollo.game.plugin.shops.CategoryWrapper.Affix
import org.apollo.game.plugin.util.lookup.lookup_item
import org.apollo.game.plugin.util.lookup.lookup_npc
/**
* Creates a [Shop].
@@ -109,7 +108,7 @@ class ShopBuilder(val name: String) {
* Converts this builder into a [Shop].
*/
internal fun build(): Shop {
val items = sold.associateBy({ (first) -> lookup_item(first)!!.id }, Pair<String, Int>::second)
val items = sold.associateBy({ (first) -> Definitions.item(first)!!.id }, Pair<String, Int>::second)
val npc = NpcDefinition.lookup(operators().first())
return Shop(name, action.action(npc), items, trades.currency, buys.policy)
@@ -174,7 +173,7 @@ class OperatorBuilder internal constructor() {
* Adds a shop operator, using the specified [name] to resolve the npc id.
*/
infix fun by(name: String): OperatorBuilder {
operators.add(lookup_npc(name)!!.id)
operators.add(Definitions.npc(name)!!.id)
return this
}