Mercurial > hg > batmud > maputils
changeset 2172:b2a4c906175b
Improve location type functionality, add more location types.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 12 Oct 2019 19:43:05 +0300 |
| parents | ebd97df1c19a |
| children | ed4135c0a0f5 |
| files | misc/arelium.loc misc/calythien.loc misc/dortlewall.loc misc/esiris.loc misc/lorenchia.loc misc/misc.css misc/rilynttar.loc misc/tyr_farwyn.loc mkcitymap.c |
| diffstat | 9 files changed, 85 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/misc/arelium.loc Sat Oct 12 19:25:19 2019 +0300 +++ b/misc/arelium.loc Sat Oct 12 19:43:05 2019 +0300 @@ -9,9 +9,9 @@ 116 ; 21 ; 0 ;BatMUD Lumberyard (non-functional);;;; 79 ; 22 ; 0 ;The Rusty Shield Bar;;;; 107 ; 23 ; 0 ;The Purity Test Room;;;; -74 ; 24 ; 0 ;Task Point shop|TP shop;;;;sell and buy TPs +74 ; 24 ; 0S ;Task Point shop|TP shop;;;;sell and buy TPs 93 ; 24 ; 0 ;Reversi room;;;; -107 ; 25 ; 0 ;Tince's Tobacco Shop;;;; +107 ; 25 ; 0S ;Tince's Tobacco Shop;;;; 95 ; 27 ; 0 ;Gambling hall;;;; 103 ; 27 ; 2G ;Ugly Joe's restaurant|Butcher's shop;;;;merchant subguild 111 ; 27 ; 0 ;Collector Cards Store;;;; @@ -23,7 +23,7 @@ 101 ; 31 ; 2G ;The Adventurer's Outfitter|Clothing store;;;;merchant subguild 22 ; 32 ; 1G ;Brotherhood of Wizardry|Mage guild;;;; 59 ; 33 ; 0 ;Society joining room;;;; -62 ; 33 ; 0 ;Player city marker shop;;;; +62 ; 33 ; 0S ;Player city marker shop;;;; 65 ; 33 ; 0 ;Assassination game sign up room;;;; 87 ; 33 ; 0 ;The Arelium Bank;;;; 95 ; 33 ; 2G ;Luxury Armoury|Ruuben;;;;merchant subguild @@ -36,36 +36,36 @@ 103 ; 36 ; 0 ;Asidonhopo's General Store|Mapper scrolls (for ships)|Reagent pouches|Wands of nothing|Scrolls of charging;;;; 22 ; 38 ; 1G ;Brotherhood of Wizardry|Mage guild;;;; 63 ; 38 ; 0 ;Arelium Police Station;;;; -93 ; 38 ; 0 ;The General Store;;;; +93 ; 38 ; 0S ;The General Store;;;; 106 ; 38 ; 0 ;Arelium Exchange Office;;;; -28 ; 39 ; 0 ;Potion shop;;;; -109 ; 39 ; 0 ;Barnum's Magic Ring shop;;;; -17 ; 40 ; 0 ;Reagent exchange;;;; +28 ; 39 ; 0S ;Potion shop;;;; +109 ; 39 ; 0S ;Barnum's Magic Ring shop;;;; +17 ; 40 ; 0S ;Reagent exchange;;;; 31 ; 40 ; 0 ;Wizard Memorial Plaque;;;; 55 ; 41 ; 0 ;Government building|Typo office|Player city tax office;;;; 72 ; 41 ; 0 ;The Bathibition Art Gallery;;;; -82 ; 41 ; 0 ;Material Exchange;;;; -104 ; 42 ; 0 ;City Armoury|Armourer;;;; +82 ; 41 ; 0S ;Material Exchange|Mineral exchange;;;; +104 ; 42 ; 0S ;City Armoury|Armourer;;;; 89 ; 43 ; 2G ;City Smithy|Weaponsmith;;;;merchant subguild -95 ; 43 ; 0 ;Chinese Armour Shop|Armourer;;;; +95 ; 43 ; 0S ;Chinese Armour Shop|Armourer;;;; 112 ; 43 ; 1G ;The Bazaar|Merchant guild|Roulette room|Slots|Blackjack|Connect4;;;; 110 ; 44 ; 0 ;Fortune-teller;;;; 24 ; 46 ; 0 ;Arelium orphanage;;;; 67 ; 46 ; 0 ;Gnomish Warehouse (non-functional);;;; 83 ; 46 ; 2G ;City Bakery|Baker;;;;merchant subguild -35 ; 47 ; 0 ;Manny LeRoy's photografikal apparati corp|Camera shop;;;;You can purchase a funny camera, and other related equipment. +35 ; 47 ; 0S ;Manny LeRoy's photografikal apparati corp|Camera shop;;;;You can purchase a funny camera, and other related equipment. 57 ; 47 ; 0 ;Lacramobo's Rent Hall;;;; 115 ; 47 ; 0 ;Conor's balloon services;;;; 74 ; 48 ; 0 ;Arelium Pantry;;;; -80 ; 48 ; 0 ;Lucidahopo's Wand Shop ;;;;Magic wands. +80 ; 48 ; 0S ;Lucidahopo's Wand Shop ;;;;Magic wands. 37 ; 49 ; 0 ;Vax museum|Race information;;;; 94 ; 50 ; 0 ;Swimming Hall + Sauna;;;; 27 ; 53 ; 0 ;Post Office ;;;;Send items to other people via brownie mail. Disabled as of August 2011. 82 ; 53 ; 2G ;Hardware shop ;;;;Hardware shop;merchant subguild -37 ; 55 ; 0 ;The Tinker's tools ;;;;Ropes, torches, bandages, stethoscopes, lock picks, water skins, blindfolds, magnifying glasses. +37 ; 55 ; 0S ;The Tinker's tools ;;;;Ropes, torches, bandages, stethoscopes, lock picks, water skins, blindfolds, magnifying glasses. 20 ; 51 ; 0 ;Church of all Gods|Church altar|Damogran/donations|Graveyard|Church dungeon|Death room|Tour guide;;;; 88 ; 51 ; 0 ;City Hospital|Sex change|Donate blood;;;;merchant subguild -46 ; 53 ; 1G ;Adventurers' Guild|Advguild|Boons/banes selection|Ability training|Dataroom|Guild leadership shrine|Quest room|Exp/quest/explore plaques|Race shrine portal;;;; +46 ; 53 ; 1C ;Adventurers' Guild|Advguild|Boons/banes selection|Ability training|Dataroom|Guild leadership shrine|Quest room|Exp/quest/explore plaques|Race shrine portal;;;; 57 ; 53 ; 1G ;Arena|Civfighter guild;;;; 54 ; 55 ; 0 ;Arelium public library;;;; 37 ; 57 ; 0 ;The Council Hall ;;;;BatMUD Council hall, probably not used now as the council was disbanded.
--- a/misc/calythien.loc Sat Oct 12 19:25:19 2019 +0300 +++ b/misc/calythien.loc Sat Oct 12 19:43:05 2019 +0300 @@ -1,16 +1,16 @@ # MapUtils LOC file (version 4.0) # Refer to README.loc for more information. # -11 ; 23 ; 0 ;Adventurers' Guild;;;; +11 ; 23 ; 0C ;Adventurers' Guild;;;; 30 ; 20 ; 0 ;The first bank of Calythien;;;; -33 ; 16 ; 0 ;The Fair Trade ;;;;General store. -17 ; 25 ; 0 ;The Last Codpiece ;;;;Armourer; armour shop. -16 ; 22 ; 0 ;The Steel and Deal ;;;;Weaponsmithy -18 ; 18 ; 0 ;The Golden Harp ;;;;Repair musical instruments. -38 ; 18 ; 0 ;The Black and Hot ;;;;Coffee shop. +33 ; 16 ; 0S ;The Fair Trade|General store;;;; +17 ; 25 ; 0S ;The Last Codpiece|Armourer|Armour shop;;;; +16 ; 22 ; 0S ;The Steel and Deal|Weaponsmithy;;;; +18 ; 18 ; 0S ;The Golden Harp|Repair musical instruments;;;; +38 ; 18 ; 0S ;The Black and Hot|Coffee shop;;;; 18 ; 11 ; 0 ;The Inn of the Three Sausages;;;; 33 ; 21 ; 0 ;The church of Calythien's office;;;; -19 ; 27 ; 0 ;Hall of Fame ;;;;Exp/quest/explore plaques. +19 ; 27 ; 0 ;Hall of Fame|Exp/quest/explore plaques;;;; 21 ; 24 ; 0 ;Guard Station;;;; 27 ; 24 ; 0 ;The Silver Pegasus Inn;;;; 34 ; 25 ; 0 ;The Wizard Memorial Plaque;;;;
--- a/misc/dortlewall.loc Sat Oct 12 19:25:19 2019 +0300 +++ b/misc/dortlewall.loc Sat Oct 12 19:43:05 2019 +0300 @@ -10,9 +10,9 @@ 9 ; 10 ; 0 ;Guildhouse - Main entrance;;;; 6 ; 12 ; 0 ;Western gatehouse;;;; 12 ; 13 ; 0 ;Halls of the duke of Dortlewall;;;; -8 ; 14 ; 0 ;Weapon store;;;; -8 ; 16 ; 0 ;Armour store;;;; +8 ; 14 ; 0S ;Weapon store;;;; +8 ; 16 ; 0S ;Armour store;;;; 12 ; 17 ; 0 ;Bank of Dortlewall;;;; -8 ; 18 ; 0 ;General store;;;; -12 ; 19 ; 0 ;Crystite trading post;;;; +8 ; 18 ; 0S ;General store;;;; +12 ; 19 ; 0S ;Crystite trading post;;;; 10 ; 20 ; 0 ;Last Keg Inn;;;;
--- a/misc/esiris.loc Sat Oct 12 19:25:19 2019 +0300 +++ b/misc/esiris.loc Sat Oct 12 19:43:05 2019 +0300 @@ -8,10 +8,10 @@ 49 ; 16 ; 0 ;Furnachia Portal;;;; 28 ; 14 ; 0 ;The Bank;;;; -18 ; 13 ; 0 ;Merchant Hardwares;;;; -20 ; 14 ; 0 ;Potions Galore;;;; -16 ; 15 ; 0 ;Alchemists Emporium;;;; -16 ; 17 ; 0 ;Material Exchange;;;; +18 ; 13 ; 0S ;Merchant Hardwares;;;; +20 ; 14 ; 0S ;Potions Galore;;;; +16 ; 15 ; 0S ;Alchemists Emporium;;;; +16 ; 17 ; 0S ;Material Exchange;;;; 20 ; 17 ; 0 ;Khududra's Bar;;;; 33 ; 17 ; 0 ;Renarya's Sauna;;;; 35 ; 19 ; 0 ;Con Monster Bazzar;;;;
--- a/misc/lorenchia.loc Sat Oct 12 19:25:19 2019 +0300 +++ b/misc/lorenchia.loc Sat Oct 12 19:43:05 2019 +0300 @@ -1,20 +1,20 @@ # MapUtils LOC file (version 4.0) # Refer to README.loc for more information. # -26 ; 10 ; 0 ;Adventurers guild;;;; +26 ; 10 ; 0C ;Adventurers guild;;;; 2 ; 12 ; 0 ;Harbour;;;; -23 ; 11 ; 0 ;The Bank of Emperor Lor ;;;;bank -32 ; 8 ; 0 ;The Lorenchian Armoury ;;;;armour shop -41 ; 8 ; 0 ;The Lorenchian WeaponSmith ;;;;weapon shop -23 ; 14 ; 0 ;Trevor's Tool Shack ;;;;ropes, torches, lock picks, hammers, chisels, picks, shovels, stethoscopes -25 ; 5 ; 0 ;BayPrixces' Magic Shop ;;;;wands of nothing, scrolls of charging, torches, magic ropes +23 ; 11 ; 0 ;The Bank of Emperor Lor;;;; +32 ; 8 ; 0S ;The Lorenchian Armoury|Armour shop;;;; +41 ; 8 ; 0S ;The Lorenchian WeaponSmith|Weapon shop;;;; +23 ; 14 ; 0S ;Trevor's Tool Shack;;;;ropes, torches, lock picks, hammers, chisels, picks, shovels, stethoscopes +25 ; 5 ; 0S ;BayPrixces' Magic Shop;;;;wands of nothing, scrolls of charging, torches, magic ropes 28 ; 7 ; 0 ;Alphidia Alkot's House of Rejuvenation ;;;;special regeneration rooms 19 ; 8 ; 0 ;Lorenchia's Sheriff Station;;;; 19 ; 11 ; 0 ;The Ismelidian temple;;;; -37 ; 11 ; 0 ;The Lorenchian General Store;;;; -42 ; 13 ; 0 ;The Lorenchia liquor store;;;; -35 ; 14 ; 0 ;Post Office ;;;;send items to other players -53 ; 14 ; 0 ;Vegetarian Food Court;;;; +37 ; 11 ; 0S ;The Lorenchian general store;;;; +42 ; 13 ; 0S ;The Lorenchia liquor store;;;; +35 ; 14 ; 0 ;Post Office;;;;send items to other players +53 ; 14 ; 0S ;Vegetarian Food Court;;;; 35 ; 16 ; 0 ;The Greasy Spoon Bar;;;; 28 ; 17 ; 0 ;Western guard tower;;;; 42 ; 17 ; 0 ;Eastern guard tower;;;;
--- a/misc/misc.css Sat Oct 12 19:25:19 2019 +0300 +++ b/misc/misc.css Sat Oct 12 19:43:05 2019 +0300 @@ -117,3 +117,11 @@ a.ltloc + .ltguild + .lt2 { color: #0f0; } + +a.ltloc + .ltshop { + color: #cc0; +} + +a.ltloc + .ltspecial { + color: #f0f; +}
--- a/misc/rilynttar.loc Sat Oct 12 19:25:19 2019 +0300 +++ b/misc/rilynttar.loc Sat Oct 12 19:43:05 2019 +0300 @@ -2,9 +2,9 @@ # Refer to README.loc for more information. # 14 ; 5 ; 0 ;Bank;;;; -49 ; 18 ; 0 ;Grocery;;;; -44 ; 20 ; 0 ;Weaponsmith;;;; -51 ; 21 ; 0 ;Armourer;;;; +49 ; 18 ; 0S ;Grocery;;;; +44 ; 20 ; 0S ;Weaponsmith;;;; +51 ; 21 ; 0S ;Armourer;;;; 24 ; 4 ; 0 ;Reaver Catacombs;;;; 54 ; 5 ; 0 ;Public Works Building;;;; 42 ; 7 ; 0 ;The Inn of the Iron Wind;;;; @@ -15,4 +15,4 @@ 56 ; 12 ; 0 ;Guard Barracks;;;; 50 ; 14 ; 0 ;Beginno, the alcohol store;;;; 35 ; 16 ; 0 ;Maze of Cage Walls;;;; -54 ; 17 ; 0 ;General Shop;;;; +54 ; 17 ; 0S ;General Shop;;;;
--- a/misc/tyr_farwyn.loc Sat Oct 12 19:25:19 2019 +0300 +++ b/misc/tyr_farwyn.loc Sat Oct 12 19:43:05 2019 +0300 @@ -1,14 +1,14 @@ # MapUtils LOC file (version 4.0) # Refer to README.loc for more information. # -35 ; 9 ; 0 ;Adventurers Guild;;;; +35 ; 9 ; 0C ;Adventurers' Guild;;;; 39 ; 21 ; 0 ;Bank of Tyr Farwyn;;;; -44 ; 13 ; 0 ;General Store;;;; +44 ; 13 ; 0S ;General Store;;;; 37 ; 14 ; 0 ;The 'Nugget', an inn;;;; -53 ; 14 ; 0 ;Smithy;;;; -45 ; 16 ; 0 ;Armoury;;;; -25 ; 19 ; 0 ;Material exchange;;;; -65 ; 18 ; 0 ;Delicatessen;;;; +53 ; 14 ; 0S ;Smithy;;;; +45 ; 16 ; 0S ;Armoury;;;; +25 ; 19 ; 0S ;Material exchange;;;; +65 ; 18 ; 0S ;Delicatessen;;;; 71 ; 18 ; 0 ;Lizard collector;;;; 9 ; 20 ; 0 ;Commoner house #1;;;;
--- a/mkcitymap.c Sat Oct 12 19:25:19 2019 +0300 +++ b/mkcitymap.c Sat Oct 12 19:43:05 2019 +0300 @@ -129,6 +129,33 @@ } +const char *getCityLocationType(int flags) +{ + switch (flags & LOCF_M_MASK) + { +// case LOCF_M_CITY: return "special"; + case LOCF_M_PCITY: return "special"; + default: + switch (flags & LOCF_T_MASK) + { + case LOCF_T_SHRINE: return "shop"; + case LOCF_T_GUILD: return "guild"; +/* + case LOCF_T_SS: return "ss"; + case LOCF_T_MONSTER: return "monster"; + case LOCF_T_TRAINER: return "trainer"; + case LOCF_T_FORT: return "fort"; +*/ + } + break; + } + + return "default"; +} + + + + void outputHTMLFooter(FILE *outFile, const MapLocations *locs) { fprintf(outFile, @@ -147,7 +174,7 @@ fprintf(outFile, "<a class=\"ltloc lt%s lt%d\" id=\"listloc%d_%d\" href=\"?%d_%d\" " "onmouseover=\"%s('%d_%d');\" onmouseout=\"qn();\">", - locGetLocationType(marker->flags), + getCityLocationType(marker->flags), marker->align, marker->xc, marker->yc, marker->xc, marker->yc,