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

Merge branch 'godbook_code_quality' into 'master'

Browse Source 
Godbook Quality Update

See merge request 2009scape/2009scape!239
This commit is contained in:
Ceikry
2021-08-28 16:47:52 +00:00
parent 6833c21823 eecdaa9478
commit e8a37a46f9
2 changed files with 135 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/interaction/item/GodBookPlugin.java
+1 -129
View File
@@ -31,9 +31,8 @@ public class GodBookPlugin extends OptionHandler {
public Plugin<Object> newInstance(Object arg) throws Throwable { public Plugin<Object> newInstance(Object arg) throws Throwable {
for (GodBook book : GodBook.values()) { for (GodBook book : GodBook.values()) {
book.getDamagedBook().getDefinition().getHandlers().put("option:check", this); book.getDamagedBook().getDefinition().getHandlers().put("option:check", this);
book.getBook().getDefinition().getHandlers().put("option:preach", this);
} }
PluginManager.definePlugins(new PageHandler(), new GodBookDialogue(), new GodBookItem(), new SymbolBlessHandler()); PluginManager.definePlugins(new PageHandler(), new GodBookItem(), new SymbolBlessHandler());
return this; return this;
} }
@@ -153,133 +152,6 @@ public class GodBookPlugin extends OptionHandler {
} }
/**
* Handles the god book dialogue.
* @author Vexia
*/
public static class GodBookDialogue extends DialoguePlugin {
/**
* The partnership messages.
*/
private static final String[][] PARTNERSHIPS = new String[][] { { "In the name of Saradomin,", "protector of us all,", " I now join you in the eyes of Saradomin." }, { "Light and dark,", "day and night,", "Balance arises from contrast.", "I unify thee in the name of Guthix." }, { "May your union not be harmonious,", "but may your conflicts make you stronger,", "in Zamorak's name,", "now two are one." } };
/**
* The last rite messages.
*/
private static final String[][] LAST_RITES = new String[][] { { "Thy cause was false,", "thy skills did lack;", "See you in Lumbridge when you get back." }, { "Thy death was not in vain,", "For it brought some balance to the world.", "May Guthix bring thee rest." }, { "The weak deserve to die,", "so the strong may flourish.", "This is the creed of Zamorak." } };
/**
* The blessing messages.
*/
private static final String[][] BLESSINGS = new String[][] { { "Go in peace in the name of Saradomin;", "may his glory shine upon you like the sun." }, { "Mayest thou walk the path,", "and never fall,", "For Guthix walks beside thee on thy journey.", "May Guthix bring thee peace." }, { "May you reject all safe paths,", "and embrace all challenges.", "Zamorak bring you strength." } };
/**
* The preaching messages.
*/
private static final String[][] PREACH = new String[][] { { "Protect yourself,", "protect your friends.", "Mine is the glory that never ends.", "This is Saradomin's wisdom." }, { "Thee trees,", "the earth,", "the sky,", "the waters:", "All play their part upon this land.", "May Guthix bring thee balance." }, { "Battles are not lost and won;", "They simply remove the weak from the equation.", "Zamorak give me strength!" } };
private static final Animation[] ANIMATIONS = new Animation[] { new Animation(1335), new Animation(1337), new Animation(1336) };
/**
* The god book.
*/
private GodBook book;
/**
* Constructs a new {@code GodBookDialogue} {@code Object}
*/
public GodBookDialogue() {
/**
* empty.
*/
}
/**
* Constructs a new {@code GodBookDialogue} {@code Object}
* @param player the player.
*/
public GodBookDialogue(Player player) {
super(player);
}
@Override
public DialoguePlugin newInstance(Player player) {
return new GodBookDialogue(player);
}
@Override
public boolean open(Object... args) {
book = (GodBook) args[0];
options("Wedding Ceremony", "Last Rites", "Blessings", "Preach");
return true;
}
@Override
public boolean handle(int interfaceId, int buttonId) {
switch (stage) {
case 0:
String[][] data = null;
switch (buttonId) {
case 1:
data = PARTNERSHIPS;
break;
case 2:
data = LAST_RITES;
break;
case 3:
data = BLESSINGS;
break;
case 4:
data = PREACH;
break;
}
say(data);
end();
break;
}
return true;
}
/**
* Says the messages for the type.
* @param data the data.
*/
private void say(String[][] data) {
if (player.inCombat()) {
player.sendMessage("You can't do that while in combat.");
return;
}
final String[] messages = data[book.ordinal()];
final Animation animation = ANIMATIONS[book.ordinal()];
player.animate(animation);
player.lock();
GameWorld.getPulser().submit(new Pulse(2, player) {
int index = 0;
@Override
public boolean pulse() {
player.animate(animation);
player.sendChat(messages[index]);
return index++ >= messages.length - 1;
}
@Override
public void stop() {
super.stop();
player.unlock();
}
});
}
@Override
public int[] getIds() {
return new int[] { DialogueInterpreter.getDialogueKey("god-book") };
}
}
/** /**
* The page handler. * The page handler.
* @author Vexia * @author Vexia
Server/src/main/kotlin/rs09/game/interaction/item/GodBookListeners.kt
+134
View File
@@ -0,0 +1,134 @@
package rs09.game.interaction.item
import api.ContentAPI
import core.game.node.entity.player.Player
import core.game.system.task.Pulse
import core.game.world.update.flag.context.Animation
import org.rs09.consts.Items
import rs09.game.content.dialogue.DialogueFile
import rs09.game.interaction.InteractionListener
import rs09.tools.END_DIALOGUE
class GodBookListeners : InteractionListener() {
val GB_SARADOMIN = Items.HOLY_BOOK_3840
val GB_ZAMORAK = Items.UNHOLY_BOOK_3842
val GB_GUTHIX = Items.BOOK_OF_BALANCE_3844
override fun defineListeners() {
on(GB_SARADOMIN, ITEM, "preach"){player, _ ->
ContentAPI.openDialogue(player, HOLY_DIALOGUE(BOOK.SARA))
return@on true
}
on(GB_ZAMORAK, ITEM, "preach"){ player, _ ->
ContentAPI.openDialogue(player, HOLY_DIALOGUE(BOOK.ZAM))
return@on true
}
on(GB_GUTHIX, ITEM, "preach"){ player, _ ->
ContentAPI.openDialogue(player, HOLY_DIALOGUE(BOOK.GUTHIX))
return@on true
}
}
internal enum class BOOK {
SARA,
GUTHIX,
ZAM
}
internal class HOLY_DIALOGUE(val book: BOOK) : DialogueFile(){
val WEDDINGS = arrayOf(
"In the name of Saradomin, protector of us all, I now join you in the eyes of Saradomin.",
"Light and dark, day and night, balance arises from contrast. I unify thee in the name of Guthix.",
"Two great warriors, joined by hand, to spread destruction across the land. In Zamorak's name, now two are one."
)
val LAST_RITES = arrayOf(
"Thy cause was false, thy skills did lack; See you in Lumbridge when you get back.",
"Thy death was not in vain, for it brought some balance to the world. May Guthix bring you rest.",
"The weak deserve to die, so the strong may flourish. This is the creed of Zamorak."
)
val BLESSINGS = arrayOf(
"Go in peace in the name of Saradomin; may his glory shine upon you like the sun.",
"May you walk the path, and never fall, for Guthix walks beside thee on thy journey. May Guthix bring you peace.",
"May your bloodthirst never be sated, and may all your battles be glorious. Zamorak bring you strength."
)
val PREACHINGS = arrayOf(
arrayOf(
"Protect your self, protect your friends. Mine is the glory that never ends.",
"The darkness in life may be avoided, by the light of wisdom shining.",
"Show love to your friends, and mercy to your enemies, and know that the wisdom of Saradomin will follow. ",
"A fight begun, when the cause is just, will prevail over all others.",
"The currency of goodness is honour; It retains its value through scarcity."
),
arrayOf(
"All things must end, as all begin; Only Guthix knows the role thou must play.",
"In life, in death, in joy, in sorrow: May thine experience show thee balance.",
"Thou must do as thou must, no matter what. Thine actions bring balance to this world.",
"he river flows, the sun ignites, May you stand with Guthix in thy fights.",
"A journey of a single step, May take thee over a thousand miles."
),
arrayOf(
"There is no opinion that cannot be proven true...by crushing those who choose to disagree with it.",
"Battles are not lost and won; They simply remove the weak from the equation.",
"Those who fight, then run away, shame Zamorak with their cowardice.",
"Battle is by those who choose to disagree with it.",
"Strike fast, strike hard, strike true: The strength of Zamorak will be with you."
)
)
val PREACH_SARA_AMEN = "This is Saradomin's Wisdom."
val PREACH_ZAM_AMEN = "Zamorak give me strength!"
val PREACH_GUTH_AMEN = "May Guthix bring you balance."
override fun handle(componentID: Int, buttonID: Int) {
when(stage){
0 -> options("Weddings","Last Rites","Blessings","Preaching").also { stage++ }
1 -> when(buttonID){
1 -> say(player!!, WEDDINGS[book.ordinal], book, false)
2 -> say(player!!, LAST_RITES[book.ordinal], book, false)
3 -> say(player!!, BLESSINGS[book.ordinal], book, false)
4 -> say(player!!, PREACHINGS[book.ordinal].random(), book, true)
else -> {}
}.also { end() }
}
}
private fun say(player: Player, message: String, book: BOOK, preach: Boolean){
val animation = when(book){
BOOK.SARA -> Animation(1335)
BOOK.ZAM -> Animation(1336)
BOOK.GUTHIX -> Animation(1337)
}
val preachText = when(book){
BOOK.SARA -> PREACH_SARA_AMEN
BOOK.ZAM -> PREACH_ZAM_AMEN
BOOK.GUTHIX -> PREACH_GUTH_AMEN
}
val lastTick = ContentAPI.animationDuration(animation)
ContentAPI.lock(player, 100)
ContentAPI.animate(player, animation)
ContentAPI.submitIndividualPulse(player, object : Pulse() {
var counter = 0
override fun pulse(): Boolean {
when(counter++){
0 -> ContentAPI.sendChat(player, message)
lastTick - 1 -> if(preach) ContentAPI.sendChat(player, preachText)
lastTick -> ContentAPI.unlock(player).also { return true }
}
return false
}
})
}
}
}