… | |
… | |
147 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
147 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
148 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news); |
148 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news); |
149 | close_and_delete (fp, comp); |
149 | close_and_delete (fp, comp); |
150 | } |
150 | } |
151 | |
151 | |
|
|
152 | float |
|
|
153 | player::weapon_speed () const |
|
|
154 | { |
|
|
155 | return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary |
|
|
156 | } |
|
|
157 | |
152 | /* This loads the first map an puts the player on it. */ |
158 | /* This loads the first map an puts the player on it. */ |
153 | static void |
159 | static void |
154 | set_first_map (object *op) |
160 | set_first_map (object *op) |
155 | { |
161 | { |
156 | op->contr->maplevel = first_map_path; |
162 | op->contr->maplevel = first_map_path; |
… | |
… | |
319 | player::set_object (object *op) |
325 | player::set_object (object *op) |
320 | { |
326 | { |
321 | ob = op; |
327 | ob = op; |
322 | ob->contr = this; /* this aren't yet in archetype */ |
328 | ob->contr = this; /* this aren't yet in archetype */ |
323 | |
329 | |
324 | ob->speed_left = 0.5; |
330 | ob->speed_left = 0.5f; |
325 | ob->speed = 1.0; |
331 | ob->speed = 1.0f; |
326 | ob->direction = 5; /* So player faces south */ |
332 | ob->direction = 5; /* So player faces south */ |
327 | } |
333 | } |
328 | |
334 | |
329 | player::player () |
335 | player::player () |
330 | { |
336 | { |
… | |
… | |
1544 | { |
1550 | { |
1545 | new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); |
1551 | new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); |
1546 | return 0; |
1552 | return 0; |
1547 | } |
1553 | } |
1548 | |
1554 | |
1549 | if (player *pl = op->contr) |
1555 | if (op->contr) |
1550 | { |
1556 | bow = op->current_weapon; |
1551 | bow = pl->ranged_ob; |
|
|
1552 | if (!op->change_weapon (bow)) |
|
|
1553 | return 0; |
|
|
1554 | } |
|
|
1555 | else |
1557 | else |
1556 | { |
1558 | { |
1557 | for (bow = op->inv; bow; bow = bow->below) |
1559 | for (bow = op->inv; bow; bow = bow->below) |
1558 | /* Don't check for applied - monsters don't apply bows - in that way, they |
1560 | /* Don't check for applied - monsters don't apply bows - in that way, they |
1559 | * don't need to switch back and forth between bows and weapons. |
1561 | * don't need to switch back and forth between bows and weapons. |
… | |
… | |
1632 | if (arrow->slaying) |
1634 | if (arrow->slaying) |
1633 | arrow->spellarg = strdup (arrow->slaying); |
1635 | arrow->spellarg = strdup (arrow->slaying); |
1634 | |
1636 | |
1635 | if (player *pl = op->contr) |
1637 | if (player *pl = op->contr) |
1636 | { |
1638 | { |
|
|
1639 | if (!pl->has_hit) |
|
|
1640 | { |
1637 | pl->has_hit = 1; |
1641 | pl->has_hit = 1; |
|
|
1642 | pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed; |
|
|
1643 | } |
1638 | #if 0 |
1644 | #if 0 |
1639 | float speed = pl->weapon_sp; |
1645 | float speed = pl->weapon_sp; |
1640 | |
1646 | |
1641 | /* penalize ROF for bestarrow */ |
1647 | /* penalize ROF for bestarrow */ |
1642 | if (pl->bowtype == bow_bestarrow) |
1648 | if (pl->bowtype == bow_bestarrow) |
… | |
… | |
1746 | } |
1752 | } |
1747 | |
1753 | |
1748 | return ret; |
1754 | return ret; |
1749 | } |
1755 | } |
1750 | |
1756 | |
1751 | |
|
|
1752 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1757 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1753 | * Broken apart from 'fire' to keep it more readable. |
1758 | * Broken apart from 'fire' to keep it more readable. |
1754 | */ |
1759 | */ |
1755 | void |
1760 | void |
1756 | fire_misc_object (object *op, int dir) |
1761 | fire_misc_object (object *op, int dir) |
… | |
… | |
1844 | object *ob = pl->ranged_ob; |
1849 | object *ob = pl->ranged_ob; |
1845 | |
1850 | |
1846 | if (!ob) |
1851 | if (!ob) |
1847 | return; |
1852 | return; |
1848 | |
1853 | |
|
|
1854 | if (!op->change_weapon (ob)) |
|
|
1855 | return; |
|
|
1856 | |
1849 | switch (ob->type) |
1857 | switch (ob->type) |
1850 | { |
1858 | { |
1851 | case BOW: |
1859 | case BOW: |
1852 | player_fire_bow (op, dir); |
1860 | player_fire_bow (op, dir); |
1853 | break; |
1861 | break; |
… | |
… | |
1859 | case BUILDER: |
1867 | case BUILDER: |
1860 | apply_map_builder (op, dir); |
1868 | apply_map_builder (op, dir); |
1861 | break; |
1869 | break; |
1862 | |
1870 | |
1863 | case SKILL: |
1871 | case SKILL: |
1864 | case SKILL_TOOL: |
|
|
1865 | do_skill (op, op, ob, dir, 0); |
1872 | do_skill (op, op, ob, dir, 0); |
1866 | break; |
1873 | break; |
1867 | |
1874 | |
1868 | default: |
1875 | default: |
1869 | fire_misc_object (op, dir); |
1876 | fire_misc_object (op, dir); |
… | |
… | |
2167 | * that party_number -1 is no party, so attacks can still happen. |
2174 | * that party_number -1 is no party, so attacks can still happen. |
2168 | */ |
2175 | */ |
2169 | else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && |
2176 | else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && |
2170 | ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) |
2177 | ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) |
2171 | { |
2178 | { |
|
|
2179 | if (!op->contr->has_hit) |
|
|
2180 | { |
2172 | op->contr->has_hit = 1; |
2181 | op->contr->has_hit = 1; |
|
|
2182 | op->speed_left += op->contr->weapon_speed () - op->speed; |
|
|
2183 | } |
2173 | |
2184 | |
2174 | skill_attack (mon, op, 0, 0, 0); |
2185 | skill_attack (mon, op, 0, 0, 0); |
2175 | |
2186 | |
2176 | /* If attacking another player, that player gets automatic |
2187 | /* If attacking another player, that player gets automatic |
2177 | * hitback, and doesn't loose luck either. |
2188 | * hitback, and doesn't loose luck either. |
… | |
… | |
2270 | * called, so we recheck it here. |
2281 | * called, so we recheck it here. |
2271 | */ |
2282 | */ |
2272 | if (op->contr->ns->handle_command ()) |
2283 | if (op->contr->ns->handle_command ()) |
2273 | return 1; |
2284 | return 1; |
2274 | |
2285 | |
2275 | if (op->speed_left > 0) |
2286 | if (op->speed_left > 0.f) |
2276 | { |
2287 | { |
2277 | if (op->direction && (op->contr->run_on || op->contr->fire_on)) |
2288 | if (op->direction && (op->contr->run_on || op->contr->fire_on)) |
2278 | { |
2289 | { |
2279 | /* All move commands take 1 tick, at least for now */ |
2290 | /* All move commands take 1 tick, at least for now */ |
2280 | --op->speed_left; |
2291 | --op->speed_left; |
… | |
… | |
2283 | * of it. Also, some of the skill stuff is only put in |
2294 | * of it. Also, some of the skill stuff is only put in |
2284 | * there, as well as the confusion stuff. |
2295 | * there, as well as the confusion stuff. |
2285 | */ |
2296 | */ |
2286 | move_player (op, op->direction); |
2297 | move_player (op, op->direction); |
2287 | |
2298 | |
2288 | return op->speed_left > 0; |
2299 | return op->speed_left > 0.f; |
2289 | } |
2300 | } |
2290 | } |
2301 | } |
2291 | |
2302 | |
2292 | return 0; |
2303 | return 0; |
2293 | } |
2304 | } |
… | |
… | |
2923 | object *force; |
2934 | object *force; |
2924 | int at; |
2935 | int at; |
2925 | |
2936 | |
2926 | force = get_archetype (FORCE_NAME); |
2937 | force = get_archetype (FORCE_NAME); |
2927 | /* 50 ticks should be enough time for the spell to abate */ |
2938 | /* 50 ticks should be enough time for the spell to abate */ |
2928 | force->speed = 0.1; |
2939 | force->speed = 0.1f; |
2929 | force->speed_left = -5.0; |
2940 | force->speed_left = -5.f; |
2930 | SET_FLAG (force, FLAG_APPLIED); |
2941 | SET_FLAG (force, FLAG_APPLIED); |
2931 | for (at = 0; at < NROFATTACKS; at++) |
2942 | for (at = 0; at < NROFATTACKS; at++) |
2932 | if (will_kill_again & (1 << at)) |
2943 | if (will_kill_again & (1 << at)) |
2933 | force->resist[at] = 100; |
2944 | force->resist[at] = 100; |
2934 | |
2945 | |