summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-19 21:40:15 +0000
committerGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-19 21:40:15 +0000
commit80ea72ef5feaca9c9b0368ad3f65e527ce653165 (patch)
tree1d0af1ff9e2691e443209fc5f4c0529443c5f22a /src/map
parent15da23e040bcd6e75af332e6f8c01b48d06c8d75 (diff)
downloadhercules-80ea72ef5feaca9c9b0368ad3f65e527ce653165.tar.gz
hercules-80ea72ef5feaca9c9b0368ad3f65e527ce653165.tar.bz2
hercules-80ea72ef5feaca9c9b0368ad3f65e527ce653165.tar.xz
hercules-80ea72ef5feaca9c9b0368ad3f65e527ce653165.zip
Removed leftovers of old charcommand config (follow-up to r13403).
Added check to ensure character `rename` status will be saved if changed. Fixed Beast Strafing (HT_POWER) damage formula and SP requirement provided by Playtester (bugreport:4675, since r4392). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14748 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c4
-rw-r--r--src/map/map.c3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index f60be479a..40e59039b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1442,8 +1442,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
case MC_MAMMONITE:
skillratio += 50*skill_lv;
break;
- case HT_POWER: //FIXME: How exactly is the STR based damage supposed to be done? [Skotlex]
- skillratio += 5*sstatus->str;
+ case HT_POWER:
+ skillratio += -50+8*sstatus->str;
break;
case AC_DOUBLE:
case MA_DOUBLE:
diff --git a/src/map/map.c b/src/map/map.c
index 2cd146ee4..9f9c93608 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -89,7 +89,6 @@ char *LOG_CONF_NAME;
char *MAP_CONF_NAME;
char *BATTLE_CONF_FILENAME;
char *ATCOMMAND_CONF_FILENAME;
-char *CHARCOMMAND_CONF_FILENAME;
char *SCRIPT_CONF_NAME;
char *MSG_CONF_NAME;
char *GRF_PATH_FILENAME;
@@ -3515,7 +3514,6 @@ void map_helpscreen(int flag)
puts(" --map-config <file> Load map-server configuration from <file>");
puts(" --battle-config <file> Load battle configuration from <file>");
puts(" --atcommand-config <file> Load atcommand configuration from <file>");
- puts(" --charcommand-config <file> Load charcommand configuration from <file>");
puts(" --script-config <file> Load script configuration from <file>");
puts(" --msg-config <file> Load message configuration from <file>");
puts(" --grf-path-file <file> Load grf path file configuration from <file>");
@@ -3564,7 +3562,6 @@ int do_init(int argc, char *argv[])
MAP_CONF_NAME = "conf/map_athena.conf";
BATTLE_CONF_FILENAME = "conf/battle_athena.conf";
ATCOMMAND_CONF_FILENAME = "conf/atcommand_athena.conf";
- CHARCOMMAND_CONF_FILENAME = "conf/charcommand_athena.conf";
SCRIPT_CONF_NAME = "conf/script_athena.conf";
MSG_CONF_NAME = "conf/msg_athena.conf";
GRF_PATH_FILENAME = "conf/grf-files.txt";