summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-03 18:18:50 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-03 18:18:50 +0000
commit5f00460ddd810828f3248d1a970b49f965771913 (patch)
tree9b025e88e5fd7ea7f9ad0c2b49c88620a2ed004b /src
parentb4e34bf1a6c0e676a8414a536353a3496d97a9a5 (diff)
downloadhercules-5f00460ddd810828f3248d1a970b49f965771913.tar.gz
hercules-5f00460ddd810828f3248d1a970b49f965771913.tar.bz2
hercules-5f00460ddd810828f3248d1a970b49f965771913.tar.xz
hercules-5f00460ddd810828f3248d1a970b49f965771913.zip
- Now the server will by default perform symmetric adding of friends
- > TODO - symmetric deletion (http://www.eathena.ws/board/index.php?showtopic=130749) - Added a first approximation of warps for the new maps (by $ephiroth) - Added Rachel and Veins to the list of @go destinations git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9613 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/common/mapindex.h2
-rw-r--r--src/map/atcommand.c2
-rw-r--r--src/map/battle.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/common/mapindex.h b/src/common/mapindex.h
index 3f5b5107a..b5ca54180 100644
--- a/src/common/mapindex.h
+++ b/src/common/mapindex.h
@@ -29,6 +29,8 @@ extern char mapindex_cfgfile[80];
#define MAP_LIGHTHALZEN "lighthalzen.gat"
#define MAP_EINBECH "einbech.gat"
#define MAP_HUGEL "hugel.gat"
+#define MAP_RACHEL "rachel.gat"
+#define MAP_VEINS "veins.gat"
#define MAP_JAIL "sec_pri.gat"
unsigned short mapindex_name2id(char*);
const char* mapindex_id2name(unsigned short);
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 0d595bef3..0784dc571 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -3324,6 +3324,8 @@ int atcommand_go(
{ MAP_LIGHTHALZEN, 158, 92 }, // 20=Lighthalzen
{ MAP_EINBECH, 70, 95 }, // 21=Einbech
{ MAP_HUGEL, 96, 145 }, // 22=Hugel
+ { MAP_RACHEL, 130, 110 }, // 23=Rachel
+ { MAP_VEINS, 216, 123 }, // 24=Veins
};
nullpo_retr(-1, sd);
diff --git a/src/map/battle.c b/src/map/battle.c
index 9951090e7..6c7a5b07b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -4244,7 +4244,7 @@ void battle_set_defaults() {
battle_config.autospell_stacking = 0;
battle_config.override_mob_names = 0;
battle_config.min_chat_delay = 0;
- battle_config.friend_auto_add = 0;
+ battle_config.friend_auto_add = 1;
battle_config.hvan_explosion_intimate = 45000; //[orn]
battle_config.homunculus_show_growth = 0; //[orn]
battle_config.homunculus_friendly_rate = 100;