Merge branch 'luciensadi:master' into master

Author: jdevnull

src/act.comm.cpp

@@ -774,7 +774,7 @@ struct obj_data *find_radio(struct char_data *ch, bool *is_cyberware, bool *is_v
 
 ACMD(do_radio)
 {
-  struct obj_data *obj, *radio = NULL;
+  struct obj_data *radio = NULL;
   char one[MAX_INPUT_LENGTH], two[MAX_INPUT_LENGTH];
   int i;
   bool cyberware = FALSE, vehicle = FALSE, matrix = FALSE;

src/act.drive.cpp

@@ -1348,7 +1348,7 @@ ACMD(do_speed)
     DELETE_AND_NULL_ARRAY(GET_VEH_DEFPOS(veh));
   }
 
-  FAILURE_CASE(veh_can_traverse_air(veh) && i > 2, "Sorry, you can't accelerate aircraft faster than cruising speed.");
+  FAILURE_CASE(GET_VEH_VNUM(veh) != 8913 && veh_can_traverse_air(veh) && i > 2, "Sorry, you can't accelerate aircraft faster than cruising speed.");
 
   if (veh->hood) {
     send_to_char("You can't move with the hood up.\r\n", ch);
@@ -2293,7 +2293,7 @@ ACMD(do_push)
     else if (ch->in_veh->cspeed > SPEED_IDLE)
       send_to_char("You are moving too fast to do that.\r\n", ch);
     else if (!(veh = get_veh_list(argument, ch->in_veh->carriedvehs, ch)))
-      send_to_char("That vehicle isn't in here.\r\n", ch);
+      send_to_char(ch, "You don't see a vehicle named '%s' to push %s into.\r\n", argument, GET_VEH_NAME(veh));
     else {
       strlcpy(buf3, GET_VEH_NAME(veh), sizeof(buf3));
       send_to_char(ch, "You push %s out of the back.\r\n", buf3);
@@ -2320,16 +2320,15 @@ ACMD(do_push)
       send_to_char("Push what?\r\n", ch);
       return;
     }
-    if (!(veh = get_veh_list(buf, ch->in_room->vehicles, ch)) || !(found_veh = get_veh_list(buf1, ch->in_room->vehicles, ch))) {
-      send_to_char("You don't see that vehicle here.\r\n", ch);
-      return;
-    }
 
-    FAILURE_CASE(found_veh == veh, "You can't push it into itself.");
-    FAILURE_CASE(!found_veh->seating[0] && !(repair_vehicle_seating(found_veh) && found_veh->seating[0]), "There's nowhere to push it into.");
-    FAILURE_CASE(found_veh->load - found_veh->usedload < calculate_vehicle_entry_load(veh), "There is not enough room in there for that.");
+    FAILURE_CASE_PRINTF(!(veh = get_veh_list(buf, ch->in_room->vehicles, ch)), "You don't see a vehicle named '%s' here.", buf);
+    FAILURE_CASE_PRINTF(!(found_veh = get_veh_list(buf1, ch->in_room->vehicles, ch)), "You don't see a vehicle named '%s' to push %s into.", buf1, GET_VEH_NAME(veh));
+
+    FAILURE_CASE_PRINTF(found_veh == veh, "You can't push %s into itself.", GET_VEH_NAME(veh));
+    FAILURE_CASE_PRINTF(!found_veh->seating[0] && !(repair_vehicle_seating(found_veh) && found_veh->seating[0]), "There's not enough seating for you in %s.", GET_VEH_NAME(found_veh));
+    FAILURE_CASE_PRINTF(found_veh->load - found_veh->usedload < calculate_vehicle_entry_load(veh), "There is not enough room in %s for that.", GET_VEH_NAME(found_veh));
     FAILURE_CASE(found_veh->locked, "You can't push it into a locked vehicle.");
-    FAILURE_CASE(veh->locked && veh->damage < VEH_DAM_THRESHOLD_DESTROYED, "The wheels seem to be locked.");
+    FAILURE_CASE_PRINTF(veh->locked && veh->damage < VEH_DAM_THRESHOLD_DESTROYED, "The wheels on %s seem to be locked.", GET_VEH_NAME(veh));
     FAILURE_CASE(found_veh->damage >= VEH_DAM_THRESHOLD_DESTROYED, "You can't push anything into a destroyed vehicle.");
 
     strlcpy(buf2, GET_VEH_NAME(veh), sizeof(buf2));
@@ -2452,6 +2451,29 @@ ACMD(do_vehicle_osay) {
   send_to_char(ch, "You say ^mOOCly^n, \"%s^n\".\r\n", capitalize(argument));
 }
 
+int get_vehicle_damage_modifier(struct veh_data *veh) {
+  switch (veh->damage)
+  {
+  case 0:
+    return 0;
+  case VEH_DAM_THRESHOLD_LIGHT:
+  case 2:
+    return 1;
+  case VEH_DAM_THRESHOLD_MODERATE:
+  case 4:
+  case 5:
+    return 2;
+  case VEH_DAM_THRESHOLD_SEVERE:
+  case 7:
+  case 8:
+  case 9:
+    return 3;
+  case 10:
+    return 10;
+  }
+  return 99;
+}
+
 int get_vehicle_modifier(struct veh_data *veh, bool include_weather)
 {
   struct char_data *ch;
@@ -2485,24 +2507,8 @@ int get_vehicle_modifier(struct veh_data *veh, bool include_weather)
     }
   }
   // Damaged? TN goes up.
-  switch (veh->damage)
-  {
-  case VEH_DAM_THRESHOLD_LIGHT:
-  case 2:
-    mod += 1;
-    break;
-  case VEH_DAM_THRESHOLD_MODERATE:
-  case 4:
-  case 5:
-    mod += 2;
-    break;
-  case VEH_DAM_THRESHOLD_SEVERE:
-  case 7:
-  case 8:
-  case 9:
-    mod += 3;
-    break;
-  }
+  mod += get_vehicle_damage_modifier(veh);
+
   // Weather makes it harder to drive too.
   if (include_weather && weather_info.sky >= SKY_RAINING)
     mod++;

src/act.informative.cpp

@@ -1572,7 +1572,7 @@ void list_one_char(struct char_data * i, struct char_data * ch)
     bool dual = TRUE;
     if (IS_ASTRAL(i))
       strlcat(buf, " (astral)", sizeof(buf));
-    if (GET_GRADE(i)) {
+    if (GET_GRADE(i) && !IS_OTAKU(i)) {
       bool init = TRUE;
       if (GET_METAMAGIC(i, META_MASKING)) {
         if (IS_SET(GET_MASKING(i), MASK_INIT) || IS_SET(GET_MASKING(i), MASK_COMPLETE))
@@ -2976,7 +2976,7 @@ void do_probe_object(struct char_data * ch, struct obj_data * j, bool is_in_shop
       break;
     case ITEM_WEAPON:
       // Ranged weapons first.
-      if (IS_GUN(GET_WEAPON_ATTACK_TYPE(j))) {
+      if (WEAPON_IS_GUN(j)) {
         int burst_count = 0;
 
         // Line 1: "It is a 3-round pistol that uses the Pistols skill to fire. Its base damage code is 2L."
@@ -4235,8 +4235,7 @@ ACMD(do_examine)
         look_in_obj(ch, tmp_object, TRUE, 0);
         send_to_char("\r\n", ch);
       }
-    } else if ((GET_OBJ_TYPE(tmp_object) == ITEM_WEAPON) &&
-               (IS_GUN(GET_OBJ_VAL(tmp_object, 3)))) {
+    } else if (GET_OBJ_TYPE(tmp_object) == ITEM_WEAPON && WEAPON_IS_GUN(tmp_object)) {
       for (i = ACCESS_LOCATION_TOP; i <= ACCESS_LOCATION_UNDER; ++i)
         if (GET_OBJ_VAL(tmp_object, i) >= 0) {
           send_to_char(ch, "There is %s attached to the %s of it.\r\n",

src/act.obj.cpp

@@ -507,7 +507,7 @@ ACMD(do_put)
     FAILURE_CASE_PRINTF(!(obj = get_obj_in_list_vis(ch, arg1, ch->carrying)), "You aren't carrying %s %s.", AN(arg1), arg1);
 
     // You can always fit Cram and Psyche in a compartment. We only evaluate the logic in this block if it's neither of these things.
-    if (GET_OBJ_TYPE(obj) != ITEM_DRUG || GET_OBJ_DRUG_TYPE(obj) != DRUG_CRAM || GET_OBJ_DRUG_TYPE(obj) != DRUG_PSYCHE) {
+    if (GET_OBJ_TYPE(obj) != ITEM_DRUG || (GET_OBJ_DRUG_TYPE(obj) != DRUG_CRAM && GET_OBJ_DRUG_TYPE(obj) != DRUG_PSYCHE)) {
       // Breakables can only take Cram/Psyche.
       FAILURE_CASE(GET_CYBERWARE_FLAGS(cont), "You can only put the drugs Cram and Psyche in breakable tooth compartments.");
 
@@ -3331,10 +3331,10 @@ int can_wield_both(struct char_data *ch, struct obj_data *one, struct obj_data *
     return TRUE;
   if (GET_OBJ_TYPE(one) != ITEM_WEAPON || GET_OBJ_TYPE(two) != ITEM_WEAPON)
     return TRUE;
-  if ((IS_GUN(GET_OBJ_VAL(one, 3)) && !IS_GUN(GET_OBJ_VAL(two, 3))) ||
-      (IS_GUN(GET_OBJ_VAL(two, 3)) && !IS_GUN(GET_OBJ_VAL(one, 3))))
+  if ((WEAPON_IS_GUN(one) && !WEAPON_IS_GUN(two)) ||
+      (WEAPON_IS_GUN(two) && !WEAPON_IS_GUN(one)))
     return FALSE;
-  else if (!IS_GUN(GET_OBJ_VAL(one, 3)) && !IS_GUN(GET_OBJ_VAL(two, 3)))
+  else if (!WEAPON_IS_GUN(one) && !WEAPON_IS_GUN(two))
     return FALSE;
   else if (IS_OBJ_STAT(one, ITEM_EXTRA_TWOHANDS) || IS_OBJ_STAT(two, ITEM_EXTRA_TWOHANDS))
     return FALSE;
@@ -3624,7 +3624,7 @@ void perform_wear(struct char_data * ch, struct obj_data * obj, int where, bool
     obj_from_obj(obj);
   else
     obj_from_char(obj);
-  equip_char(ch, obj, where);
+  equip_char(ch, obj, where, true, true);
 
   if (print_messages) {
     switch (get_armor_penalty_grade(ch)) {
@@ -3836,7 +3836,7 @@ ACMD(do_wield)
     if (!CAN_WEAR(obj, ITEM_WEAR_WIELD))
       send_to_char(ch, "You can't wield %s.\r\n", GET_OBJ_NAME(obj));
     else if (GET_OBJ_TYPE(obj) == ITEM_WEAPON
-             && !IS_GUN(GET_WEAPON_ATTACK_TYPE(obj))
+             && !WEAPON_IS_GUN(obj)
              && GET_WEAPON_FOCUS_BONDED_BY(obj) == GET_IDNUM(ch)
              && GET_MAG(ch) * 2 < GET_WEAPON_FOCUS_RATING(obj))
     {
@@ -3903,8 +3903,6 @@ void perform_remove(struct char_data * ch, int pos)
   int was_worn_on = obj->worn_on;
   int previous_armor_penalty = get_armor_penalty_grade(ch);
 
-  obj_to_char(unequip_char(ch, pos, TRUE), ch);
-
   // Gyros take a bit to get out of.
   if (GET_OBJ_TYPE(obj) == ITEM_GYRO) {
     FAILURE_CASE(CH_IN_COMBAT(ch), "While fighting?? That would be a neat trick.");
@@ -3949,6 +3947,8 @@ void perform_remove(struct char_data * ch, int pos)
     act("$n stops using $p.", TRUE, ch, obj, 0, TO_ROOM);
   }
 
+  obj_to_char(unequip_char(ch, pos, true, true, true), ch);
+
   if (previous_armor_penalty && !get_armor_penalty_grade(ch))
     send_to_char("You can move freely again.\r\n", ch);
 
@@ -4243,7 +4243,7 @@ ACMD(do_activate)
       do_wear(ch, tmp_arg, 0, 0);
     } else if (worn) {
       send_to_char(ch, "%s hasn't been bonded yet, so you need to ^WREMOVE^n it and ^WBOND^n it, then ^WWEAR^n it again. Trying that now...\r\n", CAP(GET_OBJ_NAME(obj)));
-      obj_to_char(unequip_char(ch, obj->worn_on, FALSE, TRUE), ch);
+      obj_to_char(unequip_char(ch, obj->worn_on, FALSE, TRUE, true), ch);
       do_bond(ch, tmp_arg, 0, 0);
       do_wear(ch, tmp_arg, 0, 0);
     } else {
@@ -4445,7 +4445,7 @@ int draw_from_readied_holster(struct char_data *ch, struct obj_data *holster) {
 
   // Refuse to let someone draw a weapon focus that they can't use.
   if (GET_OBJ_TYPE(contents) == ITEM_WEAPON
-          && !IS_GUN(GET_WEAPON_ATTACK_TYPE(contents))
+          && !WEAPON_IS_GUN(contents)
           && GET_WEAPON_FOCUS_RATING(contents) > 0
           && GET_WEAPON_FOCUS_BONDED_BY(contents) == GET_IDNUM(ch))
   {
@@ -4610,20 +4610,20 @@ bool holster_can_fit(struct obj_data *holster, struct obj_data *weapon) {
   switch (GET_HOLSTER_TYPE(holster)) {
     case HOLSTER_TYPE_SMALL_GUNS:
       // Handle standard small guns.
-      if (IS_GUN(GET_WEAPON_ATTACK_TYPE(weapon)) && small_weapon)
+      if (WEAPON_IS_GUN(weapon) && small_weapon)
         return TRUE;
 
       // Check for ranged tasers.
       return (GET_WEAPON_ATTACK_TYPE(weapon) == WEAP_TASER && GET_WEAPON_SKILL(weapon) == SKILL_TASERS);
     case HOLSTER_TYPE_MELEE_WEAPONS:
       // Handle standard melee weapons.
-      if (!IS_GUN(GET_WEAPON_ATTACK_TYPE(weapon)))
+      if (!WEAPON_IS_GUN(weapon))
         return TRUE;
 
       // Check for melee tasers.
       return (GET_WEAPON_ATTACK_TYPE(weapon) == WEAP_TASER && GET_WEAPON_SKILL(weapon) != SKILL_TASERS);
     case HOLSTER_TYPE_LARGE_GUNS:
-      return IS_GUN(GET_WEAPON_ATTACK_TYPE(weapon)) && !small_weapon;
+      return WEAPON_IS_GUN(weapon) && !small_weapon;
   }
 
   return FALSE;
@@ -4714,7 +4714,7 @@ ACMD(do_holster)
 
 
   FAILURE_CASE_PRINTF(!cont, "You don't have any empty %s that will fit %s.", 
-                      !IS_GUN(GET_OBJ_VAL(obj, 3)) ? "sheaths" : "holsters", decapitalize_a_an(GET_OBJ_NAME(obj)));
+                      !WEAPON_IS_GUN(obj) ? "sheaths" : "holsters", decapitalize_a_an(GET_OBJ_NAME(obj)));
 
   FAILURE_CASE_PRINTF(cont == obj, "You can't put %s inside itself.", decapitalize_a_an(GET_OBJ_NAME(obj)));
 

src/act.offensive.cpp

@@ -498,9 +498,7 @@ ACMD(do_shoot)
   for (i = WEAR_WIELD; i <= WEAR_HOLD; i++)
     if ((weapon = GET_EQ(ch, i)) &&
         (GET_OBJ_TYPE(weapon) == ITEM_FIREWEAPON ||
-         (GET_OBJ_TYPE(weapon) == ITEM_WEAPON && (IS_GUN(GET_WEAPON_ATTACK_TYPE(weapon))
-                                                  || GET_WEAPON_ATTACK_TYPE(weapon) == WEAP_GREN_LAUNCHER
-                                                  || GET_WEAPON_ATTACK_TYPE(weapon) == WEAP_MISS_LAUNCHER))))
+         (GET_OBJ_TYPE(weapon) == ITEM_WEAPON && (WEAPON_IS_GUN(weapon)))))
       if (find_weapon_range(ch, weapon) > range)
         pos = i;
 
@@ -968,7 +966,7 @@ ACMD(do_mode)
     return;
   }
 
-  if (GET_OBJ_TYPE(weapon) != ITEM_WEAPON || !IS_GUN(GET_WEAPON_ATTACK_TYPE(weapon))) {
+  if (GET_OBJ_TYPE(weapon) != ITEM_WEAPON || !WEAPON_IS_GUN(weapon)) {
     send_to_char(ch, "%s isn't a firearm.\r\n", CAP(GET_OBJ_NAME(weapon)));
     return;
   }

src/act.other.cpp

@@ -1867,7 +1867,7 @@ ACMD(do_reload)
     }
 
   if (GET_OBJ_TYPE(gun) != ITEM_WEAPON
-      || !IS_GUN(GET_WEAPON_ATTACK_TYPE(gun))
+      || !WEAPON_IS_GUN(gun)
       || GET_WEAPON_MAX_AMMO(gun) <= 0)
   {
     send_to_char(ch, "%s is not a reloadable weapon!\r\n", capitalize(GET_OBJ_NAME(gun)));
@@ -1909,7 +1909,7 @@ ACMD(do_reload)
 ACMD(do_eject)
 {
   struct obj_data *weapon = GET_EQ(ch, WEAR_WIELD);
-  if (!weapon || !IS_GUN(GET_WEAPON_ATTACK_TYPE(weapon))) {
+  if (!weapon || !WEAPON_IS_GUN(weapon)) {
     send_to_char("You're not wielding a firearm.\r\n", ch);
     return;
   }
@@ -2029,7 +2029,7 @@ ACMD(do_attach)
       send_to_char("The mount is locked.\r\n", ch);
       return;
     }
-    if (!IS_GUN(GET_WEAPON_ATTACK_TYPE(item))) {
+    if (!WEAPON_IS_GUN(item)) {
       send_to_char(ch, "%s isn't a gun, there'd be no point in attaching it to a mount.\r\n", capitalize(GET_OBJ_NAME(item)));
       return;
     }
@@ -3953,7 +3953,7 @@ ACMD(do_assense)
         if (mem)
           snprintf(ENDOF(buf), sizeof(buf) - strlen(buf), ", and is seems to have been built by %s", mem->mem);
       }
-    } else if (GET_OBJ_TYPE(obj) == ITEM_WEAPON && !IS_GUN(GET_WEAPON_ATTACK_TYPE(obj)) && GET_WEAPON_FOCUS_RATING(obj) > 0) {
+    } else if (GET_OBJ_TYPE(obj) == ITEM_WEAPON && !WEAPON_IS_GUN(obj) && GET_WEAPON_FOCUS_RATING(obj) > 0) {
       strlcat(buf, "a weapon focus", sizeof(buf));
       if (success >= 5) {
         snprintf(ENDOF(buf), sizeof(buf) - strlen(buf), ". It is of force %d", GET_WEAPON_FOCUS_RATING(obj));
@@ -4754,7 +4754,7 @@ ACMD(do_ammo) {
 
   bool sent_a_message = FALSE;
 
-  if (primary && IS_GUN(GET_WEAPON_ATTACK_TYPE(primary))) {
+  if (primary && WEAPON_IS_GUN(primary)) {
     if (primary->contains) {
       send_to_char(ch, "Primary: %d / %d %s.\r\n",
                    MIN(GET_WEAPON_MAX_AMMO(primary), GET_MAGAZINE_AMMO_COUNT(primary->contains)),
@@ -4772,7 +4772,7 @@ ACMD(do_ammo) {
     sent_a_message = TRUE;
   }
 
-  if (secondary && IS_GUN(GET_WEAPON_ATTACK_TYPE(secondary))) {
+  if (secondary && WEAPON_IS_GUN(secondary)) {
     if (secondary->contains) {
       send_to_char(ch, "Secondary: %d / %d %s.\r\n",
                    MIN(GET_WEAPON_MAX_AMMO(secondary), GET_OBJ_VAL(secondary->contains, 9)),
@@ -5286,7 +5286,7 @@ bool is_reloadable_weapon(struct obj_data *weapon, int ammotype) {
     return FALSE;
 
   // It must be a gun. Bows etc can choke on it.
-  if (GET_OBJ_TYPE(weapon) != ITEM_WEAPON || !IS_GUN(GET_WEAPON_ATTACK_TYPE(weapon)))
+  if (GET_OBJ_TYPE(weapon) != ITEM_WEAPON || !WEAPON_IS_GUN(weapon))
     return FALSE;
 
   // It must take ammo.

src/act.wizard.cpp

@@ -7271,8 +7271,14 @@ ACMD(do_hlist)
     if (!ch_can_bypass_edit_lock(ch, get_zone_from_vnum(matrix[nr].vnum)))
       continue;
 
-    snprintf(ENDOF(buf), sizeof(buf) - strlen(buf), "%5d. [%8ld] %s\r\n", ++found,
-            matrix[nr].vnum, matrix[nr].name);
+    snprintf(ENDOF(buf), sizeof(buf) - strlen(buf), "%5d. [%8ld] %s^n: %s-%d^n (%s^n)\r\n",
+             ++found,
+             matrix[nr].vnum,
+             matrix[nr].name,
+             host_color[matrix[nr].color],
+             matrix[nr].security,
+             intrusion[matrix[nr].intrusion]
+            );
   }
 
   if (!found)

src/awake.hpp

@@ -1349,7 +1349,7 @@ enum {
 #define ITEM_CREATIVE_EFFORT    49
 #define ITEM_PET                50
 #define ITEM_COMPLEX_FORM       51       /* otaku complex form               */
-#define ITEM_DRONEWAR_RELATED   52
+#define ITEM_MINIGAME_RELATED   52
 #define NUM_ITEMS               53
 // Adding something? Add convenience definees to utils.hpp and put the type's name in constants.cpp.
 
@@ -1404,7 +1404,7 @@ enum {
 #define ITEM_EXTRA_NORENT             2     /* Item cannot be rented        */
 #define ITEM_EXTRA_NODONATE           3     /* Item cannot be donated       */
 // unused, must remove, was !invis    4, also touch db.cpp item_extra_flag_map
-// unused, must remove, was invisible 5, also touch db.cpp item_extra_flag_map
+#define ITEM_EXTRA_SHEER              5
 #define ITEM_EXTRA_MAGIC              6     /* Item is magical              */
 #define ITEM_EXTRA_NODROP             7     /* Item is cursed: can't drop   */
 #define ITEM_EXTRA_FORMFIT            8     /* Item is blessed              */