summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml1
m---------client-data0
-rw-r--r--world/map/db/const-aegis.txt6
-rw-r--r--world/map/db/item_db.conf201
-rw-r--r--world/map/db/item_db_generic.txt9
-rw-r--r--world/map/db/item_db_weapon.txt4
-rw-r--r--world/map/npc/069-2/wizard.txt31
7 files changed, 160 insertions, 92 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2de0f1fe..bbf1c315 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,6 +86,7 @@ pages:
artifacts:
paths:
- public
+ expire_in: 1 month
only:
- stable
diff --git a/client-data b/client-data
-Subproject c0aa3502e8b3d689ae08a20e3c6b6f2200e56e5
+Subproject 5ac773f7bf3eba922098d067bd251f4c44db125
diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index 0a8c8105..ce49b178 100644
--- a/world/map/db/const-aegis.txt
+++ b/world/map/db/const-aegis.txt
@@ -352,6 +352,12 @@ SilverIngot 5296
GoldenTooth 5297
CloverDrawing 5298
ShadowHerb 5311
+CrozeniteCrystal 5313
+GoldOre 5314
+GoldIngot 5315
+BromenalOre 5316
+BromenalIngot 5317
+BromenalDroplet 5318
LeatherShirt 523
DesertShirt 546
Turtleneck 564
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index bf1d3f5d..73cf6802 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -1118,7 +1118,7 @@ item_db: (
WeaponLv: 1
EquipLv: 1
Refine: false
- Subtype: "W_HUUMA"
+ Subtype: "W_BOOK"
},
{
Id: 907
@@ -1142,7 +1142,7 @@ item_db: (
nomail: true
noauction: true
}
- Subtype: "W_HUUMA"
+ Subtype: "W_BOOK"
},
{
Id: 1199
@@ -1542,7 +1542,6 @@ item_db: (
Def: 0
Slots: 0
Loc: "EQP_ACC_L"
- WeaponLv: 0
EquipLv: 85
Refine: false
ViewSprite: 879
@@ -5302,7 +5301,7 @@ item_db: (
Type: "IT_ETC"
Buy: 20000
Sell: 2000
- Weight: 40
+ Weight: 20
Def: 0
Refine: false
ViewSprite: 5297
@@ -5341,6 +5340,120 @@ item_db: (
Refine: false
ViewSprite: 5311
},
+{
+ Id: 5313
+ AegisName: "CrozeniteCrystal"
+ Name: "CrozeniteCrystal"
+ Type: "IT_ETC"
+ Buy: 0
+ Sell: 0
+ Weight: 555
+ Def: 0
+ Refine: false
+ ViewSprite: 5313
+ Trade: {
+ notrade: true
+ nodrop: true
+ nostorage: false
+ nogstorage: false
+ nomail: true
+ noauction: true
+ noselltonpc: true
+ }
+ //Disabled: true // @TMWA
+},
+{
+ Id: 5314
+ AegisName: "GoldOre"
+ Name: "GoldOre"
+ Type: "IT_ETC"
+ Buy: 3200
+ Sell: 1600
+ Weight: 40
+ Def: 0
+ Refine: false
+ ViewSprite: 5314
+ //Disabled: true // @TMWA
+},
+{
+ Id: 5315
+ AegisName: "GoldIngot"
+ Name: "GoldIngot"
+ Type: "IT_ETC"
+ Buy: 40000
+ Sell: 4400
+ Weight: 1000
+ Def: 0
+ Refine: false
+ ViewSprite: 5315
+ Trade: {
+ notrade: true
+ nodrop: true
+ nostorage: false
+ nogstorage: false
+ nomail: true
+ noauction: true
+ noselltonpc: true
+ }
+ //Disabled: true // @TMWA
+},
+{
+ Id: 5316
+ AegisName: "BromenalOre"
+ Name: "BromenalOre"
+ Type: "IT_ETC"
+ Buy: 3200
+ Sell: 1600
+ Weight: 40
+ Def: 0
+ Refine: false
+ ViewSprite: 5316
+ //Disabled: true // @TMWA
+},
+{
+ Id: 5317
+ AegisName: "BromenalIngot"
+ Name: "BromenalIngot"
+ Type: "IT_ETC"
+ Buy: 30000
+ Sell: 3300
+ Weight: 1000
+ Def: 0
+ Refine: false
+ ViewSprite: 5317
+ Trade: {
+ notrade: true
+ nodrop: true
+ nostorage: false
+ nogstorage: false
+ nomail: true
+ noauction: true
+ noselltonpc: true
+ }
+ //Disabled: true // @TMWA
+},
+{
+ Id: 5318
+ AegisName: "BromenalDroplet"
+ Name: "BromenalDroplet"
+ Type: "IT_ETC"
+ Buy: 15000
+ Sell: 1500
+ Weight: 20
+ Def: 0
+ Refine: false
+ ViewSprite: 5318
+ Trade: {
+ notrade: true
+ nodrop: true
+ nostorage: false
+ nogstorage: false
+ nomail: true
+ noauction: true
+ noselltonpc: true
+ }
+ //Disabled: true // @TMWA
+},
/* Chest Armor */
{
Id: 523
@@ -5679,7 +5792,6 @@ item_db: (
Def: 15
Slots: 0
Loc: "EQP_HEAD_MID"
- WeaponLv: 0
EquipLv: 90
Refine: false
ViewSprite: 755
@@ -5836,7 +5948,6 @@ item_db: (
Def: 7
Slots: 0
Loc: "EQP_HEAD_MID"
- WeaponLv: 0
EquipLv: 90
Refine: false
ViewSprite: 880
@@ -10841,7 +10952,6 @@ item_db: (
Def: 19
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 90
Refine: false
ViewSprite: 877
@@ -10871,7 +10981,6 @@ item_db: (
Def: 9
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 882
@@ -10890,7 +10999,6 @@ item_db: (
Def: 9
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 883
@@ -10909,7 +11017,6 @@ item_db: (
Def: 9
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 884
@@ -10928,7 +11035,6 @@ item_db: (
Def: 9
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 885
@@ -10947,7 +11053,6 @@ item_db: (
Def: 9
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 886
@@ -10966,7 +11071,6 @@ item_db: (
Def: 9
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 887
@@ -11481,7 +11585,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 1255
@@ -11500,7 +11603,6 @@ item_db: (
Def: 12
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 1256
@@ -11918,7 +12020,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2190
@@ -11938,7 +12039,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2191
@@ -11958,7 +12058,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2192
@@ -11978,7 +12077,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2193
@@ -11998,7 +12096,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2194
@@ -12018,7 +12115,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2195
@@ -12038,7 +12134,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2196
@@ -12058,7 +12153,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2197
@@ -12078,7 +12172,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2198
@@ -12098,7 +12191,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2199
@@ -12118,7 +12210,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2200
@@ -12139,7 +12230,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2201
@@ -12160,7 +12250,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2202
@@ -12181,7 +12270,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2203
@@ -12202,7 +12290,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2204
@@ -12223,7 +12310,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2205
@@ -12244,7 +12330,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2206
@@ -12265,7 +12350,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2207
@@ -12286,7 +12370,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2208
@@ -12307,7 +12390,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2209
@@ -12991,7 +13073,6 @@ item_db: (
Def: 5
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 4028
@@ -13181,7 +13262,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_TOP"
- WeaponLv: 0
EquipLv: 18
Refine: false
ViewSprite: 5201
@@ -15612,7 +15692,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 586
@@ -15650,7 +15729,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 632
@@ -15688,7 +15766,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 648
@@ -15748,7 +15825,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 771
@@ -15805,7 +15881,6 @@ item_db: (
Def: 1
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 881
@@ -15824,7 +15899,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 1172
@@ -15841,7 +15915,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2100
@@ -15861,7 +15934,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2101
@@ -15881,7 +15953,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2102
@@ -15901,7 +15972,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2103
@@ -15921,7 +15991,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2104
@@ -15941,7 +16010,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2105
@@ -15961,7 +16029,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2106
@@ -15981,7 +16048,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2107
@@ -16001,7 +16067,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2108
@@ -16021,7 +16086,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2109
@@ -16041,7 +16105,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2110
@@ -16061,7 +16124,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2111
@@ -16081,7 +16143,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2112
@@ -16101,7 +16162,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2113
@@ -16121,7 +16181,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2114
@@ -16141,7 +16200,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2115
@@ -16161,7 +16219,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2116
@@ -16181,7 +16238,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2117
@@ -16201,7 +16257,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2118
@@ -16221,7 +16276,6 @@ item_db: (
Def: 2
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2119
@@ -16241,7 +16295,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2170
@@ -16261,7 +16314,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2171
@@ -16281,7 +16333,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2172
@@ -16301,7 +16352,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2173
@@ -16321,7 +16371,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2174
@@ -16341,7 +16390,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2175
@@ -16361,7 +16409,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2176
@@ -16381,7 +16428,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2177
@@ -16401,7 +16447,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2178
@@ -16421,7 +16466,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2179
@@ -16441,7 +16485,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2180
@@ -16461,7 +16504,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2181
@@ -16481,7 +16523,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2182
@@ -16501,7 +16542,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2183
@@ -16521,7 +16561,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2184
@@ -16541,7 +16580,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2185
@@ -16561,7 +16599,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2186
@@ -16581,7 +16618,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2187
@@ -16601,7 +16637,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2188
@@ -16621,7 +16656,6 @@ item_db: (
Def: 4
Slots: 0
Loc: "EQP_HEAD_LOW"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 2189
@@ -16947,7 +16981,6 @@ item_db: (
Def: 0
Slots: 0
Loc: "EQP_HAND_L"
- WeaponLv: 0
EquipLv: 1
Refine: false
ViewSprite: 585
diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt
index d5925c37..d7e31485 100644
--- a/world/map/db/item_db_generic.txt
+++ b/world/map/db/item_db_generic.txt
@@ -268,6 +268,13 @@
//5293, CrystallizedDragonBlood,3, 0, 0, 1111, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {}
5295, PinkFlowerSeed, 3, 0, 0, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {}
//5296, SilverIngot, 3, 20000, 2200, 1000, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {}
-5297, GoldenTooth, 3, 20000, 2000, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {}
+5297, GoldenTooth, 3, 20000, 2000, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {}
//5298, CloverDrawing, 3, 0, 0, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {}
5311, ShadowHerb, 3, 2, 1, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {}
+//5313, CrozeniteCrystal, 3, 0, 0, 555, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {}
+//5314, GoldOre, 3, 3200, 1600, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {}
+//5315, GoldIngot, 3, 40000, 4400, 1000, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {}
+//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
+//5316, BromenalOre, 3, 3200, 1600, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {}
+//5317, BromenalIngot, 3, 30000, 3300, 1000, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {}
+//5318, BromenalDroplet, 3, 15000, 1500, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {}, {}
diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt
index be6e511e..87a14ea8 100644
--- a/world/map/db/item_db_weapon.txt
+++ b/world/map/db/item_db_weapon.txt
@@ -44,8 +44,8 @@
903, SlingShot, 4, 500, 50, 50, 5, 0, 4, 0, 0, 2, 34, 1, 1, 11, 0, {}, {set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";}
904, SlingBullet, 10, 1, 0, 1, 3, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {set @AmmoType, AMMO_SLING; callfunc "CheckAmmo";}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
-906, KidBook, 4, 10000, 5000, 350, 1, 0, 3, 0, 0, 2, 34, 1, 1, 22, 0, {}, {}
-907, FloydBook, 4, 10000, 5000, 350, 1, 0, 3, 0, 0, 2, 34, 1, 135, 22, 7, {}, {}
+906, KidBook, 4, 10000, 5000, 350, 1, 0, 3, 0, 0, 2, 34, 1, 1, 15, 0, {}, {}
+907, FloydBook, 4, 10000, 5000, 350, 1, 0, 3, 0, 0, 2, 34, 1, 135, 15, 7, {}, {}
1170, SweetTooth, 4, 4000, 2000, 1000, 50, 0, 2, 15, 0, 2, 34, 1, 1, 23, 0, {}, {set @bStat, Int; set @minbStatVal, 60; callfunc "RequireStat";}
1171, Wand, 4, 400, 200, 100, 1, 0, 1, 5, 0, 2, 2, 1, 1, 10, 0, {}, {set @bStat, Int; set @minbStatVal, 5; callfunc "RequireStat";}
1199, Arrow, 10, 1, 0, 1, 20, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";}
diff --git a/world/map/npc/069-2/wizard.txt b/world/map/npc/069-2/wizard.txt
index d9d0464a..c94258ec 100644
--- a/world/map/npc/069-2/wizard.txt
+++ b/world/map/npc/069-2/wizard.txt
@@ -137,18 +137,39 @@ L_Doomsday:
mes "\"...The Doomsday was a fierce battle. If you go there alone, you definitely will die. You should make a party and bring them all here, then I'll consider helping you.\"";
next;
mes "[Rodium]";
- mes "\"##1##BBut... not yet. The time wheel is broken again! Oh dear, these things happen, so I guess that to see the past... You must wait for the future...##b##0\"";
- if (debug) goto L_Warp;
- if (GM >= G_EVENT) goto L_Warp;
- goto L_Menu2;
+ mes "\"I'll require 2× [@@"+BlackRose+"|@@] and 500 GP to warp everyone here back in time. The events, however, are already fixed; time travel cannot change the past, and you are too weak to make a parallel universe with only that. Ah! There are no refunds, if you're alone then it is your loss.\"";
+ next;
+ mes "[Rodium]";
+ mes "\"So? What will you do?\"";
+ menu "Nothing for now, thanks for the info and sorry for the bother.", L_Close,
+ "Please, bring me to Keshlam!", L_Fine;
+
+L_Fine:
+ if (countitem(BlackRose) < 2) goto L_Close;
+ if (Zeny < 500) goto L_Close;
+ delitem BlackRose, 2;
+ set Zeny, Zeny - 500;
+ set $@RODIUM$, strcharinfo(0);
+ // centered in Rodium (107,90) visible radius: 15 tiles
+ areatimer 0, "069-2", 92, 75, 122, 105, 10, "Mclecht Rodium::OnWarp";
+ goto L_Close;
L_Warp:
- // TODO: Require some sort of payment
// TODO: Revive all mobs from 099-1/-2/-3 (they do not respawn, iirc)
// TODO: Reduce amount of mobs >.<
warp "099-1", 34, 34;
close;
+OnWarp:
+ if (strcharinfo(0) == $@RODIUM$) goto L_Warp;
+ mes "[Rodium]";
+ mes "\"Hey, "+$@RODIUM$+" is inviting you to time-trip to Keshlam. If they didn't explain you any detail, then don't bother. Otherwise, do you want me to warp you, too?\"";
+ next;
+ mes "[Rodium]";
+ mes "\"Please make your decision.\"";
+ menu "I don't know what you're talking about, old man!", L_Close,
+ "Yeah, they're my friend, please warp me!", L_Warp;
+
L_Close:
close;
}
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-01 12:56:53 +0000