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

Fixed ironman mode being stuck after permadeath

Browse Source
This commit is contained in:
Player Name
2024-05-13 15:13:23 +00:00
committed by Ryan
parent a63867627e
commit f501468ead
9 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/global/activity/shootingstar/ShootingStarMiningPulse.kt
+1 -1
View File
@@ -48,7 +48,7 @@ class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: Shootin
val bonusXp = 75 * player.skills.getStaticLevel(Skills.MINING)
player.incrementAttribute("/save:shooting-star:bonus-xp", bonusXp)
Repository.sendNews(player.username + " is the discoverer of the crashed star near " + star.location + "!")
player.sendMessage("You have ${player.skills.experienceMutiplier * player.getAttribute("shooting-star:bonus-xp", 0).toDouble()} bonus xp towards mining stardust.")
player.sendMessage("You have ${player.skills.experienceMultiplier * player.getAttribute("shooting-star:bonus-xp", 0).toDouble()} bonus xp towards mining stardust.")
ShootingStarPlugin.submitScoreBoard(player)
star.isDiscovered = true
return player.skills.getLevel(Skills.MINING) >= star.miningLevel
Server/src/main/content/minigame/pestcontrol/reward/PCRewardInterface.java
+2 -2
View File
@@ -198,7 +198,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) * (player.getSkills().experienceMutiplier / 2);
return (int) ((level * level) / divideBy) * (player.getSkills().experienceMultiplier / 2);
}
/**
@@ -283,7 +283,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 * player.getSkills().experienceMutiplier) + " " + reward.getName() + ".";
message = "The Void Knight has granted you " + (int) (experience * player.getSkills().experienceMultiplier) + " " + reward.getName() + ".";
} else {
if (!reward.checkItemRequirement(player, option)) {
return;
Server/src/main/content/region/misc/tutisland/dialogue/TutorialMagicTutorDialogue.kt
+5 -5
View File
@@ -93,7 +93,7 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
}
}
71 -> when(stage){
0 -> options("Set Ironman Mode (current: ${player.ironmanManager.mode.name})", "Change XP Rate (current: ${player.skills.experienceMutiplier}x)", "I'm ready now.").also { stage++ }
0 -> options("Set Ironman Mode (current: ${player.ironmanManager.mode.name})", "Change XP Rate (current: ${player.skills.experienceMultiplier}x)", "I'm ready now.").also { stage++ }
1 -> when(buttonId){
1 -> options("None","Standard","Hardcore (Permadeath!)","Ultimate","Nevermind.").also { stage = 10 }
2 -> options("1.0x","2.5x","5.0x","10x").also { stage = 20 }
@@ -107,7 +107,7 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
val mode = IronmanMode.values()[buttonId - 1]
player.dialogueInterpreter.sendDialogue("You set your ironman mode to: ${mode.name}.")
player.ironmanManager.mode = mode
if (player.skills.experienceMutiplier == 10.0 && mode != IronmanMode.HARDCORE) player.skills.experienceMutiplier = 5.0
if (player.skills.experienceMultiplier == 10.0 && mode != IronmanMode.HARDCORE) player.skills.experienceMultiplier = 5.0
}
else
{
@@ -124,7 +124,7 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
return true
}
player.dialogueInterpreter.sendDialogue("You set your XP rate to: ${rate}x.")
player.skills.experienceMutiplier = rate
player.skills.experienceMultiplier = rate
stage = 0
}
@@ -154,9 +154,9 @@ class TutorialMagicTutorDialogue(player: Player? = null) : core.game.dialogue.Di
{
setAttribute(player, "/save:permadeath", true)
}
else if(player.skills.experienceMutiplier == 10.0)
else if(player.skills.experienceMultiplier == 10.0)
{
player.skills.experienceMutiplier = 5.0
player.skills.experienceMultiplier = 5.0
}
//This overwrites the stuck dialogue after teleporting to Lumbridge for some reason
Server/src/main/content/region/misthalin/lumbridge/dialogue/HansDialoguePlugin.java
+7 -7
View File
@@ -98,7 +98,7 @@ public final class HansDialoguePlugin extends DialoguePlugin {
stage = 41;
break;
case 2:
npc("Your current XP rate is: " + player.getSkills().experienceMutiplier);
npc("Your current XP rate is: " + player.getSkills().experienceMultiplier);
stage = 11;
break;
case 3:
@@ -123,7 +123,7 @@ public final class HansDialoguePlugin extends DialoguePlugin {
break;
case 11:
if (player.getSkills().experienceMutiplier == 5.0) {
if (player.getSkills().experienceMultiplier == 5.0) {
player.newPlayer = player.getSkills().getTotalLevel() < 50;
options("Change xp rate", "Nevermind.");
stage++;
@@ -152,7 +152,7 @@ public final class HansDialoguePlugin extends DialoguePlugin {
switch(buttonId){
case 1:
if(player.newPlayer) {
player.getSkills().experienceMutiplier = 1.0;
player.getSkills().experienceMultiplier = 1.0;
stage = 14;
} else {
stage = 15;
@@ -161,7 +161,7 @@ public final class HansDialoguePlugin extends DialoguePlugin {
break;
case 2:
if(player.newPlayer){
player.getSkills().experienceMutiplier = 2.5;
player.getSkills().experienceMultiplier = 2.5;
stage = 14;
} else {
stage = 15;
@@ -173,7 +173,7 @@ public final class HansDialoguePlugin extends DialoguePlugin {
return true;
case 4:
if (player.newPlayer) {
player.getSkills().experienceMutiplier = 10.0;
player.getSkills().experienceMultiplier = 10.0;
stage = 14;
} else {
stage = 15;
@@ -183,7 +183,7 @@ public final class HansDialoguePlugin extends DialoguePlugin {
npc("One moment, please...");
break;
case 14:
npc("Tada, your xp rate is now " + player.getSkills().experienceMutiplier);
npc("Tada, your xp rate is now " + player.getSkills().experienceMultiplier);
stage = 131;
break;
case 15:
@@ -376,7 +376,7 @@ public final class HansDialoguePlugin extends DialoguePlugin {
switch (buttonId) {
case 1:
interpreter.sendDialogues(npc, FacialExpression.FRIENDLY, "Tada! Your experience rate is now 10x.", "Happy Scaping!");
player.getSkills().experienceMutiplier = 10.0;
player.getSkills().experienceMultiplier = 10.0;
stage = 50;
break;
case 2: