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

Merge branch 'master' into 'master'

Browse source 
Fix: Blue Partyhat from the credits shop should be the correct item

See merge request 2009scape/2009scape!287
This commit is contained in:
Ceikry 2021-10-02 21:57:11 +00:00
commit e0086c8e80
1 changed files with 79 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Server/src/main/kotlin/rs09/game/interaction/inter/CreditShopInterface.kt
View file

@ -25,7 +25,7 @@ class CreditShopInterface : InterfaceListener() {
val specific = when(opcode){ val specific = when(opcode){
196 -> if(buttonID == 14) Items.RED_PARTYHAT_1038 else Items.RED_HWEEN_MASK_1057 196 -> if(buttonID == 14) Items.RED_PARTYHAT_1038 else Items.RED_HWEEN_MASK_1057
124 -> if(buttonID == 14) Items.GREEN_PARTYHAT_1044 else Items.GREEN_HWEEN_MASK_1053 124 -> if(buttonID == 14) Items.GREEN_PARTYHAT_1044 else Items.GREEN_HWEEN_MASK_1053
199 -> if(buttonID == 14) Items.BLUE_PARTYHAT_2422 else Items.BLUE_HWEEN_MASK_1055 199 -> if(buttonID == 14) Items.BLUE_PARTYHAT_1042 else Items.BLUE_HWEEN_MASK_1055
234 -> Items.YELLOW_PARTYHAT_1040 234 -> Items.YELLOW_PARTYHAT_1040
168 -> Items.PURPLE_PARTYHAT_1046 168 -> Items.PURPLE_PARTYHAT_1046
166 -> Items.WHITE_PARTYHAT_1048 166 -> Items.WHITE_PARTYHAT_1048
@ -46,7 +46,7 @@ class CreditShopInterface : InterfaceListener() {
private fun getItem(buttonID: Int): ShopItem{ private fun getItem(buttonID: Int): ShopItem{
return when(buttonID){ return when(buttonID){
14 -> ShopItem(Items.BLUE_PARTYHAT_2422,75) 14 -> ShopItem(Items.BLUE_PARTYHAT_1042,75)
18 -> ShopItem(Items.SCYTHE_1419,100) 18 -> ShopItem(Items.SCYTHE_1419,100)
20 -> ShopItem(Items.JANGLES_THE_MONKEY_14648,200) 20 -> ShopItem(Items.JANGLES_THE_MONKEY_14648,200)
17 -> ShopItem(Items.CHRISTMAS_CRACKER_962,65) 17 -> ShopItem(Items.CHRISTMAS_CRACKER_962,65)