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

Implemented flower protection

Browse source
This commit is contained in:
Ceikry 2021-03-08 20:03:30 -06:00
parent 811171b68c
commit 2a9f089ea1
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Server/src/main/java/Server/core/game/node/entity/skill/farming/Patch.kt
View file

@ -127,7 +127,7 @@ class Patch(val player: Player, val patch: FarmingPatch, var plantable: Plantabl
CompostType.SUPER -> 13 CompostType.SUPER -> 13
} }
if(RandomFunction.random(128) <= (17 - diseaseMod) && !isWatered && !isGrown() && !protectionPaid){ if(RandomFunction.random(128) <= (17 - diseaseMod) && !isWatered && !isGrown() && !protectionPaid && !isFlowerProtected()){
//bush, tree, fruit tree can not disease on stage 1(0) of growth. //bush, tree, fruit tree can not disease on stage 1(0) of growth.
if(!((patch.type == PatchType.BUSH || patch.type == PatchType.TREE || patch.type == PatchType.FRUIT_TREE) && currentGrowthStage == 0)) { if(!((patch.type == PatchType.BUSH || patch.type == PatchType.TREE || patch.type == PatchType.FRUIT_TREE) && currentGrowthStage == 0)) {
isDiseased = true isDiseased = true
@ -181,4 +181,18 @@ class Patch(val player: Player, val patch: FarmingPatch, var plantable: Plantabl
plantable ?: return 0 plantable ?: return 0
return getCurrentState() - plantable!!.value - plantable!!.stages return getCurrentState() - plantable!!.value - plantable!!.stages
} }
fun isFlowerProtected(): Boolean{
if(patch.type != PatchType.ALLOTMENT) return false
val fpatch = when(patch){
FarmingPatch.S_FALADOR_ALLOTMENT_SE,FarmingPatch.S_FALADOR_ALLOTMENT_NW -> FarmingPatch.S_FALADOR_FLOWER_C
FarmingPatch.ARDOUGNE_ALLOTMENT_S,FarmingPatch.ARDOUGNE_ALLOTMENT_N -> FarmingPatch.ARDOUGNE_FLOWER_C
FarmingPatch.CATHERBY_ALLOTMENT_S,FarmingPatch.CATHERBY_ALLOTMENT_N -> FarmingPatch.CATHERBY_FLOWER_C
FarmingPatch.PORT_PHAS_ALLOTMENT_SE,FarmingPatch.PORT_PHAS_ALLOTMENT_NW -> FarmingPatch.PORT_PHAS_FLOWER_C
else -> return false
}.getPatchFor(player)
return (fpatch.plantable != null && fpatch.plantable == plantable?.protectionFlower && fpatch.isGrown())
}
} }