Merge remote-tracking branch 'origin/master'

This commit is contained in:
Woah
2021-04-08 17:07:19 -04:00
9 changed files with 357 additions and 213 deletions
+5 -17
View File
@@ -948,18 +948,6 @@
"weight": "5.0",
"id": "2353",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "2434",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "173",
"maxAmount": "1"
}
]
},
@@ -9972,7 +9960,7 @@
},
{
"minAmount": "1",
"weight": "5.0",
"weight": "3.0",
"id": "143",
"maxAmount": "1"
},
@@ -36947,7 +36935,7 @@
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "20.0",
"id": "141",
"maxAmount": "1"
},
@@ -51807,10 +51795,10 @@
"maxAmount": "2"
},
{
"minAmount": "3",
"weight": "250.0",
"minAmount": "1",
"weight": "200.0",
"id": "2434",
"maxAmount": "3"
"maxAmount": "2"
},
{
"minAmount": "3",
+4
View File
@@ -15,6 +15,10 @@
"item_id": "88",
"loc_data": "{1,2654,9767,0,4587583}"
},
{
"item_id": "185",
"loc_data": "{1,2467,3176,0,7209050}"
},
{
"item_id": "223",
"loc_data": "{1,3128,9956,0,7864410}-{1,3129,9954,0,7864410}-{1,3126,9958,0,7864410}-{1,3117,9951,0,7864410}-{1,3118,9948,0,7864410}-{1,3119,9949,0,7864410}-{1,3179,9881,0,7864410}-{1,3177,9880,0,7864410}"
File diff suppressed because it is too large Load Diff
+3
View File
@@ -16033,6 +16033,7 @@
"examine": "A spiky crawling critter. ",
"melee_animation": "266",
"range_animation": "266",
"poisonous": "true",
"attack_speed": "4",
"respawn_delay": "25",
"defence_animation": "267",
@@ -16053,6 +16054,7 @@
"examine": "A spiky crawling critter. ",
"melee_animation": "266",
"range_animation": "266",
"poisonous": "true",
"attack_speed": "4",
"respawn_delay": "25",
"defence_animation": "267",
@@ -16073,6 +16075,7 @@
"examine": "A spiky crawling critter. ",
"melee_animation": "266",
"range_animation": "266",
"poisonous": "true",
"attack_speed": "4",
"respawn_delay": "25",
"defence_animation": "267",