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

Implement HCIM rework

Browse Source
This commit is contained in:
ceikry
2021-12-15 20:45:15 -06:00
parent 178bbbc05c
commit e234c9fa28
5 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/content/dialogue/HansDialoguePlugin.java
+16 -1
View File
@@ -137,7 +137,11 @@ public final class HansDialoguePlugin extends DialoguePlugin {
case 12:
switch(buttonId){
case 1:
options("1.0x","2.5x","Stay 5.0x");
if(player.getAttributes().containsKey("permadeath")){
options("1.0x", "2.5x", "Stay 5.0x", "(HCIM Only) 10x");
} else {
options("1.0x", "2.5x", "Stay 5.0x");
}
stage++;
break;
case 2:
@@ -169,6 +173,14 @@ public final class HansDialoguePlugin extends DialoguePlugin {
playerl(FacialExpression.FRIENDLY, "I'd rather stay 5x, thank you.");
stage = END_DIALOGUE;
return true;
case 4:
if (player.newPlayer) {
player.getSkills().experienceMutiplier = 10.0;
stage = 14;
} else {
stage = 15;
}
break;
}
npc("One moment, please...");
break;
@@ -325,6 +337,9 @@ public final class HansDialoguePlugin extends DialoguePlugin {
interpreter.sendDialogues(npc, FacialExpression.NEUTRAL,"I have changed your Iron Man mode to: ","" + (buttonId == 1 ? "Standard" : "<col=8A0808>Hardcore</col>" + " Ironman mode."));
player.getSettings().toggleAcceptAid();
player.getIronmanManager().setMode(IronmanMode.values()[buttonId]);
if(buttonId == 2) {
player.setAttribute("/save:permadeath",true);
}
player.sendMessage("Your Iron Man status has been changed.");
stage = 50;
break;
Server/src/main/java/core/game/node/entity/Entity.java
+6 -1
View File
@@ -55,7 +55,7 @@ public abstract class Entity extends Node {
/**
* The entity's skills.
*/
private final Skills skills = new Skills(this);
public Skills skills = new Skills(this);
/**
* The entity's extension classes.
@@ -703,6 +703,11 @@ public abstract class Entity extends Node {
return attributes.getAttributes();
}
public void clearAttributes() {
this.attributes.getAttributes().clear();
this.attributes.getSavedAttributes().clear();
}
/**
* Sets an attribute value.
* @param key The attribute name.
Server/src/main/java/core/game/node/entity/player/Player.java
+26 -7
View File
@@ -9,6 +9,7 @@ import core.game.container.impl.InventoryListener;
import core.game.content.activity.pyramidplunder.PlunderObjectManager;
import core.game.content.dialogue.DialogueInterpreter;
import core.game.content.quest.miniquest.barcrawl.BarcrawlManager;
import core.game.content.quest.tutorials.tutorialisland.TutorialSession;
import core.game.content.ttrail.TreasureTrailManager;
import core.game.interaction.Interaction;
import core.game.interaction.item.brawling_gloves.BrawlingGlovesManager;
@@ -79,10 +80,12 @@ import rs09.game.content.ame.RandomEventManager;
import rs09.game.ge.PlayerGrandExchange;
import rs09.game.node.entity.combat.CombatSwingHandler;
import rs09.game.node.entity.combat.equipment.EquipmentDegrader;
import rs09.game.node.entity.player.info.login.PlayerSaver;
import rs09.game.node.entity.skill.runecrafting.PouchManager;
import rs09.game.node.entity.state.newsys.State;
import rs09.game.node.entity.state.newsys.StateRepository;
import rs09.game.world.GameWorld;
import rs09.game.world.repository.DisconnectionQueue;
import rs09.game.world.repository.Repository;
import rs09.game.world.update.MapChunkRenderer;
import rs09.game.world.update.NPCRenderer;
@@ -201,7 +204,7 @@ public class Player extends Entity {
/**
* The quest repository.
*/
private final QuestRepository questRepository = new QuestRepository(this);
private QuestRepository questRepository = new QuestRepository(this);
/**
* The prayer manager.
@@ -241,7 +244,7 @@ public class Player extends Entity {
/**
* The saved data.
*/
private final SavedData savedData = new SavedData(this);
private SavedData savedData = new SavedData(this);
/**
* The request manager.
@@ -613,11 +616,27 @@ public class Player extends Entity {
if (!getZoneMonitor().handleDeath(killer) && (!getProperties().isSafeZone() && getZoneMonitor().getType() != ZoneType.SAFE.getId()) && getDetails().getRights() != Rights.ADMINISTRATOR) {
//If player was a Hardcore Ironman, announce that they died
if (this.getIronmanManager().getMode().equals(IronmanMode.HARDCORE)){ //if this was checkRestriction, ultimate irons would be moved to HARDCORE_DEAD as well
String gender = this.isMale() ? "Man " : "Woman ";
Repository.sendNews("Hardcore Iron " + gender + " " + this.getUsername() +" has fallen. Total Level: " + this.getSkills().getTotalLevel()); // Not enough room for XP
this.getIronmanManager().setMode(IronmanMode.STANDARD);
asPlayer().getSavedData().getActivityData().setHardcoreDeath(true);
this.sendMessage("You have fallen as a Hardcore Iron Man, your Hardcore status has been revoked.");
String gender = this.isMale() ? "man " : "woman ";
if (getAttributes().containsKey("permadeath")) {
Repository.sendNews("Permadeath Hardcore Iron" + gender + " " + this.getUsername() + " has fallen. Total Level: " + this.getSkills().getTotalLevel()); // Not enough room for XP
TutorialSession.getExtension(this).setStage(0);
equipment.clear();
inventory.clear();
bank.clear();
skills = new Skills(this);
clearAttributes();
setAttribute("/save:permadeath", true);
savedData = new SavedData(this);
questRepository = new QuestRepository(this);
new PlayerSaver(this).save();
clear(true);
return;
} else {
Repository.sendNews("Hardcore Iron " + gender + " " + this.getUsername() + " has fallen. Total Level: " + this.getSkills().getTotalLevel()); // Not enough room for XP
this.getIronmanManager().setMode(IronmanMode.STANDARD);
asPlayer().getSavedData().getActivityData().setHardcoreDeath(true);
this.sendMessage("You have fallen as a Hardcore Iron Man, your Hardcore status has been revoked.");
}
}
GroundItemManager.create(new Item(526), getLocation(), k);
final Container[] c = DeathTask.getContainers(this);