2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-20 13:30:27 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-sapphire-lanterns' into 'master'

Browse source 
Lighting sapphire lanterns requires filling them with lamp oil first.

See merge request 2009scape/2009scape!285
This commit is contained in:
Ceikry 2021-10-01 02:39:34 +00:00
commit 1c4dbe181c
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt
View file

@ -38,7 +38,7 @@ class LightSourceLighter : UseWithHandler(590,36,38){
* *
* For bullseye lanterns: * For bullseye lanterns:
* 4548 + tinderbox = 4550 * 4548 + tinderbox = 4550
* 4700 + tinderbox = 4702 * 4701 + tinderbox = 4702
* 9064 + tinderbox = 9065 * 9064 + tinderbox = 9065
* Required Level: 49 Firemaking * Required Level: 49 Firemaking
*/ */
@ -51,7 +51,7 @@ class LightSourceLighter : UseWithHandler(590,36,38){
addHandler(4522, ITEM_TYPE, this) addHandler(4522, ITEM_TYPE, this)
addHandler(4537, ITEM_TYPE, this) addHandler(4537, ITEM_TYPE, this)
addHandler(4548, ITEM_TYPE, this) addHandler(4548, ITEM_TYPE, this)
addHandler(4700, ITEM_TYPE, this) addHandler(4701, ITEM_TYPE, this)
addHandler(9064, ITEM_TYPE, this) addHandler(9064, ITEM_TYPE, this)
return this return this
} }
@ -86,4 +86,4 @@ class LightSourceLighter : UseWithHandler(590,36,38){
player.inventory.replace(item,Item(lightSource.litID)) player.inventory.replace(item,Item(lightSource.litID))
return true return true
} }
} }

6
Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSources.kt
View file

@ -9,7 +9,7 @@ enum class LightSources(val emptyID: Int, val fullID: Int, val litID: Int, val l
OIL_LAMP(4525,4522,4524,12,true), OIL_LAMP(4525,4522,4524,12,true),
OIL_LANTERN(4535,4537,4539,29,false), OIL_LANTERN(4535,4537,4539,29,false),
BULLSEYE_LANTERN(4546,4548,4550,49,false), BULLSEYE_LANTERN(4546,4548,4550,49,false),
SAPPHIRE_LANTERN(0,4700,4702,49,false), SAPPHIRE_LANTERN(0,4701,4702,49,false),
EMERALD_LANTERN(0,9064,9065,49,false); EMERALD_LANTERN(0,9064,9065,49,false);
companion object { companion object {
@ -23,10 +23,10 @@ enum class LightSources(val emptyID: Int, val fullID: Int, val litID: Int, val l
4522, 4524 -> OIL_LAMP 4522, 4524 -> OIL_LAMP
4537, 4539 -> OIL_LANTERN 4537, 4539 -> OIL_LANTERN
4548, 4550 -> BULLSEYE_LANTERN 4548, 4550 -> BULLSEYE_LANTERN
4700, 4702 -> SAPPHIRE_LANTERN 4701, 4702 -> SAPPHIRE_LANTERN
9064, 9065 -> EMERALD_LANTERN 9064, 9065 -> EMERALD_LANTERN
else -> null else -> null
} }
} }
} }
} }