diff options
author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-24 15:31:28 +0000 |
---|---|---|
committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-24 15:31:28 +0000 |
commit | 85fdcfa5c7831dc87a2b6810b3e2ebd5e3ec49c7 (patch) | |
tree | 3954f54f4adce21db6566710b1b02555b4d241a3 /src/map/clif.c | |
parent | 0e67259ca839671dac06dd804d6867ebe33df74a (diff) | |
download | hercules-85fdcfa5c7831dc87a2b6810b3e2ebd5e3ec49c7.tar.gz hercules-85fdcfa5c7831dc87a2b6810b3e2ebd5e3ec49c7.tar.bz2 hercules-85fdcfa5c7831dc87a2b6810b3e2ebd5e3ec49c7.tar.xz hercules-85fdcfa5c7831dc87a2b6810b3e2ebd5e3ec49c7.zip |
* Added 'map_charid2id'
* Changed monster damage logging to save char ID's
* Implemented 'event_script_type'
* Set Emsolute Develop as a learnable skill
* Updated 'require_glory_guild'
* Allow monsters to cast skills near themselves even when monster_nofootset is set to 'yes'
* Print number of online users in online.txt/.html even if there's only 1 user
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1282 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r-- | src/map/clif.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 2e1a7e1e7..74d26dbac 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6704,14 +6704,18 @@ int clif_guild_skillinfo(struct map_session_data *sd) case GD_KAFRACONTACT: case GD_GUARDIANRESEARCH: case GD_GUARDUP: + case GD_DEVELOPMENT: up = guild_checkskill(g,GD_APPROVAL) > 0; break; case GD_LEADERSHIP: //Glory skill requirements -- Pretty sure correct [Sara] - up = guild_checkskill(g,GD_GLORYGUILD) > 0; + up = (battle_config.require_glory_guild) ? + guild_checkskill(g,GD_GLORYGUILD) > 0 : 1; + // what skill does it need now that glory guild was removed? [celest] break; case GD_GLORYWOUNDS: - up = guild_checkskill(g,GD_GLORYGUILD) > 0; + up = (battle_config.require_glory_guild) ? + guild_checkskill(g,GD_GLORYGUILD) > 0 : 1; break; case GD_SOULCOLD: up = guild_checkskill(g,GD_GLORYWOUNDS) > 0; @@ -6734,8 +6738,8 @@ int clif_guild_skillinfo(struct map_session_data *sd) up = guild_checkskill(g,GD_GUARDIANRESEARCH) > 0 && guild_checkskill(g,GD_REGENERATION) > 0; break; - case GD_DEVELOPMENT: - up = 0; + case GD_GLORYGUILD: + up = (battle_config.require_glory_guild) ? 1 : 0; break; default: up = 1; |