summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2015-11-23 07:55:58 +0800
committerJedzkie <jedzkie13@rocketmail.com>2015-11-23 07:55:58 +0800
commitd33fa7b6348377d09136a7ab2e742bd93174973e (patch)
treeae1683589880232c20f4996880d121c68852b914 /db
parent0ef4e5868f4725aca7be5ca764d2ec1e43b91532 (diff)
downloadhercules-d33fa7b6348377d09136a7ab2e742bd93174973e.tar.gz
hercules-d33fa7b6348377d09136a7ab2e742bd93174973e.tar.bz2
hercules-d33fa7b6348377d09136a7ab2e742bd93174973e.tar.xz
hercules-d33fa7b6348377d09136a7ab2e742bd93174973e.zip
ItemDB Update:
- Added new official item status effect, 'SC_CUP_OF_BOZA'. - Follow up https://github.com/HerculesWS/Hercules/commit/f512a0b9cf93e2432f79b57fb05ccda4b6311b02. - Follow up https://github.com/HerculesWS/Hercules/commit/ce33936de2fcb9c565437cb80e6329ab76626500. - Follow up https://github.com/HerculesWS/Hercules/commit/d8909d9b2cf29f45c025fb93fc1df94ec1a40854. - Follow up https://github.com/HerculesWS/Hercules/commit/f65e0326ac7e6faf17451d4c6d275e4fd3133cc0. - Some white spaces adjustments.
Diffstat (limited to 'db')
-rw-r--r--db/const.txt1
-rw-r--r--db/pre-re/item_db.conf2
-rw-r--r--db/re/item_db.conf27
-rw-r--r--db/sc_config.txt24
4 files changed, 33 insertions, 21 deletions
diff --git a/db/const.txt b/db/const.txt
index da0293660..3f0fbdbd0 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1315,6 +1315,7 @@ SC_ATKER_ASPD 608
SC_ATKER_MOVESPEED 609
SC_FOOD_CRITICALSUCCESSVALUE 610
+SC_CUP_OF_BOZA 611
e_gasp 0
e_what 1
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 9a823e16a..3219e02df 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -88886,7 +88886,7 @@ item_db: (
View: 8
},
-// More Bows
+// More Bows
// ===================================================================
{
Id: 18100
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 8ab0ff10c..66d1d6e30 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -111848,7 +111848,7 @@ item_db: (
},
{
Id: 14619
- AegisName: "Int_Biscuit_Stick"
+ AegisName: "INT_Biscuit_Stick"
Name: "Bar of Knowledge"
Type: 11
Buy: 0
@@ -111869,7 +111869,7 @@ item_db: (
},
{
Id: 14620
- AegisName: "Dex_Biscuit_Stick"
+ AegisName: "DEX_Biscuit_Stick"
Name: "Bar of Tricks"
Type: 11
Buy: 0
@@ -111890,7 +111890,7 @@ item_db: (
},
{
Id: 14621
- AegisName: "Luk_Biscuit_Stick"
+ AegisName: "LUK_Biscuit_Stick"
Name: "Bar of Luck"
Type: 11
Buy: 0
@@ -111909,6 +111909,17 @@ item_db: (
sc_start SC_CRITICALSUCCESSVALUE,60000,rand(11,13);
">
},
+{
+ Id: 14674
+ AegisName: "Cup_Of_Boza"
+ Name: "Cup Of Boza"
+ Type: 2
+ Buy: 20
+ Weight: 10
+ Script: <"
+ sc_start2 SC_CUP_OF_BOZA,120000,10,5;
+ ">
+},
// More Armors
// ===================================================================
@@ -118153,7 +118164,7 @@ item_db: (
{
Id: 17271
AegisName: "VIT_Biscuit_Stick_Box"
- Name: "VIT Biscuit Stick Box"
+ Name: "Bar of Fitness Box"
Type: 18
Buy: 0
Weight: 10
@@ -118171,7 +118182,7 @@ item_db: (
{
Id: 17272
AegisName: "AGI_Biscuit_Stick_Box"
- Name: "AGI Biscuit Stick Box"
+ Name: "Bar of Agility Box"
Type: 18
Buy: 0
Weight: 10
@@ -118189,7 +118200,7 @@ item_db: (
{
Id: 17273
AegisName: "INT_Biscuit_Stick_Box"
- Name: "INT Biscuit Stick Box"
+ Name: "Bar of Knowledge Box"
Type: 18
Buy: 0
Weight: 10
@@ -118207,7 +118218,7 @@ item_db: (
{
Id: 17274
AegisName: "DEX_Biscuit_Stick_Box"
- Name: "DEX Biscuit Stick Box"
+ Name: "Bar of Tricks Box"
Type: 18
Buy: 0
Weight: 10
@@ -118225,7 +118236,7 @@ item_db: (
{
Id: 17275
AegisName: "LUK_Biscuit_Stick_Box"
- Name: "LUK Biscuit Stick Box"
+ Name: "Bar of Luck Box"
Type: 18
Buy: 0
Weight: 10
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 303f8a158..14ba7b500 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -400,15 +400,15 @@ SC_REBOUND, 18
SC_TELEKINESIS_INTENSE, 18
// Geffen Scrolls
-SC_SKELSCROLL, 90
-SC_DISTRUCTIONSCROLL, 90
-SC_ROYALSCROLL, 90
-SC_IMMUNITYSCROLL, 90
-SC_MYSTICSCROLL, 90
-SC_BATTLESCROLL, 90
-SC_ARMORSCROLL, 90
-SC_FREYJASCROLL, 90
-SC_SOULSCROLL, 90
+SC_SKELSCROLL, 69
+SC_DISTRUCTIONSCROLL, 69
+SC_ROYALSCROLL, 69
+SC_IMMUNITYSCROLL, 69
+SC_MYSTICSCROLL, 69
+SC_BATTLESCROLL, 69
+SC_ARMORSCROLL, 69
+SC_FREYJASCROLL, 69
+SC_SOULSCROLL, 69
// Eden Crystal Synthesis [Needs more info]
//SC_QUEST_BUFF1, ??
@@ -416,9 +416,9 @@ SC_SOULSCROLL, 90
//SC_QUEST_BUFF3, ??
// Geffen Magic Tournament [Needs more info]
-//SC_GEFFEN_MAGIC1, ??
-//SC_GEFFEN_MAGIC2, ??
-//SC_GEFFEN_MAGIC3, ??
+SC_GEFFEN_MAGIC1, 2
+SC_GEFFEN_MAGIC2, 2
+SC_GEFFEN_MAGIC3, 2
//SC_FENRIR_CARD, ??
// Guild Auras should not be saved