Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
pull from: 2009Scape:master
merge into: Snowscape:upstream
Conversation 0 Commits 204 Files changed 719 +9 -5
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 501b75aa22 - Show all commits

10
Server/src/main/content/data/EnchantedJewellery.kt
View file

@ -9,15 +9,14 @@ import core.game.event.TeleportEvent
import core.game.interaction.QueueStrength
import core.game.node.entity.player.Player
import core.game.node.entity.player.link.TeleportManager
import core.game.node.entity.player.link.diary.DiaryType
import core.game.node.item.Item
import core.game.system.task.Pulse
import core.game.world.GameWorld
import core.game.world.map.Location
import core.game.world.update.flag.context.Animation
import core.game.world.update.flag.context.Graphics
import org.rs09.consts.Items
import core.game.world.GameWorld.Pulser
import core.tools.Log
import org.rs09.consts.Items
import org.rs09.consts.Sounds
import java.util.*
@ -258,6 +257,11 @@ enum class EnchantedJewellery(
resetAnimator(player)
unlock(player)
player.dispatch(TeleportEvent(TeleportManager.TeleportType.NORMAL, TeleportMethod.JEWELRY, item, location))
if (DIGSITE_PENDANT.ids.contains(item.id)) {
player.achievementDiaryManager.finishTask(player, DiaryType.VARROCK, 1, 10)
}
if (!replace) {
return@queueScript stopExecuting(player)
}

4
Server/src/main/core/game/node/entity/player/link/diary/DiaryType.java
View file

@ -1,8 +1,8 @@
package core.game.node.entity.player.link.diary;
import core.game.node.entity.player.Player;
import org.rs09.consts.Items;
import core.game.node.item.Item;
import org.rs09.consts.Items;
/**
* An achievement diary type.
@ -118,7 +118,7 @@ public enum DiaryType {
"Select a colour for a new kitten", // TODO need ring of charos(a) and garden of tranquility to start
"Use the shortcut under the wall, north-west of the Grand<br><br>Exchange",
"Enter the A Soul's Bane rift",
"Teleport to the Digsite using a Digsite pendant", // TODO need Digsite and museum
"Teleport to the Digsite using a Digsite pendant",
"Craft an earth tiara on the Earth Altar",
"Pickpocket a guard in the Varrock Palace courtyard",
"Use the teleport to Varrock spell",