Skip to content

Commit 26f5cf5

Browse files
b5635b5635
authored
Merge pull request #857 from The-Frozen-North/shield-overhaul
removed +3 shields, revamped some shields, shield cost multipliers significantly increased
2 parents 5de1288 + 15034c2 commit 26f5cf5

30 files changed

+693
-363
lines changed

‎override/baseitems.2da‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎seeded_database/treasures.txt‎

Lines changed: 42 additions & 44 deletions
Large diffs are not rendered by default.

‎src/itp/itempalcus.itp.json‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3235,6 +3235,17 @@
32353235
"value": "armor166"
32363236
}
32373237
},
3238+
{
3239+
"__struct_id": 0,
3240+
"NAME": {
3241+
"type": "cexostring",
3242+
"value": "Dragon Shield"
3243+
},
3244+
"RESREF": {
3245+
"type": "resref",
3246+
"value": "armor26"
3247+
}
3248+
},
32383249
{
32393250
"__struct_id": 0,
32403251
"RESREF": {
@@ -3301,17 +3312,6 @@
33013312
"value": 12874
33023313
}
33033314
},
3304-
{
3305-
"__struct_id": 0,
3306-
"RESREF": {
3307-
"type": "resref",
3308-
"value": "armor26"
3309-
},
3310-
"STRREF": {
3311-
"type": "dword",
3312-
"value": 12875
3313-
}
3314-
},
33153315
{
33163316
"__struct_id": 0,
33173317
"RESREF": {
@@ -3427,6 +3427,17 @@
34273427
"value": "armor160"
34283428
}
34293429
},
3430+
{
3431+
"__struct_id": 0,
3432+
"NAME": {
3433+
"type": "cexostring",
3434+
"value": "Chaos Shield"
3435+
},
3436+
"RESREF": {
3437+
"type": "resref",
3438+
"value": "armor30"
3439+
}
3440+
},
34303441
{
34313442
"__struct_id": 0,
34323443
"RESREF": {
@@ -3471,17 +3482,6 @@
34713482
"value": "armor161"
34723483
}
34733484
},
3474-
{
3475-
"__struct_id": 0,
3476-
"RESREF": {
3477-
"type": "resref",
3478-
"value": "armor80"
3479-
},
3480-
"STRREF": {
3481-
"type": "dword",
3482-
"value": 56580
3483-
}
3484-
},
34853485
{
34863486
"__struct_id": 0,
34873487
"NAME": {
@@ -3493,17 +3493,6 @@
34933493
"value": "armor163"
34943494
}
34953495
},
3496-
{
3497-
"__struct_id": 0,
3498-
"RESREF": {
3499-
"type": "resref",
3500-
"value": "armor79"
3501-
},
3502-
"STRREF": {
3503-
"type": "dword",
3504-
"value": 56582
3505-
}
3506-
},
35073496
{
35083497
"__struct_id": 0,
35093498
"RESREF": {
@@ -3550,13 +3539,24 @@
35503539
},
35513540
{
35523541
"__struct_id": 0,
3542+
"NAME": {
3543+
"type": "cexostring",
3544+
"value": "Small Shield of Dawn"
3545+
},
35533546
"RESREF": {
35543547
"type": "resref",
3555-
"value": "armor30"
3548+
"value": "armor80"
3549+
}
3550+
},
3551+
{
3552+
"__struct_id": 0,
3553+
"NAME": {
3554+
"type": "cexostring",
3555+
"value": "Small Shield of the Watch"
35563556
},
3557-
"STRREF": {
3558-
"type": "dword",
3559-
"value": 12888
3557+
"RESREF": {
3558+
"type": "resref",
3559+
"value": "armor79"
35603560
}
35613561
},
35623562
{
@@ -3597,6 +3597,17 @@
35973597
"LIST": {
35983598
"type": "list",
35993599
"value": [
3600+
{
3601+
"__struct_id": 0,
3602+
"NAME": {
3603+
"type": "cexostring",
3604+
"value": "Bulwark of the Great Dragon"
3605+
},
3606+
"RESREF": {
3607+
"type": "resref",
3608+
"value": "armor22"
3609+
}
3610+
},
36003611
{
36013612
"__struct_id": 0,
36023613
"RESREF": {
@@ -3652,17 +3663,6 @@
36523663
"value": 12890
36533664
}
36543665
},
3655-
{
3656-
"__struct_id": 0,
3657-
"NAME": {
3658-
"type": "cexostring",
3659-
"value": "Shield of Dawn"
3660-
},
3661-
"RESREF": {
3662-
"type": "resref",
3663-
"value": "armor118"
3664-
}
3665-
},
36663666
{
36673667
"__struct_id": 0,
36683668
"RESREF": {
@@ -3674,17 +3674,6 @@
36743674
"value": 12892
36753675
}
36763676
},
3677-
{
3678-
"__struct_id": 0,
3679-
"NAME": {
3680-
"type": "cexostring",
3681-
"value": "Shield of the Watch"
3682-
},
3683-
"RESREF": {
3684-
"type": "resref",
3685-
"value": "armor116"
3686-
}
3687-
},
36883677
{
36893678
"__struct_id": 0,
36903679
"NAME": {
@@ -3731,13 +3720,24 @@
37313720
},
37323721
{
37333722
"__struct_id": 0,
3723+
"NAME": {
3724+
"type": "cexostring",
3725+
"value": "Tower Shield of Dawn"
3726+
},
37343727
"RESREF": {
37353728
"type": "resref",
3736-
"value": "armor22"
3729+
"value": "armor118"
3730+
}
3731+
},
3732+
{
3733+
"__struct_id": 0,
3734+
"NAME": {
3735+
"type": "cexostring",
3736+
"value": "Tower Shield of the Watch"
37373737
},
3738-
"STRREF": {
3739-
"type": "dword",
3740-
"value": 12901
3738+
"RESREF": {
3739+
"type": "resref",
3740+
"value": "armor116"
37413741
}
37423742
}
37433743
]

‎src/uti/armor108.uti.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"Cost": {
2020
"type": "dword",
21-
"value": 1998
21+
"value": 6836
2222
},
2323
"Cursed": {
2424
"type": "byte",
@@ -105,5 +105,9 @@
105105
"TemplateResRef": {
106106
"type": "resref",
107107
"value": "armor108"
108+
},
109+
"xModelPart1": {
110+
"type": "word",
111+
"value": 32
108112
}
109113
}

‎src/uti/armor112.uti.json‎

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"Cost": {
2020
"type": "dword",
21-
"value": 6454
21+
"value": 19440
2222
},
2323
"Cursed": {
2424
"type": "byte",
@@ -69,39 +69,8 @@
6969
},
7070
"CostValue": {
7171
"type": "word",
72-
"value": 1
73-
},
74-
"Param1": {
75-
"type": "byte",
76-
"value": 255
77-
},
78-
"Param1Value": {
79-
"type": "byte",
80-
"value": 255
81-
},
82-
"PropertyName": {
83-
"type": "word",
84-
"value": 0
85-
},
86-
"Subtype": {
87-
"type": "word",
88-
"value": 0
89-
}
90-
},
91-
{
92-
"__struct_id": 0,
93-
"ChanceAppear": {
94-
"type": "byte",
95-
"value": 100
96-
},
97-
"CostTable": {
98-
"type": "byte",
9972
"value": 2
10073
},
101-
"CostValue": {
102-
"type": "word",
103-
"value": 1
104-
},
10574
"Param1": {
10675
"type": "byte",
10776
"value": 255
@@ -112,7 +81,7 @@
11281
},
11382
"PropertyName": {
11483
"type": "word",
115-
"value": 1
84+
"value": 0
11685
},
11786
"Subtype": {
11887
"type": "word",
@@ -136,5 +105,9 @@
136105
"TemplateResRef": {
137106
"type": "resref",
138107
"value": "armor112"
108+
},
109+
"xModelPart1": {
110+
"type": "word",
111+
"value": 31
139112
}
140113
}

‎src/uti/armor113.uti.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"Cost": {
2020
"type": "dword",
21-
"value": 10596
21+
"value": 17112
2222
},
2323
"Cursed": {
2424
"type": "byte",
@@ -100,7 +100,7 @@
100100
},
101101
"CostValue": {
102102
"type": "word",
103-
"value": 5
103+
"value": 3
104104
},
105105
"Param1": {
106106
"type": "byte",
@@ -136,5 +136,9 @@
136136
"TemplateResRef": {
137137
"type": "resref",
138138
"value": "armor113"
139+
},
140+
"xModelPart1": {
141+
"type": "word",
142+
"value": 51
139143
}
140144
}

‎src/uti/armor115.uti.json‎

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"Cost": {
2020
"type": "dword",
21-
"value": 13824
21+
"value": 9678
2222
},
2323
"Cursed": {
2424
"type": "byte",
@@ -46,7 +46,7 @@
4646
},
4747
"ModelPart1": {
4848
"type": "byte",
49-
"value": 41
49+
"value": 21
5050
},
5151
"PaletteID": {
5252
"type": "byte",
@@ -71,7 +71,7 @@
7171
},
7272
"CostValue": {
7373
"type": "word",
74-
"value": 3
74+
"value": 1
7575
},
7676
"Param1": {
7777
"type": "byte",
@@ -90,6 +90,37 @@
9090
"value": 0
9191
}
9292
},
93+
{
94+
"__struct_id": 0,
95+
"ChanceAppear": {
96+
"type": "byte",
97+
"value": 100
98+
},
99+
"CostTable": {
100+
"type": "byte",
101+
"value": 2
102+
},
103+
"CostValue": {
104+
"type": "word",
105+
"value": 1
106+
},
107+
"Param1": {
108+
"type": "byte",
109+
"value": 255
110+
},
111+
"Param1Value": {
112+
"type": "byte",
113+
"value": 0
114+
},
115+
"PropertyName": {
116+
"type": "word",
117+
"value": 40
118+
},
119+
"Subtype": {
120+
"type": "word",
121+
"value": 0
122+
}
123+
},
93124
{
94125
"__struct_id": 0,
95126
"ChanceAppear": {
@@ -138,5 +169,9 @@
138169
"TemplateResRef": {
139170
"type": "resref",
140171
"value": "armor115"
172+
},
173+
"xModelPart1": {
174+
"type": "word",
175+
"value": 21
141176
}
142177
}

0 commit comments

Comments
 (0)