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

Implemented summoning skillcape perk

Browse Source 
Pet Mastery: With your mastery of summoning familiars you have also learned the ability to teach pets to fend for themselves - they no longer rely on you for food. While the summoning cape is equipped your pet's hunger no longer increases (applies to all pets).
This commit is contained in:
Zerken
2023-06-28 07:31:42 +00:00
committed by Ryan
parent e965b8bb41
commit da33c89a70
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/global/skill/skillcapeperks/SkillcapePerks.kt
+2 -1
View File
@@ -77,6 +77,7 @@ enum class SkillcapePerks(val attribute: String, val effect: ((Player) -> Unit)?
}), }),
HASTY_COOKING("cape_perks:hasty-cooking"), HASTY_COOKING("cape_perks:hasty-cooking"),
SMOOTH_HANDS("cape_perks:smooth-hands"), SMOOTH_HANDS("cape_perks:smooth-hands"),
PET_MASTERY("cape_perks.pet-mastery"),
NONE("cape_perks:none") NONE("cape_perks:none")
; ;
@@ -111,7 +112,7 @@ enum class SkillcapePerks(val attribute: String, val effect: ((Player) -> Unit)?
Skillcape.WOODCUTTING -> NEST_HUNTER Skillcape.WOODCUTTING -> NEST_HUNTER
Skillcape.FARMING -> SEED_ATTRACTION Skillcape.FARMING -> SEED_ATTRACTION
Skillcape.HUNTING -> NONE Skillcape.HUNTING -> NONE
Skillcape.SUMMONING -> NONE Skillcape.SUMMONING -> PET_MASTERY
else -> NONE else -> NONE
} }
} }
Server/src/main/content/global/skill/summoning/pet/Pet.java
+6 -1
View File
@@ -1,5 +1,6 @@
package content.global.skill.summoning.pet; package content.global.skill.summoning.pet;
import content.global.skill.skillcapeperks.SkillcapePerks;
import content.global.skill.summoning.familiar.Familiar; import content.global.skill.summoning.familiar.Familiar;
import content.global.skill.summoning.familiar.FamiliarSpecial; import content.global.skill.summoning.familiar.FamiliarSpecial;
import core.game.node.entity.player.Player; import core.game.node.entity.player.Player;
@@ -59,7 +60,11 @@ public final class Pet extends Familiar {
public void handleTickActions() { public void handleTickActions() {
final PetDetails petDetails = details; final PetDetails petDetails = details;
if (getPet().getFood().length > 0) { if (getPet().getFood().length > 0) {
petDetails.updateHunger(petDetails.getStage() == 0 ? 0.025 : 0.018); if(SkillcapePerks.isActive(SkillcapePerks.PET_MASTERY, owner)) {
petDetails.updateHunger(0);
} else {
petDetails.updateHunger(petDetails.getStage() == 0 ? 0.025 : 0.018);
}
} }
double hunger = petDetails.getHunger(); double hunger = petDetails.getHunger();
if (hunger >= 75.0 && hunger <= 90.0 && hunger % 5 == 0) { if (hunger >= 75.0 && hunger <= 90.0 && hunger % 5 == 0) {