Skip to content

Commit 12598f7

Browse files
authored
Merge pull request #1 from KeepBotting/indio-watchtower
feat: a few watchtower items
2 parents 5cd56b5 + 551c1ac commit 12598f7

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

data/src/pack/obj.pack

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,14 +2378,14 @@
23782378
2377=ogre_tooth
23792379
2378=obj_2378
23802380
2379=rock_cake
2381-
2380=obj_2380
2382-
2381=obj_2381
2383-
2382=obj_2382
2384-
2383=obj_2383
2385-
2384=obj_2384
2386-
2385=obj_2385
2387-
2386=obj_2386
2388-
2387=obj_2387
2381+
2380=watchtower_crystal1
2382+
2381=watchtower_crystal2
2383+
2382=watchtower_crystal3
2384+
2383=watchtower_crystal4
2385+
2384=fingernails
2386+
2385=old_robe
2387+
2386=unusual_armour
2388+
2387=damaged_dagger
23892389
2388=tattered_eye_patch
23902390
2389=vial_water_jangerberries
23912391
2390=mixture_guam_jangerberries

data/src/scripts/_unpack/all.obj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ iop2=Eat
11801180
category=category_734
11811181
tradeable=no
11821182

1183-
[obj_2380]
1183+
[watchtower_crystal1]
11841184
name=Crystal
11851185
model=model_2335_obj
11861186
recol1s=22292
@@ -1195,7 +1195,7 @@ weight=2lb
11951195
members=yes
11961196
tradeable=no
11971197

1198-
[obj_2381]
1198+
[watchtower_crystal2]
11991199
name=Crystal
12001200
model=model_2335_obj
12011201
recol1s=22292
@@ -1210,7 +1210,7 @@ weight=2lb
12101210
members=yes
12111211
tradeable=no
12121212

1213-
[obj_2382]
1213+
[watchtower_crystal3]
12141214
name=Crystal
12151215
model=model_2335_obj
12161216
recol1s=22292
@@ -1225,7 +1225,7 @@ weight=2lb
12251225
members=yes
12261226
tradeable=no
12271227

1228-
[obj_2383]
1228+
[watchtower_crystal4]
12291229
name=Crystal
12301230
model=model_2335_obj
12311231
recol1s=2978
@@ -1240,7 +1240,7 @@ weight=2lb
12401240
members=yes
12411241
tradeable=no
12421242

1243-
[obj_2384]
1243+
[fingernails]
12441244
name=Finger nails
12451245
desc=Eeeeyeeew!
12461246
model=model_1787_obj
@@ -1252,7 +1252,7 @@ weight=2g
12521252
members=yes
12531253
tradeable=no
12541254

1255-
[obj_2385]
1255+
[old_robe]
12561256
name=Old robe
12571257
desc=I can't wear this old thing.
12581258
model=model_2786_obj
@@ -1263,7 +1263,7 @@ weight=4lb
12631263
members=yes
12641264
tradeable=no
12651265

1266-
[obj_2386]
1266+
[unusual_armour]
12671267
name=Unusual armour
12681268
desc=Looks kind of useless...
12691269
model=model_2574_obj
@@ -1274,7 +1274,7 @@ weight=8lb
12741274
members=yes
12751275
tradeable=no
12761276

1277-
[obj_2387]
1277+
[damaged_dagger]
12781278
name=Damaged dagger
12791279
desc=Pointy.
12801280
model=model_2672_obj

0 commit comments

Comments
 (0)