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

Added new field to item configs for overriding alchemy flag

Browse source 
Fixed alchemy for Fremennik items
This commit is contained in:
Trident101 2023-05-27 12:57:04 +00:00 • committed by Ryan
parent 6dcec3c42f
commit c3c836de4d
4 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Server/data/configs/item_configs.json
View file

@ -35379,6 +35379,7 @@
"durability": null,
"name": "Sticky red goop",
"tradeable": "true",
"alchemizable": "true",
"archery_ticket_price": "0",
"id": "3747"
},
@ -35388,6 +35389,7 @@
"durability": null,
"name": "Fremennik helm",
"weight": "2.7",
"alchemizable": "true",
"archery_ticket_price": "0",
"id": "3748",
"absorb": "1,0,2",
@ -35512,6 +35514,7 @@
"durability": null,
"name": "Fremennik blade",
"weight": "1.8",
"alchemizable": "true",
"archery_ticket_price": "0",
"attack_speed": "4",
"weapon_interface": "6",
@ -35526,6 +35529,7 @@
"name": "Fremennik shield",
"destroy": "true",
"weight": "2.2",
"alchemizable": "true",
"archery_ticket_price": "0",
"id": "3758",
"bonuses": "0,0,0,-8,-2,27,31,29,-1,29,30,0,0,0,0",
@ -38237,6 +38241,7 @@
"durability": null,
"name": "Arms",
"weight": "2",
"alchemizable": "true",
"archery_ticket_price": "0",
"id": "4195"
},
@ -38244,6 +38249,7 @@
"examine": "A pair of lifeless, rotting legs.",
"durability": null,
"name": "Legs",
"alchemizable": "true",
"archery_ticket_price": "0",
"id": "4196"
},
@ -38252,6 +38258,7 @@
"durability": null,
"name": "Decapitated head",
"weight": "3",
"alchemizable": "true",
"archery_ticket_price": "0",
"id": "4197"
},
@ -38260,6 +38267,7 @@
"durability": null,
"name": "Decapitated head",
"weight": "3",
"alchemizable": "true",
"archery_ticket_price": "0",
"id": "4198"
},
@ -38268,6 +38276,7 @@
"examine": "A pickled brain, submerged inside a jar of vinegar.",
"durability": null,
"name": "Pickled brain",
"alchemizable": "true",
"archery_ticket_price": "0",
"id": "4199"
},
@ -92708,6 +92717,7 @@
{
"durability": null,
"name": "A jester stick",
"alchemizable": "true",
"archery_ticket_price": "0",
"id": "10840",
"bonuses": "0,0,0,0,0,0,0,0,5,-5,0,0,0,0,0",

2
Server/src/main/content/global/skill/magic/modern/ModernListeners.kt
View file

@ -223,7 +223,7 @@ class ModernListeners : SpellListener("modern"){
public fun alchemize(player: Player, item: Item, high: Boolean) : Boolean {
if(item.name == "Coins") player.sendMessage("You can't alchemize something that's already gold!").also { return false }
if(!item.definition.isTradeable) player.sendMessage("You can't cast this spell on something like that.").also { return false }
if((!item.definition.isTradeable) && (!item.definition.isAlchemizable)) player.sendMessage("You can't cast this spell on something like that.").also { return false }
if(player.zoneMonitor.isInZone("Alchemists' Playground")){
player.sendMessage("You can only alch items from the cupboards!")

11
Server/src/main/core/cache/def/impl/ItemDefinition.java vendored
View file

@ -1386,6 +1386,17 @@ public class ItemDefinition extends Definition<Item> {
return getConfiguration(ItemConfigParser.LOW_ALCHEMY, (int)Math.rint(value * 0.4));
}
/**
* Checks if the item is alchemizable.
* @return {@code True} if so.
*/
public boolean isAlchemizable() {
if (!getConfiguration(ItemConfigParser.ALCHEMIZABLE, false)) {
return false;
}
return true;
}
/**
* Checks if the item is tradeable.
* @return {@code True} if so.

6
Server/src/main/core/game/system/config/ItemConfigParser.kt
View file

@ -40,6 +40,11 @@ class ItemConfigParser {
*/
const val TWO_HANDED = "two_handed"
/**
* The alchemisable configuration key.
*/
const val ALCHEMIZABLE = "alchemizable"
/**
* The high-alchemy price item configuration key.
*/
@ -268,6 +273,7 @@ class ItemConfigParser {
"destroy",
"lendable",
"tradeable" -> configs.put(it.key.toString(),it.value.toString().toBoolean())
"alchemizable", -> configs.put(it.key.toString(),it.value.toString().toBoolean())
//doubles
"weight" -> configs.put(it.key.toString(),it.value.toString().toDouble())