Skip to content

Commit ab5efde

Browse files
JhobeanJhobean
committed
Rebuild add database and fix error duplication
1 parent 4c32c4d commit ab5efde

19 files changed

+89
-438
lines changed

‎crafting/interface/def_bowcraft.scp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ bowcraft_category_3_5 "i_crossbow_heavy"
4141
bowcraft_category_3_6 "i_magical_shortbow"
4242
bowcraft_category_3_7 "i_crossbow_repeating"
4343
bowcraft_category_3_8 "i_yumi"
44-
bowcraft_category_3_9 "i_blight_gripped_longbow"
44+
bowcraft_category_3_9 "i_ingredient_blight_gripped_longbow"
4545
bowcraft_category_3_10 "i_faerie_fire"
4646
bowcraft_category_3_11 "i_silvani_feywood_bow"
4747
bowcraft_category_3_12 "i_mischief_maker"

‎databases/adddialog.db

496 KB
Binary file not shown.

‎items/i_char_icons.scp

+14-14
Original file line numberDiff line numberDiff line change
@@ -3958,7 +3958,7 @@ TDATA3=c_krumpus
39583958
CATEGORY=Miscellaneous
39593959
SUBSECTION=Character Icons
39603960
DESCRIPTION=Krumpus_Statue
3961-
3961+
39623962
[ITEMDEF 0a271]
39633963
// Krumpus_Imp_Statue
39643964
DEFNAME=i_pet_krumpus_small
@@ -3968,7 +3968,7 @@ TDATA3=c_krumpus_small
39683968
CATEGORY=Miscellaneous
39693969
SUBSECTION=Character Icons
39703970
DESCRIPTION=Krumpus_Imp_Statue
3971-
3971+
39723972
[ITEMDEF 0a335]
39733973
// Crab_Coconut_Mount
39743974
DEFNAME=i_pet_crab_coconut_mount
@@ -3978,7 +3978,7 @@ TDATA3=c_coconut_crab_mount
39783978
CATEGORY=Miscellaneous
39793979
SUBSECTION=Character Icons
39803980
DESCRIPTION=Crab_Coconut_Mount
3981-
3981+
39823982
[ITEMDEF 0a336]
39833983
// Crab_Coconut_Small
39843984
DEFNAME=i_pet_crab_coconut_small
@@ -3988,7 +3988,7 @@ TDATA3=c_coconut_crab_small
39883988
CATEGORY=Miscellaneous
39893989
SUBSECTION=Character Icons
39903990
DESCRIPTION=Crab_Coconut_Small
3991-
3991+
39923992
[ITEMDEF 0a337]
39933993
// Crab_Coconut_Large
39943994
DEFNAME=i_pet_crab_coconut_large
@@ -3998,7 +3998,7 @@ TDATA3=c_coconut_crab_large
39983998
CATEGORY=Miscellaneous
39993999
SUBSECTION=Character Icons
40004000
DESCRIPTION=Crab_Coconut_Large
4001-
4001+
40024002
[ITEMDEF 0a554]
40034003
// war_boar_mount
40044004
DEFNAME=i_pet_war_boar_mount
@@ -4008,7 +4008,7 @@ TDATA3=c_war_boar_mount
40084008
CATEGORY=Miscellaneous
40094009
SUBSECTION=Character Icons
40104010
DESCRIPTION=war_boar_mount
4011-
4011+
40124012
[ITEMDEF 0a57b]
40134013
// Capybara_Mount_Stat
40144014
DEFNAME=i_pet_capybara_mount
@@ -4018,7 +4018,7 @@ TDATA3=c_capybara_mount
40184018
CATEGORY=Miscellaneous
40194019
SUBSECTION=Character Icons
40204020
DESCRIPTION=Capybara_Mount_Stat
4021-
4021+
40224022
[ITEMDEF 0a57c]
40234023
// Capybara_Baby_Statu
40244024
DEFNAME=i_pet_capybara_baby
@@ -4028,7 +4028,7 @@ TDATA3=c_capybara_baby
40284028
CATEGORY=Miscellaneous
40294029
SUBSECTION=Character Icons
40304030
DESCRIPTION=Capybara_Baby_Statu
4031-
4031+
40324032
[ITEMDEF 0a738]
40334033
// Rabbit_Doom
40344034
DEFNAME=i_pet_rabbit_doom
@@ -4038,7 +4038,7 @@ TDATA3=c_rabbit_doom
40384038
CATEGORY=Miscellaneous
40394039
SUBSECTION=Character Icons
40404040
DESCRIPTION=Rabbit_Doom
4041-
4041+
40424042
[ITEMDEF 0a739]
40434043
// Rabbit_Doom_Baby
40444044
DEFNAME=i_pet_rabbit_doom_baby
@@ -4048,7 +4048,7 @@ TDATA3=c_rabbit_doom_baby
40484048
CATEGORY=Miscellaneous
40494049
SUBSECTION=Character Icons
40504050
DESCRIPTION=Rabbit_Doom_Baby
4051-
4051+
40524052
[ITEMDEF 0a76b]
40534053
// Dog_Newfoundland
40544054
DEFNAME=i_pet_dog_newfoundland
@@ -4058,7 +4058,7 @@ TDATA3=c_dog_newfoundland
40584058
CATEGORY=Miscellaneous
40594059
SUBSECTION=Character Icons
40604060
DESCRIPTION=Dog_Newfoundland
4061-
4061+
40624062
[ITEMDEF 0a76c]
40634063
// Dog_Alaskan Malamut
40644064
DEFNAME=i_pet_dog_malamut
@@ -4078,7 +4078,7 @@ TDATA3=c_dog_dane
40784078
CATEGORY=Miscellaneous
40794079
SUBSECTION=Character Icons
40804080
DESCRIPTION=Dog_Great_Dane
4081-
4081+
40824082
[ITEMDEF 0a76e]
40834083
// Dog_Saint_Bernard
40844084
DEFNAME=i_pet_dog_bernard
@@ -4088,7 +4088,7 @@ TDATA3=c_dog_bernard
40884088
CATEGORY=Miscellaneous
40894089
SUBSECTION=Character Icons
40904090
DESCRIPTION=Dog_Saint_Bernard
4091-
4091+
40924092
[ITEMDEF 0a76f]
40934093
// Dog_Black_Russian_t
40944094
DEFNAME=i_pet_dog_terier
@@ -4098,7 +4098,7 @@ TDATA3=c_dog_terier
40984098
CATEGORY=Miscellaneous
40994099
SUBSECTION=Character Icons
41004100
DESCRIPTION=Dog_Black_Russian_t
4101-
4101+
41024102
[ITEMDEF 0a770]
41034103
// Dog_Rottweiler
41044104
DEFNAME=i_pet_dog_rottweiler

‎items/i_crops_new_legacy.scp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ DEFNAME=i_crop_gourds_2
13821382
NAME=Gourds
13831383
TYPE=t_crops
13841384
TDATA1=i_crop_gourds_1
1385-
TDATA3=i_fruit_gourd
1385+
TDATA3=i_fruit_gourd_green
13861386
VALUE=1
13871387
CATEGORY=Vegetation
13881388
SUBSECTION=Crops

‎items/i_deco_dungeons_traps_dead.scp

-19
Original file line numberDiff line numberDiff line change
@@ -4097,17 +4097,6 @@ DUPEITEM=01da3
40974097
//left leg
40984098
DUPEITEM=01da4
40994099

4100-
4101-
[ITEMDEF 0207c]
4102-
//This statue is duplicated from 01226/0139b, but used on Twisted Weald
4103-
//as container to drop dungeon keys and receive the Essence of the Wind
4104-
DEFNAME=i_statue_faie
4105-
NAME=statue of the faie
4106-
CATEGORY=Decoration - Dungeons and The Dead
4107-
SUBSECTION=Twisted Weald
4108-
DESCRIPTION=Statue of the Faie
4109-
4110-
41114100
[ITEMDEF 021fc]
41124101
DEFNAME=i_skull_spikes
41134102
NAME=skull spikes
@@ -4219,14 +4208,6 @@ CATEGORY=Traps
42194208
SUBSECTION=Goblin Trap
42204209
DESCRIPTION=Goblin Trap
42214210

4222-
4223-
[ITEMDEF 09cee]
4224-
DEFNAME=i_automaton_actuator_right
4225-
NAME=automaton actuator
4226-
CATEGORY=Decoration - Dungeons and The Dead
4227-
SUBSECTION=Kotl City
4228-
DESCRIPTION=Automaton Actuator (right)
4229-
42304211
[ITEMDEF 09ccf]
42314212
//automaton actuator (right)
42324213
NAME=automaton actuator

‎items/i_deco_virtues.scp

-1
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,6 @@ DUPEITEM=01d97
663663
//ankh of sacrifice
664664
DUPEITEM=01d97
665665

666-
667666
[ITEMDEF 040da]
668667
DEFNAME=i_sa_floor_virtue_1
669668
NAME=virtue symbol

‎items/i_holiday_anniversary.scp

+1-146
Original file line numberDiff line numberDiff line change
@@ -159,151 +159,6 @@ DUPELIST=03bb4
159159
//10th anniversary sculpture
160160
DUPEITEM=03bb3
161161

162-
163-
[ITEMDEF 040da]
164-
//codex of virtue (multi-part)
165-
NAME=codex of virtue
166-
167-
[ITEMDEF 040db]
168-
//codex of virtue (multi-part)
169-
NAME=codex of virtue
170-
171-
[ITEMDEF 040dc]
172-
//codex of virtue (multi-part)
173-
NAME=codex of virtue
174-
175-
[ITEMDEF 040dd]
176-
//codex of virtue (multi-part)
177-
NAME=codex of virtue
178-
179-
[ITEMDEF 040de]
180-
//codex of virtue (multi-part)
181-
NAME=codex of virtue
182-
183-
[ITEMDEF 040df]
184-
//codex of virtue (multi-part)
185-
NAME=codex of virtue
186-
187-
[ITEMDEF 040e0]
188-
//codex of virtue (multi-part)
189-
NAME=codex of virtue
190-
191-
[ITEMDEF 040e1]
192-
//codex of virtue (multi-part)
193-
NAME=codex of virtue
194-
195-
[ITEMDEF 040e2]
196-
//codex of virtue (multi-part)
197-
NAME=codex of virtue
198-
199-
[ITEMDEF 040e3]
200-
//codex of virtue (multi-part)
201-
NAME=codex of virtue
202-
203-
[ITEMDEF 040e4]
204-
//codex of virtue (multi-part)
205-
NAME=codex of virtue
206-
207-
[ITEMDEF 040e5]
208-
//codex of virtue (multi-part)
209-
NAME=codex of virtue
210-
211-
[ITEMDEF 040e6]
212-
//codex of virtue (multi-part)
213-
NAME=codex of virtue
214-
215-
[ITEMDEF 040e7]
216-
//codex of virtue (multi-part)
217-
NAME=codex of virtue
218-
219-
[ITEMDEF 040e8]
220-
//codex of virtue (multi-part)
221-
NAME=codex of virtue
222-
223-
[ITEMDEF 040e9]
224-
//codex of virtue (multi-part)
225-
NAME=codex of virtue
226-
227-
[ITEMDEF 040ea]
228-
//codex of virtue (multi-part)
229-
NAME=codex of virtue
230-
231-
[ITEMDEF 040eb]
232-
//codex of virtue (multi-part)
233-
NAME=codex of virtue
234-
235-
[ITEMDEF 040ec]
236-
//codex of virtue (multi-part)
237-
NAME=codex of virtue
238-
239-
[ITEMDEF 040ed]
240-
//codex of virtue (multi-part)
241-
NAME=codex of virtue
242-
243-
[ITEMDEF 040ee]
244-
//codex of virtue (multi-part)
245-
NAME=codex of virtue
246-
247-
[ITEMDEF 040ef]
248-
//codex of virtue (multi-part)
249-
NAME=codex of virtue
250-
251-
[ITEMDEF 040f0]
252-
//codex of virtue (multi-part)
253-
NAME=codex of virtue
254-
255-
[ITEMDEF 040f1]
256-
//codex of virtue (multi-part)
257-
NAME=codex of virtue
258-
259-
[ITEMDEF 040f2]
260-
//codex of virtue (multi-part)
261-
NAME=codex of virtue
262-
263-
[ITEMDEF 040f3]
264-
//codex of virtue (multi-part)
265-
NAME=codex of virtue
266-
267-
[ITEMDEF 040f4]
268-
//codex of virtue (multi-part)
269-
NAME=codex of virtue
270-
271-
[ITEMDEF 040f5]
272-
//codex of virtue (multi-part)
273-
NAME=codex of virtue
274-
275-
[ITEMDEF 040f6]
276-
//codex of virtue (multi-part)
277-
NAME=codex of virtue
278-
279-
[ITEMDEF 040f7]
280-
//codex of virtue (multi-part)
281-
NAME=codex of virtue
282-
283-
[ITEMDEF 040f8]
284-
//codex of virtue (multi-part)
285-
NAME=codex of virtue
286-
287-
[ITEMDEF 040f9]
288-
//codex of virtue (multi-part)
289-
NAME=codex of virtue
290-
291-
[ITEMDEF 040fa]
292-
//codex of virtue (multi-part)
293-
NAME=codex of virtue
294-
295-
[ITEMDEF 040fb]
296-
//codex of virtue (multi-part)
297-
NAME=codex of virtue
298-
299-
[ITEMDEF 040fc]
300-
//codex of virtue (multi-part)
301-
NAME=codex of virtue
302-
303-
[ITEMDEF 040fd]
304-
//codex of virtue (multi-part)
305-
NAME=codex of virtue
306-
307162
[ITEMDEF 04141]
308163
// Mailbox South (flag up)
309164
DUPEITEM=04142
@@ -691,7 +546,7 @@ DESCRIPTION=15th Anniversary Cake
691546
ON=@Create
692547
MORE2=10
693548
ON=@ClientTooltip
694-
addcliloc 1153151,<dMORE2> //Slices: ~1_amt~
549+
addcliloc 1153151,<dMORE2> //Slices: ~1_amt~
695550
ON=@DClick
696551
SERV.NEWITEM i_cake_15th_anniversary_slice
697552
NEW.BOUNCE

‎items/i_holiday_halloween.scp

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ VERSION=X1
77
[ITEMDEF 042b5]
88
DEFNAME=i_skulls_on_pike
99
NAME=skulls on pike
10+
TYPE=t_normal
11+
WEIGHT=13.0
12+
RESOURCES=10 i_bone,3 i_bone_skull
1013
CATEGORY=Halloween
1114
SUBSECTION=Decoration
1215
DESCRIPTION=Skulls on Pike

‎items/i_profession_cook_barkeep_baker.scp

+4-3
Original file line numberDiff line numberDiff line change
@@ -2730,7 +2730,8 @@ DUPELIST=044e6
27302730
//Fish (dragon)
27312731
DUPEITEM=044e5
27322732

2733-
[ITEMDEF 03b10]
2733+
[ITEMDEF i_seahorse]
2734+
ID=i_aquarium_seahorse
27342735
DEFNAME=i_seahorse
27352736
NAME=seahorse
27362737
TYPE=t_fish
@@ -2783,7 +2784,7 @@ DUPELIST=0a423
27832784
DEFNAME=i_serpent_steak_grilled
27842785
NAME=grilled serpent steak
27852786
FLIP=1
2786-
RESOURCES=1 i_serpent_steak_raw
2787+
RESOURCES=1 i_serpent_steak_raw
27872788
SKILLMAKE=Cooking 45.0, t_cooking
27882789
CATEGORY=Items by Professions
27892790
SUBSECTION=Cook
@@ -2856,7 +2857,7 @@ ON=@Create
28562857

28572858
[ITEMDEF i_cocoa_liquor]
28582859
ID=i_cookie_mix
2859-
NAME=cocoa liquor
2860+
NAME=cocoa liquor
28602861
TYPE=t_food
28612862
VALUE=7
28622863
WEIGHT=0.1

0 commit comments

Comments
 (0)