summaryrefslogtreecommitdiff
path: root/src/map/battle.c
AgeCommit message (Collapse)AuthorFilesLines
2006-08-16- Now arrow-consuming skills where your main weapon is a whip or musical ↵skotlex1-0/+2
instrument WILL count as arrow-type attacks, using the atk of the arrow and all related bonuses. - Fixed some homun timer initialization code. - Some cleanups on the pet.c code, but no idea if pet view will work correctly now. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8315 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-14- Sacrifice no longer shows damage to self.skotlex1-1/+0
- When Asura fails, the skill display will still come off. - Cleaned up AM_CALLHOMUN so that the required item is specified on skill_require_db - Cleaned up function merc_call_homun and added function merc_hom_vaporize to handle the respective cases. - Cleaned up a bit unit_remove_map/unit_free on regards to homun. it will display the /sob emotion when the homun dies due to low intimacy. Moved removal of timers and all that to unit_free - Cleaned up function merc_hom_dead - Simplified lots of code around by using the new merc functions. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8279 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-13- Removed @itemcheck as it was totally pointless.skotlex1-4/+8
- Corrected states killer/killable being easily dispellable. - Fixed the totally wrong text messages being used for @killer/@killable related atcommands, added appropiate entries to msg_athena - Magic and Misc attacks will now get type "flee" when they do less than 1 damage, this blocks them from causing additional status effects when they are blocked. - Cleaned up a bit the Basilica code, it should now properly end when you walk. - Added an unnecessary qty check when inserting cards :P - Fixed some logs not working when you enabled all logs. - Corrected unmute being a level 60 command by default (should be 80) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8256 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-10- Should have fixed the login-sql crash when passed user-name's length is ↵skotlex1-12/+7
beyond the limit. - Removed setting mob_ghostring_fix - Changed setting attack_attr_none to affect all neutral-element attacks. Basicly, this setting is now used to determine who can hit for full damage always when using neutral-attacks (defaults to non-players) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8237 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-09- Should have fixed a signed/unsigned warning in login-txtskotlex1-21/+0
- Moved the class-change code from battle_calc_weapon_attack to skill_additional_effect. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8211 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-09- Cleaned up some the code of TF_DOUBLE and GS_CHAINACTION.skotlex1-16/+14
- Removed the code which was auto-setting attacks that do no damage to type FLEE, since that was disabling status-effects which should incur even when the damage was blocked. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8208 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-09- Trade requests will now fail when either character is unable to act ↵skotlex1-1/+1
(character in storage, vending, interacting with an npc, petrified, etc) - Change the default of attack_attr_none to all classes except players. This means that pet/mobs/homun will always do normal attacks with no-element modifiers (but elemental reduction cards still apply) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8207 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-08- Removed config settings display_delay_skill_fail and ↵skotlex1-4/+2
display_snatcher_skill_fail, replaced them with display_skill_fail, which can be used to determine whether you hide ALL skill-failed messages, those from delay, those from Snatcher or those from Envenom (battle/skill.conf) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8186 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-08- Fixed yet again AS_SPLASHER doing full damage on all characters. Now you ↵skotlex1-3/+4
can use the NK split damage value in the skill_db if you want damage divided by the amount of targets rather than by 2. - Fixed crash on the battle_drain functions. - Cleaned up HAMI_CASTLE, HLIF_AVOID, HAMI_DEFENCE so that it's usable by other types of objects other than Homunculus. - Cleaned up the Asura Strike code so that the SP/Spheres/States is not consumed when the skill fails due to Fog of Wall. - When a negative delay for a skill is specified, this delay is now added on top of the character's amotion rather than adelay - Modified main.sql to make the guild table allow NULL on the emblem data. - Added file conf-tmpl/Changelog.txt git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8185 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-07- Removed the setting of blow-count to 0 when the target is a boss on the ↵skotlex1-11/+1
battle_calc_* functions, now skill_blown will fail when the source is different from the target and the target is a boss. - Some parenthesis cleanup before invoking battle_calc_base_damage, could be fixing the current issue with arrow attacks not adding the arrow damage. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8170 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-07- Cleaned some of mpeg's updated work.skotlex1-9/+1
- Fixed HT_BLITZBEAT hitting neutral characters when it auto-triggers. - Simplified the Tatami Gaeshi code. - Fixed AS_SPLASHER doing full damage on everyone except targetted char instead of the other way around. - Fixed KAENSIN clearing out SUITON cells and viceversa. - The spawn area is now seen as range rather than absolute for mob spawn lines. This means that x,y,10,10 will spawn the mob on a 21x21 grid around the given x,y point. - Some clean up of the mob-spawn code. Now you can specify negative areas, so that a spawn location such as 100,150,0,-1 will spawn a mob always on x=100, but any Y value of the current map. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8165 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-07- Some code cleaning in status.cskotlex1-3/+4
- Reflected damage will now also have a chance of draining hp/sp. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8164 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-07mpeg's ninja workVicious1-5/+7
http://gpegon.free.fr/ea/ninja_08-07-06_mpeg.txt git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8160 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-07- Adjusted Battle_check_target so that alchemist summoned mobs are targetted ↵skotlex1-3/+6
by everyone as long as 1. The top-level master is a player and 2. the actual attacker is not a mob-type. - Added config force_random_spawn which overrides the spawn-files defined coordinates to make all mobs always spawn randomly on the map. - SC_SPEEDUP0 is no longer dispellable by SA_DISPEL git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8159 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-05- Fixed a compile warning.skotlex1-1/+1
- Added a commented piece of code in clif_parse_LoadEndAck which will update your direction to wherever you were facing before warping. Should this be the default? Nearby people DO see you facing on the same direction before warping, it's only yourself that will always see you facing north on spawn. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8143 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-04- Fixed flag.elefix not being respected in battle_calc_misc_damage.skotlex1-9/+9
- Some code cleanups in battle_calc_damage. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8139 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-04- Removed settings enemy_critical_rate, homun_critical_rate. Added settings ↵skotlex1-8/+8
enable_critical (defaults to specify only players), mob_critical_rate and critical_rate. The last applies to all non-mobs and non-players (battle/battle.conf) - Removed settings mob_npc_warp, mob_warpportal. Replaced with setting mob_warp which specifies which types of warp can a mob step into (battle/monster.conf) - Updated status_calc_misc so that it also handles the BL_PC case, removed redundant info from status_calc_pc, and moving the SNovice Max Hp bonus to status_base_pc_maxhp git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8135 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-04- Some minor code cleanups.skotlex1-6/+6
- Cleaned up skill code for NJ_BAKUENRYU - Unified splash-damage packet display for NJ_HUUMA and other splash skills (like Brandish spear) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8134 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-04- Enabled Mastery damage on Soul Breaker again, moved adv katar mastery out ↵skotlex1-6/+10
of the mastery function so that it may apply to all skills except Soul Breaker. - Changed name of the setting log_pick to log_filter since that's what it does now. - Modified enable_logs so that instead of a 0/1 setting, you can specify which kind of events to log (so you can use a combination), see log_athena for the bitmask configuration. - Cleaned a bit the contents of log_athena.conf git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8129 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-04- Hide/Chasewalk will again stop screaming skill name (I guess displaying ↵skotlex1-2/+5
the skill animation wasn't such a good idea afterall) - Soul Breaker will no longer receive Mastery damage. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8126 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-04Fixed warning:'type' might be used uninitialized in this functiontoms1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8123 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-03- Readjusted the Chasewalk icon to be as it should be.skotlex1-0/+4
- GS_DESPERADO is now a short-range attack skill. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8114 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-03- GAHH, I am sick tired of typing TBL_HOMUNCULUS/BL_HOMUNCULUS all over the ↵skotlex1-18/+19
place. The idea is that the TBL* versions are supposed to be easier to use than the standard structure definition, but using TBL_HOMUNCULUS as an alias to struct homun_data kinda beats the purpose! Renamed them all to TBL_HOM/BL_HOM. - Fixed using the right-hand weapon's size modifiers regardless of which weapon was being used. - Simplified the ignore-size check by making the Weapon Perfection check be done when specifying the flag, also moved the size-fix property of riding spear-knights to status_calc_pc. - Removed variable hd from status_calc_bl as it's not needed. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8112 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-03- Added a damage cap to CR_ACIDDEMONSTRATION of INT_MAX/2 to prevent ↵skotlex1-0/+4
overflows. It is not capped to INT_MAX because damage increasing skills would cause it to still over flow afterwards. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8107 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-03- Fixed NPC_CRITICALSLASH not being considered as a Critical hit by the code.skotlex1-0/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8105 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-03- Cleaned up the last NJ update code.skotlex1-3/+3
- Added @ command `charspeed` - Fixed @jailfor using MAP_PRONTERA as jail instead of MAP_JAIL - Removed case for GS_SPREADATTACK on damage packets to see if the skill displays correctly now. - Corrected Deluge/Volcano/V. Gale overlaps so that the placing tiles are removed, NOT the ones who were already placed. - Made SC_SPEEDUP0 and SC_SPEEDUP1 use different icon IDs, to fix icon-confusion when both are enabled at a time. - Mob rude-attacked count is not reset now on picking a new char (gotta investigate this further) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8096 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-02- Fixed a logic error on battle_get_master which was causing infinite ↵skotlex1-8/+8
loops... ~.~ git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8077 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-02Merged Mpeg's work on Ninja skillstoms1-6/+23
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8068 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-02- Fixed Martyr's Reckoning having a cap damage of 32k.skotlex1-5/+3
- Changed Scream and Hammerfall's stun duration to 5 seconds. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8064 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-02- Made recursive master check the default (otherwise it messes skill -> pet ↵skotlex1-22/+7
-> player kind of herarchies) and cleaned up some the battle_get_master code to prevent infinite loops in the weird case someone specifies that their master is itself. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8055 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-02- Updated battle_check_target so that all alchemist summoned mobs can be ↵skotlex1-2/+2
target by everyone. - Cleaned up skill_check_condition_mob_master_sub, it will now count both total number of summoned mobs and amount that belong to the same type. - Corrected AM_CANNIBALIZE so it will fail if you already have plants of another type out. - Using NPC_SELFDESTRUCTION no longer will make the caster stop walking. - Removed SI_GUILDAURA, and replaced it with SI_LANDENDOW, now Volcano/Deluge/V. Gale will get that funky icon instead. - Changed clif_hominfo to receive both sd and hd as parameters - Some redundancy cleaning in mercenary.c - Moved updating of sd->mercenary.hp from merc_damage to pc_makesavestatus. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8048 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-01- Updated Poison React chance to counter and number of counters as per skill ↵skotlex1-2/+2
description updates. - Fixed Sharpshooting being counted as a magic attack, and hence, using your MATK as base damage. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8019 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-01- Fixed NPC_STOP id value in skill_cast_dbskotlex1-2/+2
- Bladestop will no longer stop when you push either of the characters around. - Fixed Enchant Poison having a near 100% chance of poisoning target on attack. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8015 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-31Added possibility to restrict duel usage to same maptoms1-2/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8013 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-31Merged mpeg's fix on ninja skillstoms1-1/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8012 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-31- Corrected a status_get_race call which should be status_get_race2 in misc ↵skotlex1-3/+3
attacks. - Moved the Devotion code to the top of the SC list in status_damage, meaning that now stuff like being asleep or confused won't end if you are hit, but the damage is absorbed by devotion. - Some cleanups in battle.c (replaced usage of status_get_* for status->*) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8009 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-30changed shell of blood into normal bullet. A_SHOTGUN is still around just in ↵Vicious1-6/+1
case/i didn't want to touch that.XD git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7985 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-30Merged mpeg's fix on ninja skills and SA_VOLCANO,SA_DELUGE,SA_VIOLENTGALEtoms1-6/+12
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7983 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-30- Added bNoMiscDamage setting so you can specify misc-damage blocking from ↵skotlex1-12/+11
skills. Modified battle_calc_damage so that even Pressure and similar skills will be affected by this setting. - Removed SC_LANDPROTECTOR as it wasn't being used by anything. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7982 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-30GS Skill updates/fixesVicious1-0/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7979 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-29- Some small bug fixes discovered while merging.skotlex1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7961 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-29- Added A_* constants to identify ammo types.skotlex1-3/+37
- Added Ishizu's code to check ammo type on attack. No more using Grenade rounds with Guns. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7959 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-29- offensive heal/sanctuary will only happen when the source of the heal is a ↵skotlex1-0/+1
player, mob/pet casted heal will now always heal regardless of target. - Shield Chain will now ignore the 'ice-pick' defense piercing bonus. - Removed pretty much every comment from skill.c as they were not even in ex-japanese, but they are now in butchered ex-japanese. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7958 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-28- Cleaned up the NJ update code.skotlex1-34/+37
- Restored code which was removed (stuff like SC_SKA) - Fixed possible crashes on some NJ skills if used by non-players. - Fixed most NJ magic spells doing more damage than they should. - Fixed ZenyNage being able to do more damage than zeny you have. - Cleaned up skill setting code for Suiton and Kaensin - Ordered SC_* definitions in status.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7947 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-28- Some cleaning of battle_drain, Evil Druid card should work now.skotlex1-9/+9
- Made status_damage allow damaging of objects not on a map, this should fix pet-catching making the mob never respawn again. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7946 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-28Fixed : - "uninitialized local variable 'i' used" in skill.ctoms1-5/+6
- "warning: suggest explicit braces to avoid ambiguous `else'" in battle.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7943 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-28Commiting mpeg's NJ work(from jA). some things might have gotten ↵Vicious1-17/+57
reversed/broken, so please do check, and don't kill me! D: thread: http://www.eathena.ws/board/index.php?showtopic=105413&view=findpost&p=610877 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7936 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-27- Added config setting party_update_interval so you can specify how often ↵skotlex1-0/+5
the party-mate minidots should be updated (defaults to 1 sec). - Removed a bunch of broken comments in skill.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7929 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-27- Added config setting "party_hp_mode" (battle/party.conf) which determines ↵skotlex1-0/+2
method to use to update party-mate hp bars. Aegis style is to update HP bars whenever HP changes, while eAthena style is to update it together with the map party dots. Defaults to aegis style. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7920 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-27- Applied the necessary changes to make @partyoption reflect it's changes on ↵skotlex1-2/+2
the alt+p window. - Some code indentation cleanups. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7905 54d463be-8e91-2dee-dedb-b68131a5f0ec