ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.227 by root, Tue Jan 6 19:17:07 2009 UTC

… …
210 ob->close_container (); //TODO: client-specific 210 ob->close_container (); //TODO: client-specific
211 211
212 ns->update_look = 0; 212 ns->update_look = 0;
213 ns->look_position = 0; 213 ns->look_position = 0;
214 214
215 clear_los (this); 215 clear_los ();
216 216
217 ns->reset_stats (); 217 ns->reset_stats ();
218 218
219 /* make sure he's a player -- needed because of class change. */ 219 /* make sure he's a player -- needed because of class change. */
220 ob->type = PLAYER; // we are paranoid 220 ob->type = PLAYER; // we are paranoid
… …
366 attachable::do_destroy (); 366 attachable::do_destroy ();
367 367
368 if (ob) 368 if (ob)
369 { 369 {
370 ob->destroy_inv (false); 370 ob->destroy_inv (false);
371 ob->destroy (true); 371 ob->destroy ();
372 } 372 }
373 373
374 ob = observe = 0; 374 ob = observe = 0;
375} 375}
376 376
… …
668 || op->type == CLOAK || op->type == HELMET 668 || op->type == CLOAK || op->type == HELMET
669 || op->type == SHIELD || op->type == GLOVES 669 || op->type == SHIELD || op->type == GLOVES
670 || op->type == BRACERS || op->type == GIRDLE)) 670 || op->type == BRACERS || op->type == GIRDLE))
671 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 671 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
672 { 672 {
673 op->destroy (true); 673 op->destroy ();
674 continue; 674 continue;
675 } 675 }
676 } 676 }
677 677
678 /* This really needs to be better - we should really give 678 /* This really needs to be better - we should really give
… …
689 if (tmp->type == op->type && tmp->name == op->name) 689 if (tmp->type == op->type && tmp->name == op->name)
690 break; 690 break;
691 691
692 if (tmp) 692 if (tmp)
693 { 693 {
694 op->destroy (true); 694 op->destroy ();
695 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 695 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
696 continue; 696 continue;
697 } 697 }
698 698
699 if (op->nrof > 1) 699 if (op->nrof > 1)
… …
714 CLEAR_FLAG (op, FLAG_DAMNED); 714 CLEAR_FLAG (op, FLAG_DAMNED);
715 } 715 }
716 716
717 if (op->type == SPELL) 717 if (op->type == SPELL)
718 { 718 {
719 op->destroy (true); 719 op->destroy ();
720 continue; 720 continue;
721 } 721 }
722 else if (op->type == SKILL) 722 else if (op->type == SKILL)
723 { 723 {
724 SET_FLAG (op, FLAG_CAN_USE_SKILL); 724 SET_FLAG (op, FLAG_CAN_USE_SKILL);
… …
931 LOG (llevDebug, "Fleeing player is dead.\n"); 931 LOG (llevDebug, "Fleeing player is dead.\n");
932 CLEAR_FLAG (op, FLAG_SCARED); 932 CLEAR_FLAG (op, FLAG_SCARED);
933 return; 933 return;
934 } 934 }
935 935
936 if (op->enemy == NULL) 936 if (!op->enemy)
937 { 937 {
938 LOG (llevDebug, "Fleeing player had no enemy.\n"); 938 LOG (llevDebug, "Fleeing player had no enemy.\n");
939 CLEAR_FLAG (op, FLAG_SCARED); 939 CLEAR_FLAG (op, FLAG_SCARED);
940 return; 940 return;
941 } 941 }
942 942
943 /* Seen some crashes here. Since we don't store an
944 * op->enemy_count, it is possible that something destroys the
945 * actual enemy, and the object is recycled.
946 */
947 if (op->enemy->map == NULL)
948 {
949 CLEAR_FLAG (op, FLAG_SCARED);
950 op->enemy = NULL;
951 return;
952 }
953
954 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 943 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
955 { 944 {
956 op->enemy = NULL; 945 op->enemy = NULL;
957 CLEAR_FLAG (op, FLAG_SCARED); 946 CLEAR_FLAG (op, FLAG_SCARED);
958 return; 947 return;
… …
961 get_rangevector (op, op->enemy, &rv, 0); 950 get_rangevector (op, op->enemy, &rv, 0);
962 951
963 dir = absdir (4 + rv.direction); 952 dir = absdir (4 + rv.direction);
964 for (diff = 0; diff < 3; diff++) 953 for (diff = 0; diff < 3; diff++)
965 { 954 {
966 int m = 1 - (RANDOM () & 2); 955 int m = 1 - rndm (2) * 2;
967 956
968 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 957 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
969 return; 958 return;
970 } 959 }
971 960
… …
982check_pick (object *op) 971check_pick (object *op)
983{ 972{
984 object *tmp, *next; 973 object *tmp, *next;
985 int stop = 0; 974 int stop = 0;
986 int wvratio; 975 int wvratio;
987 char putstring[128];
988 976
989 /* if you're flying, you cna't pick up anything */ 977 /* if you're flying, you cna't pick up anything */
990 if (op->move_type & MOVE_FLYING) 978 if (op->move_type & MOVE_FLYING)
991 return 1; 979 return 1;
992 980
… …
1016 1004
1017 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1005 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1018 { 1006 {
1019 if (item_matched_string (op, tmp, op->contr->search_str)) 1007 if (item_matched_string (op, tmp, op->contr->search_str))
1020 CHK_PICK_PICKUP; 1008 CHK_PICK_PICKUP;
1009
1021 continue; 1010 continue;
1022 } 1011 }
1023 1012
1024 /* high not bit set? We're using the old autopickup model */ 1013 /* pickup handling */
1014 if (op->contr->mode & PU_DEBUG)
1015 {
1016 /* some debugging code to figure out item information */
1017 const char *str = tmp->name
1018 ? format ("item name: %s item type: %d weight/value: %d",
1019 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
1020 : format ("item name: %s item type: %d weight/value: %d",
1021 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1022
1023 new_draw_info (NDI_UNIQUE, 0, op, str);
1024 }
1025
1026 if (op->contr->mode & PU_INHIBIT)
1027 return 1;
1028
1029 if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
1030 return 1;
1031
1032 /* philosophy:
1033 * It's easy to grab an item type from a pile, as long as it's
1034 * generic. This takes no game-time. For more detailed pickups
1035 * and selections, select-items should be used. This is a
1036 * grab-as-you-run type mode that's really useful for arrows for
1037 * example.
1038 * The drawback: right now it has no frontend, so you need to
1039 * stick the bits you want into a calculator in hex mode and then
1040 * convert to decimal and then 'pickup <#>
1041 */
1042
1043 /* the first two modes are exclusive: if NOTHING we return, if
1044 * STOP then we stop. All the rest are applied sequentially,
1045 * meaning if any test passes, the item gets picked up. */
1046
1047 /* if mode is set to pick nothing up, return */
1048 if (op->contr->mode == PU_NOTHING)
1049 return 1;
1050
1051 /* if mode is set to stop when encountering objects, return */
1052 /* take STOP before INHIBIT since it doesn't actually pick
1053 * anything up */
1054 if (op->contr->mode & PU_STOP)
1055 return 0;
1056
1057 /* useful for going into stores and not losing your settings... */
1058 /* and for battles wher you don't want to get loaded down while
1059 * fighting */
1060 if (op->contr->mode & PU_INHIBIT)
1061 return 1;
1062
1063 /* prevent us from turning into auto-thieves :) */
1064 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1065 continue;
1066
1067 /* ignore known cursed objects */
1068 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
1069 continue;
1070
1071 /* all food and drink if desired */
1072 /* question: don't pick up known-poisonous stuff? */
1025 if (!(op->contr->mode & PU_NEWMODE)) 1073 if (op->contr->mode & PU_FOOD)
1074 if (tmp->type == FOOD)
1026 { 1075 {
1027 switch (op->contr->mode) 1076 CHK_PICK_PICKUP;
1077 continue;
1078 }
1079
1080 if (op->contr->mode & PU_DRINK)
1081 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1082 {
1083 CHK_PICK_PICKUP;
1084 continue;
1085 }
1086
1087 if (op->contr->mode & PU_POTION)
1088 if (tmp->type == POTION)
1089 {
1090 CHK_PICK_PICKUP;
1091 continue;
1092 }
1093
1094 /* spellbooks, skillscrolls and normal books/scrolls */
1095 if (op->contr->mode & PU_SPELLBOOK)
1096 if (tmp->type == SPELLBOOK)
1097 {
1098 CHK_PICK_PICKUP;
1099 continue;
1100 }
1101
1102 if (op->contr->mode & PU_SKILLSCROLL)
1103 if (tmp->type == SKILLSCROLL)
1104 {
1105 CHK_PICK_PICKUP;
1106 continue;
1107 }
1108
1109 if (op->contr->mode & PU_READABLES)
1110 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1111 {
1112 CHK_PICK_PICKUP;
1113 continue;
1114 }
1115
1116 /* wands/staves/rods/horns */
1117 if (op->contr->mode & PU_MAGIC_DEVICE)
1118 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1119 {
1120 CHK_PICK_PICKUP;
1121 continue;
1122 }
1123
1124 /* pick up all magical items */
1125 if (op->contr->mode & PU_MAGICAL)
1126 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1127 {
1128 CHK_PICK_PICKUP;
1129 continue;
1130 }
1131
1132 if (op->contr->mode & PU_VALUABLES)
1133 {
1134 if (tmp->type == MONEY || tmp->type == GEM)
1028 { 1135 {
1029 case 0:
1030 return 1; /* don't pick up */
1031 case 1:
1032 CHK_PICK_PICKUP; 1136 CHK_PICK_PICKUP;
1033 return 1; 1137 continue;
1034 case 2:
1035 CHK_PICK_PICKUP;
1036 return 0;
1037 case 3:
1038 return 0; /* stop before pickup */
1039 case 4:
1040 CHK_PICK_PICKUP;
1041 break;
1042 case 5:
1043 CHK_PICK_PICKUP;
1044 stop = 1;
1045 break;
1046 case 6:
1047 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1048 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1049 CHK_PICK_PICKUP;
1050 break;
1051
1052 case 7:
1053 if (tmp->type == MONEY || tmp->type == GEM)
1054 CHK_PICK_PICKUP;
1055 break;
1056
1057 default:
1058 /* use value density */
1059 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1060 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1061 CHK_PICK_PICKUP;
1062 } 1138 }
1063 } 1139 }
1064 else 1140
1065 { /* old model */ 1141 /* rings & amulets - talismans seems to be typed AMULET */
1066 /* NEW pickup handling */
1067 if (op->contr->mode & PU_DEBUG) 1142 if (op->contr->mode & PU_JEWELS)
1143 if (tmp->type == RING || tmp->type == AMULET)
1068 { 1144 {
1069 /* some debugging code to figure out item information */ 1145 CHK_PICK_PICKUP;
1070 if (tmp->name != NULL)
1071 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1072 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1073 else
1074 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1075 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1076
1077 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1078 }
1079
1080 /* philosophy:
1081 * It's easy to grab an item type from a pile, as long as it's
1082 * generic. This takes no game-time. For more detailed pickups
1083 * and selections, select-items should be used. This is a
1084 * grab-as-you-run type mode that's really useful for arrows for
1085 * example.
1086 * The drawback: right now it has no frontend, so you need to
1087 * stick the bits you want into a calculator in hex mode and then
1088 * convert to decimal and then 'pickup <#>
1089 */
1090
1091 /* the first two modes are exclusive: if NOTHING we return, if
1092 * STOP then we stop. All the rest are applied sequentially,
1093 * meaning if any test passes, the item gets picked up. */
1094
1095 /* if mode is set to pick nothing up, return */
1096
1097 if (op->contr->mode & PU_NOTHING)
1098 return 1;
1099
1100 /* if mode is set to stop when encountering objects, return */
1101 /* take STOP before INHIBIT since it doesn't actually pick
1102 * anything up */
1103
1104 if (op->contr->mode & PU_STOP)
1105 return 0;
1106
1107 /* useful for going into stores and not losing your settings... */
1108 /* and for battles wher you don't want to get loaded down while
1109 * fighting */
1110 if (op->contr->mode & PU_INHIBIT)
1111 return 1;
1112
1113 /* prevent us from turning into auto-thieves :) */
1114 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1115 continue; 1146 continue;
1147 }
1116 1148
1117 /* ignore known cursed objects */ 1149 /* we don't forget dragon food */
1118 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 1150 if (op->contr->mode & PU_FLESH)
1151 if (tmp->type == FLESH)
1152 {
1153 CHK_PICK_PICKUP;
1119 continue; 1154 continue;
1155 }
1120 1156
1121 /* all food and drink if desired */ 1157 /* bows and arrows. Bows are good for selling! */
1122 /* question: don't pick up known-poisonous stuff? */ 1158 if (op->contr->mode & PU_BOW)
1159 if (tmp->type == BOW)
1160 {
1161 CHK_PICK_PICKUP;
1162 continue;
1163 }
1164
1165 if (op->contr->mode & PU_ARROW)
1166 if (tmp->type == ARROW)
1167 {
1168 CHK_PICK_PICKUP;
1169 continue;
1170 }
1171
1172 /* all kinds of armor etc. */
1173 if (op->contr->mode & PU_ARMOUR)
1174 if (tmp->type == ARMOUR)
1175 {
1176 CHK_PICK_PICKUP;
1177 continue;
1178 }
1179
1180 if (op->contr->mode & PU_HELMET)
1181 if (tmp->type == HELMET)
1182 {
1183 CHK_PICK_PICKUP;
1184 continue;
1185 }
1186
1187 if (op->contr->mode & PU_SHIELD)
1188 if (tmp->type == SHIELD)
1189 {
1190 CHK_PICK_PICKUP;
1191 continue;
1192 }
1193
1123 if (op->contr->mode & PU_FOOD) 1194 if (op->contr->mode & PU_BOOTS)
1124 if (tmp->type == FOOD) 1195 if (tmp->type == BOOTS)
1196 {
1197 CHK_PICK_PICKUP;
1198 continue;
1199 }
1200
1201 if (op->contr->mode & PU_GLOVES)
1202 if (tmp->type == GLOVES)
1203 {
1204 CHK_PICK_PICKUP;
1205 continue;
1206 }
1207
1208 if (op->contr->mode & PU_CLOAK)
1209 if (tmp->type == CLOAK)
1210 {
1211 CHK_PICK_PICKUP;
1212 continue;
1213 }
1214
1215 /* hoping to catch throwing daggers here */
1216 if (op->contr->mode & PU_MISSILEWEAPON)
1217 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1218 {
1219 CHK_PICK_PICKUP;
1220 continue;
1221 }
1222
1223 /* careful: chairs and tables are weapons! */
1224 if (op->contr->mode & PU_ALLWEAPON)
1225 {
1226 if (tmp->type == WEAPON)
1227 if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1125 { 1228 {
1126 CHK_PICK_PICKUP; 1229 CHK_PICK_PICKUP;
1127 continue; 1230 continue;
1128 } 1231 }
1232 }
1129 1233
1234 /* misc stuff that's useful */
1130 if (op->contr->mode & PU_DRINK) 1235 if (op->contr->mode & PU_KEY)
1131 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1236 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1132 { 1237 {
1133 CHK_PICK_PICKUP; 1238 CHK_PICK_PICKUP;
1134 continue; 1239 continue;
1135 } 1240 }
1136 1241
1242 /* any of the last 4 bits set means we use the ratio for value
1243 * pickups */
1137 if (op->contr->mode & PU_POTION) 1244 if (op->contr->mode & PU_RATIO)
1138 if (tmp->type == POTION) 1245 {
1246 /* use value density to decide what else to grab */
1247 /* >=7 was >= op->contr->mode */
1248 /* >=7 is the old standard setting. Now we take the last 4 bits
1139 { 1249 */
1140 CHK_PICK_PICKUP;
1141 continue;
1142 }
1143
1144 /* spellbooks, skillscrolls and normal books/scrolls */
1145 if (op->contr->mode & PU_SPELLBOOK)
1146 if (tmp->type == SPELLBOOK)
1147 {
1148 CHK_PICK_PICKUP;
1149 continue;
1150 }
1151
1152 if (op->contr->mode & PU_SKILLSCROLL)
1153 if (tmp->type == SKILLSCROLL)
1154 {
1155 CHK_PICK_PICKUP;
1156 continue;
1157 }
1158
1159 if (op->contr->mode & PU_READABLES)
1160 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1161 {
1162 CHK_PICK_PICKUP;
1163 continue;
1164 }
1165
1166 /* wands/staves/rods/horns */
1167 if (op->contr->mode & PU_MAGIC_DEVICE)
1168 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1169 {
1170 CHK_PICK_PICKUP;
1171 continue;
1172 }
1173
1174 /* pick up all magical items */
1175 if (op->contr->mode & PU_MAGICAL) 1250 wvratio = op->contr->mode & PU_RATIO;
1176 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1251 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1177 {
1178 CHK_PICK_PICKUP;
1179 continue;
1180 }
1181
1182 if (op->contr->mode & PU_VALUABLES)
1183 { 1252 {
1184 if (tmp->type == MONEY || tmp->type == GEM) 1253#if 0
1254 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1255 if (tmp->name != NULL)
1185 { 1256 {
1186 CHK_PICK_PICKUP; 1257 fprintf (stderr, "%s", tmp->name);
1187 continue;
1188 } 1258 }
1189 }
1190
1191 /* rings & amulets - talismans seems to be typed AMULET */
1192 if (op->contr->mode & PU_JEWELS)
1193 if (tmp->type == RING || tmp->type == AMULET)
1194 {
1195 CHK_PICK_PICKUP;
1196 continue;
1197 }
1198
1199 /* we don't forget dragon food */
1200 if (op->contr->mode & PU_FLESH)
1201 if (tmp->type == FLESH)
1202 {
1203 CHK_PICK_PICKUP;
1204 continue;
1205 }
1206
1207 /* bows and arrows. Bows are good for selling! */
1208 if (op->contr->mode & PU_BOW)
1209 if (tmp->type == BOW)
1210 {
1211 CHK_PICK_PICKUP;
1212 continue;
1213 }
1214
1215 if (op->contr->mode & PU_ARROW)
1216 if (tmp->type == ARROW)
1217 {
1218 CHK_PICK_PICKUP;
1219 continue;
1220 }
1221
1222 /* all kinds of armor etc. */
1223 if (op->contr->mode & PU_ARMOUR)
1224 if (tmp->type == ARMOUR)
1225 {
1226 CHK_PICK_PICKUP;
1227 continue;
1228 }
1229
1230 if (op->contr->mode & PU_HELMET)
1231 if (tmp->type == HELMET)
1232 {
1233 CHK_PICK_PICKUP;
1234 continue;
1235 }
1236
1237 if (op->contr->mode & PU_SHIELD)
1238 if (tmp->type == SHIELD)
1239 {
1240 CHK_PICK_PICKUP;
1241 continue;
1242 }
1243
1244 if (op->contr->mode & PU_BOOTS)
1245 if (tmp->type == BOOTS)
1246 {
1247 CHK_PICK_PICKUP;
1248 continue;
1249 }
1250
1251 if (op->contr->mode & PU_GLOVES)
1252 if (tmp->type == GLOVES)
1253 {
1254 CHK_PICK_PICKUP;
1255 continue;
1256 }
1257
1258 if (op->contr->mode & PU_CLOAK)
1259 if (tmp->type == CLOAK)
1260 {
1261 CHK_PICK_PICKUP;
1262 continue;
1263 }
1264
1265 /* hoping to catch throwing daggers here */
1266 if (op->contr->mode & PU_MISSILEWEAPON)
1267 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1268 {
1269 CHK_PICK_PICKUP;
1270 continue;
1271 }
1272
1273 /* careful: chairs and tables are weapons! */
1274 if (op->contr->mode & PU_ALLWEAPON)
1275 {
1276 if (tmp->type == WEAPON && tmp->name != NULL)
1277 {
1278 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1279 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1280 {
1281 CHK_PICK_PICKUP;
1282 continue;
1283 }
1284 }
1285
1286 if (tmp->type == WEAPON && tmp->name == NULL)
1287 {
1288 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1289 {
1290 CHK_PICK_PICKUP;
1291 continue;
1292 }
1293 }
1294 }
1295
1296 /* misc stuff that's useful */
1297 if (op->contr->mode & PU_KEY)
1298 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1299 {
1300 CHK_PICK_PICKUP;
1301 continue;
1302 }
1303
1304 /* any of the last 4 bits set means we use the ratio for value
1305 * pickups */
1306 if (op->contr->mode & PU_RATIO)
1307 {
1308 /* use value density to decide what else to grab */
1309 /* >=7 was >= op->contr->mode */
1310 /* >=7 is the old standard setting. Now we take the last 4 bits
1311 */
1312 wvratio = op->contr->mode & PU_RATIO;
1313 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1314 {
1315 CHK_PICK_PICKUP;
1316#if 0
1317 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1318 if (tmp->name != NULL)
1319 {
1320 fprintf (stderr, "%s", tmp->name);
1321 }
1322 else 1259 else
1323 fprintf (stderr, "%s", tmp->arch->archname); 1260 fprintf (stderr, "%s", tmp->arch->archname);
1324 fprintf (stderr, ",%d] = ", tmp->type); 1261 fprintf (stderr, ",%d] = ", tmp->type);
1325 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1262 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1326#endif 1263#endif
1264 CHK_PICK_PICKUP;
1327 continue; 1265 continue;
1328 }
1329 } 1266 }
1330 } /* the new pickup model */ 1267 } /* the new pickup model */
1331 } 1268 }
1332 1269
1333 return !stop; 1270 return !stop;
… …
1361 * against the target. A full test is not performed, simply a basic test 1298 * against the target. A full test is not performed, simply a basic test
1362 * of resistances. The archer is making a quick guess at what he sees down 1299 * of resistances. The archer is making a quick guess at what he sees down
1363 * the hall. Failing that it does it's best to pick the highest plus arrow. 1300 * the hall. Failing that it does it's best to pick the highest plus arrow.
1364 */ 1301 */
1365object * 1302object *
1366find_better_arrow (object *op, object *target, const char *type, int *better) 1303find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1367{ 1304{
1368 object *tmp = NULL, *arrow, *ntmp; 1305 object *tmp = NULL, *arrow, *ntmp;
1369 int attacknum, attacktype, betterby = 0, i; 1306 int attacknum, attacktype, betterby = 0, i;
1370 1307
1371 if (!type) 1308 if (!type)
… …
1375 { 1312 {
1376 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1313 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1377 { 1314 {
1378 i = 0; 1315 i = 0;
1379 ntmp = find_better_arrow (arrow, target, type, &i); 1316 ntmp = find_better_arrow (arrow, target, type, &i);
1317
1380 if (i > betterby) 1318 if (i > betterby)
1381 { 1319 {
1382 tmp = ntmp; 1320 tmp = ntmp;
1383 betterby = i; 1321 betterby = i;
1384 } 1322 }
1385 } 1323 }
1386 else if (arrow->type == ARROW && arrow->race == type) 1324 else if (arrow->type == ARROW && arrow->race == type)
1387 { 1325 {
1388 /* allways prefer assasination/slaying */ 1326 /* allways prefer assasination/slaying */
1389 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race)) 1327 if (target->race && arrow->slaying.contains (target->race))
1390 { 1328 {
1391 if (arrow->attacktype & AT_DEATH) 1329 if (arrow->attacktype & AT_DEATH)
1392 { 1330 {
1393 *better = 100; 1331 *better = 100;
1394 return arrow; 1332 return arrow;
… …
1409 { 1347 {
1410 tmp = arrow; 1348 tmp = arrow;
1411 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100; 1349 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1412 } 1350 }
1413 } 1351 }
1352
1414 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1353 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1415 { 1354 {
1416 tmp = arrow; 1355 tmp = arrow;
1417 betterby = 2 + arrow->magic + arrow->stats.dam; 1356 betterby = 2 + arrow->magic + arrow->stats.dam;
1418 } 1357 }
1358
1419 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1359 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1420 { 1360 {
1421 tmp = arrow; 1361 tmp = arrow;
1422 betterby = 1 + arrow->magic + arrow->stats.dam; 1362 betterby = 1 + arrow->magic + arrow->stats.dam;
1423 } 1363 }
… …
1437 * op = the shooter 1377 * op = the shooter
1438 * type = bow->race 1378 * type = bow->race
1439 * dir = fire direction 1379 * dir = fire direction
1440 */ 1380 */
1441object * 1381object *
1442pick_arrow_target (object *op, const char *type, int dir) 1382pick_arrow_target (object *op, shstr_cmp type, int dir)
1443{ 1383{
1444 object *tmp = NULL; 1384 object *tmp = NULL;
1445 maptile *m; 1385 maptile *m;
1446 int i, mflags, found, number; 1386 int i, mflags, found, number;
1447 sint16 x, y; 1387 sint16 x, y;
… …
1462 for (i = 0, found = 0; i < 20; i++) 1402 for (i = 0, found = 0; i < 20; i++)
1463 { 1403 {
1464 x += freearr_x[dir]; 1404 x += freearr_x[dir];
1465 y += freearr_y[dir]; 1405 y += freearr_y[dir];
1466 mflags = get_map_flags (m, &m, x, y, &x, &y); 1406 mflags = get_map_flags (m, &m, x, y, &x, &y);
1407
1467 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1408 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1468 { 1409 {
1469 tmp = NULL; 1410 tmp = 0;
1470 break; 1411 break;
1471 } 1412 }
1472 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1413 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1473 { 1414 {
1474 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1415 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1475 * perhaps a bad assumption. 1416 * perhaps a bad assumption.
1476 */ 1417 */
1477 tmp = NULL; 1418 tmp = 0;
1478 break; 1419 break;
1479 } 1420 }
1421
1480 if (mflags & P_IS_ALIVE) 1422 if (mflags & P_IS_ALIVE)
1481 {
1482 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1423 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1483 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1424 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1484 {
1485 found++;
1486 break;
1487 }
1488 if (found)
1489 break; 1425 break;
1490 }
1491 } 1426 }
1492 if (tmp == NULL) 1427
1428 if (!tmp)
1493 return find_arrow (op, type); 1429 return find_arrow (op, type);
1494 1430
1495 if (tmp->head) 1431 if (tmp->head)
1496 tmp = tmp->head; 1432 tmp = tmp->head;
1497 1433
… …
1542 if (bow->below) 1478 if (bow->below)
1543 { 1479 {
1544 bow->remove (); 1480 bow->remove ();
1545 op->insert (bow); 1481 op->insert (bow);
1546 } 1482 }
1547
1548 } 1483 }
1549 1484
1550 if (!bow->race || !bow->skill) 1485 if (!bow->race || !bow->skill)
1551 { 1486 {
1552 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1487 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1579 1514
1580 /* this should not happen, but sometimes does */ 1515 /* this should not happen, but sometimes does */
1581 if (arrow->nrof == 0) 1516 if (arrow->nrof == 0)
1582 { 1517 {
1583 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ()); 1518 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1584 arrow->destroy (true); 1519 arrow->destroy ();
1585 return 0; 1520 return 0;
1586 } 1521 }
1587 1522
1588 left = arrow; /* these are arrows left to the player */ 1523 left = arrow; /* these are arrows left to the player */
1589 arrow = arrow->split (); 1524 arrow = arrow->split ();
… …
1675 * hence the function name. 1610 * hence the function name.
1676 */ 1611 */
1677int 1612int
1678player_fire_bow (object *op, int dir) 1613player_fire_bow (object *op, int dir)
1679{ 1614{
1680 int ret = 0, wcmod = 0; 1615 int ret;
1681 1616
1682 if (op->contr->bowtype == bow_bestarrow) 1617 if (op->contr->bowtype == bow_bestarrow)
1683 { 1618 {
1684 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); 1619 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1685 } 1620 }
1686 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1621 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1687 { 1622 {
1688 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1623 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1689 wcmod = -1;
1690
1691 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1624 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1692 } 1625 }
1693 else if (op->contr->bowtype == bow_threewide) 1626 else if (op->contr->bowtype == bow_threewide)
1694 { 1627 {
1695 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1628 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1696 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); 1629 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1697 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]); 1630 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1698 } 1631 }
1699 else if (op->contr->bowtype == bow_spreadshot) 1632 else if (op->contr->bowtype == bow_spreadshot)
1700 { 1633 {
1701 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1634 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1702 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1635 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1703 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1636 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1704 } 1637 }
1705 else 1638 else
1706 { 1639 {
… …
1763 } 1696 }
1764 } 1697 }
1765 1698
1766 if (cast_spell (op, item, dir, item->inv, NULL)) 1699 if (cast_spell (op, item, dir, item->inv, NULL))
1767 { 1700 {
1768 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1701 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1702
1769 if (item->type == WAND) 1703 if (item->type == WAND)
1770 { 1704 {
1771 if (!(--item->stats.food)) 1705 if (!(--item->stats.food))
1772 { 1706 {
1773 object *tmp; 1707 object *tmp;
… …
1793bool 1727bool
1794fire (object *op, int dir) 1728fire (object *op, int dir)
1795{ 1729{
1796 int spellcost = 0; 1730 int spellcost = 0;
1797 1731
1798 /* check for loss of invisiblity/hide */
1799 if (action_makes_visible (op))
1800 make_visible (op);
1801
1802 player *pl = op->contr; 1732 player *pl = op->contr;
1803 1733
1804 if (pl->golem) 1734 if (pl->golem)
1805 { 1735 {
1806 control_golem (op->contr->golem, dir); 1736 control_golem (op->contr->golem, dir);
… …
1808 } 1738 }
1809 1739
1810 object *ob = pl->ranged_ob; 1740 object *ob = pl->ranged_ob;
1811 1741
1812 if (!ob) 1742 if (!ob)
1813 return false;
1814
1815 if (!op->change_weapon (ob))
1816 return false; 1743 return false;
1817 1744
1818 if (op->speed_left > 0.f) 1745 if (op->speed_left > 0.f)
1819 --op->speed_left; 1746 --op->speed_left;
1820 else 1747 else
1821 return false; 1748 return false;
1749
1750 if (!op->change_weapon (ob))
1751 return false;
1752
1753 /* check for loss of invisiblity/hide */
1754 if (action_makes_visible (op))
1755 make_visible (op);
1822 1756
1823 switch (ob->type) 1757 switch (ob->type)
1824 { 1758 {
1825 case BOW: 1759 case BOW:
1826 player_fire_bow (op, dir); 1760 player_fire_bow (op, dir);
… …
1919 * Change the color so that the message doesn't disappear with 1853 * Change the color so that the message doesn't disappear with
1920 * all the others. 1854 * all the others.
1921 */ 1855 */
1922 if (pl->contr->usekeys == key_inventory || 1856 if (pl->contr->usekeys == key_inventory ||
1923 !QUERY_FLAG (container, FLAG_APPLIED) || 1857 !QUERY_FLAG (container, FLAG_APPLIED) ||
1924 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1858 (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1925 { 1859 {
1926 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1860 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1927 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1861 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1928 return NULL; 1862 return NULL;
1929 } 1863 }
… …
2071 --op->speed_left; 2005 --op->speed_left;
2072 2006
2073 op->play_sound (sound_find ("push_player")); 2007 op->play_sound (sound_find ("push_player"));
2074 push_ob (mon, dir, op); 2008 push_ob (mon, dir, op);
2075 2009
2076 if (op->contr->tmp_invis || op->hide) 2010 if (action_makes_visible (op))
2077 make_visible (op); 2011 make_visible (op);
2078 2012
2079 return true; 2013 return true;
2080 } 2014 }
2081 else 2015 else
… …
2103 push_ob (mon, dir, op); 2037 push_ob (mon, dir, op);
2104 } 2038 }
2105 else 2039 else
2106 op->statusmsg ("You withhold your attack"); 2040 op->statusmsg ("You withhold your attack");
2107 2041
2108 if (op->contr->tmp_invis || op->hide) 2042 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2109 make_visible (op); 2043 make_visible (op);
2110 2044
2111 return true; 2045 return true;
2112 } 2046 }
2113 } 2047 }
… …
2171 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2105 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2172 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2106 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2173 2107
2174 op->facing = dir; 2108 op->facing = dir;
2175 2109
2176 if (op->hide) 2110 if (op->flag [FLAG_HIDDEN])
2177 do_hidden_move (op); 2111 do_hidden_move (op);
2178 2112
2179 bool retval; 2113 bool retval;
2180 2114
2181 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2115 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
… …
2253 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2187 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2254 { 2188 {
2255 op->play_sound (sound_find ("ob_evaporate")); 2189 op->play_sound (sound_find ("ob_evaporate"));
2256 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2190 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2257 2191
2258 tmp->destroy (true); 2192 tmp->destroy ();
2259 CLEAR_FLAG (op, FLAG_LIFESAVE); 2193 CLEAR_FLAG (op, FLAG_LIFESAVE);
2260 2194
2261 if (op->stats.hp < 0) 2195 if (op->stats.hp < 0)
2262 op->stats.hp = op->stats.maxhp; 2196 op->stats.hp = op->stats.maxhp;
2263 2197
… …
2499 { 2433 {
2500 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2434 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2501 2435
2502 if (over_hp > 0) 2436 if (over_hp > 0)
2503 { 2437 {
2504 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2438 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2505 op->last_heal = 0; 2439 op->last_heal = 0;
2506 } 2440 }
2507 else 2441 else
2508 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2442 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2509 } 2443 }
… …
2569 op->stats.food = 0; 2503 op->stats.food = 0;
2570 2504
2571 if (op->stats.hp < 0) 2505 if (op->stats.hp < 0)
2572 { 2506 {
2573 op->contr->killer = archetype::get ("killer_starvation"); 2507 op->contr->killer = archetype::get ("killer_starvation");
2574 op->contr->killer->destroy (true); 2508 op->contr->killer->destroy ();
2575 } 2509 }
2576 } 2510 }
2577 2511
2578 /* killer should be set here already */ 2512 /* killer should be set here already */
2579 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2513 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
… …
2588 */ 2522 */
2589void 2523void
2590kill_player (object *op) 2524kill_player (object *op)
2591{ 2525{
2592 int x, y; 2526 int x, y;
2593 char buf[MAX_BUF];
2594 maptile *map; /* this is for resurrection */ 2527 maptile *map; /* this is for resurrection */
2595 int will_kill_again; 2528 int will_kill_again;
2596 archetype *at; 2529 archetype *at;
2597 object *tmp; 2530 object *tmp;
2598 2531
2599 if (save_life (op)) 2532 if (save_life (op))
2600 return; 2533 return;
2534
2535 dynbuf_text deathtab;
2536
2537 /* restore player */
2538 at = archetype::find ("poisoning");
2539 if (object *tmp = present_arch_in_ob (at, op))
2540 {
2541 tmp->destroy ();
2542 deathtab << "Your body feels cleansed...\r";
2543 }
2544
2545 at = archetype::find ("confusion");
2546 if (object *tmp = present_arch_in_ob (at, op))
2547 {
2548 tmp->destroy ();
2549 deathtab << "Your mind feels clearer...\r";
2550 }
2551
2552 cure_disease (op, 0, 0); /* remove any disease */
2553
2554 max_it (op->stats.hp , op->stats.maxhp);
2555 max_it (op->stats.sp , op->stats.maxsp);
2556 max_it (op->stats.grace, op->stats.maxgrace);
2557
2558 if (op->stats.food <= 0)
2559 op->stats.food = 999;
2560
2561 // remove all spell effects that are active
2562 // to avoid long-term effects such as word-of-recall
2563 for (object *item = op->inv; item; )
2564 {
2565 object *next = item->below;
2566
2567 if (item->type == SPELL_EFFECT && item->active)
2568 item->destroy ();
2569
2570 item = next;
2571 }
2601 2572
2602 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2573 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2603 * in cities ONLY!!! It is very important that this doesn't get abused. 2574 * in cities ONLY!!! It is very important that this doesn't get abused.
2604 * Look at op_on_battleground() for more info --AndreasV 2575 * Look at op_on_battleground() for more info --AndreasV
2605 */ 2576 */
2606 if (op_on_battleground (op, &x, &y)) 2577 if (op_on_battleground (op, &x, &y))
2607 { 2578 {
2608 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2579 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2609 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2610
2611 /* restore player */
2612 at = archetype::find ("poisoning");
2613 if (object *tmp = present_arch_in_ob (at, op))
2614 {
2615 tmp->destroy (true);
2616 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2617 }
2618
2619 at = archetype::find ("confusion");
2620 if (object *tmp = present_arch_in_ob (at, op))
2621 {
2622 tmp->destroy (true);
2623 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2624 }
2625
2626 cure_disease (op, 0, 0); /* remove any disease */
2627 op->stats.hp = op->stats.maxhp;
2628 if (op->stats.food <= 0)
2629 op->stats.food = 999;
2630 2580
2631 /* create a bodypart-trophy to make the winner happy */ 2581 /* create a bodypart-trophy to make the winner happy */
2632 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2582 if (object *tmp = arch_to_object (archetype::find ("finger")))
2633 { 2583 {
2634 tmp->name = format ("%s's finger" , &op->name); 2584 tmp->name = format ("%s's finger" , &op->name);
… …
2645 } 2595 }
2646 2596
2647 /* teleport defeated player to new destination */ 2597 /* teleport defeated player to new destination */
2648 transfer_ob (op, x, y, 0, NULL); 2598 transfer_ob (op, x, y, 0, NULL);
2649 op->contr->braced = 0; 2599 op->contr->braced = 0;
2600
2601 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2650 return; 2602 return;
2651 } 2603 }
2604
2605 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2606 deathtab << "T<YOU HAVE DIED>\n\n";
2652 2607
2653 INVOKE_PLAYER (DEATH, op->contr); 2608 INVOKE_PLAYER (DEATH, op->contr);
2654 2609
2655 command_kill_pets (op, 0); 2610 command_kill_pets (op, 0);
2656 2611
… …
2690 2645
2691 lost_a_stat = 0; 2646 lost_a_stat = 0;
2692 2647
2693 for (z = 0; z < num_stats_lose; z++) 2648 for (z = 0; z < num_stats_lose; z++)
2694 { 2649 {
2695 i = RANDOM () % NUM_STATS; 2650 i = rndm (NUM_STATS);
2696 2651
2697 if (settings.stat_loss_on_death) 2652 if (settings.stat_loss_on_death)
2698 { 2653 {
2699 /* Pick a random stat and take a point off it. Tell the player 2654 /* Pick a random stat and take a point off it. Tell the player
2700 * what he lost. 2655 * what he lost.
… …
2751 } 2706 }
2752 } 2707 }
2753 2708
2754 if (lose_this_stat) 2709 if (lose_this_stat)
2755 { 2710 {
2756 this_stat = get_attr_value (&(dep->stats), i); 2711 this_stat = get_attr_value (&dep->stats, i);
2757 /* We could try to do something clever like find another 2712 /* We could try to do something clever like find another
2758 * stat to reduce if this fails. But chances are, if 2713 * stat to reduce if this fails. But chances are, if
2759 * stats have been depleted to -50, all are pretty low 2714 * stats have been depleted to -50, all are pretty low
2760 * and should be roughly the same, so it shouldn't make a 2715 * and should be roughly the same, so it shouldn't make a
2761 * difference. 2716 * difference.
… …
2775 /* If no stat lost, tell the player. */ 2730 /* If no stat lost, tell the player. */
2776 if (!lost_a_stat) 2731 if (!lost_a_stat)
2777 { 2732 {
2778 /* determine_god() seems to not work sometimes... why is this? 2733 /* determine_god() seems to not work sometimes... why is this?
2779 Should I be using something else? GD */ 2734 Should I be using something else? GD */
2780 const char *god = determine_god (op); 2735 shstr_tmp god = determine_god (op);
2781 2736
2782 if (god && (strcmp (god, "none"))) 2737 if (god != shstr_none)
2783 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2738 deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2784 else 2739 else
2785 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2740 deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2786 } 2741 }
2787#else 2742#else
2788 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely."); 2743 deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2789#endif 2744#endif
2790 2745
2791 /* Put a gravestone up where the character 'almost' died. List the 2746 /* Put a gravestone up where the character 'almost' died. List the
2792 * exp loss on the stone. 2747 * exp loss on the stone.
2793 */ 2748 */
… …
2800 insert_ob_in_map (tmp, op->map, NULL, 0); 2755 insert_ob_in_map (tmp, op->map, NULL, 0);
2801 2756
2802 /**************************************/ 2757 /**************************************/
2803 /* */ 2758 /* */
2804 /* Subtract the experience points, */ 2759 /* Subtract the experience points, */
2805 /* if we died cause of food, give us */
2806 /* food, and reset HP's... */
2807 /* */ 2760 /* */
2808 /**************************************/ 2761 /**************************************/
2809 2762
2810 /* remove any poisoning and confusion the character may be suffering. */
2811 /* restore player */
2812 at = archetype::find ("poisoning");
2813 tmp = present_arch_in_ob (at, op);
2814
2815 if (tmp)
2816 {
2817 tmp->destroy (true);
2818 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2819 }
2820
2821 at = archetype::find ("confusion");
2822 tmp = present_arch_in_ob (at, op);
2823 if (tmp)
2824 {
2825 tmp->destroy (true);
2826 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2827 }
2828
2829 cure_disease (op, 0, 0); /* remove any disease */
2830
2831 // remove all spell effects that are active
2832 // to avoid long-term effects such as word-of-recall
2833 for (object *item = op->inv; item; )
2834 {
2835 object *next = item->below;
2836
2837 if (item->type == SPELL_EFFECT && item->active)
2838 item->destroy (true);
2839
2840 item = next;
2841 }
2842
2843 /*add_exp(op, (op->stats.exp * -0.20)); */ 2763 /*add_exp(op, (op->stats.exp * -0.20)); */
2844 apply_death_exp_penalty (op); 2764 apply_death_exp_penalty (op);
2845
2846 if (op->stats.food < 100)
2847 op->stats.food = 900;
2848
2849 op->stats.hp = op->stats.maxhp;
2850 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2851 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2852 2765
2853 /* 2766 /*
2854 * Check to see if the player has any unpaid items. If so, remove them 2767 * Check to see if the player has any unpaid items. If so, remove them
2855 * and put them back in the map. 2768 * and put them back in the map.
2856 */ 2769 */
… …
2893 2806
2894 insert_ob_in_ob (force, op); 2807 insert_ob_in_ob (force, op);
2895 op->update_stats (); 2808 op->update_stats ();
2896 } 2809 }
2897 2810
2898 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2811 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2899} 2812}
2900 2813
2901void 2814void
2902loot_object (object *op) 2815loot_object (object *op)
2903{ /* Grab and destroy some treasure */ 2816{ /* Grab and destroy some treasure */
… …
2924 { 2837 {
2925 tmp->decrease (rndm (1, tmp->nrof - 1)); 2838 tmp->decrease (rndm (1, tmp->nrof - 1));
2926 insert_ob_in_map (tmp, op->map, NULL, 0); 2839 insert_ob_in_map (tmp, op->map, NULL, 0);
2927 } 2840 }
2928 else 2841 else
2929 tmp->destroy (true); 2842 tmp->destroy ();
2930 } 2843 }
2931 else 2844 else
2932 insert_ob_in_map (tmp, op->map, NULL, 0); 2845 insert_ob_in_map (tmp, op->map, NULL, 0);
2933 } 2846 }
2934} 2847}
… …
2995 if (op->type == PLAYER) 2908 if (op->type == PLAYER)
2996 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name); 2909 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
2997 2910
2998 cast_spell (op, throw_ob, dir, spob, NULL); 2911 cast_spell (op, throw_ob, dir, spob, NULL);
2999 2912
3000 throw_ob->destroy (true); 2913 throw_ob->destroy ();
3001} 2914}
3002 2915
3003void 2916void
3004make_visible (object *op) 2917make_visible (object *op)
3005{ 2918{
3006 op->hide = 0; 2919 op->flag [FLAG_HIDDEN] = 0;
3007 op->invisible = 0; 2920 op->invisible = 0;
3008 2921
3009 if (op->type == PLAYER) 2922 if (op->type == PLAYER)
3010 { 2923 {
3011 op->contr->tmp_invis = 0; 2924 op->contr->tmp_invis = 0;
… …
3036 2949
3037 if (!ob || !ob->map) 2950 if (!ob || !ob->map)
3038 return 0; 2951 return 0;
3039 2952
3040 /* so, on normal lighted maps, its hard to hide */ 2953 /* so, on normal lighted maps, its hard to hide */
3041 level = ob->map->darkness - 2; 2954 level = ob->map->darklevel () - 2;
3042 2955
3043 /* this also picks up whether the object is glowing. 2956 /* this also picks up whether the object is glowing.
3044 * If you carry a light on a non-dark map, its not 2957 * If you carry a light on a non-dark map, its not
3045 * as bad as carrying a light on a pitch dark map */ 2958 * as bad as carrying a light on a pitch dark map */
3046 if (has_carried_lights (ob)) 2959 if (ob->has_carried_lights ())
3047 level = -(10 + (2 * ob->map->darkness)); 2960 level = -(10 + (2 * ob->map->darklevel ()));
3048 2961
3049 /* scan through all nearby squares for terrain to hide in */ 2962 /* scan through all nearby squares for terrain to hide in */
3050 for (i = 0, x = ob->x, y = ob->y; 2963 for (i = 0, x = ob->x, y = ob->y;
3051 i <= SIZEOFFREE1; 2964 i <= SIZEOFFREE1;
3052 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 2965 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
… …
3199 while (op) 3112 while (op)
3200 { 3113 {
3201 dx = rv.distance_x + op->arch->x; 3114 dx = rv.distance_x + op->arch->x;
3202 dy = rv.distance_y + op->arch->y; 3115 dy = rv.distance_y + op->arch->y;
3203 3116
3204 /* only the viewable area the player sees is updated by LOS 3117 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3205 * code, so we need to restrict ourselves to that range of values
3206 * for any meaningful values.
3207 */
3208 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3209 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3210 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3211 return 1; 3118 return 1;
3212 3119
3213 op = op->more; 3120 op = op->more;
3214 } 3121 }
3215 3122
3216 return 0; 3123 return 0;
3217} 3124}
3218 3125
3219/* routine for both players and monsters. We call this when 3126/* routine for both players and monsters. We call this when
3220 * there is a possibility for our action distrubing our hiding 3127 * there is a possibility for our action distrubing our hiding
3221 * place or invisiblity spell. Artefact invisiblity is not 3128 * place or invisiblity spell. Artefact invisiblity causes
3222 * effected by this. If we arent invisible to begin with, we 3129 * "noise" instead. If we arent invisible to begin with, we
3223 * return 0. 3130 * return 0.
3224 */ 3131 */
3225int 3132int
3226action_makes_visible (object *op) 3133action_makes_visible (object *op)
3227{ 3134{
3228 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3135 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3229 { 3136 {
3230 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3137 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3138 {
3139 // artefact invisibility is permanent, but we still make noise
3140 // this is important for game-balance.
3141 if (op->contr)
3142 op->make_noise ();
3143
3231 return 0; 3144 return 0;
3145 }
3232 3146
3233 if (op->contr && op->contr->tmp_invis == 0) 3147 if (op->contr && op->contr->tmp_invis == 0)
3234 return 0; 3148 return 0;
3235 3149
3236 /* If monsters, they should become visible */ 3150 /* If monsters, they should become visible */
3237 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) 3151 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3238 { 3152 {
3239 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3153 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3240 return 1; 3154 return 1;
3241 } 3155 }
3242 } 3156 }
3243 3157
3244 return 0; 3158 return 0;
… …
3472 if (pl->ranged_ob == ob) 3386 if (pl->ranged_ob == ob)
3473 pl->ranged_ob = 0; 3387 pl->ranged_ob = 0;
3474} 3388}
3475 3389
3476sint8 3390sint8
3477player::visibility_at (maptile *map, int x, int y) const 3391player::darkness_at (maptile *map, int x, int y) const
3478{ 3392{
3479 if (!ns) 3393 if (!ns)
3480 return 0; 3394 return LOS_BLOCKED;
3481 3395
3482 int dx, dy; 3396 int dx, dy;
3483 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3397 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3484 return 0; 3398 return LOS_BLOCKED;
3485 3399
3486 x += dx - ns->current_x + ns->mapx / 2; 3400 x += dx - ns->current_x;
3487 y += dy - ns->current_y + ns->mapy / 2; 3401 y += dy - ns->current_y;
3488 3402
3489 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3490 return 0;
3491
3492 return 100 - blocked_los [x][y]; 3403 return blocked_los (x, y);
3493} 3404}
3494 3405
3495void 3406void
3496player::infobox (const char *title, const char *msg, int color) 3407player::infobox (const char *title, const char *msg, int color)
3497{ 3408{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines