summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/cashshop_db.conf4
-rw-r--r--db/const.txt28
-rw-r--r--db/pet_db.txt14
-rw-r--r--db/re/item_chain.conf4
-rw-r--r--db/re/item_db.conf1
-rw-r--r--db/re/item_group.conf4
-rw-r--r--db/re/item_packages.conf4
-rw-r--r--db/re/job_db.conf4
-rw-r--r--db/re/map_zone_db.conf4
-rw-r--r--db/re/skill_cast_db.txt2
-rw-r--r--db/re/skill_tree.conf4
-rw-r--r--db/roulette_db.conf4
-rw-r--r--db/translations.conf4
13 files changed, 50 insertions, 31 deletions
diff --git a/db/cashshop_db.conf b/db/cashshop_db.conf
index a020417c..df647640 100644
--- a/db/cashshop_db.conf
+++ b/db/cashshop_db.conf
@@ -6,9 +6,9 @@
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
//=
-//= http://hercules.ws/board/
+//= http://herc.ws/board/
//================= More Information =================
-//= http://hercules.ws/board/topic/367-introducing-cash-shop-support/
+//= http://herc.ws/board/topic/367-introducing-cash-shop-support/
//====================================================
// This file handles the entire Cashshop. You can simply
// add in any amount of items you like within each category.
diff --git a/db/const.txt b/db/const.txt
index 72cb81e7..38260b51 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -337,6 +337,7 @@ cell_basilica 4
cell_landprotector 5
cell_novending 6
cell_nochat 7
+//cell_gettype 0
cell_chkwall 1
cell_chkwater 2
cell_chkcliff 3
@@ -344,6 +345,7 @@ cell_chkpass 4
cell_chkreach 5
cell_chknopass 6
cell_chknoreach 7
+//cell_chkstack 8
cell_chknpc 9
cell_chkbasilica 10
cell_chklandprotector 11
@@ -551,6 +553,9 @@ bFixedCast 2057
bVariableCast 2058
bSetDefRace 2059
bSetMDefRace 2060
+bAddRaceTolerance 2061
+
+//reference to script.c::script_defaults():equip[] array used for easy-conversion
EQI_HEAD_TOP 1
EQI_ARMOR 2
EQI_HAND_L 3
@@ -595,7 +600,7 @@ Eff_Confusion 7
Eff_Blind 8
Eff_Bleeding 9
Eff_DPoison 10
-Eff_Fear 11
+Eff_Fear 11
Eff_Cold 12
Eff_Burning 13
Eff_Deepsleep 14
@@ -609,6 +614,8 @@ Ele_Holy 6
Ele_Dark 7
Ele_Ghost 8
Ele_Undead 9
+Ele_All 255
+
RC_Formless 0
RC_Undead 1
RC_Brute 2
@@ -619,9 +626,15 @@ RC_Demon 6
RC_DemiHuman 7
RC_Angel 8
RC_Dragon 9
-RC_Boss 10
-RC_NonBoss 11
-RC_NonDemiHuman 12
+RC_Player 10
+RC_Boss 11
+RC_NonBoss 12
+RC_NonDemiHuman 14
+RC_NonPlayer 15
+RC_DemiPlayer 16
+RC_NonDemiPlayer 17
+RC_All 255
+
RC2_None 0
RC2_Goblin 1
RC2_Kobold 2
@@ -629,6 +642,9 @@ RC2_Orc 3
RC2_Golem 4
RC2_Guardian 5
RC2_Ninja 6
+RC2_Scaraba 7
+RC2_Turtle 8
+
Size_Small 0
Size_Medium 1
Size_Large 2
@@ -3169,6 +3185,10 @@ THANATOS_KEEP 10009
4_PD_GOLDDRAGON 10108
4_PD_ZAEROG 10109
4_PD_TAMADORA 10110
+4_JP_EDGA_H 10111
+4_JP_BRAGOLEM_H 10112
+4_EL_AQUA 10113
+
MER_LIF 6001
MER_AMISTR 6002
MER_FILIR 6003
diff --git a/db/pet_db.txt b/db/pet_db.txt
index 29369923..a05246db 100644
--- a/db/pet_db.txt
+++ b/db/pet_db.txt
@@ -30,14 +30,12 @@
//In theory you can use any valid script, but it is run only once upon pet
//loading, so it is recommended you use the specific pet scripts:
-//petskillattack skillid, skilllv, rate, bonusrate
+//petskillattack skillid, skilllv, hits, rate, bonusrate
//Skill attack that triggers while the pet is attacking. Rate is the base
//chance of execution per attack. Bonusrate is an additional success rate when
-//intimacy reaches max.
-
-//petskillattack2 skillid, damage, hits, rate, bonusrate
-//Same as petskillattack, but the damage and number of hits is fixed
-//the damage specified is total, not per hit.
+//intimacy reaches max. If hits is specified and different than 0, it will make
+//the pet cast the skill with a fixed amount of damage inflicted and the
+//specified number of hits. A value of zero uses the skill's defaults.
//petskillsupport skillid, skilllv, delay, hp%, sp%
//Casts a support skill when the health levels are below the specified hp% and
@@ -50,7 +48,7 @@
//amount by which it is increased, duration signals how long the bonus lasts
//delay is the time elapsed after the bonus ends and before it starts again.
-//A single pet can have petloot, petskillbonus, petskillattack (or
-//petskillattack2) and petskillsupport at the same time, but only one of each.
+//A single pet can have petloot, petskillbonus, petskillattack and
+//petskillsupport at the same time, but only one of each.
1002,Piou,Piou,701,4000,0,507,80,60,50,100,250,20,5000,150,1,0,350,400,800,{ petloot 10; },{ bonus bLuk,2; bonus bCritical,1; }
diff --git a/db/re/item_chain.conf b/db/re/item_chain.conf
index bc6c1801..9d0026e4 100644
--- a/db/re/item_chain.conf
+++ b/db/re/item_chain.conf
@@ -6,9 +6,9 @@
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
//=
-//= http://hercules.ws/board/
+//= http://herc.ws/board/
//================= More Information =================
-// http://hercules.ws/board/topic/1244-official-item-grouppackagechain
+// http://herc.ws/board/topic/1244-official-item-grouppackagechain
//====================================================
// Structure of file:
/*
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 7c7b3a1b..e653b041 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -29,6 +29,7 @@ item_db: (
Refine: Refineable (boolean, defaults to true)
View: View ID (int, defaults to 0)
BindOnEquip: true/false (boolean, defaults to false)
+ ForceSerial: true/false (boolean, defaults to false)
BuyingStore: true/false (boolean, defaults to false)
Delay: Delay to use item (int, defaults to 0)
FloorLifeTime: Delay to remove item from ground (int, default flooritem_lifetime)
diff --git a/db/re/item_group.conf b/db/re/item_group.conf
index dcb796d7..71f6c7e1 100644
--- a/db/re/item_group.conf
+++ b/db/re/item_group.conf
@@ -6,9 +6,9 @@
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
//=
-//= http://hercules.ws/board/
+//= http://herc.ws/board/
//================= More Information =================
-// http://hercules.ws/board/topic/1244-official-item-grouppackagechain
+// http://herc.ws/board/topic/1244-official-item-grouppackagechain
//====================================================
// Structure of file:
/*
diff --git a/db/re/item_packages.conf b/db/re/item_packages.conf
index 8845a289..1e5544b3 100644
--- a/db/re/item_packages.conf
+++ b/db/re/item_packages.conf
@@ -6,9 +6,9 @@
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
//=
-//= http://hercules.ws/board/
+//= http://herc.ws/board/
//================= More Information =================
-// http://hercules.ws/board/topic/1244-official-item-grouppackagechain
+// http://herc.ws/board/topic/1244-official-item-grouppackagechain
//====================================================
// Structure of file:
/*
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 7b03c378..29069869 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -6,9 +6,9 @@
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
//=
-//= http://hercules.ws/board/
+//= http://herc.ws/board/
//================= More Information =================
-// http://hercules.ws/board/topic/9082-job-db1txt-redesign/
+// http://herc.ws/board/topic/9082-job-db1txt-redesign/
//============== RE Structure Example ================
/*
Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there)
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 997dcd99..1b1c070e 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -6,11 +6,11 @@
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
//=
-//= http://hercules.ws/board/
+//= http://herc.ws/board/
//====================================================
//= Hercules Map Zone Database [Ind/Hercules]
//================ More Information ==================
-//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
+//= http://herc.ws/board/topic/302-introducing-hercules-map-zone-database/
//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
//====================================================
//================ Description =======================
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index a9b2c614..7d73fcce 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -1565,7 +1565,7 @@
//-- SO_WARMER
2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000,1800:1600:1400:1200:1000
//-- SO_VACUUM_EXTREME
-2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,1000,5000,-1
+2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,0,5000,-1
//-- SO_VARETYR_SPEAR
2454,2200:2400:2600:2800:3000,1000,0,0,2200:2400:2600:2800:3000,2000,1800:1600:1400:1200:1000
//-- SO_ARULLO
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 977360e4..3f05236a 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -6,9 +6,9 @@
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
//=
-//= http://hercules.ws/board/
+//= http://herc.ws/board/
//================= More Information =================
-// http://hercules.ws/board/topic/1188-skill-tree-db-redesign/
+// http://herc.ws/board/topic/1188-skill-tree-db-redesign/
//================ Structure Example =================
/*
Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there)
diff --git a/db/roulette_db.conf b/db/roulette_db.conf
index 51f912ff..c7f6da08 100644
--- a/db/roulette_db.conf
+++ b/db/roulette_db.conf
@@ -6,9 +6,9 @@
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
//=
-//= http://hercules.ws/board/
+//= http://herc.ws/board/
//================= More Information =================
-//= http://hercules.ws/board/ ???
+//= http://herc.ws/board/ ???
//====================================================
// This file handles the Roulette, the format is <item>:<amount>
// The first entry is the one that loses the game.
diff --git a/db/translations.conf b/db/translations.conf
index 3b16a8c2..fc814463 100644
--- a/db/translations.conf
+++ b/db/translations.conf
@@ -6,9 +6,9 @@
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
//=
-//= http://hercules.ws/board/
+//= http://herc.ws/board/
//================= More Information =================
-//= http://hercules.ws/board/topic/8687-hercules-ultimate-localization-design/
+//= http://herc.ws/board/topic/8687-hercules-ultimate-localization-design/
//====================================================
// Translations generated with —-generate-translations
// should be pointed to here
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-12 04:00:57 +0000