diff options
| -rw-r--r-- | Changelog-Trunk.txt | 6 | ||||
| -rw-r--r-- | conf-tmpl/help.txt | 139 | ||||
| -rw-r--r-- | conf-tmpl/help2.txt | 79 | ||||
| -rw-r--r-- | doc/item_bonus.txt | 11 | ||||
| -rw-r--r-- | src/map/battle.c | 7 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
6 files changed, 156 insertions, 88 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b70953900..75c56c97a 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,12 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/03
+ * Cleared up the bAutoSpellWhenHit description in doc/item_bonus.txt
+ [Skotelx]
+ * Fixed Phantasmic Arrow and Magical Bullet not being correctly tagged as a
+ ranged arrow-type attack. [Skotlex]
+ * Updated help.txt and help2.txt, thanks to Inuyasha for providing the
+ updated files. [Skotlex]
* Char-server SQL won't perform the reconnect cleanup routines when
kick_on_disconnect is disabled. [Skotlex]
* Renamed summons_inherit_effects to summons_trigger_autospells as the
diff --git a/conf-tmpl/help.txt b/conf-tmpl/help.txt index 75630a755..9bff3be74 100644 --- a/conf-tmpl/help.txt +++ b/conf-tmpl/help.txt @@ -1,48 +1,68 @@ // put at first, the minimum level to display the line
- 0:To use one command, type it inside the message window where you usually type to chat.
- 20:@h/@help - display this help.
- 40:
- 40:--- MESSAGE CMD ---
+ 1:To use one command, type it inside the message window where you usually type to chat.
+ 20:@h/@help - display this help guide.
+ 20:@h2/@help2 - displays the second help guide.
+ 1:
+ 1:--- MESSAGE CMD ---
+ 1:@main [on|off|message] - Turns on or off global chat (@main must be on to see global chat messages)
+ 1:@noask - Auto rejects Deals/Invites
+ 20:@gmotd - Broadcasts the Message of The Day file to all players.
+ 20:@me <message> - Displays normal text as a message in this format: *name message* (like /me in mIRC)
+ 20:@fakename [Name] - Changes your name to your choice temporarly.
+ 20:@npctalk [NPC Name],[Message] - Forces a NPC to display a message in normal chat.
40:/b/@broadcast <message> - Broadcasts a GM message with name of the GM (in yellow)
40:/nb <message>/@kami <message> - Broadcasts a GM message without name of the GM (in yellow)
40:@kamib <message> - Broadcasts a GM message without name of the GM (in blue)
40:/lb/@localbroadcast <message> - Broadcasts a GM message with name of the GM (in yellow) ONLY on your map
40:/nlb <message> - Broadcasts a GM message without name of the GM (in yellow) ONLY on your map
- 0:
- 0:--- INFORMATION CMD ---
- 20:@who/@whois/@w [match_text] - Display a listing of who is online and their party/guild
- 20:@who2 [match_text] - Display a listing of who is online and their job
- 20:@who3 [match_text] - Display a listing of who is online and where
- 20:@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specifical map
- 20:@whogm [match_text] - Like @who+@who2+who3, but only for GM.
+ 1:
+ 1:--- INFORMATION CMD ---
+ 1:@commands - Displays a list of commands that you can use.
+ 1:@rates - Displays the server's current rates.
+ 1:@uptime - Displays how long the server has been online.
+ 1:@showdelay - Shows/Hides the "there is a delay after this skill" message.
+ 1:@exp - Displays current levels and % progress
+ 1:@mobinfo/@monsterinfo/@mi [Mob ID|Part of monster name] - Shows Monster Info (rates, stats, drops, MVP stuff)
+ 1:@iteminfo/@ii [Item ID|Part of item name] - Shows Item info (type, price, etc)
+ 1:@whodrops [Item ID|Part of item name] - Shows who drops an item (mobs with highest drop rates)
+ 1:@version - Displays SVN version of the server
+ 1:@email <actual@email> <new@email> - to change your e-mail (characters protection)
1:@where [char name] - Tells you the location of a character
-
+ 1:@time/@date/@server_date/@serverdate/@server_time/@servertime - Display the date/time of the server
+ 10:@showexp - Displays/Hides Experience gained.
+ 10:@showzeny - Displays/Hides Zeny gained.
+ 10:@mobsearch [Mob ID|Monster Name] - Shows the location of a certain mob on the current map.
+ 20:@who/@whois/@w [match_text] - Display a listing of who is online and their party/guild.
+ 20:@who2 [match_text] - Display a listing of who is online and their job.
+ 20:@who3 [match_text] - Display a listing of who is online and where.
+ 20:@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specifical map.
+ 20:@whogm [match_text] - Like @who+@who2+who3, but only for GM.
40:@charcartlist <char name> - Displays all items of a player's cart.
- 0:@ignorelist - Displays your ignore list
- 99:@mapinfo [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat).
- 0:@time/@date/@server_date/@serverdate/@server_time/@servertime - Display the date/time of the server
60:
- 60:@guildspy <guild_name/id> - You will receive all messages of the guild channel
- 60:@partyspy <party_name/id> - You will receive all messages of the party channel
+ 60:@guildspy <guild_name/id> - You will receive all messages of the guild channel (Chat logging must be enabled)
+ 60:@partyspy <party_name/id> - You will receive all messages of the party channel (Chat logging must be enabled)
+ 99:@mapinfo [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat).
1:
1:--- CHANGE GM STATE CMD ---
- 40:/hide/@hide - Makes you character invisible (GM invisibility). Type @hide again become visible.
- 40:@save - Sets respawn point to current spot
- 40:@load/@return - Warps you to your save point
- 40:/mm//mapmove/@warp/@rura/@mapmove <mapname> <x> <y> - Warps you to the selected position
- 40:@jump [x [y]]- Randomly warps you like a flywing.
- 20:/shift/@jumpto/@warpto/@goto <char name> - Warps you to selected character
- 20:@follow <char_name> - follow a player
+ 1:@die - Kills yourself
10:@go <number/city_name> - Warps you to a city.
10: -3: (Memo point 2) 1: morocc 5: izlude 9: yuno 13: niflheim
10: -2: (Memo point 1) 2: geffen 6: aldebaran 10: amatsu 14: louyang
10: -1: (Memo point 0) 3: payon 7: xmas (lutie) 11: gonryun 15: start point
10: 0: prontera 4: alberta 8: comodo 12: umbala 16: prison/jail
10:
- 1:@die ---- suicide
- 60:@alive - Revives yourself from death
- 40:@heal [<HP> <SP>] - Heals the desired amount of HP and SP. No value specified will do a full heal.
- 20:
+ 20:/shift/@jumpto/@warpto/@goto <char name> - Warps you to selected character
+ 20:@follow <char_name> - follow a player
+ 20:@mountpeco - Give/remove you a peco (Class is required, but not skill)
+ 20:@disguise <monster_name_or_monster_ID> - Change your appearence to other players to a mob.
+ 20:@undisguise - Restore your normal appearance.
+ 20:@model <hair ID: 0-17> <hair color: 0-8> <clothes color: 0-4> - Changes your characters appearence.
+ 20:@size <1-3> Changes your size (1-Smallest 2-Biggest 3-Normal)
+ 40:/hide/@hide - Makes you character invisible (GM invisibility). Type /hide or@hide again become visible.
+ 40:@save - Sets respawn point to current spot
+ 40:@load/@return - Warps you to your save point
+ 40:/mm//mapmove/@warp/@rura/@mapmove <mapname> <x> <y> - Warps you to the selected position
+ 40:@jump [x [y]]- Randomly warps you like a flywing.
40:@job/@jobchange <job ID> - Changes your job
40: 0: Novice 18: Alchemist 4015: Paladin
40: 1: Swordman 19: Bard 4016: Champion
@@ -54,8 +74,8 @@ 40: 7: Knight 4004: High Archer 4046: Taekwon
40: 8: Priest 4005: High Acolyte 4047: Star Gladiator
40: 9: Wizard 4006: High Merchant 4049: Soul Linker
- 40: 10: Blacksmith 4007: High Thief
- 40: 11: Hunter 4008: Lord Knight
+ 40: 10: Blacksmith 4007: High Thief 24: Gunslinger
+ 40: 11: Hunter 4008: Lord Knight 25: Ninja
40: 12: Assassin 4009: High Priest
40: 14: Crusader 4010: High Wizard
40: 15: Monk 4011: Whitesmith
@@ -69,10 +89,7 @@ 40: 4035: Baby Assassin 4037: Baby Crusader 4038: Baby Monk
40: 4039: Baby Sage 4040: Baby Rogue 4041: Baby Alchemist
40: 4042: Baby Bard 4043: Baby Dancer 4045: Super Baby
- 60:@lvup/@blevel/@baselvlup <number of levels> - Raises your base level the desired number of levels. The max is 255 (User Defined).
- 60:@joblvup/@jlevel/@joblvlup <number of levels> -Raises your job level the desired number of levels. The max is 50 For Basic Classes. For Super Novice and Advanced Classes it is 70.
- 60:@allskill/@allskills/@skillall/@skillsall - Give you all skills.
- 40:@option <param1> <param2> <param3> - Adds different visual effects on or around your character
+ 40:
40: <param1> <param2> <p3>(stackable) <param3> <param3>
40: 1 Petrified (stackable) 01 Sight 32 Peco Peco riding 2048 Orc Head
40: 2 Frozen 01 Poison 02 Hide 64 GM Perfect Hide 4096 Wedding Sprites
@@ -80,10 +97,9 @@ 40: 4 Sleeping 04 Silenced 08 Level 1 Cart 256 Level 3 Cart
40: 6 darkness 08 ??? 16 Falcon 512 Level 4 Cart
40: 16 darkness 1024 Level 5 Cart
- 20:@mountpeco - Give/remove you a peco (Class is required, but not skill)
- 20:@disguise <monster_name_or_monster_ID> - Change your appearence to other players to a mob.
- 20:@undisguise - Restore your normal appearance.
- 20:@model <hair ID: 0-17> <hair color: 0-8> <clothes color: 0-4> - Changes your characters appearence.
+ 40:
+ 40:@heal [<HP> <SP>] - Heals the desired amount of HP and SP. No value specified will do a full heal.
+ 40:@option <param1> <param2> <param3> - Adds different visual effects on or around your character
40:@dye/@ccolor <clothes color: 0-4> - Changes your characters appearence (only clothes color).
40:@hairstyle/@hstyle <hair ID: 0-17> - Changes your characters appearence (only hair style).
40:@haircolor/@hcolor <hair color: 0-8> - Changes your characters appearence (only hair color).
@@ -92,11 +108,6 @@ 40:@dropall - throws all your possession on the ground
40:@storeall - puts all your possessions in storage
40:@killable - make your character killable
- 60:@stpoint <number of points> - Gives you the desired number of stat points.
- 60:@skpoint <number of points> - Gives you the desired number of skill points.
- 60:@zeny <amount> - Gives you desired amount of Zeny.
- 60:@str,@agi,@vit,@int,@dex,@luk <amount> - Adds desired amount to any stat. For example "@str 10" raises your str by 10
- 60:@statall/@statsall/@allstats/@allstat [value] - Adds value in all stats (maximum if no value).
40:@memo [memo_position] - set/change a memo location (no position: display memo points).
40:@spiritball <number: 1-1000> - Gives you "spirit spheres" like from the skill "Call Spirits"
40: (If the number you use is > 1000, your server may become instable or crash)
@@ -113,15 +124,53 @@ 40: @skilltree <
40: @marry <player1>,<player2> - marry two players
40: @divorce <player> - divorces the two players (you need just one name of them)
+ 60:@alive - Revives yourself from death
+ 60:@lvup/@blevel/@baselvlup <number of levels> - Raises your base level the desired number of levels. The max is 255 (User Defined).
+ 60:@joblvup/@jlevel/@joblvlup <number of levels> -Raises your job level the desired number of levels. The max is 50 For Basic Classes. For Super Novice and Advanced Classes it is 70.
+ 60:@allskill/@allskills/@skillall/@skillsall - Give you all skills.
+ 60:@stpoint <number of points> - Gives you the desired number of stat points.
+ 60:@skpoint <number of points> - Gives you the desired number of skill points.
+ 60:@zeny <amount> - Gives you desired amount of Zeny.
+ 60:@str,@agi,@vit,@int,@dex,@luk <amount> - Adds desired amount to any stat. For example "@str 10" raises your str by 10
+ 60:@statall/@statsall/@allstats/@allstat [value] - Adds value in all stats (maximum if no value).
60: @addwarp <map name> <x coord> <y coord>
40:
40:--- MONSTERS CMD ---
+ 40:@killmonster2 - kill all monsters of your map (without drops)
50:/monster <monster_name> - Spawns 1 of the desired monster.
50:@spawn/@monster/@summon <monster_name_or_monster_ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]
50:@monster2 <desired_monster_name> <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]
50:@spawn/@monster/@summon/@monster2 "desired monster name" <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]
50:@spawn/@monster/@summon/@monster2 <monster_name_or_monster_ID> "desired monster name" [<number to spawn> [<x coord> [<y coord>]]]
50: Spawns the desired monster with any desired name.
+ 50:@monstersmall [Mob ID|Mob Name] - Spawns a smaller version of a monster.
+ 50:@monsterbig [Mob ID|Mob Name] - Spawns a larger version of a monster.
60:@killmonster [map] - kill all monsters of the map (they drop)
- 40:@killmonster2 - kill all monsters of your map (without drops)
-
+ 40:
+ 10:--- MISC CMD ---
+ 10:@autoloot [on|off|#] - Makes items go straight into your inventory.
+ 10:@autotrade/@at - Allows you to vend while you are offline.
+ 10:@changegm [Player Name] - Changes the leader of your guild (You must be guild leader)
+ 10:@changeleader [Player Name] - Changes the leader of your party (You must be party leader)
+ 20:@request [Message] - Sends a message to all connected GMs (via the gm whisper system)
+ 40:@sound [Path way to file in Data or GRF file] - Plays a sound from the data or grf file located on the client.
+ 50:@clone [Player Name] - Spawns a supportive clone of the given player.
+ 50:@slaveclone [Player Name] - Spawns a supportive clone of the given player that follows the creator around.
+ 50:@evilclone [Player Name] - Spawns an agressive clone of the given player.
+ 60:@changesex - Changes your gender.
+ 10:
+ 1:--- DUEL CMD ---
+ 1:@duel - Starts a duel.
+ 1:@invite - Invites a player to a duel.
+ 1:@accept - Accepts an invitation to a duel.
+ 1:@reject - Rejects an invitation to a duel.
+ 1:@leave - Leaves a duel.
+ 1:
+ 1:--- MAIL SYSTEM --- (SQL Only) (Must be enabled)
+ 1:@checkmail - Check # of messages.
+ 1:@listmail - List all messages.
+ 1:@listnewmail - List only new mail.
+ 1:@readmail - Read a message.
+ 1:@sendmail - Send mail.
+ 1:deletemail - Deletes a message.
+ 80:@sendprioritymail - Sends priority mail (cannot be deleted until read)
\ No newline at end of file diff --git a/conf-tmpl/help2.txt b/conf-tmpl/help2.txt index 8d9fd1edb..a79262aeb 100644 --- a/conf-tmpl/help2.txt +++ b/conf-tmpl/help2.txt @@ -1,10 +1,8 @@ + 0:To use one command, type it inside the message window where you usually type to chat.
1:--- ITEMS CMD ---
1:@storage - Opens storage
- 50:@gstorage - Opens guild storage
- 60:/item <item_name> - Gives you 1 of the desired item.
- 60:@item <item name or ID> <quantity> - Gives you the desired item.
- 60:@item2 <item name or ID> <quantity> <identified_flag> <refine> <broken_flag> <Card1> <Card2> <Card3> <Card4> - Gives you the desired item.
40:@itemreset - Remove all your items.
+ 50:@gstorage - Opens guild storage
60:@itemcheck - Check your items with authorised items.
60:@idsearch <part_of_item_name> - Search all items that name have part_of_item_name
60:@refine <equip position> <+/- amount>
@@ -12,6 +10,9 @@ 60: Element: 0=None 1=Ice 2=Earth 3=Fire 4=Wind
60: You can add up to 3 Star Crumbs and 1 element
60:@repairall - Repair all items of your inventory
+ 60:/item <item_name> - Gives you 1 of the desired item.
+ 60:@item <item name or ID> <quantity> - Gives you the desired item.
+ 60:@item2 <item name or ID> <quantity> <identified_flag> <refine> <broken_flag> <Card1> <Card2> <Card3> <Card4> - Gives you the desired item.
40:
40:--- PVP CMD ---
40:@pvpon - Turns pvp on on the current map
@@ -29,62 +30,66 @@ 60:@partyrecall <party_name/id> - Warps all online characters of a party to you.
1:
1:--- PETS CMD ---
- 60:@hatch - Create a pet from your inventory eggs list.
- 60:@makeegg <pet_id> - Gives pet egg for monster number in pet DB
+ 1:@petrename - Re-enable pet rename
+ 10:@pettalk [Message] - Makes your pet say a message.
40:@petfriendly <#> - Set pet friendly amount (0-1000) 1000 = Max
40:@pethungry <#> - Set pet hungry amount (0-100) 100 = Max
- 1:@petrename - Re-enable pet rename
+ 60:@hatch - Create a pet from your inventory eggs list.
+ 60:@makeegg <pet_id> - Gives pet egg for monster number in pet DB
20:
20:--- REMOTE CHAR CMD ---
- 60:@kill <char name> - Kills specified character.
+ 20:@kick <char name> - Kicks specified character off the server
40:@charkillable <char name> - make another character killable
- 60:@nuke <char name> - Kills specified character (nuclear effect).
+ 60:@unjail/@discharge <char name> - Discharges specified character/prisoner
+ 60:@kill <char name> - Kills specified character.
60:@chardropall <char name> - throws all a chars possession on the ground
60:@charstoreall <char name> - puts all of anothers charactes possessions in storage
60:/recall/@recall <char name> - Warps target character to you.
- 80:@recallall - Warps every character online to you.
60:@revive <char name> - Revives target character.
- 20:@charignorelist <char name> - Displays ignore list of the player
- 20:@inall <char name> - Allows all wispers for the player
- 20:@exall <char name> - Blocks all wispers for the player
- 60:@charblock/@block <name> - Blocks definitively a account
- 60:@charunblock/@unblock <name> - Unblocks a account
+ 60:@charblock/@block <char name> - Blocks definitively a account
+ 60:@charunblock/@unblock <char name> - Unblocks a account
60:@charban/@ban/@banish/@charbanish <time> <name> - Ban temporarily a account
60: time usage: adjustement (+/- value) and element (y/a, m, d/j, h, mn, s)
60: Example: @ban +1m-2mn1s-6y testplayer
60:@charunban/@unban/@unbanish/@charunbanish <name> - Unban a account
- 60:@jail <char_name> - Sends specified character in jails
- 60:@trade <char_name> - Open a trade window with a another player
- 20:@kick <charname> - Kicks specified character off the server
- 99:@kickall - Kick all characters off the server
- 99:@mapexit - Kick all players and shut down map-server.
+ 60:@jail <char name> - Sends specified character in jails
+ 60:@trade <char name> - Open a trade window with a another player
+ 80:@recallall - Warps every character online to you.
80:@doom - Kills all NON GM chars on the server.
80:@doommap - Kills all non GM characters on the map.
80:@raise - Resurrects all characters on the server.
80:@raisemap - Resurrects all characters on the map.
- 60:@unjail/@discharge <char_name> - Discharges specified character/prisoner
80:
80:--- ENVIRONMENT CMD ---
80:@night - Uses @option 00 16 00 on all characters. All characters are in darkness.
80:@day - Uses @option 00 00 00 on all characters.
80:@skillon - turn skills on for a map
80:@skilloff - turn skills on for a map
- 0:
- 0:--- ADMIN CMD ---
- 99:@reloaditemdb - Reload item database (admin command)
- 99:@reloadmobdb - Reload monster database (admin command)
- 99:@reloadskilldb - Reload skills definition database (admin command)
- 99:@reloadscript - Reload all scripts (admin command)
- 99:@reloadgmdb - Reload GM levels (admin command)
- 99:@adjgmlvl - Do a temporary adjustment of the GM level of a player (admin command)
- 99:@adjcmdlvl - Do a temporary adjustment of the GM level of a command (admin command)
- 80:@shownpc <NPC_name> - Enable a NPC (admin command)
- 80:@hidenpc <NPC_name> - Disable a NPC (admin command)
- 80:@loadnpc <path_to_script> - Load script (admin command)
- 80:@unloadnpc <NPC_name> - Unload script (admin command)
+ 99:@rain - Makes all maps to have the rain weather effect.
+ 99:@snow - Makes all maps to have the snow weather effect.
+ 99:@clouds - Makes all maps to have the cloudy weather effect.
+ 99:@clouds2 - Makes all maps to have another cloudy weather effect.
+ 99:@fog - Makes all maps to have the fog weather effect.
+ 99:@fireworks - Makes all maps to have the fireworks weather effect.
+ 99:@sakura - Makes all maps to have the sakura weather effect.
+ 99:@leaves - Makes all maps to have the leaves weather effect.
80:
+ 80:--- ADMIN CMD ---
+ 80:@shownpc <NPC name> - Enable a NPC
+ 80:@hidenpc <NPC name> - Disable a NPC
+ 80:@loadnpc <path to script> - Load script
+ 80:@unloadnpc <NPC name> - Unload script
+ 99:@adjgmlvl <level> <char name> - Do a temporary adjustment of the GM level of a player
+ 99:@adjcmdlvl <level> <command> - Do a temporary adjustment of the GM level of a command
+ 99:@kickall - Kick all characters off the server
+ 99:@mapexit - Kick all players and shut down map-server.
+ 99:@reloaditemdb - Reload item database.
+ 99:@reloadmobdb - Reload monster database.
+ 99:@reloadskilldb - Reload skills definition database.
+ 99:@reloadscript - Reload all scripts.
+ 99:@reloadgmdb - Reload GM levels.
+ 99:
99:@gat - For debugging (you inspect around gat)
99:@packet - For debugging (packet variety)
- 99:
-100:@GM <password> - it becomes GM!
- 0:@email <actual@email> <new@email> - to change your e-mail (characters protection)
\ No newline at end of file +100:@nuke <char name> -
+100:@GM <password> - it becomes GM! (password is set in login_athena.conf)
\ No newline at end of file diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt index f5816f373..b6a947646 100644 --- a/doc/item_bonus.txt +++ b/doc/item_bonus.txt @@ -159,8 +159,10 @@ bonus2 bAddRace2,n,x; Increase damage by x% vs. enemies of race n bonus3 bHPLossRate,n,x,y; Lose n amount of hp every x amount of time
y: 0=Don't show damage 1=Show damage
-bonus3 bAutoSpellWhenHit,x,y,n; n/10% chance to cast skill x of level y when
- being hit by physical close range damage
+bonus3 bAutoSpellWhenHit,x,y,n; n/10% chance to cast skill x of level y on
+ attacker when being hit by a direct
+ attack. Target must be within spell's
+ range to go off.
bonus3 bSPDrainRate,n,x,y; When attacking there is a n% chance to either
gain SP equivalent to x% of damage dealt, OR
drain the amount of sp from the enemy.
@@ -175,8 +177,9 @@ bonus4 bAutoSpell,x,y,n,i; n/10% chance to cast skill x of level y when being attacking
i:0=cast on self 1=cast on enemy
bonus4 bAutoSpellWhenHit,x,y,n,i; n/10% chance to cast skill x of level y when
- being hit by physical close range damage
- i:0=cast on self 1=cast on enemy
+ being hit by a direct attack. Target
+ must be within spell's range to go
+ off. i:0=cast on self 1=cast on enemy
//---- 2/22 new card effects ----
diff --git a/src/map/battle.c b/src/map/battle.c index c4a5b29fb..be22f4bc7 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -843,7 +843,12 @@ static struct Damage battle_calc_weapon_attack( } wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG; break; - + case GS_MAGICALBULLET: + case HT_PHANTASMIC: + //Since these do not consume ammo, they need to be explicitly set as arrow attacks. + flag.arrow = 1; + wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG; + break; case CR_SHIELDBOOMERANG: case PA_SHIELDCHAIN: flag.weapon = 0; diff --git a/src/map/skill.c b/src/map/skill.c index a5b270329..6e8e0702c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6402,7 +6402,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid, { //Take on the base element, not the elemental one. struct status_data *bstatus = status_get_base_status(src); val1 = bstatus?bstatus->rhw.ele:status->rhw.ele; - if (sd) sd->state.arrow_atk = 0; //Disable consumption rigth away. + if (sd) sd->state.arrow_atk = 0; //Disable consumption right away. else if (!val1) val1 = ELE_WATER+rand()%(ELE_WIND-ELE_WATER); break; } |