Commit Graph

243 Commits (ab1e982afc021691fc2337009aeb648e8c73b602)

Author SHA1 Message Date
Kevin Zheng 9e5bc36af3 Prevent players from getting trapped
Replace the connection-triggered bridge that can only work one time with
a creator that adds an invis_exit when the junction switch is thrown.

Reported by:    bugs/667
2022-05-07 18:29:39 -07:00
Kevin Zheng e167fb334e Reduce Lord Eureca's AC to something reasonable 2022-05-06 00:25:38 -07:00
Kevin Zheng 13462e2f54 Move text to magic mouth so it is visible 2022-04-25 22:40:58 -07:00
Kevin Zheng 6579836e3a Add stand_still flag to Siegfried
An altar underneath Siegfried detects his death. This altar doesn't work
if Siegfried doesn't stand still.
2022-04-24 12:19:32 -07:00
DraugTheWhopper 288b6287d5 Adjust more dialogue affected by the recent grammatical changes.
Some reversions, some additional adjustments. Overall, I've tried to make things more natural, at least for American English.
2021-11-01 18:22:23 -04:00
Rick Tanner 6788da9ab6 Grammar and spelling corrections to NPC dialog 2021-10-10 00:20:18 -05:00
tannerrj 88700149be Grammar and spelling corrections to NPC dialog 2021-10-04 00:43:43 -05:00
Nicolas Weeger 34109846d6 Describe the origin or purpose of every key
This patch will give the vast majority of the keys in the game
a message that describes the location the key was found in, or straight-up what it's used for.

It also names or renames a lot of them, although this isn't the focus (for now).

Patch https://sourceforge.net/p/crossfire/patches/415/ by Saiapatsu.
2021-08-13 18:55:09 +02:00
Andreas Kirschbaum 449fc26e37 Reorder game object attributes in canonical order 2021-08-01 17:50:28 +02:00
Andreas Kirschbaum f6ada1f307 Reformat and fix spelling of messages 2021-07-25 23:44:39 +02:00
Andreas Kirschbaum 9815651c16 Use lower case letters in @match lines 2021-07-25 17:15:11 +02:00
Andreas Kirschbaum 6e0b7aa2ee Reorder @match statements so that '@match *' comes last 2021-07-25 14:41:45 +02:00
Nicolas Weeger 5272e27aba Remove executable flag on maps. 2021-05-13 12:28:34 +02:00
rjtanner d12fa28bc2 Cosmetic changes to remove blocked tiles and replace them with solid cave wall segments, other changes for nicer cave wall merging in Path (pup_land/ancient/ruin/path). No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21016 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-09-14 00:07:05 +00:00
rjtanner 9de0b4716d Cosmetic changes between spiked walls and normal walls in Kurte's Shop (pup_land/ancient/kurte/shop) for nicer merging. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21015 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-09-13 23:56:34 +00:00
rjtanner 43a2f2b1d4 Cosmetic changes to adjust rough walls for nicer merging with each other in Cave (pup_land/ancient/mountain/cave.b1). No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21013 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-09-10 00:23:16 +00:00
rjtanner 5e2a225643 Fill up the rest of the empty map space with blocked tiles in Cave (pup_land/ancient/mountain/cave.b2), adjust rough walls for nicer merging with nearby walls. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21012 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-09-10 00:19:54 +00:00
rjtanner 1e26969f86 Fill up the rest of the empty map space with blocked tiles in Cave (pup_land/ancient/mountain/cave.b3). No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21011 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-09-10 00:17:18 +00:00
rjtanner 37217521a9 Cosmetic changes to Tower of the Necromancer, Dungeon (pup_land/ancient/mountain/tower.b1) for nicer merging between spiked walls and rough walls. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21010 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-09-10 00:13:37 +00:00
rjtanner 23130b06b4 Correct map header last changed author info
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21009 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-09-10 00:10:22 +00:00
rjtanner cb62f3205c Cosmetic changes to Tower of the Necromancer, Entrance (pup_land/ancient/mountain/tower.1) for nicer merging between spiked walls and castle walls. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21008 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-09-10 00:03:33 +00:00
rjtanner b6819c2fc0 Cosmetic changes to Tower of the Necromancer, Level 3 (pup_land/ancient/mountain/tower.3) for nicer merging between spiked walls and castle walls. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21007 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-09-10 00:01:18 +00:00
rjtanner 124f45106a Cosmetic changes to Tower of the Necromancer, Level 4 (pup_land/ancient/mountain/tower.4) for nicer merging between spiked walls and castle walls. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21006 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-09-09 23:59:26 +00:00
silvernexus dd55ae5a6c Some additional firewall changes missed in r20471.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20472 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-08-06 01:44:56 +00:00
akirschbaum dd472884c9 Run MapNormalizer editor script on all map files.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18817 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-19 13:26:30 +00:00
akirschbaum 5e430c833f Remove trailing whitespace.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18703 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-05-09 11:08:11 +00:00
rjtanner 0a581f3af1 Wording correction (rise -> raise) in message text to Warden (pup_land/ancient/volcano/guardians) in Pup Land. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17833 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-05 04:30:48 +00:00
rjtanner d048278499 Capitalize proper name of Evil Masters in message text to House (pup_land/ancient/ruin/house5) in Pup Land. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17832 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-05 04:24:56 +00:00
rjtanner 3a0fa23dca Map title capitalization update, house -> House (pup_land/ancient/ruin/house2) in Pup Land.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17831 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-05 04:22:29 +00:00
rjtanner a038210404 Capitalization updates in message text to Tower of the Necromancer, Dungeon (pup_land/ancient/mountain/tower.4) in Pup Land. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17830 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-05 04:19:43 +00:00
rjtanner 7c622a4ea4 Wording changes in message text to Tower of the Necromancer, Level 4 (pup_land/ancient/mountain/tower.4) - changed invertible to reversible and breeding to raising.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17829 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-05 04:17:38 +00:00
rjtanner 8208ce682f Grammar correction in message text (being still alive -> it's still alive) to Tower of the Necromancer, Level 3 (pup_land/ancient/mountain/tower.3) in Pup Land. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17828 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-04 05:44:18 +00:00
rjtanner f795fa536a Capitalize proper name of Kurte's Shop in message text to Kurte's Shop (pup_land/ancient/kurte/shop).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17827 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-04 05:38:13 +00:00
rjtanner 0cfd00a030 Capitalize proper name of Lone Village in message text to Kurte's House (pup_land/ancient/kurte/house).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17826 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-04 05:35:50 +00:00
rjtanner 6a8d600a70 Capitalize proper name of Evil Masters in message text to LoveLove Company (pup_land/ancient/company).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17825 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-04 05:34:04 +00:00
rjtanner cdfb2edd55 Capitalize proper name of Evil Master's in message text to Gothwolte's Castle, Level 6 (pup_land/ancient/castle/castle.6).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17824 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-04 05:25:48 +00:00
rjtanner 8848d4ea46 World spacing corrections in message text to Gothwolte's Castle, Level 6 (pup_land/ancient/castle/castle.6) in Pup Land. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17823 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-04 05:24:50 +00:00
rjtanner 8fb7681d2c Capitalize proper name of Evil Master's in message text to Gothwolte's Castle, Level 3 (pup_land/ancient/castle/castle.3).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17822 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-04 05:21:40 +00:00
rjtanner 06bd63d2d3 Capitalize proper name of Evil Master's in message text to Gothwolte's Castle, Level 2 (pup_land/ancient/castle/castle.2).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17821 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-04 05:20:09 +00:00
rjtanner 46c2795689 Capitalize proper name of Evil Master's in message text to Gothwolte's Castle, Entrance (pup_land/ancient/castle/castle.1).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17820 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-04 05:18:37 +00:00
rjtanner 3cab4baa4b Syntax update to Pup Land reference (was Pupland) and map name capitalization (now Hall of Fame) in message text to Treasure (pup_land/ancient/volcano/treasure). No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17800 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-03 04:29:20 +00:00
rjtanner 2c9054862e Capitalization correction and syntax update to Pup Land reference (was pupland) in message text to Lone Village Library (pup_land/ancient/village/library). No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17798 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-02 06:17:59 +00:00
rjtanner 1a23a0452f Spelling correction (Restistance -> Resistance) in item text to Gothwolte's Castle, Level 6 (pup_land/ancient/castle/castle.6) in Pup Land.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17646 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-03-23 04:12:49 +00:00
rjtanner 758ef456e5 Spelling update (demontrap -> demon trap) in message text to House (pup_land/ancient/ruin/house3) in Pup Land.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17622 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-03-21 01:12:46 +00:00
rjtanner 0e9a7ca407 Word spacing correction to message text in Volcano, Inner Cavern (pup_land/ancient/village/volcano/volcano.3) in Pup Land.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17258 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-02-28 05:33:03 +00:00
rjtanner ea616e4d51 Word spacing and punctuation correction to message text in Volcano Cavern (pup_land/ancient/village/volcano/volcano.2) in Pup Land.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17257 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-02-28 05:30:30 +00:00
rjtanner cb20f0b75c Word spacing corrections to message text in Volcano, Entrance (pup_land/ancient/village/volcano/volcano.1) in Pup Land.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17256 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-02-28 05:29:09 +00:00
rjtanner 0a54853b51 Word spacing corrections to message text in Treasure (pup_land/ancient/village/volcano/treasure) in Pup Land.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17255 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-02-28 05:24:43 +00:00
rjtanner a4c0bb6c76 Word spacing and spelling (you scent a -> you sense a) correction to message text in Warden (pup_land/ancient/village/volcano/guardians) in Pup Land.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17254 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-02-28 05:22:31 +00:00
rjtanner cabbaabfc7 Word spacing corrections to message text in Siegfried's House, Level 3 (pup_land/ancient/village/siegfried/siegfried.3) in Pup Land.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17253 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-02-28 05:16:39 +00:00