(update): Merge dev to master (#87)

* (update): add new market items (#85) Co-authored-by: Sakurajimai#6742 <sakurajimai.san1202gmail.com> Co-authored-by: BearTS <[email protected]>
BearTS · Jan 14, 2021 · a198c82 · a198c82
1 parent ece0657
commit a198c82
Showing 1 changed file with 279 additions and 15 deletions.
diff --git a/assets/json/market.json b/assets/json/market.json
@@ -26,7 +26,7 @@
   {
     "id": 3,
     "name": "Midas' Golden Wreath",
-    "description": "Wreath touched by Midas'.",
+    "description": "Rare profile wreath.",
     "type": "wreath",
     "deletable": true,
     "giftable": true,
@@ -38,7 +38,7 @@
   {
     "id": 4,
     "name": "Bronze Wreath",
-    "description": "An ancient wreath used to repel demons of ancient times. Not that it is useful for today.",
+    "description": "Uncommon profile wreath.",
     "type": "wreath",
     "deletable": true,
     "giftable": true,
@@ -50,7 +50,7 @@
   {
     "id": 5,
     "name": "Green Wreath",
-    "description": "For Nature By Nature.",
+    "description": "Uncommon profile wreath.",
     "type": "wreath",
     "deletable": true,
     "giftable": true,
@@ -62,7 +62,7 @@
   {
     "id": 6,
     "name": "Common Wreath",
-    "description": "Usual decorative wreaths found at homes' doors.",
+    "description": "Common profile wreath.",
     "type": "wreath",
     "deletable": true,
     "giftable": true,
@@ -139,7 +139,7 @@
     "giftable": true,
     "price": 20000,
     "assets": {
-      "link": "https://i.imgur.com/5ncD8Hz.png"
+      "link": "https://i.imgur.com/akIFviF.png"
     }
   },{
     "id": 13,
@@ -392,7 +392,7 @@
     "giftable": true,
     "price": 25000,
     "assets": {
-      "link": "https://i.imgur.com/a8u2Am3.png"
+      "link": "https://i.imgur.com/CmdVWzS.png"
     }
   },{
     "id": 36,
@@ -403,7 +403,7 @@
     "giftable": true,
     "price": 20000,
     "assets": {
-      "link": "https://i.imgur.com/gSXFVff.png"
+      "link": "https://i.imgur.com/Flmb0gd.png"
     }
   },{
     "id": 37,
@@ -414,7 +414,7 @@
     "giftable": true,
     "price": 25000,
     "assets": {
-      "link": "https://i.imgur.com/Ngamnoy.png"
+      "link": "https://i.imgur.com/kKOIJjk.png"
     }
   },{
     "id": 38,
@@ -425,7 +425,7 @@
     "giftable": true,
     "price": 25000,
     "assets": {
-      "link": "https://i.imgur.com/UwNj1X3.png"
+      "link": "https://i.imgur.com/DSpPTsG.png"
     }
   },{
     "id": 39,
@@ -436,7 +436,7 @@
     "giftable": true,
     "price": 25000,
     "assets": {
-      "link": "https://i.imgur.com/fAeG65b.png"
+      "link": "https://i.imgur.com/kzoCRtJ.png"
     }
   },{
     "id": 40,
@@ -447,7 +447,7 @@
     "giftable": true,
     "price": 32000,
     "assets": {
-      "link": "https://i.imgur.com/bmlGTTC.png"
+      "link": "https://i.imgur.com/7Of98fM.png"
     }
   },{
     "id": 41,
@@ -755,7 +755,7 @@
     "giftable": true,
     "price": 12000,
     "assets": {
-      "link": "https://i.imgur.com/UNWxceV.png"
+      "link": "https://i.imgur.com/s0OYPpx.png"
     }
   },{
     "id": 69,
@@ -766,7 +766,7 @@
     "giftable": true,
     "price": 12000,
     "assets": {
-      "link": "https://i.imgur.com/vtvGL9k.png"
+      "link": "https://i.imgur.com/FI0gqMF.png"
     }
   },{
     "id": 70,
@@ -775,9 +775,273 @@
     "type": "emblem",
     "deletable": true,
     "giftable": true,
-    "price": 25000,
+    "price": 20000,
+    "assets": {
+      "link": "https://i.imgur.com/rfIOHrG.png"
+    }
+  },{
+     "id": 71,
+    "name": "Megumin Angwry",
+    "description": "Uncommon Profile Emblem",
+    "type": "emblem",
+    "deletable": true,
+    "giftable": true,
+    "price": 12000,
+    "assets": {
+      "link": "https://i.imgur.com/rgtr8De.png"
+    }
+  },{
+    "id": 72,
+    "name": "Megumin Point Up",
+    "description": "Uncommon Profile Emblem",
+    "type": "emblem",
+    "deletable": true,
+    "giftable": true,
+    "price": 18000,
+    "assets": {
+      "link": "https://i.imgur.com/v7fybxn.png"
+    }
+  },{
+    "id": 73,
+    "name": "Megumin Lazygumin",
+    "description": "Uncommon Profile Emblem",
+    "type": "emblem",
+    "deletable": true,
+    "giftable": true,
+    "price": 20000,
+    "assets": {
+      "link": "https://i.imgur.com/v9ZaGGI.png"
+    }
+  },{
+    "id": 74,
+    "name": "Megumin Kawaii",
+    "description": "Uncommon Profile Emblem",
+    "type": "emblem",
+    "deletable": true,
+    "giftable": true,
+    "price": 20000,
+    "assets": {
+      "link": "https://i.imgur.com/VDZ3ppW.png"
+    }
+  },{
+    "id": 75,
+    "name": "Megumin Smug",
+    "description": "Rare Profile Emblem",
+    "type": "emblem",
+    "deletable": true,
+    "giftable": true,
+    "price": 30000,
+    "assets": {
+      "link": "https://i.imgur.com/UnjCkMd.png"
+    }
+  },{
+    "id": 76,
+    "name": "Megumin - Chuuni na Majo",
+    "description": "Super Rare Profile Emblem",
+    "type": "emblem",
+    "deletable": true,
+    "giftable": true,
+    "price": 35000,
+    "assets": {
+      "link": "https://i.imgur.com/YmZYBiY.png"
+    }
+  },{
+    "id": 77,
+    "name": "Violet evergarden",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 15000,
+    "assets": {
+      "link": "https://i.imgur.com/b7SQkTJ.png"
+    }
+  },{
+    "id": 78,
+    "name": "World End",
+    "description": "Uncommon Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 10000,
+    "assets": {
+      "link": "https://i.imgur.com/MCb6UYl.png"
+    }
+  },{
+    "id": 79,
+    "name": "Shelter",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 15000,
+    "assets": {
+      "link": "https://i.imgur.com/djQUKcd.png"
+    }
+  },{
+    "id": 80,
+    "name": "Rory Mercury Gate",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 15000,
+    "assets": {
+      "link": "https://i.imgur.com/BxA2YSg.png"
+    }
+  },{
+    "id": 81,
+    "name": "Shiro NGNL",
+    "description": "Uncommon Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 10000,
+    "assets": {
+      "link": "https://i.imgur.com/YFy1CAV.png"
+    }
+  },{
+    "id": 82,
+    "name": "Made in Abyss",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 17000,
+    "assets": {
+      "link": "https://i.imgur.com/fT1MO8I.png"
+    }
+  },{
+    "id": 83,
+    "name": "Assassination classroom",
+    "description": "Uncommon Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 12000,
+    "assets": {
+      "link": "https://i.imgur.com/LukCj9s.png"
+    }
+  },{
+    "id": 84,
+    "name": "Anohana",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 15000,
+    "assets": {
+      "link": "https://i.imgur.com/EprdGpe.png"
+    }
+  },{
+    "id": 85,
+    "name": "Taki and Mitsuha",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 22000,
+    "assets": {
+      "link": "https://i.imgur.com/h8NIocv.png"
+    }
+  },{
+    "id": 86,
+    "name": "Your Lie in april",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 18000,
+    "assets": {
+      "link": "https://i.imgur.com/DrmbNka.png"
+    }
+  },{
+    "id": 87,
+    "name": "Date a Live",
+    "description": "Uncommon Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 12000,
+    "assets": {
+      "link": "https://i.imgur.com/78z5pAX.png"
+    }
+  },{
+    "id": 88,
+    "name": "Angel Beats",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 12000,
+    "assets": {
+      "link": "https://i.imgur.com/tpxTwp9.png"
+    }
+  },{
+    "id": 89,
+    "name": "Tanya the Loli",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 18000,
+    "assets": {
+      "link": "https://i.imgur.com/jFKGy5x.png"
+    }
+  },{
+    "id": 90,
+    "name": "Girl looking at night sky",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 20000,
+    "assets": {
+      "link": "https://i.imgur.com/IRfgxvl.png"
+    }
+  },{
+    "id": 91,
+    "name": "Eclipse",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 20000,
+    "assets": {
+      "link": "https://i.imgur.com/hl7VJ0I.png"
+    }
+  },{
+    "id": 92,
+    "name": "Girl Drawing",
+    "description": "Uncommon Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 12000,
+    "assets": {
+      "link": "https://i.imgur.com/2qrW1rK.png"
+    }
+  },{
+    "id": 93,
+    "name": "Space",
+    "description": "Rare Profile Background",
+    "type": "background",
+    "deletable": true,
+    "giftable": true,
+    "price": 18000,
+    "assets": {
+      "link": "https://i.imgur.com/899JaFT.png"
+    }
+  },{
+    "id": 94,
+    "name": "SL Ahjin Emblem",
+    "description": "Rare Profile Emblem",
+    "type": "emblem",
+    "deletable": true,
+    "giftable": true,
+    "price": 30000,
     "assets": {
-      "link": "https://i.imgur.com/p8RCriy.png"
+      "link": "https://i.imgur.com/ffH9gnI.png"
     }
   }
 ]