Touched up taxi list to separate hotels/motels from apartment complexes

luciensadi · Jul 6, 2024 · ab9ca21 · ab9ca21
1 parent b3bd83f
commit ab9ca21
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/transport.cpp b/src/transport.cpp
@@ -70,7 +70,7 @@ struct dest_data seattle_taxi_destinations[] =
   { "council", "island", "Council Island", 9149, TAXI_DEST_TYPE_AREA_OF_TOWN , TRUE },
   { "hospital", "", "Council Island Hospital", 9161, TAXI_DEST_TYPE_HOSPITALS, TRUE },
   { "dante", "dante's", "Dante's Inferno", 32661, TAXI_DEST_TYPE_RESTAURANTS_AND_NIGHTCLUBS, TRUE },
-  { "diver", "easy", "Easy Diver Coffin Hotel", 32644, TAXI_DEST_TYPE_ACCOMMODATIONS, TRUE },
+  { "diver", "easy", "Easy Diver Coffin Hotel", 32644, TAXI_DEST_TYPE_HOTELS_MOTELS, TRUE },
   { "evergreen", "", "Evergreen Complex", 2201, TAXI_DEST_TYPE_ACCOMMODATIONS, TRUE },
   { "everett", "", "Everett", 39263, TAXI_DEST_TYPE_AREA_OF_TOWN , TRUE },
   { "epicenter", "", "The Epicenter", 2418, TAXI_DEST_TYPE_RESTAURANTS_AND_NIGHTCLUBS, TRUE },
@@ -112,7 +112,7 @@ struct dest_data seattle_taxi_destinations[] =
   { "syberspace", "", "SyberSpace", 30612, TAXI_DEST_TYPE_RESTAURANTS_AND_NIGHTCLUBS, TRUE },
   { "tarislar", "", "Tarislar", 4965, TAXI_DEST_TYPE_AREA_OF_TOWN , TRUE },
   { "tacoma", "", "Tacoma", 2000, TAXI_DEST_TYPE_AREA_OF_TOWN, TRUE },
-  { "coffin", "motel", "Tacoma Coffin Motel", 2045, TAXI_DEST_TYPE_ACCOMMODATIONS, TRUE },
+  { "coffin", "motel", "Tacoma Coffin Motel", 2045, TAXI_DEST_TYPE_HOTELS_MOTELS, TRUE },
   { "mall", "", "Tacoma Mall", 2093, TAXI_DEST_TYPE_SHOPPING, TRUE },
   { "TWE", "", "Tacoma Weapons Emporium", 2514, TAXI_DEST_TYPE_SHOPPING, TRUE },
   { "afterlife", "", "The Afterlife", 2072, TAXI_DEST_TYPE_RESTAURANTS_AND_NIGHTCLUBS, TRUE },
@@ -151,6 +151,7 @@ struct dest_data seattle_taxi_destinations[] =
     { "crusher", "495", "Crusher 495", 25364, TAXI_DEST_TYPE_RESTAURANTS_AND_NIGHTCLUBS, TRUE },
     { "banshee", "", "The Banshee", 25368, TAXI_DEST_TYPE_RESTAURANTS_AND_NIGHTCLUBS, TRUE },
     { "paine", "snohomish", "Paine Field-Snohomish Airport", 39233, TAXI_DEST_TYPE_TRANSPORTATION, TRUE },
+    { "villas", "lucianos", "Villa de Lucianos", 98501, TAXI_DEST_TYPE_ACCOMMODATIONS, TRUE },
 #endif
     { "\n", "", "", 0, 0, 0 } // this MUST be last
   };
@@ -210,7 +211,8 @@ struct taxi_dest_type taxi_dest_type_info[] = {
   { "^rTransportation", "^R" },
   { "^mRestaurants and Nightclubs", "^M" },
   { "^bShopping", "^B" },
-  { "^gAccommodation", "^G" },
+  { "^gHotels / Motels", "^g" },
+  { "^gApartments and Housing", "^G" },
   { "^rHospitals", "^R" },
   { "^WEverything Else", "^W" },
   { "^MOOC Areas", "^W"},

diff --git a/src/transport.hpp b/src/transport.hpp
@@ -39,11 +39,12 @@
 #define TAXI_DEST_TYPE_TRANSPORTATION             3
 #define TAXI_DEST_TYPE_RESTAURANTS_AND_NIGHTCLUBS 4
 #define TAXI_DEST_TYPE_SHOPPING                   5
-#define TAXI_DEST_TYPE_ACCOMMODATIONS             6
-#define TAXI_DEST_TYPE_HOSPITALS                  7
-#define TAXI_DEST_TYPE_OTHER                      8
-#define TAXI_DEST_TYPE_OOC                        9
-#define NUM_TAXI_DEST_TYPES                       10
+#define TAXI_DEST_TYPE_HOTELS_MOTELS              6
+#define TAXI_DEST_TYPE_ACCOMMODATIONS             7
+#define TAXI_DEST_TYPE_HOSPITALS                  8
+#define TAXI_DEST_TYPE_OTHER                      9
+#define TAXI_DEST_TYPE_OOC                        10
+#define NUM_TAXI_DEST_TYPES                       11
 
 // Define to collapse validation logic for destinations. Input is an integer index in the destination list.
 #define DEST_IS_VALID(destination, dest_list) ((dest_list)[(destination)].enabled && !vnum_from_non_connected_zone((dest_list)[(destination)].vnum))