yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfixes

Browse Source
This commit is contained in:
Ceikry
2021-03-22 12:27:38 -05:00
parent bb82cd461f
commit 5fe2dcde4a
6 changed files with 63630 additions and 63740 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/data/configs/drop_tables.json
+84 -204
View File
@@ -27820,249 +27820,129 @@
"main": [
{
"minAmount": "1",
"weight": "50.0",
"id": "1069",
"weight": "0.07",
"id": "4105",
"maxAmount": "1"
},
{
"minAmount": "5",
"weight": "8.0",
"id": "557",
"maxAmount": "5"
},
{
"minAmount": "42",
"weight": "1.3",
"id": "557",
"maxAmount": "42"
},
{
"minAmount": "2",
"weight": "1.3",
"id": "562",
"maxAmount": "2"
},
{
"minAmount": "1",
"weight": "5.9",
"id": "440",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "1355",
"weight": "3.6",
"id": "453",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "1197",
"weight": "2.3",
"id": "438",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "1161",
"weight": "1.0",
"id": "2351",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "1213",
"weight": "1.0",
"id": "436",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "0.5",
"id": "2349",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "0.3",
"id": "447",
"maxAmount": "1"
},
{
"minAmount": "4",
"weight": "1.0",
"id": "5318",
"maxAmount": "4"
},
{
"minAmount": "4",
"weight": "0.6",
"id": "5319",
"maxAmount": "4"
},
{
"minAmount": "4",
"weight": "0.5",
"id": "5324",
"maxAmount": "4"
},
{
"minAmount": "3",
"weight": "50.0",
"id": "563",
"weight": "0.2",
"id": "5322",
"maxAmount": "3"
},
{
"minAmount": "15",
"weight": "25.0",
"id": "561",
"maxAmount": "45"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "5106",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "5280",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "5281",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "5296",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "5297",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "5300",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "5301",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "5298",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "5299",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "5302",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "5303",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "5295",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "5304",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "199",
"minAmount": "3",
"weight": "0.1",
"id": "5320",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "201",
"maxAmount": "3"
"minAmount": "2",
"weight": "0.05",
"id": "5323",
"maxAmount": "2"
},
{
"minAmount": "2",
"weight": "0.025",
"id": "5321",
"maxAmount": "2"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "203",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "205",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "207",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "209",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "211",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "213",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "2485",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "215",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "217",
"maxAmount": "3"
},
{
"minAmount": "44",
"weight": "50.0",
"id": "995",
"maxAmount": "44"
},
{
"minAmount": "88",
"weight": "50.0",
"id": "995",
"maxAmount": "88"
},
{
"minAmount": "1",
"weight": "50.0",
"id": "225",
"weight": "3.7",
"id": "1913",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "4113",
"weight": "2.6",
"id": "2347",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "1.0",
"id": "13290",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "4113",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "1.0",
"id": "13290",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "2725",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"weight": "1.3",
"id": "31",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "100.0",
"id": "0",
"maxAmount": "1"
}
]
},
Server/data/configs/npc_configs.json
+63530 -63530
View File
File diff suppressed because it is too large Load Diff
Server/src/main/java/core/game/node/entity/player/link/emote/Emotes.java
+1 -1
View File
@@ -108,7 +108,7 @@ public enum Emotes {
if(player.getLocation().getRegionId() == 13206 && !player.getAttribute("mistag-greeted", false)) {
RegionManager.getLocalNpcs(player).forEach(npc -> {
if (npc.getId() == 2084 && npc.getLocation().withinDistance(player.getLocation(), 3) && player.getQuestRepository().getQuest("Lost Tribe").getStage(player) == 45) {
player.getDialogueInterpreter().open(2084,"greeting");
player.getDialogueInterpreter().open(2084,npc,"greeting");
player.setAttribute("/save:mistag-greeted",true);
}
});
Server/src/main/kotlin/rs09/game/content/dialogue/MistagDialogue.kt
+5 -4
View File
@@ -1,11 +1,11 @@
package rs09.game.content.dialogue
import core.game.component.Component
import core.game.node.entity.player.Player
import core.plugin.Initializable
import core.game.content.activity.ActivityManager
import core.game.content.dialogue.DialoguePlugin
import core.game.content.dialogue.FacialExpression
import core.game.node.entity.npc.NPC
import core.game.node.entity.player.Player
import core.plugin.Initializable
import rs09.game.content.quest.members.thelosttribe.GoblinFollower
import rs09.game.content.quest.members.thelosttribe.MistagLTDialogue
import rs09.tools.END_DIALOGUE
@@ -22,9 +22,10 @@ class MistagDialogue (player: Player? = null) : DialoguePlugin(player){
}
override fun open(vararg args: Any?): Boolean {
npc = args[0] as NPC
val ltStage = player.questRepository.getStage("Lost Tribe")
if(args.size > 0 && args[0] == "greeting"){
if(args.size > 1 && args[1] == "greeting"){
npc("A human knows ancient greeting?")
loadFile(MistagLTDialogue(true,ltStage))
return true
Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt
+6 -1
View File
@@ -156,7 +156,12 @@ object UseWithPatchHandler{
return true
}
val plantItem = if(patch.type == PatchType.ALLOTMENT) Item(plantable.itemID,3) else Item(plantable.itemID,1)
val plantItem =
if(patch.type == PatchType.ALLOTMENT) Item(plantable.itemID,3) else if(patch.type == PatchType.HOPS){
if(plantable == Plantable.JUTE_SEED) Item(plantable.itemID,3) else Item(plantable.itemID,4)
} else {
Item(plantable.itemID,1)
}
if(patch.type == PatchType.ALLOTMENT){
if(!player.inventory.containsItem(plantItem)){
Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt
+4
View File
@@ -469,5 +469,9 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){
player.varpManager.get(1048).clearBitRange(0,31)
player.varpManager.get(1048).send(player)
}
define("resetmistag",Command.Privilege.STANDARD){player,_ ->
player.removeAttribute("mistag-greeted")
}
}
}