From a9bfb4e9cd5e301fc2a380fa3e3a70bc5860864f Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 23 Sep 2022 17:27:59 -0400 Subject: [PATCH] v1.4.0: implemented the final region lore document --- .../messages/journal/journal.properties | 50 +++++++++---------- .../journal/Document.java | 24 ++++----- .../levels/RegularLevel.java | 3 +- 3 files changed, 38 insertions(+), 39 deletions(-) diff --git a/core/src/main/assets/messages/journal/journal.properties b/core/src/main/assets/messages/journal/journal.properties index 0b1988187..dfd5d07e9 100644 --- a/core/src/main/assets/messages/journal/journal.properties +++ b/core/src/main/assets/messages/journal/journal.properties @@ -102,31 +102,31 @@ journal.document.caves_explorer.alive.body=23rd of Summer, 308\n\nOne of the dwa journal.document.caves_explorer.report.title=Final Report journal.document.caves_explorer.report.body=28th of Summer, 308\n\nToday we will finish packing up our belongings and prepare to leave. Just in time as well, several of our group have begun having terrible nightmares following the incident with the aggressive machine. It's probably just fatigue, but their nightmares are all worryingly similar.\n\nIn summary, the upper areas of the mine are quite safe. If a use could be found for dark gold then mining it may be quite lucrative. The large open spaces would work very well for the city's construction plans as well. The lower mines are more dangerous however, and should be avoided.\n\nI'll write all this into my final report over the new few days.\n- Archibald journal.document.city_warlock.title=Warlock's Journal -journal.document.city_warlock.p1.title=The King is Dead -journal.document.city_warlock.p1.body=It is the 5th day of the 2nd month of the 33rd year of the age of magic. If an overworlder is reading this, it is sometime in Winter 264. My name is Thymor Zahir, and to the best of my knowledge I am the last surviving member of the dwarven court.\n\nOur King is dead, replaced by one of my former colleagues who has gone mad with power. The rest of the court submitted to him, like the fools they are, and lost their free will in the process. I alone saw this coming and fled before his ritual could be completed.\n\nThe inner circle has fallen, but the new King's power has not yet reached everyone. I must mount a resistance as quickly as possible. I refuse to let our glorious civilization fall to this megalomaniac! -journal.document.city_warlock.p2.title=A Resistance -journal.document.city_warlock.p2.body=Word seems to have spread quickly. It has only been a few days and I have already amassed a small army of loyalists to the old king. Few are skilled with magic, but almost the entire order of warrior monks is among us. We should be more than a match for one crazed dwarf and his court of slaves.\n\nMeanwhile the new king has hidden himself in the inner chambers of our city. No doubt he has expended most of his power and is hoping to recover before he encounters more resistance.\n\nWe will launch our attack in another couple of hours. With luck we will be able to form an interim council and return our wondrous city to stability by the end of the night. -journal.document.city_warlock.p3.title=Failure -journal.document.city_warlock.p3.body=It seems that I'm a fool as well. I assumed that the new king needed the court to submit to him willingly, but now I see that he has the power to control even those who resist him.\n\nI blindly brought all of the strongest opposition right to his doorstep so that he could personally turn them into his slaves. Now waves of his necrotic energy are washing through the city, instantly turning most into his supplicants.\n\nThe few who still have free will are fleeing. I have chosen to stay behind to observe as best I can and look for an opening. With the magic power I have I should be able to stay hidden and safe for some time. -journal.document.city_warlock.p4.title=More Powerful -journal.document.city_warlock.p4.body=Keeping track of time has become difficult, but it has been about a week since my last entry. Our civilization has truly collapsed. The gates are shut, all functions of our society have ceased, and empty dwarven husks roam the halls.\n\nThroughout all of this, somehow, the new king is becoming even more powerful. Every day the force of his will becomes stronger, but it is also changing. I cannot describe it, but it feels as if he is no longer a dwarf at all.\n\nI'm beginning to accept that the best I can probably hope to do is document these events. I will stay here for as long as I can, and then retreat once my will begins to weaken. -journal.document.city_warlock.p5.title=A New Power -journal.document.city_warlock.p5.body=What is happening here? The power emanating from the new king is indeed different than at first, but there is something else too. This new power seems to radiate from the innermost halls of our city.\n\nEven more puzzling is that activity in the upper metropolis has decreased as well. I do not know what is happening down there, but it is attracting almost all of the new king's attention.\n\nReturning to the deep halls will be dangerous, but I must discover what is causing this change. Perhaps the new king has a weakness after all? -journal.document.city_warlock.p6.title=I've Seen It -journal.document.city_warlock.p6.body=I have seen what lies below, but I cannot describe it. My hands shake uncontrollably as I try to put my thoughts into writing.\n\nWhy is this happening? Did the new king do this? It makes no sense. Perhaps his wanton use of power attracted it? I had hoped to save our civilization, but now I see that the entire world is at stake.\n\nSomehow, the king is the lesser evil. I have no other choice, for the greater good I will surrender myself. Please guide me my king, use me as an instrument to hold Yog-Dzewa at bay! -journal.document.halls_king.title=main title -journal.document.halls_king.p1.title=title -journal.document.halls_king.p1.body=body -journal.document.halls_king.p2.title=title -journal.document.halls_king.p2.body=body -journal.document.halls_king.p3.title=title -journal.document.halls_king.p3.body=body -journal.document.halls_king.p4.title=title -journal.document.halls_king.p4.body=body -journal.document.halls_king.p5.title=title -journal.document.halls_king.p5.body=body -journal.document.halls_king.p6.title=title -journal.document.halls_king.p6.body=body +journal.document.city_warlock.old_king.title=The King is Dead +journal.document.city_warlock.old_king.body=It is the 5th day of the 2nd month of the 33rd year of the age of magic. If an overworlder is reading this, it is sometime in Winter 264. My name is Thymor Zahir, and to the best of my knowledge I am the last surviving member of the dwarven court.\n\nOur King is dead, replaced by one of my former colleagues who has gone mad with power. The rest of the court submitted to him, like the fools they are, and lost their free will in the process. I alone saw this coming and fled before his ritual could be completed.\n\nThe inner circle has fallen, but the new King's power has not yet reached everyone. I must mount a resistance as quickly as possible. I refuse to let our glorious civilization fall to this megalomaniac! +journal.document.city_warlock.resistance.title=A Resistance +journal.document.city_warlock.resistance.body=Word seems to have spread quickly. It has only been a few days and I have already amassed a small army of loyalists to the old king. Few are skilled with magic, but almost the entire order of warrior monks is among us. We should be more than a match for one crazed dwarf and his court of slaves.\n\nMeanwhile the new king has hidden himself in the inner chambers of our city. No doubt he has expended most of his power and is hoping to recover before he encounters more resistance.\n\nWe will launch our attack in another couple of hours. With luck we will be able to form an interim council and return our wondrous city to stability by the end of the night. +journal.document.city_warlock.failure.title=Failure +journal.document.city_warlock.failure.body=It seems that I'm a fool as well. I assumed that the new king needed the court to submit to him willingly, but now I see that he has the power to control even those who resist him.\n\nI blindly brought all of the strongest opposition right to his doorstep so that he could personally turn them into his slaves. Now waves of his necrotic energy are washing through the city, instantly turning most into his supplicants.\n\nThe few who still have free will are fleeing. I have chosen to stay behind to observe as best I can and look for an opening. With the magic power I have I should be able to stay hidden and safe for some time. +journal.document.city_warlock.more_powerful.title=More Powerful +journal.document.city_warlock.more_powerful.body=Keeping track of time has become difficult, but it has been about a week since my last entry. Our civilization has truly collapsed. The gates are shut, all functions of our society have ceased, and empty dwarven husks roam the halls.\n\nThroughout all of this, somehow, the new king is becoming even more powerful. Every day the force of his will becomes stronger, but it is also changing. I cannot describe it, but it feels as if he is no longer a dwarf at all.\n\nI'm beginning to accept that the best I can probably hope to do is document these events. I will stay here for as long as I can, and then retreat once my will begins to weaken. +journal.document.city_warlock.new_power.title=A New Power +journal.document.city_warlock.new_power.body=What is happening here? The power emanating from the new king is indeed different than at first, but there is something else too. This new power seems to radiate from the innermost halls of our city.\n\nEven more puzzling is that activity in the upper metropolis has decreased as well. I do not know what is happening down there, but it is attracting almost all of the new king's attention.\n\nReturning to the deep halls will be dangerous, but I must discover what is causing this change. Perhaps the new king has a weakness after all? +journal.document.city_warlock.seen_it.title=I've Seen It +journal.document.city_warlock.seen_it.body=I have seen what lies below, but I cannot describe it. My hands shake uncontrollably as I try to put my thoughts into writing.\n\nWhy is this happening? Did the new king do this? It makes no sense. Perhaps his wanton use of power attracted it? I had hoped to save our civilization, but now I see that the entire world is at stake.\n\nSomehow, the king is the lesser evil. I have no other choice, for the greater good I will surrender myself. Please guide me my king, use me as an instrument to hold Yog-Dzewa at bay! +journal.document.halls_king.title=New King's Journal +journal.document.halls_king.rejection.title=Rejection +journal.document.halls_king.rejection.body=IMBECILES!\n\nOver the last 33 years our kingdom has flourished with our new magical technology. We've learned how to summon elemental spirits and bend them to our will, but somehow now further experimentation is 'too dangerous'.\n\nI know what's really going on. The rejection of my theories has nothing to do with their merit and everything to do with the person who suggests them. They're probably all laughing at me behind my back.\n\nWell no more! I don't care what they say, I will explore the furthest reaches or our universe alone, and keep everything I discover for myself!\n- R. +journal.document.halls_king.amulet.title=The Amulet +journal.document.halls_king.amulet.body=I'VE DONE IT!\n\nI didn't know what I might find exactly, but what I discovered out in there was beyond my wildest speculation. So much power, just sitting there ready to be taken, and it's all mine!\n\nWith this none of the fools in the court will dare oppose me. I'm just giddy thinking about all the different ways I could humiliate them. Hell, why stop there, I have enough power to destroy every last one of them if I want! That might be excessive, but I mustn't take too long deciding or they're get suspicious.\n\nI think I'll call this great power the Amulet of Yendor!\n- R. +journal.document.halls_king.ritual.title=The Ritual +journal.document.halls_king.ritual.body=Thymor publicly confronted me earlier today and insisted I explain my new source of power. I dismissed him as best I could, but I can feel the judging eyes of the rest of the court on me once again.\n\nI had hoped to spend a little more time enjoying the calm before the storm, but it doesn't really matter. I've decided what I want to do. I will claim I gained my power through a new ritual, and will offer to perform it on the other warlocks and the King. One the ritual is over, I will be king!\n\nThymor will protest, of course, but with this much power on offer I doubt they will listen to him!\n\nALL WILL BOW BEFORE ME!\n- Future King of the Dwarves +journal.document.halls_king.new_king.title=A New King +journal.document.halls_king.new_king.body=I AM KING, AHAHAHAHAAA!\n\nThey just let me do it! With hardly any convincing they agreed to let me 'share' this power with them in a great ritual. In an instant they were transformed from a chorus of mocking voices to my new court of silent subjects!\n\nPredictably, Thymor fled like a coward at the first sign of trouble. I can already feel the resistance force he is building as well. I think I'll allow him to continue, so that he can deliver all of his conspirators right to my door!\n\nClearly the kingdom doesn't respect me either, I suppose I'll fix that as well.\n- King of the Dwarves +journal.document.halls_king.thing.title=The Thing +journal.document.halls_king.thing.body=There's a problem. Thymor was dispatched without effort, but it seems my scrounging in the outer planes did not go unnoticed.\n\nSome... 'thing'... has been attracted to my world and is starting to force itself through at the bottom of the lower halls. To complicate things further, that is the exact location where I stored the amulet! Such a spiteful creature, why must it try to deny me my power when there is plenty out there still to take?\n\nDespite my power though, I don't think I can just charge in and fight it. Its true power is unfathomable, but there must be some way to limit it. I WILL DEFEND MY PRIZE! +journal.document.halls_king.attrition.title=Attrition +journal.document.halls_king.attrition.body=I have a plan for dealing with the thing. Its power is infinite, but its ability to encroach on this world is not. It's relying on minions and avatars to do its bidding while it tries to build enough power to take the amulet.\n\nWhile I don't possess the amulet physically I still have full control over its power. With the entire dwarven city at my disposal I also have a numbers advantage. I can simply keep sending soldiers to prevent it from seizing the amulet and steadily win this war through attrition!\n\nI DON'T CARE HOW LONG IT TAKES, I WILL OUTLAST YOU YOG-DZEWA! journal.notes$landmark.well_of_health=well of health journal.notes$landmark.well_of_awareness=well of awareness diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Document.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Document.java index 29fb6a2e6..ff5a4a766 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Document.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Document.java @@ -276,19 +276,19 @@ public enum Document { CAVES_EXPLORER.pagesStates.put("alive", debug ? READ : NOT_FOUND); CAVES_EXPLORER.pagesStates.put("report", debug ? READ : NOT_FOUND); - CITY_WARLOCK.pagesStates.put("p1", NOT_FOUND); - CITY_WARLOCK.pagesStates.put("p2", NOT_FOUND); - CITY_WARLOCK.pagesStates.put("p3", NOT_FOUND); - CITY_WARLOCK.pagesStates.put("p4", NOT_FOUND); - CITY_WARLOCK.pagesStates.put("p5", NOT_FOUND); - CITY_WARLOCK.pagesStates.put("p6", NOT_FOUND); + CITY_WARLOCK.pagesStates.put("old_king", debug ? READ : NOT_FOUND); + CITY_WARLOCK.pagesStates.put("resistance", debug ? READ : NOT_FOUND); + CITY_WARLOCK.pagesStates.put("failure", debug ? READ : NOT_FOUND); + CITY_WARLOCK.pagesStates.put("more_powerful", debug ? READ : NOT_FOUND); + CITY_WARLOCK.pagesStates.put("new_power", debug ? READ : NOT_FOUND); + CITY_WARLOCK.pagesStates.put("seen_it", debug ? READ : NOT_FOUND); - HALLS_KING.pagesStates.put("p1", NOT_FOUND); - HALLS_KING.pagesStates.put("p2", NOT_FOUND); - HALLS_KING.pagesStates.put("p3", NOT_FOUND); - HALLS_KING.pagesStates.put("p4", NOT_FOUND); - HALLS_KING.pagesStates.put("p5", NOT_FOUND); - HALLS_KING.pagesStates.put("p6", NOT_FOUND); + HALLS_KING.pagesStates.put("Rejection", debug ? READ : NOT_FOUND); + HALLS_KING.pagesStates.put("amulet", debug ? READ : NOT_FOUND); + HALLS_KING.pagesStates.put("ritual", debug ? READ : NOT_FOUND); + HALLS_KING.pagesStates.put("new_king", debug ? READ : NOT_FOUND); + HALLS_KING.pagesStates.put("thing", debug ? READ : NOT_FOUND); + HALLS_KING.pagesStates.put("attrition", debug ? READ : NOT_FOUND); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java index 0e50e3256..f465ae3d0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java @@ -505,8 +505,7 @@ public abstract class RegularLevel extends Level { case 5: regionDoc = Document.HALLS_KING; break; } - //TODO no halls document at the moment - if (region <=4 && !regionDoc.allPagesFound()) { + if (regionDoc != null && !regionDoc.allPagesFound()) { Dungeon.LimitedDrops limit = limitedDocs.get(regionDoc);