summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player-act.cc
Commit message (Collapse)AuthorAgeFilesLines
* "Maras are frozen" -> "The Maras are frozen" (5054)Jesse Luehrs2014-08-141-1/+1
|
* Move canned_message() from stuff.cc to message.ccNicholas Feinberg2014-07-271-1/+1
|
* Make ranged weapon delay display properly on @Nicholas Feinberg2014-07-251-2/+15
| | | | | | | | It only works if you have the appropriate projectile type quivered (otherwise it shows you as if using the weapon in melee, i.e. breadswing speed), but that's still an improvement. Also, constify.
* Put "you" in the pronoun declension table.Neil Moore2014-07-201-9/+3
| | | | | | Pretending it is a gender for simplicity. Better might be to rename gender_type to pronoun_type, and rename pronoun_type to pronoun_case or something similar.
* Simplify.Neil Moore2014-07-201-9/+3
|
* Allow Felids to wield non-weapons again (#8797)Neil Moore2014-07-151-7/+6
|
* Make tree form extra-balanced and immune to Leda's.Neil Moore2014-07-141-0/+1
| | | | The latter to match stationary monsters.
* Separate 'permanent' and 'temporary' monster hit diceNicholas Feinberg2014-07-131-0/+5
| | | | As part of a wider scheme to make draining temporary.
* Refactor weapon_skill()Nicholas Feinberg2014-07-131-3/+1
| | | | | | | | | | | | | | This function was misleadingly named (it only provided the skill used for melee weapons, not ranged weapons), and incomplete; code along the lines of "is_ranged_weapon(*it) ? range_skill(*it) : weapon_skill(*it)" was scattered in about half a dozen different functions. I've corrected both of those problems (renaming weapon_ skill() to melee_skill() and adding item_weapon_skill()), and also possibly fixed two bugs in the process - an l_you.cc function that claimed to provide the skill used for the starting weapon (but actually only gave the melee skill), and unrand creation code that checked if a potential unrand swap used the same (melee) skill as the weapon type being generated.
* Refactor duplicate code from can_wield()Nicholas Feinberg2014-07-131-16/+45
|
* Refactor item handedness codeNicholas Feinberg2014-07-131-1/+1
| | | | | | | | | | | | | | Instead of specifying HANDS_ONE or HANDS_TWO in Weapon_prop[] (which were... misleading at best), there's now a min_2h_size and min_1h_size field. The former controls the minimum size a player or monster must be to wield the weapon at all; the latter is the minimum size required to wield it with one hand. This means that giants can now wield daggers (unlike before); if necessary, a max_size field can be added, but this seems a low priority to preserve. This breaks formatting of Weapon_prop[] a bit; apologies.
* Give pigs trotters.Neil Moore2014-07-121-1/+5
| | | | | | Burning your own trotters might not be such a smart idea! A thick slime forms on your front trotters.
* Rename "vampiricism" to "vampirism" (ChrisOelmueller, #8435)reaverb2014-06-151-1/+1
| | | | | | | Chris Oelmueller made an excellent patch for this, but unfortunately it was rather rotted by the time somebody decided to look at it. It was easier to recreate than update. I've also added some tiles stuff which was missed in the original patch.
* Remove old, unhelpful commentsreaverb2014-06-081-4/+0
| | | | | | | Talking about design decisions that have been the status quo for years as though they were new untested decisions is far more likely to confuse somebody then help them. The text of these comments should have been in the commit messages, not the source code.
* Adjust a message for cancelling FinesseChris Campbell2014-06-071-1/+1
|
* Move go_berserk() out of misc.ccNicholas Feinberg2014-06-041-2/+111
|
* Remove SIZE_HUGE.Neil Moore2014-05-281-1/+1
| | | | | | | It's not marshalled anywhere, so there's no need to wait for a major bump. Also add a static array size check, and adjust a few variables.
* Remove player burden and carrying capacitygammafunk2014-05-261-13/+7
| | | | | | | | | | | Item inventory weights (based on item mass) generally don't lead to meaningful decisions that justify the inventory juggling and interface problems that come from having burden states. The 52-slot limit is a better system for limiting inventory and providing inventory-related decisions because it's not so fine-grained and doesn't require the player to examine weights for each slot. Work is ongoing to improve the slot system by consolidating food types and handling strategic consumables in a different way.
* Don't use inventory weight for the chance of activating a shaft trapgammafunk2014-05-261-5/+0
| | | | | | | Shaft traps previously considered the actor's total inventory weight in addition to body weight, but the player burden calculation code isn't worth keeping for this consideration alone. The chance of a shaft trap activating now depends only on the actor's body weight.
* Remove two checks based on item mass.Shmuale Mark2014-05-261-5/+8
| | | | | | Should be no functional change. (commiter's note: tweaked the comments.)
* Don't allow wielding an item that's too large while transformed.Shmuale Mark2014-05-191-1/+1
| | | | | | Not currently relevant, but might be if a SZ_LARGE or greater item-using form is added. (cherry picked from commit 0f69f1eb2bc0a8c8596bfd6a9c3515eb4d2a87df)
* Melt away lava orcs.Steve Melenchuk2014-05-141-2/+5
| | | | | | | | | | | | | | | | When you strip away the fundamentally broken tension mechanic, you're left with a species that is essentially "Hill Orcs WITH FIRE". No effort has come forward with code to fix either aspect of them despite the length of time they've been around in trunk, and the code is littered with a very large number of special cases in their presence. Current lava orcs should be able to finish their games fine, but new starts are disallowed. There are a couple of bits I've left present but which will have no function for the moment, mostly related to interactions with lava (as there are a couple of species proposals floating around that benefit from having those interactions).
* Formatting fixes (add braces).Neil Moore2014-05-121-0/+4
| | | | This fixes all the instances caught by unbrace.
* Don't trigger berserkitis on ranged attacks (#8516).Steve Melenchuk2014-05-081-2/+2
| | | | Oops.
* Revert "Revert "Remove player clinging"."reaver2014-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 65ff1ef470978c29490100d1732bf2b9ce2fb7cd. Conflicts: crawl-ref/source/main.cc crawl-ref/source/output.cc crawl-ref/source/player.cc crawl-ref/source/shout.cc crawl-ref/source/status.cc crawl-ref/source/status.h crawl-ref/source/terrain.cc crawl-ref/source/transform.cc Minor, prerequesite reverts: b0d520741c8e9a26e7a786a34285f7a9412d8d10 Trival removal of clinging from the Boots of the Spider 3e0928f93c3f8a78ac6327c26986b406f7d7f603 (conflict in crawl-ref/source/item_use.cc) Thanks to gammafunk for removing the last bits of clinging code! To do: Decide what to do about the boots of the spider.
* Ranged weapon delay.Steve Melenchuk2014-04-271-0/+94
| | | | | | Moves the delay calculations into player and monster respectively so that it can properly be done at the start of the ranged attack; it doesn't make sense to have them in attack or ranged_attack.
* Auto-id jewellery on equip.Shmuale Mark2014-04-271-5/+0
| | | | | | | | | | | | In the case of rings/amulets that identified themselves when they had an effect, the player would want to try to put themselves in a position where the item would identify, which was techincally optimal but quite annoying. There were a few items that never would identify, but on the whole it's not worth keeping around the behavior just for them. The ID code is pretty confusing and it's quite possible the implementation is not ideal or there are actual bugs.
* Remove some more djinn code.Shmuale Mark2014-04-101-4/+0
| | | | | | | Nothing that changes functionality or that makes the interface looks too weird. In several of the instances the code would be weird after moving to TAG_MAJOR_VERSION 35, so it seems worth it to remove now rather than leaving it around.
* Remove the unused jelly formChris Campbell2014-04-101-8/+0
|
* Adjust fungus form's melee attackChris Campbell2014-04-101-1/+1
| | | | | | | Don't handle it like the confusing touch spell (no special accuracy bonus or damage penalty), don't affect unbreathing monsters. Sadly it doesn't decrease the player's XL by one on every hit like the monster attack. Also use XL instead of unarmed skill for melee accuracy.
* Remove Formicid giant club wielding, reduce shield penalties, apt tweaksDracoOmega2014-03-121-8/+1
| | | | | | | | | | | | | | | | | | | | | | Giant spiked clubs were stronger than other weapons to such a degree that they commonly eclipsed the more unique formicid mechanic of using a two-hander with a shield. There is already a race whose weapon choice centers around giant clubs, so I think it better for formicids to lose this ability so as to hilight the more interesting one. In the same vein, formicids now recieve the same reduced shield penalties that large races do (a perk of effectively having more limbs to juggle everything with), which should make shield usage further encouraged earlier on, where they have yet to gain enough xp to otherwise benefit from using them with a two-hander (and the race is considered weak enough that a few buffs like this feel perfectly safe). Additionally, there are a couple apt tweaks: Fighting 0 -> +1 Short Blades +1 -> 0 Armour +2 -> +1 Shields 0 -> +2
* Fix some jump-attack checks (PleasingFungus)Chris Campbell2014-03-121-2/+8
| | | | | Don't allow jumping while caught in a net or web, do allow it while flying over lava (but not while standing in lava as a Lava Orc).
* Remove djinn.wheals2014-02-241-1/+9
| | | | | | | Djinn games can't be started (hopefully including using the rcfile), and djinn code should be removed on save-compat bump. Also, schedule a few SE things to be removed.
* Shadow god: Shadow Form.Steve Melenchuk2014-01-101-0/+6
| | | | | | | | For 9 MP, 10 piety, and skill drain, you transform into a swirling mass of dark shadows with immunity to poison, draining, torment, and hostile enchantments as well as 50% damage reduction and a transformation of your bled smoke into miasma (guaranteed on hit). However, you also only deal 50% melee damage and suffer a double-strength spell anti-enhancer.
* A lame name for djinni "feet".Adam Borowski2013-12-031-0/+2
| | | | "underside" is awfully generic, but "taper" takes a while to understand.
* Replace `mprf(s)` with `mpr(s)`Chris Oelmueller2013-11-281-1/+1
| | | | Scripted, then manually reviewed.
* More formatting fixes for return (...);Neil Moore2013-11-151-7/+7
|
* Drop unnecessary parentheses from return statements.Adam Borowski2013-11-151-5/+5
|
* Remove moths of suppressionChris Campbell2013-11-111-2/+2
| | | | | | | | | | | Suppression is a hugely complicated and inconsistent mechanic. Its original purpose was to be a way of overriding rPois in Spider but there are now plenty of monsters that do this effectively (and much more simply). [1KB: I moved this to trunk, as it made an already extremely hard to review branch massively more so. There's nothing but a single enum to preserve, so compat break doesn't make this removal any easier or harder.]
* A missing period.Adam Borowski2013-11-101-1/+1
|
* Merge branch 'dwants'. Bring some Raid.Adam Borowski2013-11-061-6/+19
|\
| * Merge branch 'master' into dwantsAdam Borowski2013-11-011-4/+59
| |\
| * | Assorted formatting fixes.Adam Borowski2013-11-011-2/+0
| | |
| * | Merge branch 'master' into dwantspubby2013-10-011-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: crawl-ref/source/dat/des/variable/mini_monsters.des crawl-ref/source/enum.h crawl-ref/source/itemprop.cc crawl-ref/source/main.cc crawl-ref/source/mutation-data.h crawl-ref/source/mutation.cc crawl-ref/source/newgame.cc crawl-ref/source/ng-restr.cc crawl-ref/source/rltiles/dc-player.txt crawl-ref/source/spl-selfench.cc crawl-ref/source/throw.cc crawl-ref/source/tilepick-p.cc crawl-ref/source/wiz-you.cc
| * \ \ Merge branch 'master' into dwantspubby2013-08-311-27/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: crawl-ref/docs/crawl_manual.reST crawl-ref/source/abl-show.cc crawl-ref/source/dat/descript/ability.txt crawl-ref/source/delay.cc crawl-ref/source/enum.h crawl-ref/source/main.cc crawl-ref/source/mon-cast.cc crawl-ref/source/mon-gear.cc crawl-ref/source/mon-spll.h crawl-ref/source/mutation-data.h crawl-ref/source/mutation.cc crawl-ref/source/ng-restr.cc crawl-ref/source/ng-setup.cc crawl-ref/source/output.cc crawl-ref/source/player-act.cc crawl-ref/source/player.cc crawl-ref/source/species.cc crawl-ref/source/spl-data.h crawl-ref/source/wiz-you.cc
| * | | | Fix whitespace.Neil Moore2013-08-281-1/+1
| | | | |
| * | | | Create Formicid species and monsters.pubby2013-08-251-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tavern post: https://crawl.develz.org/tavern/viewtopic.php?f=8&t=8298 Wierdness & mutations: - poison weakness - retractable antennae (can wear headgear and ignore mutation) - chitin skin (+3 AC) - most weapons 1-handed, big weapons 2-handed - permanent stasis - ability to shaft self - ability to dig - Starts with 2 curing pots 3 monster versions of formicids were added: formicid, a weak fighter formicid drone, a stronger fighter formicid venom mage, a magician with olgreb's and mass cure poison [ Pushing to a branch for experimental playtesting on CSZO. Also optimised the new tiles. -nfm ]
* | | | | Axe a buttload of useless #includes.Adam Borowski2013-11-031-1/+0
| |_|_|/ |/| | | | | | | | | | | | | | | Can't test Android, MSVC or Mac, but a very brief glance at the diff suggests it's unlikely they're affected.
* | | | Dj: disallow berserk.Adam Borowski2013-11-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Angels and demons can't zerk, and here we got an excuse. Balance reasons for Trog are obvious (no hunger). Perhaps Trog should be forbidden outright (made of magic)?
* | | | Use a COMPILE_CHECK instead of an ASSERT.Adam Borowski2013-10-271-1/+1
| | | |