From 14fa8024d2c12107bda3bab1d2047ed806bc7b74 Mon Sep 17 00:00:00 2001 From: rjtanner Date: Mon, 31 Dec 2012 07:22:27 +0000 Subject: [PATCH] Removed forced line breaks in message text to Dark Cave (dungeons/dark-cave/*) maps. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18555 282e977c-c81d-0410-88c4-b93c2d0d6712 --- dungeons/dark-cave/dark-cave | 42 +++++++++----------------------- dungeons/dark-cave/dark-cave-2 | 43 ++++++++------------------------- dungeons/dark-cave/dwarven_camp | 39 +++++------------------------- dungeons/dark-cave/ogre-cave | 35 +++++---------------------- 4 files changed, 34 insertions(+), 125 deletions(-) diff --git a/dungeons/dark-cave/dark-cave b/dungeons/dark-cave/dark-cave index fbdbe67a3..b218a7087 100644 --- a/dungeons/dark-cave/dark-cave +++ b/dungeons/dark-cave/dark-cave @@ -10,10 +10,7 @@ msg Creator: jesse@phiwumbda.org Date: 2008-01-21 -This dark cave looks like a Dwarven mine -town, fallen on very hard times indeed. The -ogrish lot at the mouth of the cave seems fairly -pleased with its plunder! +This dark cave looks like a Dwarven mine town, fallen on very hard times indeed. The ogrish lot at the mouth of the cave seems fairly pleased with its plunder! Modified: 2012-12-31 Rick Tanner endmsg end @@ -578,15 +575,11 @@ arch letter msg Deer Mommy, -Me do good in army. Me won medal for goodest looting of -hole squad. Me destroy many dworf homes in big battle. +Me do good in army. Me won medal for goodest looting of hole squad. Me destroy many dworf homes in big battle. -But me a sad now. Giant army beat dworfs. Minetown -ours, but mean and bad wizurd came. Wizurd took -minetown. +But me a sad now. Giant army beat dworfs. Minetown ours, but mean and bad wizurd came. Wizurd took minetown. -Giant army will fight wizurd. Me fight gooder and harder -so army beat wizurd. Army take back town. +Giant army will fight wizurd. Me fight gooder and harder so army beat wizurd. Army take back town. Soon. @@ -3906,9 +3899,7 @@ y 25 end arch magic_mouth msg -Across the bridge, you see some squat -ruins. In the distance, one building -appears well-lit and in good condition. +Across the bridge, you see some squat ruins. In the distance, one building appears well-lit and in good condition. endmsg x 8 y 25 @@ -4085,8 +4076,7 @@ y 55 end arch magic_mouth msg -It appears as if these stairs have not been -used in some time. +It appears as if these stairs have not been used in some time. endmsg x 8 y 55 @@ -4663,9 +4653,7 @@ arch tooth_charm name A crude medal name_pl crude medals msg -This appears to be a crudely constructed military medal. -The inscription reads, "For exceptional Valor and Cruelty -in the Art of Pillaging." +This appears to be a crudely constructed military medal. The inscription reads, "For exceptional Valor and Cruelty in the Art of Pillaging." endmsg resist_confusion 0 resist_slow 0 @@ -6095,8 +6083,7 @@ y 30 end arch magic_mouth msg -The ruins appear to be dwarven. Apparently -a mining town. +The ruins appear to be dwarven. Apparently a mining town. endmsg x 13 y 30 @@ -7125,8 +7112,7 @@ arch magic_mouth msg It appears to be a wizard's study. -The wizard is evidently engrossed in his -research and has so far ignored you. +The wizard is evidently engrossed in his research and has so far ignored you. endmsg x 15 y 46 @@ -9037,15 +9023,11 @@ name A distracted necromancer title the Necromancer msg @match dwarf|Dwarf|dwarves|Dwarves -Dwarves? There were no dwarves when I moved here. Just a few easily -persuaded ogres. +Dwarves? There were no dwarves when I moved here. Just a few easily persuaded ogres. @match ogre|Ogre|giant|Giant -The ogre army? They're not with me. This cave is large enough to share and it -took only a little persuasion before they agreed. +The ogre army? They're not with me. This cave is large enough to share and it took only a little persuasion before they agreed. @match mine|Mine -Yes, this area appears to be an abandoned mine town. I've been too busy with -my research to explore it deeply. I'm afraid that once I put in my security, I've rarely -ventured outside this study. +Yes, this area appears to be an abandoned mine town. I've been too busy with my research to explore it deeply. I'm afraid that once I put in my security, I've rarely ventured outside this study. @match stairs|Stairs|down|Down Feel free to look around downstairs, but I warn you to leave my possessions be. @match key|Key diff --git a/dungeons/dark-cave/dark-cave-2 b/dungeons/dark-cave/dark-cave-2 index e3d5e77cd..5a920958b 100644 --- a/dungeons/dark-cave/dark-cave-2 +++ b/dungeons/dark-cave/dark-cave-2 @@ -1528,8 +1528,7 @@ y 32 end arch magic_mouth msg -The appreciative dwarf priest presents -you with a reward for your services. +The appreciative dwarf priest presents you with a reward for your services. endmsg food 1 x 5 @@ -1897,39 +1896,19 @@ end arch dwarf_priest msg @match yes|Yes|letter|Letter -Have you word from our friends? Please, -step forward and deliver it! +Have you word from our friends? Please, step forward and deliver it! @match no|No|where|Where|giant|Giant|ogre|Ogre -The giant army is from the Red Foot tribe. -The Red Foots are located in the mountains -north of the nearby inn. If our dwarven -brothers still live, they are likely being held -there. +The giant army is from the Red Foot tribe. The Red Foots are located in the mountains north of the nearby inn. If our dwarven brothers still live, they are likely being held there. @match wizard|Wizard|glint|Glint|necromancer|Necromancer -Some time after the battle against the ogres, -a wizard arrived. We do not know much -about him, but it appears that he has chosen -our outpost as his home. +Some time after the battle against the ogres, a wizard arrived. We do not know much about him, but it appears that he has chosen our outpost as his home. -We have heard battles raging upstairs, -perhaps between the giants and the -wizard's minions. But the battles have -been silent for some time now. +We have heard battles raging upstairs, perhaps between the giants and the wizard's minions. But the battles have been silent for some time now. -We would be most appreciative if you -can help rid us of this new threat, but -I am afraid we have no more reward to -offer you. +We would be most appreciative if you can help rid us of this new threat, but I am afraid we have no more reward to offer you. @match * -Welcome! We have been in hiding here -since the giant army invaded our mining -outpost. The battle was bloody and many -dwarves were captured. Our only protection -is this secret room and the spirits of our -ancestors. +Welcome! We have been in hiding here since the giant army invaded our mining outpost. The battle was bloody and many dwarves were captured. Our only protection is this secret room and the spirits of our ancestors. -Have you perchance stumbled across our -captive brethren? +Have you perchance stumbled across our captive brethren? endmsg x 6 y 32 @@ -2345,8 +2324,7 @@ name Last Warning! msg We warned you once. -But good luck. The next room -can be deadly. +But good luck. The next room can be deadly. endmsg x 7 y 43 @@ -2403,8 +2381,7 @@ name A warning msg Warning! -Be prepared for bad things ahead! -There is a nasty surprise or two. +Be prepared for bad things ahead! There is a nasty surprise or two. endmsg x 7 y 49 diff --git a/dungeons/dark-cave/dwarven_camp b/dungeons/dark-cave/dwarven_camp index 60b6396c5..2f24de849 100644 --- a/dungeons/dark-cave/dwarven_camp +++ b/dungeons/dark-cave/dwarven_camp @@ -7,8 +7,7 @@ height 10 msg Creator: jesse Date: 2009-10-06 -A small camp of dwarven refugees, tired and -beaten. +A small camp of dwarven refugees, tired and beaten. Modified: 2012-12-31 Rick Tanner endmsg outdoor 1 @@ -247,10 +246,7 @@ y 4 end arch magic_mouth msg -Hail, good fellow! You bring news? Ah, but that is good -to hear! Please, take this letter to the mine town south of -here. Find the last band of dwarves, hidden deep in the -tombs, and deliver your message! +Hail, good fellow! You bring news? Ah, but that is good to hear! Please, take this letter to the mine town south of here. Find the last band of dwarves, hidden deep in the tombs, and deliver your message! endmsg x 5 y 5 @@ -268,27 +264,11 @@ end arch dwarf_priest msg @match mine|Mine|town|Town|Grondell|Quest|quest -We are from Grondell, a small mining town -south of here. But Grondell has fallen. -The Red Foot tribe invaded our peaceful -village two months ago. They captured -many of our brethren and occupy the -village still. Will you help us free our -comrades? - +We are from Grondell, a small mining town south of here. But Grondell has fallen. The Red Foot tribe invaded our peaceful village two months ago. They captured many of our brethren and occupy the village still. Will you help us free our comrades? @match dwarves|dwarfs|captured|free|yes|Yes|OK -The Red Foot tribal cave is just north -of the nearby inn. Our comrades are being -held there. - +The Red Foot tribal cave is just north of the nearby inn. Our comrades are being held there. @match letter|Letter -You've returned with a letter? Wonderful! -But it doesn't appear to be for me. I -understand that some dwarves escaped -the invasion and are hidden in the mine's -tombs. If you find them, you can deliver -the letter. - +You've returned with a letter? Wonderful! But it doesn't appear to be for me. I understand that some dwarves escaped the invasion and are hidden in the mine's tombs. If you find them, you can deliver the letter. @match * Eh? Didn't quite catch that. endmsg @@ -324,14 +304,7 @@ y 2 end arch magic_mouth msg -A handful of dwarves sit 'round the -campfire. The eldest greets you. - - "Welcome to our camp! I am afraid -we have not much to offer you. We -are refugees from the mining town -of Grondell and our stores are low, -but we will share what we can." +A handful of dwarves sit 'round the campfire. The eldest greets you. "Welcome to our camp! I am afraid we have not much to offer you. We are refugees from the mining town of Grondell and our stores are low, but we will share what we can." endmsg x 6 y 3 diff --git a/dungeons/dark-cave/ogre-cave b/dungeons/dark-cave/ogre-cave index 519bac0d3..c8a42435f 100644 --- a/dungeons/dark-cave/ogre-cave +++ b/dungeons/dark-cave/ogre-cave @@ -2680,11 +2680,7 @@ name letter from dwarf captives msg To our beseiged friends, -The bearer of this letter has freed us from -the Red Foot tribe. We will gather arms and -return to the outpost to reclaim it once and -for all. Our rescuer has agreed to mount an -initial attack and establish contact with you. +The bearer of this letter has freed us from the Red Foot tribe. We will gather arms and return to the outpost to reclaim it once and for all. Our rescuer has agreed to mount an initial attack and establish contact with you. Until we return, we pray for your safety. @@ -2961,36 +2957,17 @@ arch dwarf_wiz name Snortrider msg @match letter|Letter|outpost|Outpost -Our mining town is not far. Head -east from the Inn until you find a -footpath going south. Our town is -in the mountains at the end of the -path. - -Once in the cave, you must find the -tombs. Our brothers are hidden in -a secret room near there. +Our mining town is not far. Head east from the Inn until you find a footpath going south. Our town is in the mountains at the end of the path. +Once in the cave, you must find the tombs. Our brothers are hidden in a secret room near there. @match yes|Yes|Yeah|yeah Wonderful! Please, take this letter. - @match * -Thank Mostrai you have arrived! -We were captured by the Red Foot -ogres in a terrible battle in our -mining outpost south east of here. +Thank Mostrai you have arrived! We were captured by the Red Foot ogres in a terrible battle in our mining outpost south east of here. -A small group managed to escape -capture by hiding in the tombs of -the outpost. I am sure they are -there still. We will raise arms to -re-take the outpost and drive the -giants out for good. +A small group managed to escape capture by hiding in the tombs of the outpost. I am sure they are there still. We will raise arms to re-take the outpost and drive the giants out for good. -If you can deliver this letter to the -outpost, we would be most grateful. -You will be well-rewarded. Will you -accept this task? +If you can deliver this letter to the outpost, we would be most grateful. You will be well-rewarded. Will you accept this task? endmsg x 12 y 35