HerculesWS · MishimaHaruna · Oct 22, 2018 · Aug 21, 2018 · Aug 21, 2018 · Sep 23, 2018
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Use skill '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**System specs (please complete the following information):**
+ - OS: [e.g. windows 10 version 1809, macOS 10.14]
+ - Hercules Version [e.g. v2018.09.22]
+ - Mode: [renewal or pre-renewal?]
+ - Packet version: [e.g. 20101130]
+ - Client type: [e.g. main, RE, zero, sak, ad]
+
+**Plugins used or source modifications**
+If you are using any plugins besides the ones that come bundled with Hercules,
+please enumerate them here.
+
+**Additional context**
+Add any other context about the problem here. If the bug report is about a
+crash, please attach the core/stack-dump or crash-log, if any.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always
+frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've
+considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,37 +1,28 @@
-[//]: # (**********************************)
-[//]: # (** Fill in the following fields **)
-[//]: # (**********************************)
+<!-- Before you continue, please change "base: stable" to "base: master" and
+ enable the setting "[√] Allow edits from maintainers." when creating your
+ pull request if you have not already enabled it. -->
 
-[//]: # (Note: Lines beginning with syntax such as this one, are comments and will not be visible in your report!)
+<!-- Note: Lines with this <!-- syntax are comments and will not be visible in
+ your pull request. You can safely ignore or remove them. -->
 
 ### Pull Request Prelude
 
-[//]: # (Thank you for working on improving Hercules!)
-
-[//]: # (Please complete these steps and check the following boxes by putting an `x` inside the brackets _before_ filing your Pull Request.)
+<!-- Thank you for working on improving Hercules! -->
+<!-- Please complete these steps and check the following boxes by putting an `x`
+ inside the [brackets] before filing your Pull Request. -->
 
 - [ ] I have followed [proper Hercules code styling][code].
 - [ ] I have read and understood the [contribution guidelines][cont] before making this PR.
-- [ ] I am aware that this PR will be closed if the above-mentioned criteria are not fulfilled.
+- [ ] I am aware that this PR may be closed if the above-mentioned criteria are not fulfilled.
 
 ### Changes Proposed
 
-[//]: # (Describe at length, the changes that this pull request makes.)
-
-**Affected Branches:** 
-
-[//]: # (Master? Slave?)
-
-**Issues addressed:**
-
-[//]: # (Issue Tracker Number if any.)
+<!-- Describe the changes that this pull request makes. -->
 
-### Known Issues and TODO List
+**Issues addressed:** <!-- Write here the issue number, if any. -->
 
-[//]: # (Insert checklist here)
-[//]: # (Syntax: - [ ] Checkbox)
 
-[//]: # (**NOTE** Enable the setting "[√] Allow edits from maintainers." when creating your pull request if you have not already enabled it.)
+<!-- You can safely ignore the links below: -->
 
 [cont]: https://github.com/HerculesWS/Hercules/blob/master/CONTRIBUTING.md
 [code]: https://github.com/HerculesWS/Hercules/wiki/Coding-Style
diff --git a/README.md b/README.md
@@ -218,7 +218,7 @@ the weather. For an in-depth explanation, please see /doc/atcommands.txt
 The Hercules emulator has a permission system that enables certain groups of
 players to perform certain actions, or have access to certain visual
 enhancements or in-game activity. To see what permissions are available, they
-are detailed in /doc/permissions.txt
+are detailed in /doc/permissions.md
 
 ### Others
 There are more files in the /doc/ directory that will help you to create scripts

diff --git 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/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
@@ -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
@@ -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)
 // ----------------------------------------

diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
@@ -4299,6 +4299,7 @@ skill_db: (
  Element: "Ele_Wind"
  DamageType: {
  SplashArea: true
+ SplitDamage: true
  IgnoreFlee: true
  }
  SplashRange: 1
@@ -4350,6 +4351,7 @@ skill_db: (
  Element: "Ele_Fire"
  DamageType: {
  SplashArea: true
+ SplitDamage: true
  IgnoreFlee: true
  }
  SplashRange: 2

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
@@ -4520,6 +4520,7 @@ skill_db: (
  Element: "Ele_Wind"
  DamageType: {
  SplashArea: true
+ SplitDamage: true
  IgnoreFlee: true
  }
  SplashRange: 1
@@ -4572,6 +4573,7 @@ skill_db: (
  Element: "Ele_Fire"
  DamageType: {
  SplashArea: true
+ SplitDamage: true
  IgnoreFlee: true
  }
  SplashRange: 2

diff --git a/doc/atcommands.txt b/doc/atcommands.txt
@@ -1498,3 +1498,9 @@ Reloads the 'conf/clans.conf' file.
 Obs: it will reload 'db/clans.conf' too since it's included inside 'conf/clans.conf'
 
 ---------------------------------------
+
+@camerainfo {<range>, <rotation>, <latitude>}
+
+Allow show/hide or change client camera parameters
+
+---------------------------------------