warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#W# Change: Felucca is now Veridia

Browse source
This commit is contained in:
WarrentyExpired 2026-08-31 18:00:19 -04:00
parent d7fb1b1c03
commit 7cf3e68b37
87 changed files with 1279 additions and 1279 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Distribution/Configuration/expansion.json
View file

@ -50,7 +50,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": true,
@ -69,11 +69,11 @@
},
"MobileStatusVersion": 6,
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": true,
"Malas": true,
"Tokuno": false,
"TerMur": false
}
}
}

50
Distribution/Data/expansions.json
View file

@ -31,7 +31,7 @@
"EJ": false
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": false,
"Ilshenar": false,
"Malas": false,
@ -54,7 +54,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": false,
@ -76,7 +76,7 @@
"Id": 1,
"Name": "The Second Age",
"RequiredClient": null,
"ClientFlags": "Felucca",
"ClientFlags": "Veridia",
"SupportedFeatures": {
"T2A": true,
"UOR": false,
@ -104,7 +104,7 @@
"EJ": false
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": false,
"Malas": false,
@ -127,7 +127,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": false,
@ -177,7 +177,7 @@
"EJ": false
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": false,
"Malas": false,
@ -200,7 +200,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": false,
@ -250,7 +250,7 @@
"EJ": false
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": true,
"Malas": false,
@ -273,7 +273,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": false,
@ -323,7 +323,7 @@
"EJ": false
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": true,
"Malas": false,
@ -346,7 +346,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": false,
@ -396,7 +396,7 @@
"EJ": false
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": true,
"Malas": true,
@ -419,7 +419,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": true,
@ -469,7 +469,7 @@
"EJ": false
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": true,
"Malas": true,
@ -492,7 +492,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": true,
@ -542,7 +542,7 @@
"EJ": false
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": true,
"Malas": true,
@ -565,7 +565,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": true,
@ -615,7 +615,7 @@
"EJ": false
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": true,
"Malas": true,
@ -638,7 +638,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": true,
@ -688,7 +688,7 @@
"EJ": false
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": true,
"Malas": true,
@ -711,7 +711,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": true,
@ -761,7 +761,7 @@
"EJ": false
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": true,
"Malas": true,
@ -784,7 +784,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": true,
@ -834,7 +834,7 @@
"EJ": true
},
"MapSelectionFlags": {
"Felucca": true,
"Veridia": true,
"Trammel": true,
"Ilshenar": true,
"Malas": true,
@ -857,7 +857,7 @@
"SeventhCharacterSlot": false,
"Unk4": false,
"NewMovementSystem": false,
"NewFeluccaAreas": false
"NewVeridiaAreas": false
},
"HousingFlags": {
"AOS": true,

2
Distribution/Data/go.json
View file

@ -3,7 +3,7 @@
"categories": [
{ "name": "Fel", "categories": [
{ "name": "Towns", "locations": [
{ "name": "Brit Fel", "location": [1592, 1680, 10], "map": "Felucca" } ] } ] },
{ "name": "Brit Fel", "location": [1592, 1680, 10], "map": "Veridia" } ] } ] },
{ "name": "Tram", "categories": [
{ "name": "Towns", "locations": [
{ "name": "Brit Tram", "location": [1592, 1680, 10], "map": "Trammel" } ] } ] }

4
Distribution/Data/map-definitions.json
View file

@ -3,11 +3,11 @@
"index": 0,
"id": 0,
"fileIndex": 0,
"name": "Felucca",
"name": "Veridia",
"width": 7168,
"height": 4096,
"season": 1,
"rules": "FeluccaRules"
"rules": "VeridiaRules"
},
{
"index": 1,

280
Distribution/Data/regions.json
View file

@ -1,7 +1,7 @@
[
{
"$type": "GuardedRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Moongates",
"Priority": 50,
"Area": [
@ -17,7 +17,7 @@
},
{
"$type": "GuardedRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "T2A Arena",
"Priority": 50,
"Area": [
@ -31,7 +31,7 @@
{
"$type": "TownRegion",
"Entrance": {"x": 535, "y": 995, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "The Heartwood",
"Priority": 50,
"Area": [{"x1": 6911, "y1": 255, "x2": 7168, "y2": 512}],
@ -41,7 +41,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 762, "y": 1645, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Sanctuary",
"Priority": 50,
"Area": [{"x1": 6144, "y1": 0, "x2": 6399, "y2": 255}],
@ -51,7 +51,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 1716, "y": 892, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "The Painted Caves",
"Priority": 50,
"Area": [{"x1": 6240, "y1": 850, "x2": 6315, "y2": 920}],
@ -61,7 +61,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 3784, "y": 1097, "z": 14},
"Map": "Felucca",
"Map": "Veridia",
"Name": "The Prism of Light",
"Priority": 50,
"Area": [{"x1": 6400, "y1": 0, "x2": 6621, "y2": 255}],
@ -71,7 +71,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 587, "y": 1641, "z": -1},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Blighted Grove",
"Priority": 50,
"Area": [{"x1": 6440, "y1": 820, "x2": 6600, "y2": 970}],
@ -81,7 +81,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 5574, "y": 3024, "z": 31},
"Map": "Felucca",
"Map": "Veridia",
"Name": "The Palace of Paroxysmus",
"Priority": 50,
"Area": [{"x1": 6191, "y1": 311, "x2": 6561, "y2": 671}],
@ -90,21 +90,21 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Bravehorn's drinking pool",
"Priority": 50,
"Area": [{"x1": 1302, "y1": 2331, "x2": 1340, "y2": 2353}]
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Huntsman's Forest",
"Priority": 50,
"Area": [{"x1": 1595, "y1": 550, "x2": 1715, "y2": 670}]
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Cove",
"Priority": 50,
"Area": [
@ -116,7 +116,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Britain",
"Priority": 50,
"Area": [
@ -133,8 +133,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 1492, "y1": 1602, "z1": 0, "x2": 1500, "y2": 1621, "z2": 128},
@ -154,8 +154,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Name": "A Wheatfield in Britain 1",
"Priority": 50,
"Area": [{"x1": 1120, "y1": 1776, "x2": 1152, "y2": 1808}],
@ -163,8 +163,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Name": "A Wheatfield in Britain 2",
"Priority": 50,
"Area": [{"x1": 1184, "y1": 1808, "x2": 1216, "y2": 1840}],
@ -172,8 +172,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Name": "A Wheatfield in Britain 3",
"Priority": 50,
"Area": [{"x1": 1216, "y1": 1872, "x2": 1248, "y2": 1904}],
@ -181,8 +181,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Name": "A Carrot Field in Britain 1",
"Priority": 50,
"Area": [{"x1": 1208, "y1": 1712, "x2": 1224, "y2": 1736}],
@ -190,8 +190,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Name": "An Onion Field in Britain 1",
"Priority": 50,
"Area": [{"x1": 1224, "y1": 1712, "x2": 1240, "y2": 1736}],
@ -199,8 +199,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Name": "A Cabbage Field in Britain 1",
"Priority": 50,
"Area": [{"x1": 1176, "y1": 1672, "x2": 1192, "y2": 1695}],
@ -208,8 +208,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Name": "A Turnip Field in Britain 1",
"Priority": 50,
"Area": [{"x1": 1192, "y1": 1672, "x2": 1208, "y2": 1696}],
@ -217,8 +217,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Name": "A Wheatfield in Britain 4",
"Priority": 50,
"Area": [{"x1": 1104, "y1": 1608, "x2": 1136, "y2": 1640}],
@ -226,8 +226,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Name": "A Wheatfield in Britain 5",
"Priority": 50,
"Area": [{"x1": 1136, "y1": 1560, "x2": 1168, "y2": 1592}],
@ -235,8 +235,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Name": "A Turnip Field in Britain 2",
"Priority": 50,
"Area": [{"x1": 1208, "y1": 1592, "x2": 1224, "y2": 1616}],
@ -244,8 +244,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Britain", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Britain", "Map": "Veridia" },
"Name": "A Carrot Field in Britain 2",
"Priority": 50,
"Area": [{"x1": 1224, "y1": 1592, "x2": 1240, "y2": 1616}],
@ -253,7 +253,7 @@
},
{
"$type": "NoHousingRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Britain Graveyard",
"Priority": 50,
"Area": [{"x1": 1333, "y1": 1441, "x2": 1417, "y2": 1523}],
@ -261,7 +261,7 @@
},
{
"$type": "NoHousingRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Jhelom Islands",
"Priority": 50,
"Area": [
@ -274,8 +274,8 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Parent": { "Name": "Jhelom Islands", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Jhelom Islands", "Map": "Veridia" },
"Name": "Jhelom",
"Priority": 50,
"Area": [
@ -288,8 +288,8 @@
{
"$type": "NoHousingRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Jhelom", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Jhelom", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 1352, "y1": 3800, "z1": -20, "x2": 1368, "y2": 3832, "z2": 128},
@ -300,7 +300,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Minoc",
"Priority": 50,
"Area": [
@ -316,8 +316,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Minoc", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Minoc", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 2457, "y1": 397, "x2": 2497, "y2": 405},
@ -327,7 +327,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Ocllo",
"Priority": 50,
"Area": [
@ -346,8 +346,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Ocllo", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Ocllo", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 3664, "y1": 2608, "x2": 3680, "y2": 2624},
@ -357,7 +357,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Trinsic",
"Priority": 50,
"Area": [
@ -374,8 +374,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Trinsic", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Trinsic", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 1834, "y1": 2728, "x2": 1856, "y2": 2744},
@ -388,7 +388,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Vesper",
"Priority": 50,
"Area": [
@ -403,8 +403,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Vesper", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Vesper", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 2952, "y1": 864, "x2": 2968, "y2": 896},
@ -417,7 +417,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Yew",
"Priority": 50,
"Area": [
@ -434,16 +434,16 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Yew", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Yew", "Map": "Veridia" },
"Priority": 50,
"Area": [{"x1": 600, "y1": 808, "z1": 0, "x2": 624, "y2": 832, "z2": 39}]
},
{
"$type": "TownRegion",
"RuneName": "A Field of Sheep in Yew",
"Map": "Felucca",
"Parent": { "Name": "Yew", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Yew", "Map": "Veridia" },
"Name": "A Field of Sheep in Yew 1",
"Priority": 50,
"Area": [{"x1": 664, "y1": 928, "x2": 686, "y2": 950}],
@ -452,8 +452,8 @@
{
"$type": "TownRegion",
"RuneName": "A Field of Sheep in Yew",
"Map": "Felucca",
"Parent": { "Name": "Yew", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Yew", "Map": "Veridia" },
"Name": "A Field of Sheep in Yew 2",
"Priority": 50,
"Area": [{"x1": 664, "y1": 1168, "x2": 686, "y2": 1190}],
@ -462,8 +462,8 @@
{
"$type": "TownRegion",
"RuneName": "A Farm in Yew",
"Map": "Felucca",
"Parent": { "Name": "Yew", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Yew", "Map": "Veridia" },
"Name": "A Farm in Yew",
"Priority": 50,
"Area": [{"x1": 560, "y1": 1088, "x2": 582, "y2": 1110}],
@ -472,8 +472,8 @@
{
"$type": "TownRegion",
"RuneName": "A Wheatfield in Yew",
"Map": "Felucca",
"Parent": { "Name": "Yew", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Yew", "Map": "Veridia" },
"Name": "A Wheatfield in Yew 1",
"Priority": 50,
"Area": [{"x1": 560, "y1": 1232, "x2": 576, "y2": 1248}],
@ -482,8 +482,8 @@
{
"$type": "TownRegion",
"RuneName": "A Wheatfield in Yew",
"Map": "Felucca",
"Parent": { "Name": "Yew", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Yew", "Map": "Veridia" },
"Name": "A Wheatfield in Yew 2",
"Priority": 50,
"Area": [{"x1": 368, "y1": 1176, "x2": 382, "y2": 1208}],
@ -491,7 +491,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Wind",
"Priority": 50,
"Area": [
@ -513,8 +513,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Wind", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Wind", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 5159, "y1": 15, "x2": 5184, "y2": 24},
@ -528,7 +528,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Serpent's Hold",
"Priority": 50,
"Area": [
@ -540,8 +540,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Serpent's Hold", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Serpent's Hold", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 2960, "y1": 3400, "z1": 0, "x2": 2976, "y2": 3416, "z2": 128},
@ -551,7 +551,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Skara Brae",
"Priority": 50,
"Area": [{"x1": 538, "y1": 2107, "x2": 688, "y2": 2297}],
@ -561,8 +561,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Skara Brae", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Skara Brae", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 600, "y1": 2232, "x2": 616, "y2": 2256},
@ -574,7 +574,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Nujel'm",
"Priority": 50,
"Area": [
@ -586,8 +586,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Nujel'm", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Nujel'm", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 3736, "y1": 1184, "z1": 0, "x2": 3752, "y2": 1207, "z2": 128},
@ -607,7 +607,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Moonglow",
"Priority": 50,
"Area": [
@ -642,8 +642,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Moonglow", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Moonglow", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 4384, "y1": 1152, "z1": 0, "x2": 4392, "y2": 1176, "z2": 128},
@ -656,7 +656,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Magincia",
"Priority": 50,
"Area": [
@ -672,8 +672,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Magincia", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Magincia", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 3680, "y1": 2152, "x2": 3704, "y2": 2160},
@ -682,7 +682,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Buccaneer's Den",
"Priority": 50,
"GuardsDisabled": true,
@ -696,8 +696,8 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Buccaneer's Den", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Buccaneer's Den", "Map": "Veridia" },
"Priority": 50,
"Area": [
{"x1": 2712, "y1": 2080, "x2": 2728, "y2": 2096},
@ -709,7 +709,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 2499, "y": 916, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Covetous",
"Priority": 50,
"Area": [
@ -722,7 +722,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 4111, "y": 429, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Deceit",
"Priority": 50,
"Area": [{"x1": 5122, "y1": 518, "x2": 5370, "y2": 770}],
@ -732,7 +732,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 1296, "y": 1082, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Despise",
"Priority": 50,
"Area": [{"x1": 5377, "y1": 516, "x2": 5631, "y2": 1022}],
@ -742,7 +742,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 1176, "y": 2635, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Destard",
"Priority": 50,
"Area": [{"x1": 5120, "y1": 770, "x2": 5371, "y2": 1028}],
@ -752,7 +752,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 4722, "y": 3814, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Hythloth",
"Priority": 50,
"Area": [{"x1": 5898, "y1": 2, "x2": 6136, "y2": 246}],
@ -762,7 +762,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 5882, "y": 3819, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Khaldun",
"Priority": 50,
"Area": [{"x1": 5381, "y1": 1284, "x2": 5628, "y2": 1509}],
@ -771,7 +771,7 @@
},
{
"$type": "JailRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Jail",
"Priority": 50,
"Area": [{"x1": 5271, "y1": 1159, "x2": 5312, "y2": 1192}],
@ -779,7 +779,7 @@
},
{
"$type": "GreenAcresRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Green Acres",
"Priority": 1,
"Area": [{"x1": 5376, "y1": 512, "x2": 6143, "y2": 1279}],
@ -788,7 +788,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 512, "y": 1559, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Shame",
"Priority": 50,
"Area": [
@ -801,7 +801,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 2042, "y": 226, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Wrong",
"Priority": 50,
"Area": [{"x1": 5633, "y1": 511, "x2": 5886, "y2": 1021}],
@ -810,7 +810,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Cave 1",
"Priority": 50,
"Area": [
@ -823,7 +823,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Cave 2",
"Priority": 50,
"Area": [{"x1": 1887, "y1": 354, "x2": 1920, "y2": 377}],
@ -831,7 +831,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Cave 3",
"Priority": 50,
"Area": [{"x1": 1925, "y1": 307, "x2": 1943, "y2": 325}],
@ -839,7 +839,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Cave 4",
"Priority": 50,
"Area": [{"x1": 2323, "y1": 809, "x2": 2368, "y2": 851}],
@ -847,7 +847,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Britain Mine 1",
"Priority": 50,
"Area": [{"x1": 1436, "y1": 1215, "x2": 1465, "y2": 1252}],
@ -855,7 +855,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Britain Mine 2",
"Priority": 50,
"Area": [{"x1": 1611, "y1": 1175, "x2": 1662, "y2": 1204}],
@ -863,7 +863,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Minoc Cave 1",
"Priority": 50,
"Area": [{"x1": 2406, "y1": 168, "x2": 2428, "y2": 184}],
@ -871,7 +871,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Minoc Cave 2",
"Priority": 50,
"Area": [{"x1": 2418, "y1": 81, "x2": 2442, "y2": 113}],
@ -879,7 +879,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Minoc Cave 3",
"Priority": 50,
"Area": [{"x1": 2447, "y1": 39, "x2": 2489, "y2": 67}],
@ -887,7 +887,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Minoc Mine",
"Priority": 50,
"Area": [
@ -898,7 +898,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Avatar Isle Cave",
"Priority": 50,
"Area": [{"x1": 4594, "y1": 3807, "x2": 4617, "y2": 3824}],
@ -906,7 +906,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Ice Isle Cave 1",
"Priority": 50,
"Area": [{"x1": 4018, "y1": 421, "x2": 4067, "y2": 470}],
@ -914,7 +914,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Ice Isle Cave 2",
"Priority": 50,
"Area": [
@ -925,7 +925,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "North Territory Cave",
"Priority": 50,
"Area": [{"x1": 1973, "y1": 251, "x2": 1994, "y2": 274}],
@ -933,7 +933,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Yew Cave",
"Priority": 50,
"Area": [{"x1": 766, "y1": 1683, "x2": 778, "y2": 1697}],
@ -941,7 +941,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "North Territory Mine 1",
"Priority": 50,
"Area": [{"x1": 1713, "y1": 1055, "x2": 1753, "y2": 1080}],
@ -949,7 +949,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "North Territory Mine 2",
"Priority": 50,
"Area": [{"x1": 1604, "y1": 958, "x2": 1650, "y2": 1009}],
@ -957,7 +957,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Mt Kendall",
"Priority": 50,
"Area": [
@ -969,7 +969,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Covetous Mine",
"Priority": 50,
"Area": [
@ -982,7 +982,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 5426, "y": 3120, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Terathan Keep",
"Priority": 50,
"Area": [
@ -995,7 +995,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 2922, "y": 3402, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Fire",
"Priority": 50,
"Area": [{"x1": 5635, "y1": 1285, "x2": 5880, "y2": 1520}],
@ -1005,7 +1005,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 1996, "y": 80, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Ice",
"Priority": 50,
"Area": [
@ -1018,7 +1018,7 @@
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Delucia",
"Priority": 50,
"Area": [
@ -1031,14 +1031,14 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Delucia", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Delucia", "Map": "Veridia" },
"Priority": 50,
"Area": [{"x1": 5194, "y1": 4053, "x2": 5204, "y2": 4073}]
},
{
"$type": "TownRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Papua",
"Priority": 50,
"Area": [
@ -1050,14 +1050,14 @@
{
"$type": "TownRegion",
"NoLogoutDelay": true,
"Map": "Felucca",
"Parent": { "Name": "Papua", "Map": "Felucca" },
"Map": "Veridia",
"Parent": { "Name": "Papua", "Map": "Veridia" },
"Priority": 50,
"Area": [{"x1": 5757, "y1": 3150, "x2": 5781, "y2": 3174}]
},
{
"$type": "NoHousingRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Wrong Entrance",
"Priority": 50,
"Area": [{"x1": 1939, "y1": 215, "x2": 2073, "y2": 352}],
@ -1066,7 +1066,7 @@
},
{
"$type": "NoHousingRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Covetous Entrance",
"Priority": 50,
"Area": [{"x1": 2433, "y1": 846, "x2": 2561, "y2": 974}],
@ -1075,7 +1075,7 @@
},
{
"$type": "NoHousingRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Despise Entrance",
"Priority": 50,
"Area": [{"x1": 1289, "y1": 1064, "x2": 1321, "y2": 1101}],
@ -1083,7 +1083,7 @@
},
{
"$type": "NoHousingRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "Despise Passage",
"Priority": 50,
"Area": [
@ -1096,7 +1096,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 1492, "y": 1641, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Misc Dungeons",
"Priority": 50,
"Area": [{"x1": 5886, "y1": 1281, "x2": 6143, "y2": 1535}],
@ -1106,7 +1106,7 @@
{
"$type": "DungeonRegion",
"Entrance": {"x": 1014, "y": 1434, "z": 0},
"Map": "Felucca",
"Map": "Veridia",
"Name": "Orc Cave",
"Priority": 50,
"Area": [
@ -1120,7 +1120,7 @@
{
"$type": "BaseRegion",
"RuneName": "A Cotton Field in Moonglow",
"Map": "Felucca",
"Map": "Veridia",
"Name": "A Cotton Field in Moonglow",
"Priority": 50,
"Area": [{"x1": 4557, "y1": 1471, "x2": 4577, "y2": 1481}],
@ -1129,7 +1129,7 @@
{
"$type": "BaseRegion",
"RuneName": "A Wheatfield in Skara Brae",
"Map": "Felucca",
"Map": "Veridia",
"Name": "A Wheatfield in Skara Brae 1",
"Priority": 50,
"Area": [{"x1": 796, "y1": 2152, "x2": 832, "y2": 2176}],
@ -1137,7 +1137,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "A Carrot Field in Skara Brae",
"Priority": 50,
"Area": [{"x1": 816, "y1": 2251, "x2": 832, "y2": 2259}],
@ -1145,7 +1145,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "An Onion Field in Skara Brae",
"Priority": 50,
"Area": [{"x1": 816, "y1": 2261, "x2": 832, "y2": 2269}],
@ -1153,7 +1153,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "A Cabbage Field in Skara Brae 1",
"Priority": 50,
"Area": [{"x1": 816, "y1": 2271, "x2": 832, "y2": 2279}],
@ -1161,7 +1161,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "A Cabbage Field in Skara Brae 2",
"Priority": 50,
"Area": [{"x1": 816, "y1": 2281, "x2": 832, "y2": 2289}],
@ -1169,7 +1169,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "A Wheatfield in Skara Brae 2",
"Priority": 50,
"Area": [{"x1": 835, "y1": 2344, "x2": 851, "y2": 2360}],
@ -1177,7 +1177,7 @@
},
{
"$type": "BaseRegion",
"Map": "Felucca",
"Map": "Veridia",
"Name": "A Cotton Field in Skara Brae",
"Priority": 50,
"Area": [{"x1": 816, "y1": 2344, "x2": 832, "y2": 2368}],

1728
Distribution/Data/teleporters.json
View file

File diff suppressed because it is too large Load diff

4
Projects/Server/ExpansionInfo.cs
View file

@ -41,7 +41,7 @@ public enum Expansion
public enum ClientFlags
{
None = 0x00000000,
Felucca = 0x00000001,
Veridia = 0x00000001,
Trammel = 0x00000002,
Ilshenar = 0x00000004,
Malas = 0x00000008,
@ -114,7 +114,7 @@ public enum CharacterListFlags
SeventhCharacterSlot = 0x00001000,
Unk4 = 0x00002000,
NewMovementSystem = 0x00004000, // Doesn't seem to be used on OSI
NewFeluccaAreas = 0x00008000,
NewVeridiaAreas = 0x00008000,
ExpansionNone = ContextMenus,
ExpansionT2A = ContextMenus,

4
Projects/Server/Maps/Map.cs
View file

@ -35,7 +35,7 @@ public enum MapRules
BeneficialRestrictions = 0x0004, // Disallow performing beneficial actions on criminals/murderers
HarmfulRestrictions = 0x0008, // Disallow performing harmful actions on innocents
TrammelRules = FreeMovement | BeneficialRestrictions | HarmfulRestrictions,
FeluccaRules = None
VeridiaRules = None
}
/// <summary>
@ -90,7 +90,7 @@ public sealed partial class Map : IComparable<Map>, ISpanFormattable, ISpanParsa
public static Map[] Maps { get; } = new Map[0x100];
public static Map Felucca => Maps[0];
public static Map Veridia => Maps[0];
public static Map Trammel => Maps[1];
public static Map Ilshenar => Maps[2];
public static Map Malas => Maps[3];

2
Projects/Server/Maps/MapSelection.cs
View file

@ -7,7 +7,7 @@ namespace Server.Maps;
[Flags]
public enum MapSelectionFlags
{
Felucca = 0x00000001,
Veridia = 0x00000001,
Trammel = 0x00000002,
Ilshenar = 0x00000004,
Malas = 0x00000008,

4
Projects/Server/Network/Packets/OutgoingAccountPackets.cs
View file

@ -215,8 +215,8 @@ public static class OutgoingAccountPackets
map = m.LogoutMap;
}
writer.Write((short)(map?.Width ?? Map.Felucca.Width));
writer.Write((short)(map?.Height ?? Map.Felucca.Height));
writer.Write((short)(map?.Width ?? Map.Veridia.Width));
writer.Write((short)(map?.Height ?? Map.Veridia.Height));
writer.Clear(writer.Capacity - writer.Position); // Remaining is zero
ns.Send(writer.Span);

2
Projects/Server/TileMatrix/TileMatrix.cs
View file

@ -63,7 +63,7 @@ public class TileMatrix
public static void Configure()
{
// Set to true to support < 6.0.0 clients where map0.mul is both Felucca & Trammel
// Set to true to support < 6.0.0 clients where map0.mul is both Veridia & Trammel
var isPre6000Trammel = UOClient.ServerClientVersion != null && UOClient.ServerClientVersion < ClientVersion.Version6000;
Pre6000ClientSupport = ServerConfiguration.GetSetting("maps.enablePre6000Trammel", isPre6000Trammel);
}

2
Projects/UOContent/Commands/Object Creation/Decorate.cs
View file

@ -34,7 +34,7 @@ namespace Server.Commands
NetState.FlushAll();
Generate("Data/Decoration/Overworld", Map.Felucca);
Generate("Data/Decoration/Overworld", Map.Veridia);
Generate("Data/Decoration/Underworld", Map.Trammel);
m_Mobile.SendMessage($"World generating complete. {m_Count} items were generated.");

4
Projects/UOContent/Commands/SignParser.cs
View file

@ -52,8 +52,8 @@ namespace Server.Commands
}
}
Map[] brit = { Map.Felucca, Map.Trammel };
Map[] fel = { Map.Felucca };
Map[] brit = { Map.Veridia, Map.Trammel };
Map[] fel = { Map.Veridia };
Map[] tram = { Map.Trammel };
Map[] ilsh = { Map.Ilshenar };
Map[] malas = { Map.Malas };

8
Projects/UOContent/Engines/Advanced Search/AdvancedSearchFilter.cs
View file

@ -17,7 +17,7 @@ public enum AdvancedSearchFilterOptions : long
FilterAge = 0x00000200,
FilterAgeDirection = 0x00000400,
HideValidInternalMap = 0x00000800,
FilterFelucca = 0x00001000,
FilterVeridia = 0x00001000,
FilterTrammel = 0x00002000,
FilterIlshenar = 0x00004000,
FilterMalas = 0x00008000,
@ -96,10 +96,10 @@ public record AdvancedSearchFilter
set => SetOptionsFlag(AdvancedSearchFilterOptions.HideValidInternalMap, value);
}
public bool FilterFelucca
public bool FilterVeridia
{
get => GetOptionsFlag(AdvancedSearchFilterOptions.FilterFelucca);
set => SetOptionsFlag(AdvancedSearchFilterOptions.FilterFelucca, value);
get => GetOptionsFlag(AdvancedSearchFilterOptions.FilterVeridia);
set => SetOptionsFlag(AdvancedSearchFilterOptions.FilterVeridia, value);
}
public bool FilterTrammel

6
Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs
View file

@ -69,7 +69,7 @@ public class AdvancedSearchGump : Gump
public static readonly AdvancedSearchFilter DefaultFilter = new()
{
FilterType = true,
FilterFelucca = true,
FilterVeridia = true,
HideValidInternalMap = true,
Type = typeof(Spawner),
};
@ -195,7 +195,7 @@ public class AdvancedSearchGump : Gump
AddLabel(98, y, 0x384, "Null");
y += 20;
AddCheck(5, y, 0xD2, 0xD3, Filter.FilterFelucca, 308);
AddCheck(5, y, 0xD2, 0xD3, Filter.FilterVeridia, 308);
AddLabel(28, y, 0x384, "Fel");
AddCheck(75, y, 0xD2, 0xD3, Filter.FilterTrammel, 309);
AddLabel(98, y, 0x384, "Tram");
@ -427,7 +427,7 @@ public class AdvancedSearchGump : Gump
Filter.FilterRange = info.IsSwitched(304);
Filter.FilterType = info.IsSwitched(305);
Filter.FilterName = info.IsSwitched(306);
Filter.FilterFelucca = info.IsSwitched(308);
Filter.FilterVeridia = info.IsSwitched(308);
Filter.FilterTrammel = info.IsSwitched(309);
Filter.FilterMalas = info.IsSwitched(310);
Filter.FilterIlshenar = info.IsSwitched(311);

2
Projects/UOContent/Engines/Advanced Search/AdvancedSearchThreadWorker.cs
View file

@ -159,7 +159,7 @@ public class AdvancedSearchThreadWorker
}
// Check for valid map
if (_filter.FilterFelucca && entity.Map != Map.Felucca ||
if (_filter.FilterVeridia && entity.Map != Map.Veridia ||
_filter.FilterTrammel && entity.Map != Map.Trammel ||
_filter.FilterIlshenar && entity.Map != Map.Ilshenar ||
_filter.FilterMalas && entity.Map != Map.Malas ||

8
Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs
View file

@ -439,7 +439,7 @@ public partial class ChampionSpawn : Item
private static PowerScroll CreateRandomPS() => PowerScroll.CreateRandomNoCraft(5, 5);
public static void GiveScrollTo(Mobile killer, SpecialScroll scroll, bool isFelucca = true)
public static void GiveScrollTo(Mobile killer, SpecialScroll scroll, bool isVeridia = true)
{
if (scroll == null || killer == null) // sanity
{
@ -455,7 +455,7 @@ public partial class ChampionSpawn : Item
killer.SendLocalizedMessage(1049524); // You have received a scroll of power!
}
if (!isFelucca)
if (!isVeridia)
{
killer.AddToBackpack(scroll);
return;
@ -537,7 +537,7 @@ public partial class ChampionSpawn : Item
{
_altar.Hue = 0;
if (HasStarRoomGate && (!Core.ML || Map == Map.Felucca))
if (HasStarRoomGate && (!Core.ML || Map == Map.Veridia))
{
new StarRoomGate(_altar.Location, _altar.Map, true);
}
@ -614,7 +614,7 @@ public partial class ChampionSpawn : Item
continue;
}
var isFel = Map == Map.Felucca;
var isFel = Map == Map.Veridia;
double mapChance;
if (isFel)
{

36
Projects/UOContent/Engines/CannedEvil/GenChamps.cs
View file

@ -30,31 +30,31 @@ public static class ChampionGenerator
private static readonly ChampionEntry[] LLLocations =
[
new(typeof(LLChampionSpawn), new Point3D(5511, 2360, 42), Map.Felucca, new Point3D(5439, 2323, 26), Map.Felucca),
new(typeof(LLChampionSpawn), new Point3D(6038, 2401, 47), Map.Felucca, new Point3D(5988, 2340, 24), Map.Felucca),
new(typeof(LLChampionSpawn), new Point3D(5549, 2640, 16), Map.Felucca, new Point3D(5645, 2696, -8), Map.Felucca),
new(typeof(LLChampionSpawn), new Point3D(5636, 2916, 37), Map.Felucca, new Point3D(5721, 2949, 28), Map.Felucca),
new(typeof(LLChampionSpawn), new Point3D(6035, 2943, 50), Map.Felucca, new Point3D(6098, 2997, 17), Map.Felucca),
new(typeof(LLChampionSpawn), new Point3D(5265, 3171, 105), Map.Felucca, new Point3D(5314, 3232, 2), Map.Felucca),
new(typeof(LLChampionSpawn), new Point3D(5282, 3368, 50), Map.Felucca, new Point3D(5215, 3318, 3), Map.Felucca),
new(typeof(LLChampionSpawn), new Point3D(5207, 3637, 20), Map.Felucca, new Point3D(5263, 3687, 0), Map.Felucca),
new(typeof(LLChampionSpawn), new Point3D(5954, 3475, 25), Map.Felucca, new Point3D(6013, 3529, 0), Map.Felucca),
new(typeof(LLChampionSpawn), new Point3D(5982, 3882, 20), Map.Felucca, new Point3D(5929, 3820, -1), Map.Felucca),
new(typeof(LLChampionSpawn), new Point3D(5724, 3991, 41), Map.Felucca, new Point3D(5774, 4041, 26), Map.Felucca),
new(typeof(LLChampionSpawn), ChampionSpawnType.ForestLord, new Point3D(5559, 3757, 21), Map.Felucca, new Point3D(5513, 3878, 3), Map.Felucca)
new(typeof(LLChampionSpawn), new Point3D(5511, 2360, 42), Map.Veridia, new Point3D(5439, 2323, 26), Map.Veridia),
new(typeof(LLChampionSpawn), new Point3D(6038, 2401, 47), Map.Veridia, new Point3D(5988, 2340, 24), Map.Veridia),
new(typeof(LLChampionSpawn), new Point3D(5549, 2640, 16), Map.Veridia, new Point3D(5645, 2696, -8), Map.Veridia),
new(typeof(LLChampionSpawn), new Point3D(5636, 2916, 37), Map.Veridia, new Point3D(5721, 2949, 28), Map.Veridia),
new(typeof(LLChampionSpawn), new Point3D(6035, 2943, 50), Map.Veridia, new Point3D(6098, 2997, 17), Map.Veridia),
new(typeof(LLChampionSpawn), new Point3D(5265, 3171, 105), Map.Veridia, new Point3D(5314, 3232, 2), Map.Veridia),
new(typeof(LLChampionSpawn), new Point3D(5282, 3368, 50), Map.Veridia, new Point3D(5215, 3318, 3), Map.Veridia),
new(typeof(LLChampionSpawn), new Point3D(5207, 3637, 20), Map.Veridia, new Point3D(5263, 3687, 0), Map.Veridia),
new(typeof(LLChampionSpawn), new Point3D(5954, 3475, 25), Map.Veridia, new Point3D(6013, 3529, 0), Map.Veridia),
new(typeof(LLChampionSpawn), new Point3D(5982, 3882, 20), Map.Veridia, new Point3D(5929, 3820, -1), Map.Veridia),
new(typeof(LLChampionSpawn), new Point3D(5724, 3991, 41), Map.Veridia, new Point3D(5774, 4041, 26), Map.Veridia),
new(typeof(LLChampionSpawn), ChampionSpawnType.ForestLord, new Point3D(5559, 3757, 21), Map.Veridia, new Point3D(5513, 3878, 3), Map.Veridia)
];
private static readonly ChampionEntry[] DungeonLocations =
[
new(typeof(DungeonChampionSpawn), ChampionSpawnType.UnholyTerror, new Point3D(5179, 709, 20), Map.Felucca, new Point3D(4111, 432, 5), Map.Felucca),
new(typeof(DungeonChampionSpawn), ChampionSpawnType.VerminHorde, new Point3D(5557, 827, 65), Map.Felucca, new Point3D(5580, 632, 30), Map.Felucca),
new(typeof(DungeonChampionSpawn), ChampionSpawnType.ColdBlood, new Point3D(5259, 837, 64), Map.Felucca, new Point3D(1176, 2637, 0), Map.Felucca),
new(typeof(DungeonChampionSpawn), ChampionSpawnType.Abyss, new Point3D(5815, 1352, 5), Map.Felucca, new Point3D(2923, 3406, 8), Map.Felucca),
new(typeof(DungeonChampionSpawn), ChampionSpawnType.Arachnid, new Point3D(5190, 1607, 20), Map.Felucca, new Point3D(5482, 3161, -54), Map.Felucca)
new(typeof(DungeonChampionSpawn), ChampionSpawnType.UnholyTerror, new Point3D(5179, 709, 20), Map.Veridia, new Point3D(4111, 432, 5), Map.Veridia),
new(typeof(DungeonChampionSpawn), ChampionSpawnType.VerminHorde, new Point3D(5557, 827, 65), Map.Veridia, new Point3D(5580, 632, 30), Map.Veridia),
new(typeof(DungeonChampionSpawn), ChampionSpawnType.ColdBlood, new Point3D(5259, 837, 64), Map.Veridia, new Point3D(1176, 2637, 0), Map.Veridia),
new(typeof(DungeonChampionSpawn), ChampionSpawnType.Abyss, new Point3D(5815, 1352, 5), Map.Veridia, new Point3D(2923, 3406, 8), Map.Veridia),
new(typeof(DungeonChampionSpawn), ChampionSpawnType.Arachnid, new Point3D(5190, 1607, 20), Map.Veridia, new Point3D(5482, 3161, -54), Map.Veridia)
];
[Usage("GenChamps")]
[Description("Generates champions for Felucca Dungeons & Lost Lands.")]
[Description("Generates champions for Veridia Dungeons & Lost Lands.")]
private static void ChampGen_OnCommand(CommandEventArgs e)
{
/*

2
Projects/UOContent/Engines/CannedEvil/StarRoomGate.cs
View file

@ -31,7 +31,7 @@ public partial class StarRoomGate : Moongate
}
[Constructible]
public StarRoomGate(bool decays = false) : base(new Point3D(5143, 1774, 0), Map.Felucca)
public StarRoomGate(bool decays = false) : base(new Point3D(5143, 1774, 0), Map.Veridia)
{
Dispellable = false;
ItemID = 0x1FD4;

28
Projects/UOContent/Engines/Character Creation/CharacterCreation.cs
View file

@ -85,17 +85,17 @@ public static partial class CharacterCreation
new("Magincia", "The Great Horns Tavern", 1075077, 3734, 2222, 20, Map.Trammel),
];
public static readonly CityInfo[] FeluccaStartingCities =
public static readonly CityInfo[] VeridiaStartingCities =
[
new("Yew", "The Empath Abbey", 1075072, 633, 858, 0, Map.Felucca),
new("Minoc", "The Barnacle", 1075073, 2476, 413, 15, Map.Felucca),
new("Britain", "Sweet Dreams Inn", 1075074, 1496, 1628, 10, Map.Felucca),
new("Moonglow", "The Scholars Inn", 1075075, 4408, 1168, 0, Map.Felucca),
new("Trinsic", "The Traveler's Inn", 1075076, 1845, 2745, 0, Map.Felucca),
new("Magincia", "The Great Horns Tavern", 1075077, 3734, 2222, 20, Map.Felucca),
new("Jhelom", "The Mercenary Inn", 1075078, 1374, 3826, 0, Map.Felucca),
new("Skara Brae", "The Falconer's Inn", 1075079, 618, 2234, 0, Map.Felucca),
new("Vesper", "The Ironwood Inn", 1075080, 2771, 976, 0, Map.Felucca)
new("Yew", "The Empath Abbey", 1075072, 633, 858, 0, Map.Veridia),
new("Minoc", "The Barnacle", 1075073, 2476, 413, 15, Map.Veridia),
new("Britain", "Sweet Dreams Inn", 1075074, 1496, 1628, 10, Map.Veridia),
new("Moonglow", "The Scholars Inn", 1075075, 4408, 1168, 0, Map.Veridia),
new("Trinsic", "The Traveler's Inn", 1075076, 1845, 2745, 0, Map.Veridia),
new("Magincia", "The Great Horns Tavern", 1075077, 3734, 2222, 20, Map.Veridia),
new("Jhelom", "The Mercenary Inn", 1075078, 1374, 3826, 0, Map.Veridia),
new("Skara Brae", "The Falconer's Inn", 1075079, 618, 2234, 0, Map.Veridia),
new("Vesper", "The Ironwood Inn", 1075080, 2771, 976, 0, Map.Veridia)
];
public static readonly CityInfo[] TrammelStartingCities =
@ -148,9 +148,9 @@ public static partial class CharacterCreation
return [..NewHavenStartingCities, ..TrammelStartingCities];
}
if (availableMaps.Includes(MapSelectionFlags.Felucca))
if (availableMaps.Includes(MapSelectionFlags.Veridia))
{
return FeluccaStartingCities;
return VeridiaStartingCities;
}
logger.Error("No starting cities are available.");
@ -308,8 +308,8 @@ public static partial class CharacterCreation
if (m.AccessLevel > AccessLevel.Player)
{
var map = availableMaps.Includes(MapSelectionFlags.Felucca) ? Map.Felucca : Map.Trammel;
if (availableMaps.Includes(MapSelectionFlags.Felucca))
var map = availableMaps.Includes(MapSelectionFlags.Veridia) ? Map.Veridia : Map.Trammel;
if (availableMaps.Includes(MapSelectionFlags.Veridia))
{
return new CityInfo("Green Acres", "Green Acres", 5445, 1153, 0, map);
}

2
Projects/UOContent/Engines/ConPVP/Arena.cs
View file

@ -593,7 +593,7 @@ namespace Server.Engines.ConPVP
if (m_Facet == null)
{
loc = new Point3D(2715, 2165, 0);
facet = Map.Felucca;
facet = Map.Veridia;
}
else
{

2
Projects/UOContent/Engines/Craft/Core/CraftItem.cs
View file

@ -1439,7 +1439,7 @@ namespace Server.Engines.Craft
{
item = customCraft.CompleteCraft(out num);
}
else if (typeof(MapItem).IsAssignableFrom(ItemType) && from.Map != Map.Trammel && from.Map != Map.Felucca)
else if (typeof(MapItem).IsAssignableFrom(ItemType) && from.Map != Map.Trammel && from.Map != Map.Veridia)
{
item = new IndecipherableMap();
from.SendLocalizedMessage(1070800); // The map you create becomes mysteriously indecipherable.

2
Projects/UOContent/Engines/Factions/Core/Faction.cs
View file

@ -25,7 +25,7 @@ public abstract class Faction : IComparable<Faction>, ISpanParsable<Faction>
public static readonly TimeSpan LeavePeriod = TimeSpan.FromDays(3.0);
public static readonly Map Facet = Map.Felucca;
public static readonly Map Facet = Map.Veridia;
public static readonly TimeSpan SkillLossPeriod = TimeSpan.FromMinutes(20.0);
private static readonly Dictionary<Mobile, SkillLossContext> m_SkillLoss = new();

2
Projects/UOContent/Engines/Factions/Instances/Factions/Shadowlords.cs
View file

@ -25,7 +25,7 @@ public class Shadowlords : Faction
* The Shadow Lords are a faction that has sprung up within the ranks of
* Minax. Comprised mostly of undead and those who would seek to be
* necromancers, they pose a threat to both the sides of good and evil.
* Their plans have disrupted the hold Minax has over Felucca, and their
* Their plans have disrupted the hold Minax has over Veridia, and their
* ultimate goal is to destroy all life.
*/
1011451,

2
Projects/UOContent/Engines/Harvest/Core/HarvestDefinition.cs
View file

@ -30,7 +30,7 @@ namespace Server.Engines.Harvest
public int ConsumedPerHarvest { get; set; }
public int ConsumedPerFeluccaHarvest { get; set; }
public int ConsumedPerVeridiaHarvest { get; set; }
public bool PlaceAtFeetIfFull { get; set; }

14
Projects/UOContent/Engines/Harvest/Core/HarvestSystem.cs
View file

@ -169,22 +169,22 @@ namespace Server.Engines.Harvest
if (item.Stackable)
{
var amount = def.ConsumedPerHarvest;
var feluccaAmount = def.ConsumedPerFeluccaHarvest;
var VeridiaAmount = def.ConsumedPerVeridiaHarvest;
var racialAmount = (int)Math.Ceiling(amount * 1.1);
var feluccaRacialAmount = (int)Math.Ceiling(feluccaAmount * 1.1);
var VeridiaRacialAmount = (int)Math.Ceiling(VeridiaAmount * 1.1);
var eligableForRacialBonus = def.RaceBonus && from.Race == Race.Human;
var inFelucca = map == Map.Felucca;
var inVeridia = map == Map.Veridia;
if (eligableForRacialBonus && inFelucca && bank.Current >= feluccaRacialAmount &&
if (eligableForRacialBonus && inVeridia && bank.Current >= VeridiaRacialAmount &&
Utility.RandomDouble() < 0.1)
{
item.Amount = feluccaRacialAmount;
item.Amount = VeridiaRacialAmount;
}
else if (inFelucca && bank.Current >= feluccaAmount)
else if (inVeridia && bank.Current >= VeridiaAmount)
{
item.Amount = feluccaAmount;
item.Amount = VeridiaAmount;
}
else if (eligableForRacialBonus && bank.Current >= racialAmount && Utility.RandomDouble() < 0.1)
{

10
Projects/UOContent/Engines/Harvest/Fishing.cs
View file

@ -81,7 +81,7 @@ namespace Server.Engines.Harvest
RangedTiles = true,
MaxRange = 4,
ConsumedPerHarvest = 1,
ConsumedPerFeluccaHarvest = 1,
ConsumedPerVeridiaHarvest = 1,
EffectActions = new[] { 12 },
EffectSounds = Array.Empty<int>(),
EffectCounts = new[] { 1 },
@ -200,7 +200,7 @@ namespace Server.Engines.Harvest
{
foreach (var sos in pack.FindItemsByType<SOS>())
{
if ((from.Map == Map.Felucca || from.Map == Map.Trammel) && from.InRange(sos.TargetLocation, 60))
if ((from.Map == Map.Veridia || from.Map == Map.Trammel) && from.InRange(sos.TargetLocation, 60))
{
return true;
}
@ -225,12 +225,12 @@ namespace Server.Engines.Harvest
level = 1;
}
return new TreasureMap(level, from.Map == Map.Felucca ? Map.Felucca : Map.Trammel);
return new TreasureMap(level, from.Map == Map.Veridia ? Map.Veridia : Map.Trammel);
}
if (type == typeof(MessageInABottle))
{
return new MessageInABottle(from.Map == Map.Felucca ? Map.Felucca : Map.Trammel);
return new MessageInABottle(from.Map == Map.Veridia ? Map.Veridia : Map.Trammel);
}
var pack = from.Backpack;
@ -240,7 +240,7 @@ namespace Server.Engines.Harvest
// We don't have to queue since we are returning on the first SOS.
foreach (var sos in pack.FindItemsByType<SOS>())
{
if ((from.Map == Map.Felucca || from.Map == Map.Trammel) && from.InRange(sos.TargetLocation, 60))
if ((from.Map == Map.Veridia || from.Map == Map.Trammel) && from.InRange(sos.TargetLocation, 60))
{
Item preLoot = null;

2
Projects/UOContent/Engines/Harvest/Lumberjacking.cs
View file

@ -51,7 +51,7 @@ namespace Server.Engines.Harvest
StaticTiles = m_TreeTiles,
MaxRange = 2,
ConsumedPerHarvest = 10,
ConsumedPerFeluccaHarvest = 20,
ConsumedPerVeridiaHarvest = 20,
EffectActions = new[] { 13 },
EffectSounds = new[] { 0x13E },
EffectCounts = Core.AOS ? new[] { 1 } : new[] { 1, 2, 2, 2, 3 },

4
Projects/UOContent/Engines/Harvest/Mining.cs
View file

@ -95,7 +95,7 @@ namespace Server.Engines.Harvest
RangedTiles = true,
MaxRange = 2,
ConsumedPerHarvest = 1,
ConsumedPerFeluccaHarvest = 2,
ConsumedPerVeridiaHarvest = 1,
EffectActions = new[] { 11 },
EffectSounds = new[] { 0x125, 0x126 },
EffectCounts = new[] { 1 },
@ -234,7 +234,7 @@ namespace Server.Engines.Harvest
RangedTiles = true,
MaxRange = 2,
ConsumedPerHarvest = 1,
ConsumedPerFeluccaHarvest = 1,
ConsumedPerVeridiaHarvest = 1,
EffectActions = new[] { 11 },
EffectSounds = new[] { 0x125, 0x126 },
EffectCounts = new[] { 6 },

8
Projects/UOContent/Engines/Help/StuckMenu.cs
View file

@ -160,7 +160,7 @@ namespace Server.Menus.Questions
}
private static bool IsInSecondAgeArea(Mobile m) =>
(m.Map == Map.Trammel || m.Map == Map.Felucca) &&
(m.Map == Map.Trammel || m.Map == Map.Veridia) &&
(m.X >= 5120 && m.Y >= 2304 || m.Region.IsPartOf("Terathan Keep"));
public void BeginClose()
@ -294,13 +294,13 @@ namespace Server.Menus.Questions
{
destMap = Map.Trammel;
}
else if (m_Mobile.Map == Map.Felucca)
else if (m_Mobile.Map == Map.Veridia)
{
destMap = Map.Felucca;
destMap = Map.Veridia;
}
else
{
destMap = m_Mobile.Murderer ? Map.Felucca : Map.Trammel;
destMap = m_Mobile.Murderer ? Map.Veridia : Map.Trammel;
}
BaseCreature.TeleportPets(m_Mobile, dest, destMap);

16
Projects/UOContent/Engines/Khaldun/KhaldunGen.cs
View file

@ -15,7 +15,7 @@ namespace Server.Commands
public static bool FindMorphItem(int x, int y, int z, int inactiveItemID, int activeItemID)
{
var found = false;
foreach (var morphItem in Map.Felucca.GetItemsAt<MorphItem>(x, y))
foreach (var morphItem in Map.Veridia.GetItemsAt<MorphItem>(x, y))
{
if (morphItem.Z == z && morphItem.InactiveItemId == inactiveItemID && morphItem.ActiveItemId == activeItemID)
{
@ -30,7 +30,7 @@ namespace Server.Commands
public static bool FindEffectController(int x, int y, int z)
{
var found = false;
foreach (var item in Map.Felucca.GetItemsAt<EffectController>(x, y))
foreach (var item in Map.Veridia.GetItemsAt<EffectController>(x, y))
{
if (item.Z == z)
{
@ -44,13 +44,13 @@ namespace Server.Commands
public static T TryCreateItem<T>(int x, int y, int z, T srcItem) where T : Item
{
foreach (var item in Map.Felucca.GetItemsAt<T>(x, y))
foreach (var item in Map.Veridia.GetItemsAt<T>(x, y))
{
srcItem.Delete();
return item;
}
srcItem.MoveToWorld(new Point3D(x, y, z), Map.Felucca);
srcItem.MoveToWorld(new Point3D(x, y, z), Map.Veridia);
m_Count++;
return srcItem;
}
@ -64,7 +64,7 @@ namespace Server.Commands
var item = new MorphItem(inactiveItemID, activeItemID, range, 3);
item.MoveToWorld(new Point3D(x, y, z), Map.Felucca);
item.MoveToWorld(new Point3D(x, y, z), Map.Veridia);
m_Count++;
}
@ -78,7 +78,7 @@ namespace Server.Commands
var item = new MorphItem(off, on, 2, 3);
item.Light = light;
item.MoveToWorld(new Point3D(x, y, z), Map.Felucca);
item.MoveToWorld(new Point3D(x, y, z), Map.Veridia);
m_Count++;
}
@ -96,7 +96,7 @@ namespace Server.Commands
TriggerRange = range
};
item.MoveToWorld(new Point3D(x, y, z), Map.Felucca);
item.MoveToWorld(new Point3D(x, y, z), Map.Veridia);
m_Count++;
}
@ -109,7 +109,7 @@ namespace Server.Commands
var item = new MorphItem(reverse ? 0x17DC : 0x17EE, reverse ? 0x17EE : 0x17DC, 1, 3);
item.MoveToWorld(new Point3D(x, y, 0), Map.Felucca);
item.MoveToWorld(new Point3D(x, y, 0), Map.Veridia);
m_Count++;
}

2
Projects/UOContent/Engines/Khaldun/KhaldunPitTeleporter.cs
View file

@ -19,7 +19,7 @@ public partial class KhaldunPitTeleporter : Item
private Map _mapDest;
[Constructible]
public KhaldunPitTeleporter() : this(new Point3D(5451, 1374, 0), Map.Felucca)
public KhaldunPitTeleporter() : this(new Point3D(5451, 1374, 0), Map.Veridia)
{
}

2
Projects/UOContent/Engines/Pathing/BitmapAStarAlgorithm.cs
View file

@ -149,7 +149,7 @@ public class BitmapAStarAlgorithm : PathAlgorithm
// Dead and spectral mobiles pass through doors too. Mirrors MovementImpl.
_currentMobileIgnoreDoors |= !m.Alive || m.Body.BodyID == 0x3DB || m.IsDeadBondedPet;
_currentMobileIgnoreSpellFields = m is PlayerMobile && map != Map.Felucca;
_currentMobileIgnoreSpellFields = m is PlayerMobile && map != Map.Veridia;
Array.Clear(_nodeStates);

2
Projects/UOContent/Engines/Pathing/Movement.cs
View file

@ -266,7 +266,7 @@ public class MovementImpl : IMovementImpl
var checkTop = startZ + PersonHeight;
var ignoreDoors = AlwaysIgnoreDoors || !m.Alive || m.Body.BodyID == 0x3DB || m.IsDeadBondedPet;
var ignoreSpellFields = m is PlayerMobile && map != Map.Felucca;
var ignoreSpellFields = m is PlayerMobile && map != Map.Veridia;
int testTop;

4
Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs
View file

@ -65,13 +65,13 @@ public partial class GreenThorns : Item
return;
}
if (from.Map != Map.Trammel && from.Map != Map.Felucca)
if (from.Map != Map.Trammel && from.Map != Map.Veridia)
{
from.LocalOverheadMessage(
MessageType.Regular,
0x2B2,
true,
"No solen lairs exist on this facet. Try again in Trammel or Felucca."
"No solen lairs exist on this facet. Try again in Trammel or Veridia."
);
return;
}

8
Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs
View file

@ -36,7 +36,7 @@ public partial class EnchantedSextant : Item
new(5669, 3131)
};
private static readonly Point2D[] _feluccaBanks =
private static readonly Point2D[] _VeridiaBanks =
{
new(652, 820),
new(1813, 2825),
@ -96,10 +96,10 @@ public partial class EnchantedSextant : Item
banks = _trammelBanks;
moongates = PMList.Trammel;
}
else if (from.Map == Map.Felucca)
else if (from.Map == Map.Veridia)
{
banks = _feluccaBanks;
moongates = PMList.Felucca;
banks = _VeridiaBanks;
moongates = PMList.Veridia;
}
else if (from.Map == Map.Ilshenar)
{

4
Projects/UOContent/Engines/Quests/Study of the Solen Hive/Objectives.cs
View file

@ -27,7 +27,7 @@ namespace Server.Engines.Quests.Naturalist
{
var nest = m_CurrentNest;
if ((from.Map == Map.Trammel || from.Map == Map.Felucca) && nest.Contains(from.Location))
if ((from.Map == Map.Trammel || from.Map == Map.Veridia) && nest.Contains(from.Location))
{
if (m_StudyState != StudyState.Inactive)
{
@ -74,7 +74,7 @@ namespace Server.Engines.Quests.Naturalist
m_CurrentNest = null;
}
}
else if (from.Map == Map.Trammel || from.Map == Map.Felucca)
else if (from.Map == Map.Trammel || from.Map == Map.Veridia)
{
var nest = NestArea.Find(from.Location);

2
Projects/UOContent/Engines/Quests/Witch Apprentice/Items/MagicFlute.cs
View file

@ -39,7 +39,7 @@ public partial class MagicFlute : Item
return;
}
if (player.Map != Map.Trammel && player.Map != Map.Felucca || !player.InRange(obj.ImpLocation, 8))
if (player.Map != Map.Trammel && player.Map != Map.Veridia || !player.InRange(obj.ImpLocation, 8))
{
// Nothing happens. Zeefzorpul must not be hiding in this area.
player.SendLocalizedMessage(1055053);

2
Projects/UOContent/Engines/Quests/Witch Apprentice/Objectives.cs
View file

@ -41,7 +41,7 @@ namespace Server.Engines.Quests.Hag
var player = System.From;
var map = player.Map;
if (Corpse?.Deleted == false || map != Map.Trammel && map != Map.Felucca ||
if (Corpse?.Deleted == false || map != Map.Trammel && map != Map.Veridia ||
!player.InRange(m_CorpseLocation, 8))
{
return;

2
Projects/UOContent/Engines/Spawners/Commands/ImportSpawnersCommand.cs
View file

@ -350,7 +350,7 @@ public static class ImportSpawnersCommand
{
var parts = line.Split('|');
var mapId = mapIdOverride != -1 ? mapIdOverride : int.Parse(parts[10]);
Map[] maps = mapId == 0 ? [Map.Felucca, Map.Trammel] : [Map.Maps[mapId - 1]];
Map[] maps = mapId == 0 ? [Map.Veridia, Map.Trammel] : [Map.Maps[mapId - 1]];
foreach (var map in maps)
{

2
Projects/UOContent/Engines/Virtues/Honor.cs
View file

@ -137,7 +137,7 @@ public static class HonorVirtue
return;
}
// Allow honor on blue if not in a guarded region or blue in Felucca
// Allow honor on blue if not in a guarded region or blue in Veridia
if (target.Body.IsHuman && (target is not BaseCreature cret || !cret.AlwaysAttackable && !cret.AlwaysMurderer) &&
reg?.IsDisabled() == true && (map?.Rules & MapRules.HarmfulRestrictions) != 0)
{

10
Projects/UOContent/Engines/Virtues/Justice.cs
View file

@ -135,7 +135,7 @@ public class JusticeVirtue
{
protector.SendLocalizedMessage(1049542); // You cannot protect someone while being protected.
}
else if (protector.Map != Map.Felucca)
else if (protector.Map != Map.Veridia)
{
protector.SendLocalizedMessage(1049372); // You cannot use this ability here.
}
@ -167,7 +167,7 @@ public class JusticeVirtue
{
protector.SendLocalizedMessage(1049542); // You cannot protect someone while being protected.
}
else if (protector.Map != Map.Felucca)
else if (protector.Map != Map.Veridia)
{
protector.SendLocalizedMessage(1049372); // You cannot use this ability here.
}
@ -175,7 +175,7 @@ public class JusticeVirtue
{
protector.SendLocalizedMessage(1049678); // Only players can be protected.
}
else if (pm.Map != Map.Felucca)
else if (pm.Map != Map.Veridia)
{
protector.SendLocalizedMessage(1049372); // You cannot use this ability here.
}
@ -211,11 +211,11 @@ public class JusticeVirtue
{
protector.SendLocalizedMessage(1049542); // You cannot protect someone while being protected.
}
else if (protector.Map != Map.Felucca)
else if (protector.Map != Map.Veridia)
{
protector.SendLocalizedMessage(1049372); // You cannot use this ability here.
}
else if (protectee.Map != Map.Felucca)
else if (protectee.Map != Map.Veridia)
{
protector.SendLocalizedMessage(1049372); // You cannot use this ability here.
}

6
Projects/UOContent/Gumps/AdminGump.cs
View file

@ -4030,10 +4030,10 @@ namespace Server.Gumps
InvokeCommand("GenerateSpawners Data/Spawns/shared/trammel/**.json");
}
if (availableMaps.Includes(MapSelectionFlags.Felucca))
if (availableMaps.Includes(MapSelectionFlags.Veridia))
{
InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/felucca/**.json");
InvokeCommand("GenerateSpawners Data/Spawns/shared/felucca/**.json");
InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/Veridia/**.json");
InvokeCommand("GenerateSpawners Data/Spawns/shared/Veridia/**.json");
}
}

2
Projects/UOContent/Gumps/Go/GoLocations.cs
View file

@ -16,7 +16,7 @@ public static class GoLocations
public static LocationTree GetLocations(Map map)
{
// Always return the same world tree, regardless of which map 'GetLocations' is called with
return _world ??= LoadLocations("go", Map.Felucca);
return _world ??= LoadLocations("go", Map.Veridia);
}
private static LocationTree LoadLocations(string fileName, Map map)

2
Projects/UOContent/Gumps/RunebookGump.cs
View file

@ -49,7 +49,7 @@ public class RunebookGump : DynamicGump
return 10;
}
if (map == Map.Felucca)
if (map == Map.Veridia)
{
return 81;
}

24
Projects/UOContent/Items/Addons/SHTeleporter.cs
View file

@ -284,7 +284,7 @@ namespace Server.Items
public static void AddSHTCouple(bool ext1, int x1, int y1, int z1, bool ext2, int x2, int y2, int z2)
{
AddSHTCouple(Map.Trammel, ext1, x1, y1, z1, ext2, x2, y2, z2);
AddSHTCouple(Map.Felucca, ext1, x1, y1, z1, ext2, x2, y2, z2);
AddSHTCouple(Map.Veridia, ext1, x1, y1, z1, ext2, x2, y2, z2);
}
public static void CreateSHTeleporters()
@ -298,9 +298,9 @@ namespace Server.Items
var tele2 = AddSHT(Map.Trammel, false, 5658, 1898, 0);
Link(tele1, tele2);
tele1 = AddSHT(Map.Felucca, false, 5747, 1895, 0);
tele1 = AddSHT(Map.Veridia, false, 5747, 1895, 0);
tele1.LeftTele.TeleOffset = new Point3D(-1, 3, 0);
tele2 = AddSHT(Map.Felucca, false, 5658, 1898, 0);
tele2 = AddSHT(Map.Veridia, false, 5658, 1898, 0);
Link(tele1, tele2);
AddSHTCouple(false, 5727, 1894, 0, false, 5756, 1794, 0);
@ -311,9 +311,9 @@ namespace Server.Items
tele2 = AddSHT(Map.Trammel, false, 5657, 1954, 0);
Link(tele1, tele2);
tele1 = AddSHT(Map.Felucca, false, 5711, 1952, 0);
tele1 = AddSHT(Map.Veridia, false, 5711, 1952, 0);
tele1.LeftTele.TeleOffset = new Point3D(-1, 3, 0);
tele2 = AddSHT(Map.Felucca, false, 5657, 1954, 0);
tele2 = AddSHT(Map.Veridia, false, 5657, 1954, 0);
Link(tele1, tele2);
tele1 = AddSHT(Map.Trammel, false, 5655, 2018, 0);
@ -321,9 +321,9 @@ namespace Server.Items
tele2 = AddSHT(Map.Trammel, true, 1690, 2789, 0);
Link(tele1, tele2);
tele1 = AddSHT(Map.Felucca, false, 5655, 2018, 0);
tele1 = AddSHT(Map.Veridia, false, 5655, 2018, 0);
tele1.LeftTele.TeleOffset = new Point3D(-1, 3, 0);
tele2 = AddSHT(Map.Felucca, true, 1690, 2789, 0);
tele2 = AddSHT(Map.Veridia, true, 1690, 2789, 0);
Link(tele1, tele2);
AddSHTCouple(false, 5809, 1905, 0, false, 5876, 1891, 0);
@ -333,9 +333,9 @@ namespace Server.Items
tele2 = AddSHT(Map.Trammel, false, 5913, 1893, 0);
Link(tele1, tele2);
tele1 = AddSHT(Map.Felucca, false, 5814, 2015, 0);
tele1 = AddSHT(Map.Veridia, false, 5814, 2015, 0);
tele1.LeftTele.TeleOffset = new Point3D(-1, 3, 0);
tele2 = AddSHT(Map.Felucca, false, 5913, 1893, 0);
tele2 = AddSHT(Map.Veridia, false, 5913, 1893, 0);
Link(tele1, tele2);
AddSHTCouple(false, 5919, 2021, 0, true, 1724, 814, 0);
@ -345,10 +345,10 @@ namespace Server.Items
Link(tele1, tele2);
AddSHT(Map.Trammel, false, 5734, 1859, 0).ChangeDest(tele2);
tele1 = AddSHT(Map.Felucca, false, 5654, 1791, 0);
tele2 = AddSHT(Map.Felucca, true, 730, 1451, 0);
tele1 = AddSHT(Map.Veridia, false, 5654, 1791, 0);
tele2 = AddSHT(Map.Veridia, true, 730, 1451, 0);
Link(tele1, tele2);
AddSHT(Map.Felucca, false, 5734, 1859, 0).ChangeDest(tele2);
AddSHT(Map.Veridia, false, 5734, 1859, 0).ChangeDest(tele2);
}
}
}

4
Projects/UOContent/Items/Addons/SolenAntHole.cs
View file

@ -18,7 +18,7 @@ namespace Server.Items
{
var map = Map;
if (map == Map.Trammel || map == Map.Felucca)
if (map == Map.Trammel || map == Map.Veridia)
{
from.MoveToWorld(new Point3D(5922, 2024, 0), map);
// * ~1_NAME~ dives into the mysterious hole! *
@ -104,7 +104,7 @@ namespace Server.Items
SpawnAnt(new RedSolenWarrior());
}
}
else if (map == Map.Felucca)
else if (map == Map.Veridia)
{
if (random < 2)
{

2
Projects/UOContent/Items/Containers/ParagonChest.cs
View file

@ -184,6 +184,6 @@ public partial class ParagonChest : LockableContainer
DropItem(item);
}
DropItem(new TreasureMap(level + 1, Utility.RandomBool() ? Map.Felucca : Map.Trammel));
DropItem(new TreasureMap(level + 1, Utility.RandomBool() ? Map.Veridia : Map.Trammel));
}
}

2
Projects/UOContent/Items/Food/Beverage.cs
View file

@ -692,7 +692,7 @@ public abstract partial class BaseBeverage : Item, IHasQuantity
var vat = component.Addon;
if (vat.X > 5784 && vat.X < 5814 && vat.Y > 1903 && vat.Y < 1934 &&
(qs.RedSolen && vat.Map == Map.Trammel || !qs.RedSolen && vat.Map == Map.Felucca))
(qs.RedSolen && vat.Map == Map.Trammel || !qs.RedSolen && vat.Map == Map.Veridia))
{
if (obj.CurProgress + Quantity > obj.MaxProgress)
{

2
Projects/UOContent/Items/Maps/MapItem.cs
View file

@ -107,7 +107,7 @@ public partial class MapItem : Item, ICraftable
{
var ns = from.NetState;
if (!ns.NewCharacterList && _facet != null && _facet != Map.Felucca && _facet != Map.Trammel)
if (!ns.NewCharacterList && _facet != null && _facet != Map.Veridia && _facet != Map.Trammel)
{
from.SendMessage("You must have client 7.0.13.0 or higher to display this map.");
return;

6
Projects/UOContent/Items/Maps/TreasureMap.cs
View file

@ -477,7 +477,7 @@ public partial class TreasureMap : MapItem
{
base.GetProperties(list);
list.Add(_chestMap == Map.Felucca ? 1041502 : 1041503); // for somewhere in Felucca : for somewhere in Trammel
list.Add(_chestMap == Map.Veridia ? 1041502 : 1041503); // for somewhere in Veridia : for somewhere in Trammel
if (_completed)
{
@ -516,11 +516,11 @@ public partial class TreasureMap : MapItem
{
if (_level == 6)
{
LabelTo(from, 1041522, $"#{1063452}\t \t#{(_chestMap == Map.Felucca ? 1041502 : 1041503)}");
LabelTo(from, 1041522, $"#{1063452}\t \t#{(_chestMap == Map.Veridia ? 1041502 : 1041503)}");
}
else
{
LabelTo(from, 1041522, $"#{1041510 + _level}\t \t#{(_chestMap == Map.Felucca ? 1041502 : 1041503)}");
LabelTo(from, 1041522, $"#{1041510 + _level}\t \t#{(_chestMap == Map.Veridia ? 1041502 : 1041503)}");
}
}
}

8
Projects/UOContent/Items/Misc/Moonstone.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items;
public enum MoonstoneType
{
Felucca,
Veridia,
Trammel
}
@ -56,13 +56,13 @@ public partial class Moonstone : Item
{
from.SendLocalizedMessage(1061632); // You can't do that while carrying the sigil.
}
else if (from.Map == GetTargetMap() || from.Map != Map.Trammel && from.Map != Map.Felucca)
else if (from.Map == GetTargetMap() || from.Map != Map.Trammel && from.Map != Map.Veridia)
{
from.SendLocalizedMessage(1005401); // You cannot bury the stone here.
}
else if (from is PlayerMobile mobile && mobile.Young)
{
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Felucca while you are still young.
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Veridia while you are still young.
}
else if (from.Murderer)
{
@ -93,7 +93,7 @@ public partial class Moonstone : Item
}
}
public Map GetTargetMap() => _type == MoonstoneType.Felucca ? Map.Felucca : Map.Trammel;
public Map GetTargetMap() => _type == MoonstoneType.Veridia ? Map.Veridia : Map.Trammel;
private void Deserialize(IGenericReader reader, int version)
{

28
Projects/UOContent/Items/Misc/PublicMoongate.cs
View file

@ -107,7 +107,7 @@ public partial class PublicMoongate : Item
var count = 0;
count += MoonGen(PMList.Trammel, MapSelectionFlags.Trammel);
count += MoonGen(PMList.Felucca, MapSelectionFlags.Felucca);
count += MoonGen(PMList.Veridia, MapSelectionFlags.Veridia);
count += MoonGen(PMList.Ilshenar, MapSelectionFlags.Ilshenar);
count += MoonGen(PMList.Malas, MapSelectionFlags.Malas);
count += MoonGen(PMList.Tokuno, MapSelectionFlags.Tokuno);
@ -195,11 +195,11 @@ public class PMList
]
);
public static readonly PMList Felucca =
public static readonly PMList Veridia =
new(
1012001,
1012013,
Map.Felucca,
Map.Veridia,
[
new PMEntry(new Point3D(4467, 1283, 5), 1012003), // Moonglow
new PMEntry(new Point3D(1336, 1997, 5), 1012004), // Britain
@ -209,7 +209,7 @@ public class PMList
new PMEntry(new Point3D(1828, 2948, -20), 1012008), // Trinsic
new PMEntry(new Point3D(643, 2067, 5), 1012009), // Skara Brae
/* Dynamic Z for Magincia to support both old and new maps. */
new PMEntry(new Point3D(3563, 2139, Map.Felucca.GetAverageZ(3563, 2139)), 1012010), // (New) Magincia
new PMEntry(new Point3D(3563, 2139, Map.Veridia.GetAverageZ(3563, 2139)), 1012010), // (New) Magincia
new PMEntry(new Point3D(2711, 2234, 0), 1019001) // Buccaneer's Den
]
);
@ -276,21 +276,21 @@ public class PMList
]
);
public static readonly PMList[] NoTrammelLists = [Felucca];
public static readonly PMList[] T2ALists = [Trammel, Felucca];
public static readonly PMList[] NoTrammelLists = [Veridia];
public static readonly PMList[] T2ALists = [Trammel, Veridia];
public static readonly PMList[] T2AListsYoung = [Trammel];
public static readonly PMList[] LBRLists = [Trammel, Felucca, Ilshenar];
public static readonly PMList[] LBRLists = [Trammel, Veridia, Ilshenar];
public static readonly PMList[] LBRListsYoung = [Trammel, Ilshenar];
public static readonly PMList[] AOSLists = [Trammel, Felucca, Ilshenar, Malas];
public static readonly PMList[] AOSLists = [Trammel, Veridia, Ilshenar, Malas];
public static readonly PMList[] AOSListsYoung = [Trammel, Ilshenar, Malas];
public static readonly PMList[] SELists = [Trammel, Felucca, Ilshenar, Malas, Tokuno];
public static readonly PMList[] SELists = [Trammel, Veridia, Ilshenar, Malas, Tokuno];
public static readonly PMList[] SEListsYoung = [Trammel, Ilshenar, Malas, Tokuno];
public static readonly PMList[] SALists = [Trammel, Felucca, Ilshenar, Malas, Tokuno, TerMur];
public static readonly PMList[] SALists = [Trammel, Veridia, Ilshenar, Malas, Tokuno, TerMur];
public static readonly PMList[] SAListsYoung = [Trammel, Ilshenar, Malas, Tokuno, TerMur];
public static readonly PMList[] TOLLists = [Trammel, Felucca, Ilshenar, Malas, Tokuno, TerMurEodon];
public static readonly PMList[] TOLLists = [Trammel, Veridia, Ilshenar, Malas, Tokuno, TerMurEodon];
public static readonly PMList[] TOLListsYoung = [Trammel, Ilshenar, Malas, Tokuno, TerMurEodon];
public static readonly PMList[] RedLists = [Felucca];
public static readonly PMList[] SigilLists = [Felucca];
public static readonly PMList[] RedLists = [Veridia];
public static readonly PMList[] SigilLists = [Veridia];
public PMList(int number, int selNumber, Map map, PMEntry[] entries)
{
@ -485,7 +485,7 @@ public class MoongateGump : DynamicGump
{
from.SendLocalizedMessage(1019002); // You are too far away to use the gate.
}
else if (from.Player && from.Murderer && list.Map != Map.Felucca ||
else if (from.Player && from.Murderer && list.Map != Map.Veridia ||
Sigil.ExistsOn(from) && list.Map != Faction.Facet)
{
from.SendLocalizedMessage(1019004); // You are not allowed to travel there.

2
Projects/UOContent/Items/Skill Items/Fishing/Misc/SOS.cs
View file

@ -151,7 +151,7 @@ public partial class SOS : Item
Rectangle2D[] regions;
if (map == Map.Felucca || map == Map.Trammel)
if (map == Map.Veridia || map == Map.Trammel)
{
regions = BritRegions;
}

2
Projects/UOContent/Items/Skill Items/Fishing/Misc/Sextant.cs
View file

@ -33,7 +33,7 @@ public partial class Sextant : Item
xWidth = 5120;
yHeight = 4096;
if (map == Map.Trammel || map == Map.Felucca)
if (map == Map.Trammel || map == Map.Veridia)
{
if (x >= 0 && y >= 0 && x < 5120 && y < 4096)
{

2
Projects/UOContent/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs
View file

@ -291,7 +291,7 @@ public partial class SpecialFishingNet : Item
if (spawn is Kraken && Utility.RandomDouble() < 0.2)
{
spawn.PackItem(new MessageInABottle(map == Map.Felucca ? Map.Felucca : Map.Trammel));
spawn.PackItem(new MessageInABottle(map == Map.Veridia ? Map.Veridia : Map.Trammel));
}
}

14
Projects/UOContent/Items/Skill Items/Magical/Misc/Moongate.cs
View file

@ -41,7 +41,7 @@ public partial class Moongate : Item
Dispellable = dispellable;
}
public virtual bool ShowFeluccaWarning => false;
public virtual bool ShowVeridiaWarning => false;
public override void OnDoubleClick(Mobile from)
{
@ -92,11 +92,11 @@ public partial class Moongate : Item
{
m.SendLocalizedMessage(1061632); // You can't do that while carrying the sigil.
}
else if (TargetMap == Map.Felucca && m is PlayerMobile mobile && mobile.Young)
else if (TargetMap == Map.Veridia && m is PlayerMobile mobile && mobile.Young)
{
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Felucca while you are still young.
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Veridia while you are still young.
}
else if (m.Murderer && TargetMap != Map.Felucca ||
else if (m.Murderer && TargetMap != Map.Veridia ||
TargetMap == Map.Tokuno && (flags & ClientFlags.Tokuno) == 0 ||
TargetMap == Map.Malas && (flags & ClientFlags.Malas) == 0 ||
TargetMap == Map.Ilshenar && (flags & ClientFlags.Ilshenar) == 0 ||
@ -150,7 +150,7 @@ public partial class Moongate : Item
public virtual void BeginConfirmation(Mobile from)
{
if (IsInTown(from.Location, from.Map) && !IsInTown(Target, TargetMap) ||
from.Map != Map.Felucca && TargetMap == Map.Felucca && ShowFeluccaWarning)
from.Map != Map.Veridia && TargetMap == Map.Veridia && ShowVeridiaWarning)
{
if (from.AccessLevel == AccessLevel.Player || !from.Hidden)
{
@ -342,9 +342,9 @@ public class MoongateConfirmGump : DynamicGump
builder.AddImageTiled(10, 40, 400, 200, 2624);
builder.AddAlphaRegion(10, 40, 400, 200);
if (_from.Map != Map.Felucca && _gate.TargetMap == Map.Felucca && _gate.ShowFeluccaWarning)
if (_from.Map != Map.Veridia && _gate.TargetMap == Map.Veridia && _gate.ShowVeridiaWarning)
{
// This Gate goes to Felucca... Continue to enter the gate, Cancel to stay here
// This Gate goes to Veridia... Continue to enter the gate, Cancel to stay here
builder.AddHtmlLocalized(10, 40, 400, 200, 1062050, 32512, false, true);
}
else

10
Projects/UOContent/Items/Skill Items/Magical/Misc/RecallRune.cs
View file

@ -99,7 +99,7 @@ public partial class RecallRune : Item
{
Hue = House != null ? 0x47F : 50;
}
else if (_targetMap == Map.Felucca)
else if (_targetMap == Map.Veridia)
{
Hue = House != null ? 0x66D : 0;
}
@ -191,9 +191,9 @@ public partial class RecallRune : Item
{
list.Add(House != null ? 1062454 : 1060804, $"a recall rune for {desc}"); // ~1_val~ (Malas)[(House)]
}
else if (_targetMap == Map.Felucca)
else if (_targetMap == Map.Veridia)
{
list.Add(House != null ? 1062452 : 1060805, $"a recall rune for {desc}"); // ~1_val~ (Felucca)[(House)]
list.Add(House != null ? 1062452 : 1060805, $"a recall rune for {desc}"); // ~1_val~ (Veridia)[(House)]
}
else if (_targetMap == Map.Trammel)
{
@ -232,11 +232,11 @@ public partial class RecallRune : Item
$"a recall rune for {desc}"
);
}
else if (_targetMap == Map.Felucca)
else if (_targetMap == Map.Veridia)
{
LabelTo(
from,
House != null ? 1062452 : 1060805, // ~1_val~ (Felucca)[(House)]
House != null ? 1062452 : 1060805, // ~1_val~ (Veridia)[(House)]
$"a recall rune for {desc}"
);
}

4
Projects/UOContent/Items/Skill Items/Tinkering/Spyglass.cs
View file

@ -39,10 +39,10 @@ public partial class Spyglass : Item
MessageType.Regular,
0x3B2,
3,
1008146 + (int)Clock.GetMoonPhase(Map.Felucca, from.X, from.Y),
1008146 + (int)Clock.GetMoonPhase(Map.Veridia, from.X, from.Y),
"",
AffixType.Prepend,
"Felucca : "
"Veridia : "
);
if (from is PlayerMobile player)

6
Projects/UOContent/Items/Special/Solen Items/BraceletOfBinding.cs
View file

@ -216,13 +216,13 @@ public partial class BraceletOfBinding : BaseBracelet, TranslocationItem
return false;
}
if (boundRoot.Map == Map.Felucca && from is PlayerMobile mobile && mobile.Young)
if (boundRoot.Map == Map.Veridia && from is PlayerMobile mobile && mobile.Young)
{
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Felucca while you are still young.
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Veridia while you are still young.
return false;
}
if (from.Murderer && boundRoot.Map != Map.Felucca)
if (from.Murderer && boundRoot.Map != Map.Veridia)
{
from.SendLocalizedMessage(1019004); // You are not allowed to travel there.
return false;

6
Projects/UOContent/Misc/DoorGenerator.cs
View file

@ -363,7 +363,7 @@ public static class DoorGenerator
var trammelCount = m_Count;
m_Map = Map.Felucca;
m_Map = Map.Veridia;
m_Count = 0;
for (var i = 0; i < _britRegions.Length; ++i)
@ -371,7 +371,7 @@ public static class DoorGenerator
Generate(_britRegions[i]);
}
var feluccaCount = m_Count;
var VeridiaCount = m_Count;
m_Map = Map.Ilshenar;
m_Count = 0;
@ -396,7 +396,7 @@ public static class DoorGenerator
World.Broadcast(
0x35,
true,
$"Door generation complete. Trammel: {trammelCount}; Felucca: {feluccaCount}; Ilshenar: {ilshenarCount}; Malas: {malasCount};"
$"Door generation complete. Trammel: {trammelCount}; Veridia: {VeridiaCount}; Ilshenar: {ilshenarCount}; Malas: {malasCount};"
);
}

2
Projects/UOContent/Misc/Titles.cs
View file

@ -121,7 +121,7 @@ namespace Server.Misc
var totalFame = killed.Fame / 100;
var totalKarma = -killed.Karma / 100;
if (Core.LBR && map == Map.Felucca)
if (Core.LBR && map == Map.Veridia)
{
totalFame += totalFame / 10 * 3;
totalKarma += totalKarma / 10 * 3;

2
Projects/UOContent/Misc/TreasureMapProtection.cs
View file

@ -43,7 +43,7 @@ namespace Server
try
{
new TreasureRegion(x, y, Map.Felucca);
new TreasureRegion(x, y, Map.Veridia);
new TreasureRegion(x, y, Map.Trammel);
}
catch (Exception e)

2
Projects/UOContent/Misc/Weather.cs
View file

@ -59,7 +59,7 @@ public partial class Weather
public static void Initialize()
{
m_Facets = [Map.Felucca, Map.Trammel];
m_Facets = [Map.Veridia, Map.Trammel];
/* Static weather:
*

2
Projects/UOContent/Misc/WelcomeTimer.cs
View file

@ -26,7 +26,7 @@ namespace Server.Misc
"A spellbook and a bag of reagents has been placed into your bank box.",
"Various tools have been placed into your bank.",
"Various raw materials like ingots, logs, feathers, hides, bottles, etc, have been placed into your bank.",
"5 unmarked recall runes, 5 Felucca moonstones and 5 Trammel moonstones have been placed into your bank box.",
"5 unmarked recall runes, 5 Veridia moonstones and 5 Trammel moonstones have been placed into your bank box.",
"One of each level of treasure map has been placed in your bank box.",
"You will find 9000 silver pieces deposited into your bank box. Spend it as you see fit and enjoy yourself!",
"You will find 9000 gold pieces deposited into your bank box. Spend it as you see fit and enjoy yourself!",

2
Projects/UOContent/Mobiles/Animals/Misc/Sheep.cs
View file

@ -79,7 +79,7 @@ namespace Server.Mobiles
}
from.SendLocalizedMessage(500452); // You place the gathered wool into your backpack.
from.AddToBackpack(new Wool(Map == Map.Felucca ? 2 : 1));
from.AddToBackpack(new Wool(Map == Map.Veridia ? 2 : 1));
NextWoolTime = Core.Now + TimeSpan.FromHours(3.0); // TODO: Proper time delay
}

14
Projects/UOContent/Mobiles/BaseCreature.cs
View file

@ -1731,16 +1731,16 @@ namespace Server.Mobiles
hides = (int)Math.Ceiling(hides * 1.1); // 10% bonus only applies to hides, ore & logs
}
if (corpse.Map == Map.Felucca)
if (corpse.Map == Map.Veridia)
{
feathers *= 2;
wool *= 2;
hides *= 2;
feathers *= 1;
wool *= 1;
hides *= 1;
if (Core.ML)
{
meat *= 2;
scales *= 2;
meat *= 1;
scales *= 1;
}
}
@ -3035,7 +3035,7 @@ namespace Server.Mobiles
{
PackItem(new ParagonChest(Name, treasureLevel));
}
else if ((Map == Map.Felucca || Map == Map.Trammel) && Utility.RandomDouble() < TreasureMap.LootChance)
else if ((Map == Map.Veridia || Map == Map.Trammel) && Utility.RandomDouble() < TreasureMap.LootChance)
{
PackItem(new TreasureMap(treasureLevel, Map));
}

2
Projects/UOContent/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs
View file

@ -55,7 +55,7 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override Poison PoisonImmune => Poison.Lethal;
public override bool FollowsAcquireRules => Core.AOS || !Summoned || SummonMaster?.Player != true || Map != Map.Felucca;
public override bool FollowsAcquireRules => Core.AOS || !Summoned || SummonMaster?.Player != true || Map != Map.Veridia;
public override double GetFightModeRanking(Mobile m, FightMode acqType, bool bPlayerOnly) =>
(m.Str + m.Skills.Tactics.Value) / Math.Max(this.GetDistanceToSqrt(m), 1.0);

2
Projects/UOContent/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs
View file

@ -63,7 +63,7 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override Poison PoisonImmune => Poison.Lethal;
public override bool FollowsAcquireRules => Core.AOS || !Summoned || SummonMaster?.Player != true || Map != Map.Felucca;
public override bool FollowsAcquireRules => Core.AOS || !Summoned || SummonMaster?.Player != true || Map != Map.Veridia;
public override double GetFightModeRanking(Mobile m, FightMode acqType, bool bPlayerOnly) =>
(m.Int + m.Skills.Magery.Value) / Math.Max(this.GetDistanceToSqrt(m), 1.0);

4
Projects/UOContent/Mobiles/Special/BaseChampion.cs
View file

@ -69,7 +69,7 @@ public abstract partial class BaseChampion : BaseCreature
public void GivePowerScrolls()
{
if (Map != Map.Felucca)
if (Map != Map.Veridia)
{
return;
}
@ -235,7 +235,7 @@ public abstract partial class BaseChampion : BaseCreature
public override void OnDeath(Container c)
{
if (Map == Map.Felucca)
if (Map == Map.Veridia)
{
// TODO: Confirm SE change or AoS one too?
var rights = GetLootingRights(DamageEntries, HitsMax);

4
Projects/UOContent/Mobiles/Special/Harrower.cs
View file

@ -128,9 +128,9 @@ public partial class Harrower : BaseCreature
var harrower = new Harrower();
harrower.MoveToWorld(entry.m_Location, Map.Felucca);
harrower.MoveToWorld(entry.m_Location, Map.Veridia);
harrower._gateItem = new HarrowerGate(harrower, platLoc, platMap, entry.m_Entrance, Map.Felucca);
harrower._gateItem = new HarrowerGate(harrower, platLoc, platMap, entry.m_Entrance, Map.Veridia);
return harrower;
}

6
Projects/UOContent/Mobiles/Townfolk/BaseEscortable.cs
View file

@ -776,7 +776,7 @@ public partial class BaseEscortable : BaseCreature
public virtual string PickRandomDestination()
{
if (Map.Felucca.Regions.Count == 0 || Map == null || Map == Map.Internal || Location == Point3D.Zero)
if (Map.Veridia.Regions.Count == 0 || Map == null || Map == Map.Internal || Location == Point3D.Zero)
{
return null; // Not yet fully initialized
}
@ -815,7 +815,7 @@ public partial class BaseEscortable : BaseCreature
return _destination;
}
if (Map.Felucca.Regions.Count > 0)
if (Map.Veridia.Regions.Count > 0)
{
_destination = EDI.Find(_destinationString);
@ -854,7 +854,7 @@ public class EscortDestinationInfo
public static void Initialize()
{
var list = Map.Felucca.Regions.Values;
var list = Map.Veridia.Regions.Values;
if (list.Count == 0)
{

4
Projects/UOContent/Multis/Boats/BaseBoat.cs
View file

@ -962,7 +962,7 @@ namespace Server.Multis
return false;
}
if (Map != Map.Trammel && Map != Map.Felucca || NextNavPoint < 0 || NextNavPoint >= MapItem.Pins.Count)
if (Map != Map.Trammel && Map != Map.Veridia || NextNavPoint < 0 || NextNavPoint >= MapItem.Pins.Count)
{
if (message)
{
@ -1590,7 +1590,7 @@ namespace Server.Multis
return false;
}
else if (Map != Map.Trammel && Map != Map.Felucca || NextNavPoint < 0 || NextNavPoint >= MapItem.Pins.Count)
else if (Map != Map.Trammel && Map != Map.Veridia || NextNavPoint < 0 || NextNavPoint >= MapItem.Pins.Count)
{
if (message)
{

8
Projects/UOContent/Multis/Boats/Strandedness.cs
View file

@ -5,7 +5,7 @@ namespace Server.Misc
{
public static class Strandedness
{
private static readonly Point2D[] m_Felucca =
private static readonly Point2D[] m_Veridia =
{
new(2528, 3568), new(2376, 3400), new(2528, 3896),
new(2168, 3904), new(1136, 3416), new(1432, 3648),
@ -40,7 +40,7 @@ namespace Server.Misc
new(1840, 2640), new(1928, 2952), new(2120, 2712)
};
private static readonly Point2D[] m_Trammel = m_Felucca;
private static readonly Point2D[] m_Trammel = m_Veridia;
private static readonly Point2D[] m_Ilshenar =
{
@ -127,9 +127,9 @@ namespace Server.Misc
Point2D[] list;
if (map == Map.Felucca)
if (map == Map.Veridia)
{
list = m_Felucca;
list = m_Veridia;
}
else if (map == Map.Trammel)
{

2
Projects/UOContent/Multis/Houses/HousePlacement.cs
View file

@ -63,7 +63,7 @@ namespace Server.Multis
return HousePlacementResult.Valid; // Staff can place anywhere
}
if (map == Map.Ilshenar || SpellHelper.IsFeluccaT2A(map, center))
if (map == Map.Ilshenar || SpellHelper.IsVeridiaT2A(map, center))
{
return HousePlacementResult.BadRegion; // No houses in Ilshenar/T2A
}

2
Projects/UOContent/Regions/DungeonRegion.cs
View file

@ -29,5 +29,5 @@ public class DungeonRegion : BaseRegion
global = LightCycle.DungeonLevel;
}
public override bool CanUseStuckMenu(Mobile m) => Map != Map.Felucca && base.CanUseStuckMenu(m);
public override bool CanUseStuckMenu(Mobile m) => Map != Map.Veridia && base.CanUseStuckMenu(m);
}

4
Projects/UOContent/Skills/DetectHidden.cs
View file

@ -66,8 +66,8 @@ public static class DetectHidden
return false;
}
// Felucca PvP only
if (stealther.Map != Map.Felucca)
// Veridia PvP only
if (stealther.Map != Map.Veridia)
{
return false;
}

4
Projects/UOContent/Special Systems/Engines/PreventInaccess.cs
View file

@ -23,9 +23,9 @@ namespace Server.Misc
private static readonly LocationInfo[] m_Destinations =
{
new(new Point3D(5275, 1163, 0), Map.Felucca), // Jail
new(new Point3D(5275, 1163, 0), Map.Veridia), // Jail
new(new Point3D(5275, 1163, 0), Map.Trammel),
new(new Point3D(5445, 1153, 0), Map.Felucca), // Green acres
new(new Point3D(5445, 1153, 0), Map.Veridia), // Green acres
new(new Point3D(5445, 1153, 0), Map.Trammel)
};

6
Projects/UOContent/Special Systems/Engines/TestCenter.cs
View file

@ -489,7 +489,7 @@ namespace Server.Misc
for (var i = 0; i < 10; i++)
{
PlaceItemIn(cont, 117, 128, new MessageInABottle(Utility.RandomBool() ? Map.Trammel : Map.Felucca, 4));
PlaceItemIn(cont, 117, 128, new MessageInABottle(Utility.RandomBool() ? Map.Trammel : Map.Veridia, 4));
}
PlaceItemIn(bank, 18, 124, cont);
@ -567,10 +567,10 @@ namespace Server.Misc
for (var i = 0; i < 5; ++i)
{
bag.DropItem(new Moonstone(MoonstoneType.Felucca));
bag.DropItem(new Moonstone(MoonstoneType.Veridia));
}
// Felucca moonstones
// Veridia moonstones
bank.DropItem(bag);
bag = new Bag();

24
Projects/UOContent/Spells/Base/SpellHelper.cs
View file

@ -82,14 +82,14 @@ namespace Server.Spells
private static readonly TravelValidator[] m_Validators =
{
IsFeluccaT2A,
IsVeridiaT2A,
IsKhaldun,
IsIlshenar,
IsTrammelWind,
IsFeluccaWind,
IsFeluccaDungeon,
IsVeridiaWind,
IsVeridiaDungeon,
IsTrammelSolenHive,
IsFeluccaSolenHive,
IsVeridiaSolenHive,
IsCrystalCave,
IsDoomGauntlet,
IsDoomFerry,
@ -699,7 +699,7 @@ namespace Server.Spells
return x >= 5120 && y >= 0 && x < 5376 && y < 256;
}
public static bool IsFeluccaWind(Map map, Point3D loc) => map == Map.Felucca && IsWindLoc(loc);
public static bool IsVeridiaWind(Map map, Point3D loc) => map == Map.Veridia && IsWindLoc(loc);
public static bool IsTrammelWind(Map map, Point3D loc) => map == Map.Trammel && IsWindLoc(loc);
@ -714,26 +714,26 @@ namespace Server.Spells
public static bool IsTrammelSolenHive(Map map, Point3D loc) => map == Map.Trammel && IsSolenHiveLoc(loc);
public static bool IsFeluccaSolenHive(Map map, Point3D loc) => map == Map.Felucca && IsSolenHiveLoc(loc);
public static bool IsVeridiaSolenHive(Map map, Point3D loc) => map == Map.Veridia && IsSolenHiveLoc(loc);
public static bool IsFeluccaT2A(Map map, Point3D loc)
public static bool IsVeridiaT2A(Map map, Point3D loc)
{
int x = loc.X, y = loc.Y;
return map == Map.Felucca && x >= 5120 && y >= 2304 && x < 6144 && y < 4096;
return map == Map.Veridia && x >= 5120 && y >= 2304 && x < 6144 && y < 4096;
}
public static bool IsAnyT2A(Map map, Point3D loc)
{
int x = loc.X, y = loc.Y;
return (map == Map.Trammel || map == Map.Felucca) && x >= 5120 && y >= 2304 && x < 6144 && y < 4096;
return (map == Map.Trammel || map == Map.Veridia) && x >= 5120 && y >= 2304 && x < 6144 && y < 4096;
}
public static bool IsFeluccaDungeon(Map map, Point3D loc)
public static bool IsVeridiaDungeon(Map map, Point3D loc)
{
var region = Region.Find(loc, map);
return region.IsPartOf<DungeonRegion>() && region.Map == Map.Felucca;
return region.IsPartOf<DungeonRegion>() && region.Map == Map.Veridia;
}
public static bool IsKhaldun(Map map, Point3D loc) => Region.Find(loc, map).Name == "Khaldun";
@ -830,7 +830,7 @@ namespace Server.Spells
{
int x = loc.X, y = loc.Y;
return (map == Map.Trammel || map == Map.Felucca) && x >= 6911 && y >= 254 && x < 7167 && y < 511;
return (map == Map.Trammel || map == Map.Veridia) && x >= 6911 && y >= 254 && x < 7167 && y < 511;
}
public static bool IsMLDungeon(Map map, Point3D loc) => MondainsLegacy.IsMLRegion(Region.Find(loc, map));

6
Projects/UOContent/Spells/Chivalry/SacredJourney.cs
View file

@ -56,11 +56,11 @@ namespace Server.Spells.Chivalry
{
failureMessage.SendMessageTo(Caster);
}
else if (map == Map.Felucca && Caster is PlayerMobile { Young: true } mobile)
else if (map == Map.Veridia && Caster is PlayerMobile { Young: true } mobile)
{
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Felucca while you are still young.
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Veridia while you are still young.
}
else if (Caster.Murderer && map != Map.Felucca)
else if (Caster.Murderer && map != Map.Veridia)
{
Caster.SendLocalizedMessage(1019004); // You are not allowed to travel there.
}

10
Projects/UOContent/Spells/Fourth/ArchCure.cs
View file

@ -40,7 +40,7 @@ namespace Server.Spells.Fourth
var directTarget = p as Mobile;
var loc = new Point3D(p);
var feluccaRules = map.Rules == MapRules.FeluccaRules;
var VeridiaRules = map.Rules == MapRules.VeridiaRules;
// You can target any living mobile directly, beneficial checks apply
if (directTarget != null && Caster.CanBeBeneficial(directTarget, false))
@ -50,7 +50,7 @@ namespace Server.Spells.Fourth
foreach (var m in map.GetMobilesInRange(loc, 2))
{
if (m != directTarget && AreaCanTarget(m, feluccaRules))
if (m != directTarget && AreaCanTarget(m, VeridiaRules))
{
pool.Enqueue(m);
}
@ -98,10 +98,10 @@ namespace Server.Spells.Fourth
Caster.Target = new SpellTarget<IPoint3D>(this, allowGround: true);
}
private bool AreaCanTarget(Mobile target, bool feluccaRules)
private bool AreaCanTarget(Mobile target, bool VeridiaRules)
{
/* Arch cure area effect won't cure aggressors, victims, murderers, criminals or monsters.
* In Felucca, it will also not cure summons and pets.
* In Veridia, it will also not cure summons and pets.
* For red players it will only cure themselves and guild members.
*/
@ -122,7 +122,7 @@ namespace Server.Spells.Fourth
return false;
}
if (feluccaRules && target is not PlayerMobile)
if (VeridiaRules && target is not PlayerMobile)
{
return false;
}

6
Projects/UOContent/Spells/Fourth/Recall.cs
View file

@ -56,11 +56,11 @@ namespace Server.Spells.Fourth
{
failureMessage.SendMessageTo(Caster);
}
else if (map == Map.Felucca && Caster is PlayerMobile mobile && mobile.Young)
else if (map == Map.Veridia && Caster is PlayerMobile mobile && mobile.Young)
{
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Felucca while you are still young.
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Veridia while you are still young.
}
else if (Caster.Murderer && map != Map.Felucca)
else if (Caster.Murderer && map != Map.Veridia)
{
Caster.SendLocalizedMessage(1019004); // You are not allowed to travel there.
}

4
Projects/UOContent/Spells/Necromancy/Exorcism.cs
View file

@ -170,7 +170,7 @@ public class ExorcismSpell : NecromancerSpell
Point3D[] locList;
if (map == Map.Felucca || map == Map.Trammel)
if (map == Map.Veridia || map == Map.Trammel)
{
locList = m_BritanniaLocs;
}
@ -208,4 +208,4 @@ public class ExorcismSpell : NecromancerSpell
return closest;
}
}
}

10
Projects/UOContent/Spells/Seventh/GateTravel.cs
View file

@ -48,11 +48,11 @@ public class GateTravelSpell : MagerySpell, IRecallSpell
{
failureMessage.SendMessageTo(Caster);
}
else if (map == Map.Felucca && Caster is PlayerMobile mobile && mobile.Young)
else if (map == Map.Veridia && Caster is PlayerMobile mobile && mobile.Young)
{
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Felucca while you are still young.
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Veridia while you are still young.
}
else if (Caster.Murderer && map != Map.Felucca)
else if (Caster.Murderer && map != Map.Veridia)
{
Caster.SendLocalizedMessage(1019004); // You are not allowed to travel there.
}
@ -160,7 +160,7 @@ public partial class GateTravelMoongate : Moongate
{
Map = map;
if (ShowFeluccaWarning && map == Map.Felucca)
if (ShowVeridiaWarning && map == Map.Veridia)
{
ItemID = 0xDDA;
}
@ -175,7 +175,7 @@ public partial class GateTravelMoongate : Moongate
[CommandProperty(AccessLevel.GameMaster)]
public Moongate LinkedGate { get; set; }
public override bool ShowFeluccaWarning => Core.AOS;
public override bool ShowVeridiaWarning => Core.AOS;
public override void UseGate(Mobile m)
{

2
Projects/UOContent/Spells/Spellweaving/ArcaneCircle.cs
View file

@ -66,7 +66,7 @@ namespace Server.Spells.Spellweaving
}
private static bool IsSanctuary(Point3D p, Map m) =>
(m == Map.Trammel || m == Map.Felucca) && p.X == 6267 && p.Y == 131;
(m == Map.Trammel || m == Map.Veridia) && p.X == 6267 && p.Y == 131;
private static bool IsValidLocation(Point3D location, Map map)
{

6
Projects/UOContent/Systems/JailSystem/JailSystem.cs
View file

@ -25,7 +25,7 @@ namespace Server.Systems.JailSystem;
public class JailSystem : GenericPersistence
{
// Jail locations (modify if using custom maps)
// felucca void
// Veridia void
private static readonly Point3D[] JailLocations =
[
new(5276, 1164, 0),
@ -41,7 +41,7 @@ public class JailSystem : GenericPersistence
];
// Jail map, change this for custom maps
public static readonly Map JailMap = Map.Felucca;
public static readonly Map JailMap = Map.Veridia;
private static readonly JailRecord EmptyRecord = new();
private static readonly HashSet<PlayerMobile> CurrentlyBeingJailed = [];
@ -54,7 +54,7 @@ public class JailSystem : GenericPersistence
// Release location, change this for custom maps
private static readonly Point3D ReleaseLocation = new(1444, 1697, 10); // Britain Bank
public static readonly Map ReleaseMap = Map.Felucca;
public static readonly Map ReleaseMap = Map.Veridia;
private static JailSystem Instance;