diff --git a/_module/are/area111.are.json b/_module/are/area111.are.json index f1df7db1..8d02c73e 100644 --- a/_module/are/area111.are.json +++ b/_module/are/area111.are.json @@ -14,7 +14,7 @@ }, "Comments": { "type": "cexostring", - "value": "" + "value": "|OLD-Daern's Instant Fortress|" }, "Creator_ID": { "type": "int", @@ -87,7 +87,7 @@ "Name": { "type": "cexolocstring", "value": { - "0": "Daern's Instant Fortress" + "0": "|OLD-Daern's Instant Fortress|" } }, "NoRest": { @@ -2913,7 +2913,7 @@ }, "Version": { "type": "dword", - "value": 4 + "value": 5 }, "Width": { "type": "int", diff --git a/_module/are/cityofbaleas.are.json b/_module/are/cityofbaleas.are.json index e280e404..d3cc86fd 100644 --- a/_module/are/cityofbaleas.are.json +++ b/_module/are/cityofbaleas.are.json @@ -11169,7 +11169,7 @@ }, "Version": { "type": "dword", - "value": 91 + "value": 92 }, "Width": { "type": "int", diff --git a/_module/are/healerthospital.are.json b/_module/are/healerthospital.are.json index b1a961b8..cb591858 100644 --- a/_module/are/healerthospital.are.json +++ b/_module/are/healerthospital.are.json @@ -1193,7 +1193,7 @@ }, "Version": { "type": "dword", - "value": 36 + "value": 37 }, "Width": { "type": "int", diff --git a/_module/gic/area111.gic.json b/_module/gic/area111.gic.json index 4751a892..7f28073a 100644 --- a/_module/gic/area111.gic.json +++ b/_module/gic/area111.gic.json @@ -133,14 +133,6 @@ }, "WaypointList": { "type": "list", - "value": [ - { - "__struct_id": 5, - "Comment": { - "type": "cexostring", - "value": "This is the default waypoint you may place to set a patrol path for a creature or NPC.\r\n1. Create the creature and either use its current Tag or fill in a new one.\r\n2. Place or make sure the WalkWayPoints() is within the body of the On Spawn script for the creature.\r\n3. Place a series of waypoints along the route you wish the creature to walk.\r\n4. Select all of the newly created waypoints and right click. Choose the Create Set option.\r\n5. The waypoint set will have a set name of \"WP_\" + NPC Tag. Thus if an NPC with the Tag \"Guard\" will have a waypoint set called \"WP_Guard\". Note that Tags are case sensitive." - } - } - ] + "value": [] } } diff --git a/_module/gic/cityofbaleas.gic.json b/_module/gic/cityofbaleas.gic.json index 67f1aefb..1475952d 100644 --- a/_module/gic/cityofbaleas.gic.json +++ b/_module/gic/cityofbaleas.gic.json @@ -1100,6 +1100,13 @@ "type": "cexostring", "value": "On the Advanced tab, replace with whatever information you wish to appear on the Map of an area." } + }, + { + "__struct_id": 5, + "Comment": { + "type": "cexostring", + "value": "This is the default waypoint you may place to set a patrol path for a creature or NPC.\r\n1. Create the creature and either use its current Tag or fill in a new one.\r\n2. Place or make sure the WalkWayPoints() is within the body of the On Spawn script for the creature.\r\n3. Place a series of waypoints along the route you wish the creature to walk.\r\n4. Select all of the newly created waypoints and right click. Choose the Create Set option.\r\n5. The waypoint set will have a set name of \"WP_\" + NPC Tag. Thus if an NPC with the Tag \"Guard\" will have a waypoint set called \"WP_Guard\". Note that Tags are case sensitive." + } } ] } diff --git a/_module/git/area111.git.json b/_module/git/area111.git.json index 700cc0f6..e9f6ae96 100644 --- a/_module/git/area111.git.json +++ b/_module/git/area111.git.json @@ -3230,67 +3230,6 @@ }, "WaypointList": { "type": "list", - "value": [ - { - "__struct_id": 5, - "Appearance": { - "type": "byte", - "value": 1 - }, - "Description": { - "type": "cexolocstring", - "value": {} - }, - "HasMapNote": { - "type": "byte", - "value": 0 - }, - "LinkedTo": { - "type": "cexostring", - "value": "" - }, - "LocalizedName": { - "id": 14817, - "type": "cexolocstring", - "value": {} - }, - "MapNote": { - "type": "cexolocstring", - "value": {} - }, - "MapNoteEnabled": { - "type": "byte", - "value": 1 - }, - "Tag": { - "type": "cexostring", - "value": "daern1" - }, - "TemplateResRef": { - "type": "resref", - "value": "nw_waypoint001" - }, - "XOrientation": { - "type": "float", - "value": 0.0 - }, - "XPosition": { - "type": "float", - "value": 34.97268295288086 - }, - "YOrientation": { - "type": "float", - "value": 1.0 - }, - "YPosition": { - "type": "float", - "value": 40.72053146362305 - }, - "ZPosition": { - "type": "float", - "value": -5.7220458984375e-006 - } - } - ] + "value": [] } } diff --git a/_module/git/cityofbaleas.git.json b/_module/git/cityofbaleas.git.json index f3cbc387..ebc48edf 100644 --- a/_module/git/cityofbaleas.git.json +++ b/_module/git/cityofbaleas.git.json @@ -22373,6 +22373,66 @@ "type": "float", "value": 0.199999526143074 } + }, + { + "__struct_id": 5, + "Appearance": { + "type": "byte", + "value": 3 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "HasMapNote": { + "type": "byte", + "value": 0 + }, + "LinkedTo": { + "type": "cexostring", + "value": "" + }, + "LocalizedName": { + "id": 14817, + "type": "cexolocstring", + "value": {} + }, + "MapNote": { + "type": "cexolocstring", + "value": {} + }, + "MapNoteEnabled": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "WP_TOWNPORT" + }, + "TemplateResRef": { + "type": "resref", + "value": "nw_waypoint001" + }, + "XOrientation": { + "type": "float", + "value": 8.240847279304878e-025 + }, + "XPosition": { + "type": "float", + "value": 19.97921943664551 + }, + "YOrientation": { + "type": "float", + "value": 1.0 + }, + "YPosition": { + "type": "float", + "value": 49.73426055908203 + }, + "ZPosition": { + "type": "float", + "value": -0.1500000059604645 + } } ] } diff --git a/_module/git/healerthospital.git.json b/_module/git/healerthospital.git.json index ead019df..d65d0657 100644 --- a/_module/git/healerthospital.git.json +++ b/_module/git/healerthospital.git.json @@ -38318,7 +38318,7 @@ "__struct_id": 5, "Appearance": { "type": "byte", - "value": 1 + "value": 3 }, "Description": { "type": "cexolocstring", @@ -38335,7 +38335,9 @@ "LocalizedName": { "id": 14817, "type": "cexolocstring", - "value": {} + "value": { + "0": "PC Death Respawn Point" + } }, "MapNote": { "type": "cexolocstring", @@ -38347,7 +38349,7 @@ }, "Tag": { "type": "cexostring", - "value": "townport" + "value": "WP_HOSPITAL" }, "TemplateResRef": { "type": "resref", diff --git a/_module/ncs/69_hench_canwork.ncs b/_module/ncs/69_hench_canwork.ncs index 89f60de1..db7b2c5a 100644 Binary files a/_module/ncs/69_hench_canwork.ncs and b/_module/ncs/69_hench_canwork.ncs differ diff --git a/_module/ncs/69_hench_crtrsmn.ncs b/_module/ncs/69_hench_crtrsmn.ncs index 6f24b885..1bcf18e3 100644 Binary files a/_module/ncs/69_hench_crtrsmn.ncs and b/_module/ncs/69_hench_crtrsmn.ncs differ diff --git a/_module/ncs/69_hench_crtruns.ncs b/_module/ncs/69_hench_crtruns.ncs index 3eb87862..69ccf662 100644 Binary files a/_module/ncs/69_hench_crtruns.ncs and b/_module/ncs/69_hench_crtruns.ncs differ diff --git a/_module/ncs/69_hench_destobj.ncs b/_module/ncs/69_hench_destobj.ncs index b57fd4f5..9ee294cc 100644 Binary files a/_module/ncs/69_hench_destobj.ncs and b/_module/ncs/69_hench_destobj.ncs differ diff --git a/_module/ncs/69_hench_eqmelee.ncs b/_module/ncs/69_hench_eqmelee.ncs index 1397ef43..2f88224a 100644 Binary files a/_module/ncs/69_hench_eqmelee.ncs and b/_module/ncs/69_hench_eqmelee.ncs differ diff --git a/_module/ncs/69_hench_eqrange.ncs b/_module/ncs/69_hench_eqrange.ncs index 8dd69f3f..e7b5fd8f 100644 Binary files a/_module/ncs/69_hench_eqrange.ncs and b/_module/ncs/69_hench_eqrange.ncs differ diff --git a/_module/ncs/69_hench_gomelee.ncs b/_module/ncs/69_hench_gomelee.ncs index 1e479485..cd20e419 100644 Binary files a/_module/ncs/69_hench_gomelee.ncs and b/_module/ncs/69_hench_gomelee.ncs differ diff --git a/_module/ncs/69_hench_gorange.ncs b/_module/ncs/69_hench_gorange.ncs index a7ebb2e2..93fb7531 100644 Binary files a/_module/ncs/69_hench_gorange.ncs and b/_module/ncs/69_hench_gorange.ncs differ diff --git a/_module/ncs/69_hench_identfy.ncs b/_module/ncs/69_hench_identfy.ncs index 576f9869..bcd3e24d 100644 Binary files a/_module/ncs/69_hench_identfy.ncs and b/_module/ncs/69_hench_identfy.ncs differ diff --git a/_module/ncs/69_hench_rangeno.ncs b/_module/ncs/69_hench_rangeno.ncs index abade2d1..1418dab5 100644 Binary files a/_module/ncs/69_hench_rangeno.ncs and b/_module/ncs/69_hench_rangeno.ncs differ diff --git a/_module/ncs/69_hench_rangeye.ncs b/_module/ncs/69_hench_rangeye.ncs index e6a1f6f7..9939650b 100644 Binary files a/_module/ncs/69_hench_rangeye.ncs and b/_module/ncs/69_hench_rangeye.ncs differ diff --git a/_module/ncs/69_hench_switchn.ncs b/_module/ncs/69_hench_switchn.ncs index c7a5c8cf..6ad5c38a 100644 Binary files a/_module/ncs/69_hench_switchn.ncs and b/_module/ncs/69_hench_switchn.ncs differ diff --git a/_module/ncs/69_henchrt_enter.ncs b/_module/ncs/69_henchrt_enter.ncs index bd251035..6d915970 100644 Binary files a/_module/ncs/69_henchrt_enter.ncs and b/_module/ncs/69_henchrt_enter.ncs differ diff --git a/_module/ncs/69_henchstr_exit.ncs b/_module/ncs/69_henchstr_exit.ncs index 4df0b27d..6a56ca64 100644 Binary files a/_module/ncs/69_henchstr_exit.ncs and b/_module/ncs/69_henchstr_exit.ncs differ diff --git a/_module/ncs/69_o0_death.ncs b/_module/ncs/69_o0_death.ncs index 8be815d6..2d9d436f 100644 Binary files a/_module/ncs/69_o0_death.ncs and b/_module/ncs/69_o0_death.ncs differ diff --git a/_module/ncs/69_o0_dying.ncs b/_module/ncs/69_o0_dying.ncs index 1a116142..d7542135 100644 Binary files a/_module/ncs/69_o0_dying.ncs and b/_module/ncs/69_o0_dying.ncs differ diff --git a/_module/ncs/7cryptport.ncs b/_module/ncs/7cryptport.ncs index b4215d66..1e563d7c 100644 Binary files a/_module/ncs/7cryptport.ncs and b/_module/ncs/7cryptport.ncs differ diff --git a/_module/ncs/7doortodes.ncs b/_module/ncs/7doortodes.ncs index f882eab9..4eb926c6 100644 Binary files a/_module/ncs/7doortodes.ncs and b/_module/ncs/7doortodes.ncs differ diff --git a/_module/ncs/7portbard.ncs b/_module/ncs/7portbard.ncs index 84bc5861..faa11053 100644 Binary files a/_module/ncs/7portbard.ncs and b/_module/ncs/7portbard.ncs differ diff --git a/_module/ncs/8lakeuprope.ncs b/_module/ncs/8lakeuprope.ncs index 1559ba33..c8446bc1 100644 Binary files a/_module/ncs/8lakeuprope.ncs and b/_module/ncs/8lakeuprope.ncs differ diff --git a/_module/ncs/8river10.ncs b/_module/ncs/8river10.ncs index 201fda3a..4c47c1c5 100644 Binary files a/_module/ncs/8river10.ncs and b/_module/ncs/8river10.ncs differ diff --git a/_module/ncs/8river11.ncs b/_module/ncs/8river11.ncs index db69b3bf..07da4af0 100644 Binary files a/_module/ncs/8river11.ncs and b/_module/ncs/8river11.ncs differ diff --git a/_module/ncs/8river12.ncs b/_module/ncs/8river12.ncs index 2af7390d..37f2dd67 100644 Binary files a/_module/ncs/8river12.ncs and b/_module/ncs/8river12.ncs differ diff --git a/_module/ncs/8river13.ncs b/_module/ncs/8river13.ncs index 6d678af9..ad97fc1e 100644 Binary files a/_module/ncs/8river13.ncs and b/_module/ncs/8river13.ncs differ diff --git a/_module/ncs/8river14.ncs b/_module/ncs/8river14.ncs index 0117f2c4..5047138d 100644 Binary files a/_module/ncs/8river14.ncs and b/_module/ncs/8river14.ncs differ diff --git a/_module/ncs/8river15.ncs b/_module/ncs/8river15.ncs index 9ee8853a..22e73902 100644 Binary files a/_module/ncs/8river15.ncs and b/_module/ncs/8river15.ncs differ diff --git a/_module/ncs/8river16.ncs b/_module/ncs/8river16.ncs index 342911de..be3391d9 100644 Binary files a/_module/ncs/8river16.ncs and b/_module/ncs/8river16.ncs differ diff --git a/_module/ncs/8river17.ncs b/_module/ncs/8river17.ncs index 2b37d33d..f2004376 100644 Binary files a/_module/ncs/8river17.ncs and b/_module/ncs/8river17.ncs differ diff --git a/_module/ncs/8river18.ncs b/_module/ncs/8river18.ncs index c199052d..e18b5e8a 100644 Binary files a/_module/ncs/8river18.ncs and b/_module/ncs/8river18.ncs differ diff --git a/_module/ncs/9ariver1.ncs b/_module/ncs/9ariver1.ncs index ab641a00..416be22e 100644 Binary files a/_module/ncs/9ariver1.ncs and b/_module/ncs/9ariver1.ncs differ diff --git a/_module/ncs/9ariver10.ncs b/_module/ncs/9ariver10.ncs index 1ef3eeb7..0d15148d 100644 Binary files a/_module/ncs/9ariver10.ncs and b/_module/ncs/9ariver10.ncs differ diff --git a/_module/ncs/9ariver11.ncs b/_module/ncs/9ariver11.ncs index 15203b73..1bb8bd5d 100644 Binary files a/_module/ncs/9ariver11.ncs and b/_module/ncs/9ariver11.ncs differ diff --git a/_module/ncs/9ariver12.ncs b/_module/ncs/9ariver12.ncs index 1660d426..cf487d74 100644 Binary files a/_module/ncs/9ariver12.ncs and b/_module/ncs/9ariver12.ncs differ diff --git a/_module/ncs/9ariver2.ncs b/_module/ncs/9ariver2.ncs index 371634d2..0e5eeb62 100644 Binary files a/_module/ncs/9ariver2.ncs and b/_module/ncs/9ariver2.ncs differ diff --git a/_module/ncs/9ariver3.ncs b/_module/ncs/9ariver3.ncs index 24c658e8..e67961d7 100644 Binary files a/_module/ncs/9ariver3.ncs and b/_module/ncs/9ariver3.ncs differ diff --git a/_module/ncs/9ariver4.ncs b/_module/ncs/9ariver4.ncs index ca849bce..25099d41 100644 Binary files a/_module/ncs/9ariver4.ncs and b/_module/ncs/9ariver4.ncs differ diff --git a/_module/ncs/9ariver5.ncs b/_module/ncs/9ariver5.ncs index 551648df..ad5b0d07 100644 Binary files a/_module/ncs/9ariver5.ncs and b/_module/ncs/9ariver5.ncs differ diff --git a/_module/ncs/9ariver6.ncs b/_module/ncs/9ariver6.ncs index f14186ef..a1342cd6 100644 Binary files a/_module/ncs/9ariver6.ncs and b/_module/ncs/9ariver6.ncs differ diff --git a/_module/ncs/9ariver7.ncs b/_module/ncs/9ariver7.ncs index 2dfb4520..52c6e802 100644 Binary files a/_module/ncs/9ariver7.ncs and b/_module/ncs/9ariver7.ncs differ diff --git a/_module/ncs/9ariver8.ncs b/_module/ncs/9ariver8.ncs index 08e700ef..e26e389b 100644 Binary files a/_module/ncs/9ariver8.ncs and b/_module/ncs/9ariver8.ncs differ diff --git a/_module/ncs/9ariver9.ncs b/_module/ncs/9ariver9.ncs index 598851e6..c1af25c8 100644 Binary files a/_module/ncs/9ariver9.ncs and b/_module/ncs/9ariver9.ncs differ diff --git a/_module/ncs/9bportntos.ncs b/_module/ncs/9bportntos.ncs index 8eb7b3cc..dae08107 100644 Binary files a/_module/ncs/9bportntos.ncs and b/_module/ncs/9bportntos.ncs differ diff --git a/_module/ncs/9bportston.ncs b/_module/ncs/9bportston.ncs index 1ca7dd76..b714a66f 100644 Binary files a/_module/ncs/9bportston.ncs and b/_module/ncs/9bportston.ncs differ diff --git a/_module/ncs/9briver1.ncs b/_module/ncs/9briver1.ncs index 3c361890..6ca48cbc 100644 Binary files a/_module/ncs/9briver1.ncs and b/_module/ncs/9briver1.ncs differ diff --git a/_module/ncs/9briver2.ncs b/_module/ncs/9briver2.ncs index 3a8208c6..7affdb42 100644 Binary files a/_module/ncs/9briver2.ncs and b/_module/ncs/9briver2.ncs differ diff --git a/_module/ncs/9bvrokdive.ncs b/_module/ncs/9bvrokdive.ncs index 23e47fbd..b976204f 100644 Binary files a/_module/ncs/9bvrokdive.ncs and b/_module/ncs/9bvrokdive.ncs differ diff --git a/_module/ncs/agycrypt.ncs b/_module/ncs/agycrypt.ncs index a6be480d..ce851a11 100644 Binary files a/_module/ncs/agycrypt.ncs and b/_module/ncs/agycrypt.ncs differ diff --git a/_module/ncs/agypyramid.ncs b/_module/ncs/agypyramid.ncs index 9d092fd6..be2a5695 100644 Binary files a/_module/ncs/agypyramid.ncs and b/_module/ncs/agypyramid.ncs differ diff --git a/_module/ncs/ar_st_pawn.ncs b/_module/ncs/ar_st_pawn.ncs index a93da072..fde56128 100644 Binary files a/_module/ncs/ar_st_pawn.ncs and b/_module/ncs/ar_st_pawn.ncs differ diff --git a/_module/ncs/attackpc.ncs b/_module/ncs/attackpc.ncs index 86096a25..2221d478 100644 Binary files a/_module/ncs/attackpc.ncs and b/_module/ncs/attackpc.ncs differ diff --git a/_module/ncs/attpcnofact.ncs b/_module/ncs/attpcnofact.ncs index c0ab3753..13188875 100644 Binary files a/_module/ncs/attpcnofact.ncs and b/_module/ncs/attpcnofact.ncs differ diff --git a/_module/ncs/doscreenev.ncs b/_module/ncs/doscreenev.ncs index abe1ca35..4e50ba38 100644 Binary files a/_module/ncs/doscreenev.ncs and b/_module/ncs/doscreenev.ncs differ diff --git a/_module/ncs/prc_ilr.ncs b/_module/ncs/prc_ilr.ncs index 638ef669..ae49581e 100644 Binary files a/_module/ncs/prc_ilr.ncs and b/_module/ncs/prc_ilr.ncs differ diff --git a/_module/ncs/resptownport.ncs b/_module/ncs/resptownport.ncs index 873deff6..26c6848d 100644 Binary files a/_module/ncs/resptownport.ncs and b/_module/ncs/resptownport.ncs differ diff --git a/_module/ncs/teleportationsto.ncs b/_module/ncs/teleportationsto.ncs index 2cb56be0..abd425bc 100644 Binary files a/_module/ncs/teleportationsto.ncs and b/_module/ncs/teleportationsto.ncs differ diff --git a/_module/nss/prc_ilr.nss b/_module/nss/prc_ilr.nss index 9774de5a..98584197 100644 --- a/_module/nss/prc_ilr.nss +++ b/_module/nss/prc_ilr.nss @@ -232,7 +232,7 @@ struct itemRestriction GetItemLevelRestriction(object oItem, object oPC) else { - int iGPValue = GetGoldPieceValue(oItem); + int iGPValue = GetGoldPieceValue(oItem) / 4; // Code to check for plotitem and restrict it by its internal value: // only runs if set (=default) @@ -241,7 +241,7 @@ struct itemRestriction GetItemLevelRestriction(object oItem, object oPC) if (GetPlotFlag(oItem) == TRUE) { SetPlotFlag(oItem, FALSE); - int iGPValue = GetGoldPieceValue(oItem); + int iGPValue = GetGoldPieceValue(oItem) / 4; SetPlotFlag(oItem, TRUE); } } diff --git a/_module/nss/resptownport.nss b/_module/nss/resptownport.nss index 63ed2aab..de2aa73d 100644 --- a/_module/nss/resptownport.nss +++ b/_module/nss/resptownport.nss @@ -7,7 +7,7 @@ void main() object oPC = GetLastRespawnButtonPresser(); object oTarget; location lTarget; -oTarget = GetWaypointByTag("townport"); +oTarget = GetWaypointByTag("WP_HOSPITAL"); lTarget = GetLocation(oTarget); if (!GetIsPC(oPC)) return; diff --git a/_module/nss/teleportationsto.nss b/_module/nss/teleportationsto.nss index 7bf55d4f..a96e0ec8 100644 --- a/_module/nss/teleportationsto.nss +++ b/_module/nss/teleportationsto.nss @@ -12,7 +12,7 @@ oPC = GetItemActivator(); object oTarget; location lTarget; -oTarget = GetWaypointByTag("townport"); +oTarget = GetWaypointByTag("WP_TOWNPORT"); lTarget = GetLocation(oTarget); diff --git a/_module/ra_tdog.mod b/_module/ra_tdog.mod index 429b28cb..cacc5497 100644 Binary files a/_module/ra_tdog.mod and b/_module/ra_tdog.mod differ diff --git a/_module/uti/teleportationsto.uti.json b/_module/uti/teleportationsto.uti.json index 977d4b5c..5c1e6129 100644 --- a/_module/uti/teleportationsto.uti.json +++ b/_module/uti/teleportationsto.uti.json @@ -38,7 +38,7 @@ }, "Identified": { "type": "byte", - "value": 0 + "value": 1 }, "LocalizedName": { "type": "cexolocstring",