summaryrefslogtreecommitdiff
path: root/conf-tmpl/battle
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-30 17:38:39 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-30 17:38:39 +0000
commitbed9459f0edafeab823aa4c0a473828e77e43c15 (patch)
tree1fef3bbf08bb8d7b68307df619daad521aab53f6 /conf-tmpl/battle
parent6f24a7748e12e3dd2e24153bd0a5382d89273b98 (diff)
downloadhercules-bed9459f0edafeab823aa4c0a473828e77e43c15.tar.gz
hercules-bed9459f0edafeab823aa4c0a473828e77e43c15.tar.bz2
hercules-bed9459f0edafeab823aa4c0a473828e77e43c15.tar.xz
hercules-bed9459f0edafeab823aa4c0a473828e77e43c15.zip
- Corrected char deletion not working (column is called homun_id, not hom_id...)
- Collapsed config settings produce_item_name_input, produce_potion_name_input, making_arrow_name_input, holywater_name_input, cdp_name_input into a single config produce_item_name_input which uses bitmasks to determine what it affects. - Updated arrow_decrement to have 3 possible values: Disabled, Enabled, and Enabled as well as giving arrow requirements to skills that do not have them when used with ranged weapons (auto-guess for plagiarized/item-granted skills) - Minor cleanings git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9746 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf-tmpl/battle')
-rw-r--r--conf-tmpl/battle/battle.conf8
-rw-r--r--conf-tmpl/battle/items.conf22
2 files changed, 14 insertions, 16 deletions
diff --git a/conf-tmpl/battle/battle.conf b/conf-tmpl/battle/battle.conf
index c951746e7..4b520dfee 100644
--- a/conf-tmpl/battle/battle.conf
+++ b/conf-tmpl/battle/battle.conf
@@ -164,5 +164,9 @@ equip_skill_break_rate: 100
// NOTE: The official setting is yes, even thought it degrades performance a bit.
delay_battle_damage: yes
-// Are arrows are consumed when used on a bow? (Note 1)
-arrow_decrement: yes
+// Are arrows/ammo consumed when used on a bow/gun?
+// 0 - No, 1 - Yes
+// 2 - Yes even for skills that do not specify arrow consumption when said
+// skill is weapon-based and used with ranged weapons (auto-guesses which
+// skills should consume ammo when it's acquired via a card or plagiarize)
+arrow_decrement: 1
diff --git a/conf-tmpl/battle/items.conf b/conf-tmpl/battle/items.conf
index 98f1a7034..6ec9524eb 100644
--- a/conf-tmpl/battle/items.conf
+++ b/conf-tmpl/battle/items.conf
@@ -39,20 +39,14 @@ weapon_produce_rate: 100
// Prepare Potion success rate. (Note 2)
potion_produce_rate: 100
-// Do produced items have the maker's name on them? (Note 1)
-produce_item_name_input: yes
-
-// Do produced potions have the maker's name on them? (Note 1)
-produce_potion_name_input: yes
-
-// Do crafted arrows have the maker's name on them? (Note 1)
-making_arrow_name_input: no
-
-// Do created holy waters have the maker's name on it? (Note 1)
-holywater_name_input: no
-
-// Do created poison bottles have the maker's name on it? (Note 1)
-cdp_name_input: no
+// Do produced items have the maker's name on them? (Note 4)
+// 0x01: Produced Weapons
+// 0x02: Produced Potions
+// 0x04: Produced Arrows
+// 0x08: Produced Holy Water
+// 0x10: Produced Deadly Potions
+// 0x80: Other produced items.
+produce_item_name_input: 0x03
// Is a monster summoned via dead branch aggressive? (Note 1)
dead_branch_active: yes