diff --git a/core/src/main/assets/messages/journal/journal.properties b/core/src/main/assets/messages/journal/journal.properties index 503714cdb..b091dc0d1 100644 --- a/core/src/main/assets/messages/journal/journal.properties +++ b/core/src/main/assets/messages/journal/journal.properties @@ -88,19 +88,19 @@ journal.document.prison_warden.no_support.title=No Support journal.document.prison_warden.no_support.body=11th of Spring, 364\n\nWhat the hell is the city thinking? After urgently requesting help I've heard nothing, not even an empty apology like they usually send when my requests are denied.\n\nMeanwhile the inmates continue to get worse, and some of the guards have even started to cause trouble. Do they plan to just let this keep getting worse until we're dealing with a riot!?\n\nThomas has stayed reliable as ever at least. His organizational help has been invaluable, and his idea to activate those old DM-100 units was regrettable but necessary. I'm confident I can get back on top of this situation, I just need some damned support!\n-Smith journal.document.prison_warden.letter.title=Letter to Thomas journal.document.prison_warden.letter.body=Thomas,\n\nYou've been a great friend, so I'm doing you a favour.\n\nWhen you start your shift tonight, lock and reinforce Tengu's cell, throw the key into some alcove, and get out. It doesn't matter if the other prisoners are unattended, pretty soon nobody will be able to leave this place. That freak has to stay secured though, if he escapes there's no telling what he'll do.\n\nTell nobody of this, and don't bother looking for me. A captain must go down with her ship.\n- Kiana -journal.document.caves_explorer.title=main title -journal.document.caves_explorer.p1.title=title -journal.document.caves_explorer.p1.body=body -journal.document.caves_explorer.p2.title=title -journal.document.caves_explorer.p2.body=body -journal.document.caves_explorer.p3.title=title -journal.document.caves_explorer.p3.body=body -journal.document.caves_explorer.p4.title=title -journal.document.caves_explorer.p4.body=body -journal.document.caves_explorer.p5.title=title -journal.document.caves_explorer.p5.body=body -journal.document.caves_explorer.p6.title=title -journal.document.caves_explorer.p6.body=body +journal.document.caves_explorer.title=Caves Expedition Log +journal.document.caves_explorer.expedition.title=Expedition Start! +journal.document.caves_explorer.expedition.body=1st of Summer, 308\n\nToday begins our four week expedition into the abandoned dwarven mines! I have been commissioned by the king himself to explore the region. My chief goals are to find any untapped natural resources and to survey the caves for a potential prison construction project.\n\nWhile I am capable of defending myself, I have accepted an escort from the city guard at the king's insistence. They're a bunch of simpletons, but as long as they don't slow me down their presence is tolerable.\n\nWe are expected to clear the sewers and reach the mines by evening.\n- Archibald Drummond. PhD, southern wizarding institute. +journal.document.caves_explorer.gold.title=So Much Gold! +journal.document.caves_explorer.gold.body=4th of Summer, 308\n\nOur first few days have been very fruitful indeed! After establishing a base camp, we set out exploring some of the upper areas of the abandoned mine. While there is plenty of useless clutter left by the dwarves, many of the cave walls are also teeming with gold!\n\nUnfortunately, we aren't the first ones here. The caves are rife with aggressive wildlife, and it seems packs of gnolls have an interest in the gold as well. I admit that I was unfair toward my guard escort, they have been much more capable explorers and bodyguards than I expected.\n\nEven with this success, we still have much of the mines left to explore.\n- Archibald +journal.document.caves_explorer.troll.title=Met a Troll +journal.document.caves_explorer.troll.body=11th of Summer, 308\n\nAfter beginning our exploration into the midsection of the mines, we ran into a friendly face! Well... relatively friendly. A cave troll has set up a little smithy there. He is gruff and not very talkative, but did repair our equipment in exchange for some gold.\n\nUnfortunately, the troll blacksmith has also informed us that all of this lovely gold isn't quite as good as it seems. He calls it 'dark gold' and it apparently rapidly degrades in sunlight. That would certainly explain why there were never any conflicts over the resources here.\n\nI suppose we need to delve a little deeper to see if there is anything more valuable.\n- Archibald +journal.document.caves_explorer.city.title=The City Entrance +journal.document.caves_explorer.city.body=21st of Summer, 308\n\nWe're now at the three week mark, and after spending much of the last ten days charting ever deeper, we have finally reached the bottom of the mines. We found various metal contraptions and a great gate which blocks entry to the old dwarven metropolis.\n\nThe blacksmith warned us about some of this machinery. It was apparently meant for area defense and has a tendency to activate when disturbed. We have no business in the city, and the metal would have minimal scrap value, so we thought it best to heed his warning and head back out.\n\nI must admit I was curious, but investigating down there certainly wasn't worth the risk.\n- Archibald +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 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 27170ff5d..29fb6a2e6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Document.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Document.java @@ -263,18 +263,18 @@ public enum Document { SEWERS_GUARD.pagesStates.put("not_worth", debug ? READ : NOT_FOUND); PRISON_WARDEN.pagesStates.put("journal", debug ? READ : NOT_FOUND); - PRISON_WARDEN.pagesStates.put("recruits", debug ? READ : NOT_FOUND); + PRISON_WARDEN.pagesStates.put("recruits", debug ? READ : NOT_FOUND); PRISON_WARDEN.pagesStates.put("mines", debug ? READ : NOT_FOUND); PRISON_WARDEN.pagesStates.put("rotberry", debug ? READ : NOT_FOUND); - PRISON_WARDEN.pagesStates.put("no_support", debug ? READ : NOT_FOUND); + PRISON_WARDEN.pagesStates.put("no_support", debug ? READ : NOT_FOUND); PRISON_WARDEN.pagesStates.put("letter", debug ? READ : NOT_FOUND); - CAVES_EXPLORER.pagesStates.put("p1", NOT_FOUND); - CAVES_EXPLORER.pagesStates.put("p2", NOT_FOUND); - CAVES_EXPLORER.pagesStates.put("p3", NOT_FOUND); - CAVES_EXPLORER.pagesStates.put("p4", NOT_FOUND); - CAVES_EXPLORER.pagesStates.put("p5", NOT_FOUND); - CAVES_EXPLORER.pagesStates.put("p6", NOT_FOUND); + CAVES_EXPLORER.pagesStates.put("expedition", debug ? READ : NOT_FOUND); + CAVES_EXPLORER.pagesStates.put("gold", debug ? READ : NOT_FOUND); + CAVES_EXPLORER.pagesStates.put("troll", debug ? READ : NOT_FOUND); + CAVES_EXPLORER.pagesStates.put("city", debug ? READ : NOT_FOUND); + 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); 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 b9f3a0801..22d666685 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/prison for the moment - if (region <= 2 && !regionDoc.allPagesFound()) { + //TODO only sewers-caves for the moment + if (region <= 3 && !regionDoc.allPagesFound()) { Dungeon.LimitedDrops limit = limitedDocs.get(regionDoc); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java index e93ab04c8..f6ba0235a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java @@ -38,12 +38,6 @@ public class WndStory extends Window { private static final int WIDTH_P = 125; private static final int WIDTH_L = 180; private static final int MARGIN = 2; - - public static final int ID_SEWERS = 0; - public static final int ID_PRISON = 1; - public static final int ID_CAVES = 2; - public static final int ID_CITY = 3; - public static final int ID_HALLS = 4; private IconTitle ttl; private RenderedTextBlock tf; @@ -84,7 +78,7 @@ public class WndStory extends Window { blocker.camera = PixelScene.uiCamera; add(blocker); - resize( (int)(tf.width() + MARGIN * 2), (int)Math.min( tf.bottom()+MARGIN, 180 ) ); + resize( width + 2*MARGIN, (int)(tf.bottom()+MARGIN) ); } public WndStory setDelays(float appearDelay, float disappearDelay){