Skip to content

Commit

Permalink
Merge pull request #857 from The-Frozen-North/shield-overhaul
Browse files Browse the repository at this point in the history 
removed +3 shields, revamped some shields, shield cost multipliers significantly increased
  • Loading branch information
@b5635
b5635 authored Dec 29, 2024
2 parents 5de1288 + 15034c2 commit 26f5cf5
Show file tree
Hide file tree
Showing 30 changed files with 693 additions and 363 deletions.
6 changes: 3 additions & 3 deletions override/baseitems.2da
View file

Large diffs are not rendered by default.

86 changes: 42 additions & 44 deletions seeded_database/treasures.txt
View file

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions src/itp/itempalcus.itp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3235,6 +3235,17 @@
"value": "armor166"
}
},
{
"__struct_id": 0,
"NAME": {
"type": "cexostring",
"value": "Dragon Shield"
},
"RESREF": {
"type": "resref",
"value": "armor26"
}
},
{
"__struct_id": 0,
"RESREF": {
Expand Down Expand Up @@ -3301,17 +3312,6 @@
"value": 12874
}
},
{
"__struct_id": 0,
"RESREF": {
"type": "resref",
"value": "armor26"
},
"STRREF": {
"type": "dword",
"value": 12875
}
},
{
"__struct_id": 0,
"RESREF": {
Expand Down Expand Up @@ -3427,6 +3427,17 @@
"value": "armor160"
}
},
{
"__struct_id": 0,
"NAME": {
"type": "cexostring",
"value": "Chaos Shield"
},
"RESREF": {
"type": "resref",
"value": "armor30"
}
},
{
"__struct_id": 0,
"RESREF": {
Expand Down Expand Up @@ -3471,17 +3482,6 @@
"value": "armor161"
}
},
{
"__struct_id": 0,
"RESREF": {
"type": "resref",
"value": "armor80"
},
"STRREF": {
"type": "dword",
"value": 56580
}
},
{
"__struct_id": 0,
"NAME": {
Expand All @@ -3493,17 +3493,6 @@
"value": "armor163"
}
},
{
"__struct_id": 0,
"RESREF": {
"type": "resref",
"value": "armor79"
},
"STRREF": {
"type": "dword",
"value": 56582
}
},
{
"__struct_id": 0,
"RESREF": {
Expand Down Expand Up @@ -3550,13 +3539,24 @@
},
{
"__struct_id": 0,
"NAME": {
"type": "cexostring",
"value": "Small Shield of Dawn"
},
"RESREF": {
"type": "resref",
"value": "armor30"
"value": "armor80"
}
},
{
"__struct_id": 0,
"NAME": {
"type": "cexostring",
"value": "Small Shield of the Watch"
},
"STRREF": {
"type": "dword",
"value": 12888
"RESREF": {
"type": "resref",
"value": "armor79"
}
},
{
Expand Down Expand Up @@ -3597,6 +3597,17 @@
"LIST": {
"type": "list",
"value": [
{
"__struct_id": 0,
"NAME": {
"type": "cexostring",
"value": "Bulwark of the Great Dragon"
},
"RESREF": {
"type": "resref",
"value": "armor22"
}
},
{
"__struct_id": 0,
"RESREF": {
Expand Down Expand Up @@ -3652,17 +3663,6 @@
"value": 12890
}
},
{
"__struct_id": 0,
"NAME": {
"type": "cexostring",
"value": "Shield of Dawn"
},
"RESREF": {
"type": "resref",
"value": "armor118"
}
},
{
"__struct_id": 0,
"RESREF": {
Expand All @@ -3674,17 +3674,6 @@
"value": 12892
}
},
{
"__struct_id": 0,
"NAME": {
"type": "cexostring",
"value": "Shield of the Watch"
},
"RESREF": {
"type": "resref",
"value": "armor116"
}
},
{
"__struct_id": 0,
"NAME": {
Expand Down Expand Up @@ -3731,13 +3720,24 @@
},
{
"__struct_id": 0,
"NAME": {
"type": "cexostring",
"value": "Tower Shield of Dawn"
},
"RESREF": {
"type": "resref",
"value": "armor22"
"value": "armor118"
}
},
{
"__struct_id": 0,
"NAME": {
"type": "cexostring",
"value": "Tower Shield of the Watch"
},
"STRREF": {
"type": "dword",
"value": 12901
"RESREF": {
"type": "resref",
"value": "armor116"
}
}
]
Expand Down
6 changes: 5 additions & 1 deletion src/uti/armor108.uti.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"Cost": {
"type": "dword",
"value": 1998
"value": 6836
},
"Cursed": {
"type": "byte",
Expand Down Expand Up @@ -105,5 +105,9 @@
"TemplateResRef": {
"type": "resref",
"value": "armor108"
},
"xModelPart1": {
"type": "word",
"value": 32
}
}
39 changes: 6 additions & 33 deletions src/uti/armor112.uti.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"Cost": {
"type": "dword",
"value": 6454
"value": 19440
},
"Cursed": {
"type": "byte",
Expand Down Expand Up @@ -69,39 +69,8 @@
},
"CostValue": {
"type": "word",
"value": 1
},
"Param1": {
"type": "byte",
"value": 255
},
"Param1Value": {
"type": "byte",
"value": 255
},
"PropertyName": {
"type": "word",
"value": 0
},
"Subtype": {
"type": "word",
"value": 0
}
},
{
"__struct_id": 0,
"ChanceAppear": {
"type": "byte",
"value": 100
},
"CostTable": {
"type": "byte",
"value": 2
},
"CostValue": {
"type": "word",
"value": 1
},
"Param1": {
"type": "byte",
"value": 255
Expand All @@ -112,7 +81,7 @@
},
"PropertyName": {
"type": "word",
"value": 1
"value": 0
},
"Subtype": {
"type": "word",
Expand All @@ -136,5 +105,9 @@
"TemplateResRef": {
"type": "resref",
"value": "armor112"
},
"xModelPart1": {
"type": "word",
"value": 31
}
}
8 changes: 6 additions & 2 deletions src/uti/armor113.uti.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"Cost": {
"type": "dword",
"value": 10596
"value": 17112
},
"Cursed": {
"type": "byte",
Expand Down Expand Up @@ -100,7 +100,7 @@
},
"CostValue": {
"type": "word",
"value": 5
"value": 3
},
"Param1": {
"type": "byte",
Expand Down Expand Up @@ -136,5 +136,9 @@
"TemplateResRef": {
"type": "resref",
"value": "armor113"
},
"xModelPart1": {
"type": "word",
"value": 51
}
}
41 changes: 38 additions & 3 deletions src/uti/armor115.uti.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"Cost": {
"type": "dword",
"value": 13824
"value": 9678
},
"Cursed": {
"type": "byte",
Expand Down Expand Up @@ -46,7 +46,7 @@
},
"ModelPart1": {
"type": "byte",
"value": 41
"value": 21
},
"PaletteID": {
"type": "byte",
Expand All @@ -71,7 +71,7 @@
},
"CostValue": {
"type": "word",
"value": 3
"value": 1
},
"Param1": {
"type": "byte",
Expand All @@ -90,6 +90,37 @@
"value": 0
}
},
{
"__struct_id": 0,
"ChanceAppear": {
"type": "byte",
"value": 100
},
"CostTable": {
"type": "byte",
"value": 2
},
"CostValue": {
"type": "word",
"value": 1
},
"Param1": {
"type": "byte",
"value": 255
},
"Param1Value": {
"type": "byte",
"value": 0
},
"PropertyName": {
"type": "word",
"value": 40
},
"Subtype": {
"type": "word",
"value": 0
}
},
{
"__struct_id": 0,
"ChanceAppear": {
Expand Down Expand Up @@ -138,5 +169,9 @@
"TemplateResRef": {
"type": "resref",
"value": "armor115"
},
"xModelPart1": {
"type": "word",
"value": 21
}
}
Loading

0 comments on commit 26f5cf5

Please sign in to comment.