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 -1
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 50ef07052e - Show all commits

10
Server/src/main/content/global/skill/farming/Patch.kt
View file

@ -209,7 +209,15 @@ class Patch(val player: Player, val patch: FarmingPatch, var plantable: Plantabl
PatchType.HERB_PATCH -> {
if(isDead) setVisualState(getHerbDeathValue())
else if(isDiseased && !isDead) setVisualState(getHerbDiseaseValue())
else setVisualState((plantable?.value ?: 0) + currentGrowthStage)
else {
var state = (plantable?.value ?: 0) + currentGrowthStage
// Spirit Weed contains states with bits 0x40 and 0x80 set, which the disease-free patch scenery interprets as watered/dead
// Visually transmogrifies Spirit Weed (204-208) into Guam (4-8) while it's planted in the disease-free patch
if (patch == FarmingPatch.TROLL_STRONGHOLD_HERB && plantable == Plantable.SPIRIT_WEED_SEED) {
state = 4 + currentGrowthStage
}
setVisualState(state)
}
}
PatchType.MUSHROOM_PATCH -> {
if(isDead) setVisualState(getMushroomDeathValue())