Skip to content

Commit

Permalink
Merge pull request #3595 from Kherae/master
Browse files Browse the repository at this point in the history
a bit of mastery
  • Loading branch information
sayterdarkwynd authored Sep 22, 2024
2 parents c28cb24 + 8c0caf1 commit aa14e8c
Show file tree
Hide file tree
Showing 181 changed files with 667 additions and 605 deletions.
5 changes: 3 additions & 2 deletions items/armors/apex/apex-tier4/apextier4.chest.patch
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.19^reset;
^yellow;^reset; Magnorb: Mastery +^green;19^reset;%
^yellow;^reset; Thrown: Damage x^green;1.19^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -81,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
5 changes: 3 additions & 2 deletions items/armors/apex/apex-tier4/apextier4.head.patch
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.19^reset;
^yellow;^reset; Magnorb: Mastery +^green;19^reset;%
^yellow;^reset; Thrown: Damage x^green;1.19^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -81,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
5 changes: 3 additions & 2 deletions items/armors/apex/apex-tier4/apextier4.legs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.19^reset;
^yellow;^reset; Magnorb: Mastery +^green;19^reset;%
^yellow;^reset; Thrown: Damage x^green;1.19^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -81,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
[{
"op": "test",
Expand Down Expand Up @@ -40,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.22^reset;
^yellow;^reset; Magnorb: Mastery +^green;22^reset;%
^yellow;^reset; Thrown: Damage x^green;1.22^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
[{
"op": "test",
Expand Down Expand Up @@ -40,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.22^reset;
^yellow;^reset; Magnorb: Mastery +^green;22^reset;%
^yellow;^reset; Thrown: Damage x^green;1.22^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
[{
"op": "test",
Expand Down Expand Up @@ -40,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.22^reset;
^yellow;^reset; Magnorb: Mastery +^green;22^reset;%
^yellow;^reset; Thrown: Damage x^green;1.22^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
[{
"op": "test",
Expand Down Expand Up @@ -40,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.22^reset;
^yellow;^reset; Magnorb: Mastery +^green;22^reset;%
^yellow;^reset; Thrown: Damage x^green;1.22^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
[{
"op": "test",
Expand Down Expand Up @@ -40,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.22^reset;
^yellow;^reset; Magnorb: Mastery +^green;22^reset;%
^yellow;^reset; Thrown: Damage x^green;1.22^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
[{
"op": "test",
Expand Down Expand Up @@ -40,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.22^reset;
^yellow;^reset; Magnorb: Mastery +^green;22^reset;%
^yellow;^reset; Thrown: Damage x^green;1.22^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
[{
"op": "test",
Expand Down Expand Up @@ -40,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.22^reset;
^yellow;^reset; Magnorb: Mastery +^green;22^reset;%
^yellow;^reset; Thrown: Damage x^green;1.22^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
[{
"op": "test",
Expand Down Expand Up @@ -40,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.22^reset;
^yellow;^reset; Magnorb: Mastery +^green;22^reset;%
^yellow;^reset; Thrown: Damage x^green;1.22^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
[{
"op": "test",
Expand Down Expand Up @@ -40,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.22^reset;
^yellow;^reset; Magnorb: Mastery +^green;22^reset;%
^yellow;^reset; Thrown: Damage x^green;1.22^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
[{
"op": "test",
Expand Down Expand Up @@ -40,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.25^reset;
^yellow;^reset; Magnorb: Mastery +^green;25^reset;%
^yellow;^reset; Thrown: Damage x^green;1.25^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.25^reset;
^yellow;^reset; Magnorb: Mastery +^green;25^reset;%
^yellow;^reset; Thrown: Damage x^green;1.25^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -81,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[
[{
"op": "test",
Expand Down Expand Up @@ -40,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.25^reset;
^yellow;^reset; Magnorb: Mastery +^green;25^reset;%
^yellow;^reset; Thrown: Damage x^green;1.25^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.25^reset;
^yellow;^reset; Magnorb: Mastery +^green;25^reset;%
^yellow;^reset; Thrown: Damage x^green;1.25^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -81,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.25^reset;
^yellow;^reset; Magnorb: Mastery +^green;25^reset;%
^yellow;^reset; Thrown: Damage x^green;1.25^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -81,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.25^reset;
^yellow;^reset; Magnorb: Mastery +^green;25^reset;%
^yellow;^reset; Thrown: Damage x^green;1.25^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -81,4 +82,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.25^reset;
^yellow;^reset; Magnorb: Mastery +^green;25^reset;%
^yellow;^reset; Thrown: Damage x^green;1.25^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +83,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"op": "replace",
"path": "/description",
"value": "^orange;Set Bonuses^reset;:
^yellow;^reset; Magnorb/Thrown: Damage x^green;1.25^reset;
^yellow;^reset; Magnorb: Mastery +^green;25^reset;%
^yellow;^reset; Thrown: Damage x^green;1.25^reset;
^yellow;^reset; ^cyan;Immune^reset;: Radiation Burn"
},
{
Expand Down Expand Up @@ -82,4 +83,4 @@
"value": "/items/buildscripts/fubuildarmor.lua"
}
]
]
]
Loading

0 comments on commit aa14e8c

Please sign in to comment.