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

Add ability to set exp rate to 10x by talking to Hans (#81)

Browse source 
* Add ability to set exp rate to 15x by talking to Hans

* Change EXP rate multiplier to 10x rather than 15
This commit is contained in:
Daniel Ginovker 2020-02-18 19:46:53 -05:00 • committed by GitHub
parent b41f05d039
commit 598b2fc722
5 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Server/src/org/crandor/game/content/skill/Skills.java
View file

@ -2,14 +2,11 @@ package org.crandor.game.content.skill;
import org.crandor.game.content.global.SkillcapePerks;
import org.crandor.game.content.global.tutorial.TutorialSession;
import org.crandor.game.content.holiday.HolidayEvent;
import org.crandor.game.node.entity.Entity;
import org.crandor.game.node.entity.combat.ImpactHandler;
import org.crandor.game.node.entity.npc.NPC;
import org.crandor.game.node.entity.player.Player;
import org.crandor.game.node.entity.player.link.IronmanMode;
import org.crandor.game.node.entity.player.link.request.assist.AssistSession;
import org.crandor.game.system.SystemManager;
import org.crandor.game.world.repository.Repository;
import org.crandor.game.world.update.flag.player.AppearanceFlag;
import org.crandor.net.packet.PacketRepository;
@ -27,7 +24,7 @@ public final class Skills {
/**
* Represents the constant modifier of experience.
*/
public static final double EXPERIENCE_MULTIPLIER = 20;
public double experienceMutiplier = 5.0;
/**
* The maximum experience multiplier.
@ -261,7 +258,7 @@ public final class Skills {
private double getExperienceMod(int slot, double experience, boolean playerMod, boolean multiplyer) {
//Keywords for people ctrl + Fing the project
//xprate xp rate xp multiplier skilling rate
return 5.0;
return experienceMutiplier;
/*if (!(entity instanceof Player)) {
return 1.0;
}
@ -359,6 +356,10 @@ public void parse(ByteBuffer buffer) {
experienceGained = buffer.getInt();
}
public void parseExpRate(ByteBuffer buffer) {
experienceMutiplier = buffer.getDouble();
}
/**
* Saves the skill data on the buffer.
* @param buffer The byte buffer.
@ -378,6 +379,10 @@ public void save(ByteBuffer buffer) {
buffer.putInt(experienceGained);
}
public void saveExpRate(ByteBuffer buffer) {
buffer.putDouble(experienceMutiplier);
}
/**
* Refreshes all the skill levels.
*/

7
Server/src/org/crandor/game/node/entity/player/info/login/PlayerParser.java
View file

@ -146,6 +146,9 @@ public final class PlayerParser {
player.getSkills().setCombatMilestone(buffer.get() & 0xFF);
player.getSkills().setSkillMilestone(buffer.get() & 0xFF);
break;
case 46:
player.getSkills().parseExpRate(buffer);
break;
default:
System.err.println("[Player parsing] Unhandled opcode: " + opcode + " for " + player.getName() + " - [log=" + Arrays.toString(opcodeLog) + "].");
break;
@ -297,7 +300,9 @@ public final class PlayerParser {
if (player.getSkills().getCombatMilestone() > 0 || player.getSkills().getSkillMilestone() > 0) {
buffer.put((byte) 45).put((byte) player.getSkills().getCombatMilestone()).put((byte) player.getSkills().getSkillMilestone());
}
player.getSkills().saveExpRate(buffer.put((byte) 46));
buffer.put((byte) 0); // EOF opcode
buffer.flip();
File file = new File(directory + "players/" + player.getName() + ".save");

4
Server/src/plugin/activity/pestcontrol/reward/PCRewardInterface.java
View file

@ -199,7 +199,7 @@ public final class PCRewardInterface extends ComponentPlugin {
} else if (skillId == Skills.MAGIC || skillId == Skills.RANGE) {
divideBy = 29;//19.1-31 ideal range
}
return (int) ((level * level) / divideBy) * (Skills.EXPERIENCE_MULTIPLIER / 2);
return (int) ((level * level) / divideBy) * (player.getSkills().experienceMutiplier / 2);
}
/**
@ -284,7 +284,7 @@ public final class PCRewardInterface extends ComponentPlugin {
if (reward.isSkillReward()) {
final double experience = ((int) calculateExperience(player, reward.getSkill()) * points);
player.getSkills().addExperience(reward.getSkill(), experience);
message = "The Void Knight has granted you " + (int) (experience * Skills.EXPERIENCE_MULTIPLIER) + " " + reward.getName() + ".";
message = "The Void Knight has granted you " + (int) (experience * player.getSkills().experienceMutiplier) + " " + reward.getName() + ".";
} else {
if (!reward.checkItemRequirement(player, option)) {
return;

28
Server/src/plugin/dialogue/HansDialoguePlugin.java
View file

@ -51,7 +51,7 @@ public final class HansDialoguePlugin extends DialoguePlugin {
switch (stage) {
case 0:
interpreter.sendOptions("Select an Option", "I'm looking for whoever is in charge of this place.", "I have come to kill everyone in this castle!", "I don't know. I'm lost. Where am I?", "Have you been here as long as me?");
interpreter.sendOptions("Select an Option", "I'm looking for whoever is in charge of this place.", "I have come to kill everyone in this castle!", "I don't know. I'm lost. Where am I?", "Have you been here as long as me?", "I'd like to learn faster!");
stage++;
break;
case 1:
@ -75,6 +75,15 @@ public final class HansDialoguePlugin extends DialoguePlugin {
interpreter.sendDialogues(npc, FacialExpression.NEUTRAL, "I've been patrolling this castle for years!");
stage = 40;
break;
case 5:
if (player.getSkills().experienceMutiplier == 15.0) {
interpreter.sendDialogues(npc, FacialExpression.OSRS_NORMAL, "Sorry, but you're already at the fastest experience", "rate. It's only a one way operation, and", "you can't learn faster yet I'm afraid!");
stage = 50;
} else {
interpreter.sendDialogues(npc, FacialExpression.HAPPY, "That's great! I can help you with that, but", "I must warn you it's only a one-way thing. There's no", "going back!");
stage = 150;
}
break;
}
break;
@ -108,6 +117,23 @@ public final class HansDialoguePlugin extends DialoguePlugin {
//Closing Chat
case 50:
end();
break;
case 150:
interpreter.sendOptions("Select an Option", "Set my exp rate to 10x", "Nevermind");
stage++;
break;
case 151:
switch (buttonId) {
case 1:
interpreter.sendDialogues(npc, FacialExpression.NEUTRAL, "Tada! Your experience rate is now 15x.", "Happy Scaping!");
player.getSkills().experienceMutiplier = 10.0;
stage = 50;
break;
case 2:
end();
break;
}
break;
}

4
Server/src/plugin/interaction/inter/ExperienceLampInterface.java
View file

@ -80,13 +80,13 @@ public final class ExperienceLampInterface extends ComponentPlugin {
double experience = skillLevel * modifier;
if (type != null && type != Lamps.GENIE_LAMP) {
player.getDialogueInterpreter().open(70099, new Object[] { "The lamp gives you " + (int) type.getExp() + " " + Skills.SKILL_NAME[skillType.skill] + " experience." });
experience = type.getExp() / Skills.EXPERIENCE_MULTIPLIER;
experience = type.getExp() / player.getSkills().experienceMutiplier;
int skill = skillType.skill;
if (skill == Skills.ATTACK || skill == Skills.DEFENCE || skill == Skills.HITPOINTS || skill == Skills.STRENGTH || skill == Skills.STRENGTH || skill == Skills.MAGIC || skill == Skills.RANGE) {
experience /= 2;
}
} else {
player.getDialogueInterpreter().open(70099, new Object[] { "The lamp gives you " + (experience * (Skills.EXPERIENCE_MULTIPLIER)) + " " + Skills.SKILL_NAME[skillType.skill] + " experience." });
player.getDialogueInterpreter().open(70099, new Object[] { "The lamp gives you " + (experience * (player.getSkills().experienceMutiplier)) + " " + Skills.SKILL_NAME[skillType.skill] + " experience." });
}
player.getSkills().addExperience(skillType.skill, experience, false);
}