8 files changed, 45 insertions, 5 deletions
diff --git a/conf/atcommand.conf b/conf/atcommand.conf
index 175286eb0..871322a05 100644
--- a/conf/atcommand.conf
+++ b/conf/atcommand.conf
@@ -57,6 +57,7 @@ aliases: {
 	itemreset: ["clearinventory"]
 	channel: ["main"]
 	autoloottype: ["aloottype"]
+	camerainfo: ["setcamera", "viewpointvalue"]
 }
 
 /* List of commands that should not be logged at all */
diff --git a/conf/channels.conf b/conf/channels.conf
index 9c2b567f4..c8f14aa27 100644
--- a/conf/channels.conf
+++ b/conf/channels.conf
@@ -64,5 +64,11 @@ chsys: (
 	irc_flood_protection_enabled: true /* Whether to enable anti-flood protection for outgoing messages */
 	irc_flood_protection_rate: 1000 /* The delay between messages during anti-flood protection (milliseconds) */
 	irc_flood_protection_burst: 3 /* The maximum number of messages that are sent at once burst size before triggering the anti-flood protection */
+
+	// @channel setopt MessageDelay <delay>
+	// Sets the maximum amount of message delay (in seconds) allowed for a channel.
+	// Default: 10
+	// Max: 255
+	channel_opt_msg_delay: 10
 }
 )
diff --git a/conf/char/char-server.conf b/conf/char/char-server.conf
index 76bd5e359..0f07731fb 100644
--- a/conf/char/char-server.conf
+++ b/conf/char/char-server.conf
@@ -50,7 +50,7 @@ char_configuration: {
 		// Server Communication username and password.
 		userid: "s1"
 		passwd: "p1"
-		
+
 		// Login Server IP
 		// The character server connects to the login server using this IP address.
 		// NOTE: This is useful when you are running behind a firewall or are on
@@ -162,6 +162,11 @@ char_configuration: {
 			// Set the letters/symbols that you want use with the 'char_name_option' option.
 			// Note: Don't add spaces unless you mean to add 'space' to the list.
 			name_letters: "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
+
+			// Block renaming if character is in a guild or a party? (BOOL)
+			// Athena: false	Aegis: true
+			// This check is imposed by Aegis to avoid dead entries in databases and is not needed on Hercules, as we clear data properly
+			use_aegis_rename: false
 		}
 
 		deletion: {
diff --git a/conf/groups.conf b/conf/groups.conf
index 3f0c34ffb..5756a3412 100644
--- a/conf/groups.conf
+++ b/conf/groups.conf
@@ -47,7 +47,7 @@ Requires 'log_commands' to be enabled in 'conf/logs.conf'.
 A group of settings
 	<permission> : <bool>
 If a permission is not included, false is assumed.
-For a full list of available permissions, see: doc/permissions.txt
+For a full list of available permissions, see: doc/permissions.md
 
 <inherit>
 A list of group names that given group will inherit commands and permissions
@@ -126,6 +126,7 @@ groups: (
 		go: true
 		breakguild: true
 		channel: true
+		camerainfo: true
 	}
 	permissions: {
 	}
diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
index 35c585bf6..b7d4ac781 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -177,3 +177,15 @@ client_emblem_max_blank_percent: 100
 // kRO removed the packet and this re-enables the message.
 // Official: false.
 mvp_exp_reward_message: false
+
+// Displays the same HP value as official servers do when a character is dead.
+// (Note 1)
+// On official servers, HP are never displayed as 0, but when dead, they
+// display the value that will be shown after resurrection (50% HP for novice
+// classes, 1 HP for other classes). Athena servers, instead, show the real
+// value (0 when dead), to avoid confusion.
+// Note: this is only a visual setting, and the server will internally handle
+// it as 0 regardless of this. This means that scripts will know that the
+// character has 0 HP when dead.
+// Default: true (Official behavior)
+display_fake_hp_when_dead: true
diff --git a/conf/map/battle/items.conf b/conf/map/battle/items.conf
index 144e04ea4..e834b80f6 100644
--- a/conf/map/battle/items.conf
+++ b/conf/map/battle/items.conf
@@ -123,3 +123,11 @@ boarding_halter_speed: 25
 // Allow to use items when the storage is open?
 // Official: false (Default)
 storage_use_item: false
+
+// Minimum item buy price at shop
+// Default: 1
+min_item_buy_price: 1
+
+// Minimum item sell price at shop
+// Default: 0
+min_item_sell_price: 0
diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf
index d258567a0..64bba68b5 100644
--- a/conf/map/battle/skill.conf
+++ b/conf/map/battle/skill.conf
@@ -307,6 +307,12 @@ dancing_weaponswitch_fix: true
 // 1: Traps in GvG make player stop moving right when stepping over it.
 skill_trap_type: 0
 
+// Trap Reflect
+// Whether the damage from traps must be reflected (for example by Reflect Shield or High Orc Card)?
+// true: Aegis - traps are reflected
+// false: Athena - traps are not reflected
+trap_reflect: true
+
 // Max Possible Level of Monster skills
 // Note: If your MVPs are too tough, reduce it to 10.
 mob_max_skilllvl: 100
diff --git a/conf/messages.conf b/conf/messages.conf
index f986e4649..2f790b13f 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -448,7 +448,8 @@
 
 // Return pet to egg message
 451: You can't return your pet because your inventory is full.
-//452-497 FREE
+452: usage @camerainfo range rotation latitude
+//453-497 FREE
 
 // Messages of others (not for GM commands)
 // ----------------------------------------
@@ -1494,11 +1495,11 @@
 1448: -- Available options
 1449: option '%s' is already enabled, if you'd like to disable it type '@channel opt %s 0'
 1450: option '%s' is now enabled for channel '%s'
-1451: value '%d' for option '%s' is out of range (limit is 0-10)
+1451: value '%d' for option '%s' is out of range (limit is 0-%d)
 1452: option '%s' is now enabled for channel '%s' with %d seconds
 1453: option '%s' is now disabled for channel '%s'
 1454: option '%s' is not enabled on channel '%s'
-1455: You're talking too fast!
+1455: You cannot send a message to this channel for another %d seconds.
 1456: -- %s ban <channel name> <character name>
 1457: - bans <character name> from <channel name> channel
 1458: -- %s banlist <channel name>