diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index a7f42c846..840533cf6 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -606,7 +606,7 @@ items.journal.regionlorepage$caves.name=old log entry items.journal.regionlorepage$caves.desc=What looks to be an entry in an explorer's logbook, preserved surprisingly well despite how old it must be. Pick it up to read it. items.journal.regionlorepage$city.name=rusted tablet -items.journal.regionlorepage$city.desc=A smalled rusted metal tablet with a message magically etched into it. The letters are still clear despite the tablet's age, but you'll have to pick it up to read it. +items.journal.regionlorepage$city.desc=A small rusted metal tablet with a message magically etched into it. The letters are still clear despite the tablet's age, but you'll have to pick it up to read it. items.journal.regionlorepage$halls.name=glowing tablet items.journal.regionlorepage$halls.desc=A small black tablet with glowing green letters etched into it. The glowing letters blur together into a haze at a distance, you'll have to pick it up to read it. diff --git a/core/src/main/assets/messages/journal/journal.properties b/core/src/main/assets/messages/journal/journal.properties index b091dc0d1..0b1988187 100644 --- a/core/src/main/assets/messages/journal/journal.properties +++ b/core/src/main/assets/messages/journal/journal.properties @@ -101,19 +101,19 @@ journal.document.caves_explorer.alive.title=It's Alive! journal.document.caves_explorer.alive.body=23rd of Summer, 308\n\nOne of the dwarven machines came to life somehow! We were merely passing by when it charged and almost crushed two of our group with its huge metal fists. Luckily, I was carrying my wand of disintegration with me. A few well-aimed blasts from that and the beastly thing was reduced to scrap metal.\n\nWhat troubles me is that we did absolutely nothing to provoke the machine. The dwarves couldn't possibly have designed the machines to be so aggressive, it's as if it was trying to ambush us!\n\nAt least I was able to offer some help to my companions for once.\n- Archibald 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=main title -journal.document.city_warlock.p1.title=title -journal.document.city_warlock.p1.body=body -journal.document.city_warlock.p2.title=title -journal.document.city_warlock.p2.body=body -journal.document.city_warlock.p3.title=title -journal.document.city_warlock.p3.body=body -journal.document.city_warlock.p4.title=title -journal.document.city_warlock.p4.body=body -journal.document.city_warlock.p5.title=title -journal.document.city_warlock.p5.body=body -journal.document.city_warlock.p6.title=title -journal.document.city_warlock.p6.body=body +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 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 22d666685..0e50e3256 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,8 @@ public abstract class RegularLevel extends Level { case 5: regionDoc = Document.HALLS_KING; break; } - //TODO only sewers-caves for the moment - if (region <= 3 && !regionDoc.allPagesFound()) { + //TODO no halls document at the moment + if (region <=4 && !regionDoc.allPagesFound()) { Dungeon.LimitedDrops limit = limitedDocs.get(regionDoc);