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

Applied embargoed patches - Marks Nov 1, 2021 Release.

Browse Source
This commit is contained in:
ceikry
2021-11-01 20:33:29 -05:00
parent a1003306c9
commit e8c422619a
9 changed files with 791 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/content/consumable/effects/PercentHeal.java
+4 -4
View File
@@ -12,10 +12,10 @@ public class PercentHeal extends ConsumableEffect {
@Override
public void activate(Player p) {
int amount = (int) Math.floor(p.getSkills().getMaximumLifepoints() * perc);
if(p.getSkills().getLifepoints() + amount > (p.getSkills().getMaximumLifepoints() + (p.getSkills().getMaximumLifepoints() * perc))){
amount = 0;
}
int maxHp = p.getSkills().getMaximumLifepoints();
int curHp = p.getSkills().getLifepoints();
int amount = (int) Math.floor(maxHp * perc);
amount = Math.min(amount, (int)((1.0 + perc) * (double)maxHp - (double)curHp));
p.getSkills().healNoRestrictions(amount);
}
}
Server/src/main/java/core/game/node/entity/npc/familiar/ElementalTitanNPC.java
+5 -2
View File
@@ -8,7 +8,7 @@ import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial;
public abstract class ElementalTitanNPC extends Familiar {
private static final int scrollHealAmount = 8;
private static final double scrollDefenceBoostPercent = 12.5;
private static final double scrollDefenceBoostPercent = 0.125;
public ElementalTitanNPC(Player owner, int id, int ticks, int pouchId, int specialCost, int attackStyle) {
super(owner, id, ticks, pouchId, specialCost, attackStyle);
@@ -20,7 +20,10 @@ public abstract class ElementalTitanNPC extends Familiar {
@Override
protected boolean specialMove(FamiliarSpecial special) {
int currentDefenceLevel = owner.getSkills().getLevel(Skills.DEFENCE);
owner.getSkills().updateLevel(Skills.DEFENCE, (int)(scrollDefenceBoostPercent * currentDefenceLevel));
int maximumDefenceLevel = owner.getSkills().getStaticLevel(Skills.DEFENCE);
owner.getSkills().updateLevel(Skills.DEFENCE,
(int)((1.0 + scrollDefenceBoostPercent) * currentDefenceLevel),
(int)((1.0 + scrollDefenceBoostPercent) * maximumDefenceLevel));
int currentHp = owner.getSkills().getLifepoints();
int maxHp = owner.getSkills().getMaximumLifepoints() + scrollHealAmount;
int healAmount = Math.min(maxHp - currentHp, scrollHealAmount);
Server/src/main/java/core/game/node/entity/player/Player.java
+1 -1
View File
@@ -577,7 +577,7 @@ public class Player extends Entity {
packetDispatch.sendMessage("Unhandled special attack for item " + weaponId + "!");
}
}
if (style == CombatStyle.RANGE && equipment.getNew(3).getId() == 10034) {
if (style == CombatStyle.RANGE && equipment.getNew(3).getId() == 10033 || equipment.getNew(3).getId() == 10034) {
return ChinchompaSwingHandler.getInstance();
}
return style.getSwingHandler();