Skip to content

Commit

Permalink
Merge pull request #1 from GuardianDll/patch-1
Browse files Browse the repository at this point in the history
lint
  • Loading branch information
Lumi-Virtual authored Oct 15, 2023
2 parents f3d87bf + ebee0f8 commit 26a7184
Show file tree
Hide file tree
Showing 51 changed files with 103 additions and 506 deletions.
5 changes: 1 addition & 4 deletions data/json/ascii_art/ammo/10mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
{
"type": "ascii_art",
"id": "10mm_fmj",
"picture": [
"<color_yellow>,",
"º"
]
"picture": [ "<color_yellow>,", "º" ]
}
]
6 changes: 1 addition & 5 deletions data/json/ascii_art/ammo/12mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{
"type": "ascii_art",
"id": "12mm",
"picture": [
"<color_dark_gray>.",
"<color_light_gray>X</color>",
"\""
]
"picture": [ "<color_dark_gray>.", "<color_light_gray>X</color>", "\"" ]
}
]
24 changes: 4 additions & 20 deletions data/json/ascii_art/ammo/20x66mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,21 @@
{
"type": "ascii_art",
"id": "20x66_abstract",
"picture": [
"<color_light_red>╒╕",
"││",
"╙╜"
]
"picture": [ "<color_light_red>╒╕", "││", "╙╜" ]
},
{
"type": "ascii_art",
"id": "20x66_beanbag",
"picture": [
"<color_white>╒╕",
"<color_light_red>││",
"╙╜"
]
"picture": [ "<color_white>╒╕", "<color_light_red>││", "╙╜" ]
},
{
"type": "ascii_art",
"id": "20x66_flare",
"picture": [
"<color_yellow>╒╕",
"<color_light_red>││",
"╙╜"
]
"picture": [ "<color_yellow>╒╕", "<color_light_red>││", "╙╜" ]
},
{
"type": "ascii_art",
"id": "20x66_inc",
"picture": [
"<color_red>╒╕",
"<color_light_red>││",
"╙╜"
]
"picture": [ "<color_red>╒╕", "<color_light_red>││", "╙╜" ]
}
]
15 changes: 3 additions & 12 deletions data/json/ascii_art/ammo/22.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,16 @@
{
"type": "ascii_art",
"id": "22_lr",
"picture": [
"<color_yellow>.",
""
]
"picture": [ "<color_yellow>.", "" ]
},
{
"type": "ascii_art",
"id": "22_cb",
"picture": [
"<color_dark_gray>,",
"<color_yellow>~"
]
"picture": [ "<color_dark_gray>,", "<color_yellow>~" ]
},
{
"type": "ascii_art",
"id": "22_ratshot",
"picture": [
"<color_cyan>.",
"<color_yellow>╨"
]
"picture": [ "<color_cyan>.", "<color_yellow>╨" ]
}
]
24 changes: 4 additions & 20 deletions data/json/ascii_art/ammo/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,21 @@
{
"type": "ascii_art",
"id": "223",
"picture": [
"<color_yellow>,",
"",
"\""
]
"picture": [ "<color_yellow>,", "", "\"" ]
},
{
"type": "ascii_art",
"id": "556",
"picture": [
"<color_light_green>,",
"<color_yellow>‼",
"\""
]
"picture": [ "<color_light_green>,", "<color_yellow>‼", "\"" ]
},
{
"type": "ascii_art",
"id": "556_m855a1",
"picture": [
"<color_light_gray>,",
"<color_yellow>‼",
"\""
]
"picture": [ "<color_light_gray>,", "<color_yellow>‼", "\"" ]
},
{
"type": "ascii_art",
"id": "556_incendiary",
"picture": [
"<color_red>,",
"<color_yellow>‼",
"\""
]
"picture": [ "<color_red>,", "<color_yellow>‼", "\"" ]
}
]
6 changes: 1 addition & 5 deletions data/json/ascii_art/ammo/270win.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{
"type": "ascii_art",
"id": "270win_jsp",
"picture": [
"<color_yellow>;",
"",
"\""
]
"picture": [ "<color_yellow>;", "", "\"" ]
}
]
6 changes: 1 addition & 5 deletions data/json/ascii_art/ammo/300.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{
"type": "ascii_art",
"id": "300_winmag",
"picture": [
"<color_yellow>;",
"",
"\""
]
"picture": [ "<color_yellow>;", "", "\"" ]
}
]
18 changes: 3 additions & 15 deletions data/json/ascii_art/ammo/3006.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,16 @@
{
"type": "ascii_art",
"id": "3006",
"picture": [
"<color_yellow>;",
"",
"\""
]
"picture": [ "<color_yellow>;", "", "\"" ]
},
{
"type": "ascii_art",
"id": "3006_incendiary",
"picture": [
"<color_white>;",
"<color_yellow>‼",
"\""
]
"picture": [ "<color_white>;", "<color_yellow>‼", "\"" ]
},
{
"type": "ascii_art",
"id": "3006fmj",
"picture": [
"<color_dark_gray>;",
"<color_yellow>‼",
"\""
]
"picture": [ "<color_dark_gray>;", "<color_yellow>‼", "\"" ]
}
]
6 changes: 1 addition & 5 deletions data/json/ascii_art/ammo/300blk.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{
"type": "ascii_art",
"id": "300blk",
"picture": [
"<color_yellow>,",
"",
"\""
]
"picture": [ "<color_yellow>,", "", "\"" ]
}
]
12 changes: 2 additions & 10 deletions data/json/ascii_art/ammo/308.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,11 @@
{
"type": "ascii_art",
"id": "308",
"picture": [
"<color_yellow>;",
"",
"\""
]
"picture": [ "<color_yellow>;", "", "\"" ]
},
{
"type": "ascii_art",
"id": "762_51_incendiary",
"picture": [
"<color_red>;",
"<color_yellow>‼",
"\""
]
"picture": [ "<color_red>;", "<color_yellow>‼", "\"" ]
}
]
5 changes: 1 addition & 4 deletions data/json/ascii_art/ammo/30carbine.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
{
"type": "ascii_art",
"id": "30carbine",
"picture": [
"<color_yellow>,",
""
]
"picture": [ "<color_yellow>,", "" ]
}
]
5 changes: 1 addition & 4 deletions data/json/ascii_art/ammo/32.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
{
"type": "ascii_art",
"id": "32_acp",
"picture": [
"<color_yellow>,",
"º"
]
"picture": [ "<color_yellow>,", "º" ]
}
]
5 changes: 1 addition & 4 deletions data/json/ascii_art/ammo/357mag.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
{
"type": "ascii_art",
"id": "357mag_fmj",
"picture": [
"<color_yellow>,",
""
]
"picture": [ "<color_yellow>,", "" ]
}
]
5 changes: 1 addition & 4 deletions data/json/ascii_art/ammo/357sig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
{
"type": "ascii_art",
"id": "357sig_fmj",
"picture": [
"<color_yellow>,",
"º"
]
"picture": [ "<color_yellow>,", "º" ]
}
]
4 changes: 1 addition & 3 deletions data/json/ascii_art/ammo/36paper.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
{
"type": "ascii_art",
"id": "36navy",
"picture": [
"<color_white>î"
]
"picture": [ "<color_white>î" ]
}
]
5 changes: 1 addition & 4 deletions data/json/ascii_art/ammo/38.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
{
"type": "ascii_art",
"id": "38_special",
"picture": [
"<color_yellow>,",
""
]
"picture": [ "<color_yellow>,", "" ]
}
]
5 changes: 1 addition & 4 deletions data/json/ascii_art/ammo/380.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
{
"type": "ascii_art",
"id": "380_FMJ",
"picture": [
"<color_yellow>,",
"º"
]
"picture": [ "<color_yellow>,", "º" ]
}
]
5 changes: 1 addition & 4 deletions data/json/ascii_art/ammo/38super.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
{
"type": "ascii_art",
"id": "38super_fmj",
"picture": [
"<color_yellow>,",
""
]
"picture": [ "<color_yellow>,", "" ]
}
]
5 changes: 1 addition & 4 deletions data/json/ascii_art/ammo/40.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
{
"type": "ascii_art",
"id": "40sw",
"picture": [
"<color_yellow>,",
"º"
]
"picture": [ "<color_yellow>,", "º" ]
}
]
35 changes: 5 additions & 30 deletions data/json/ascii_art/ammo/40x46mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,26 @@
{
"type": "ascii_art",
"id": "40x46mm_m1006",
"picture": [
"<color_light_green>/^\\",
"<color_dark_gray>║ ║",
"<color_white>║ ║",
"~~~"
]
"picture": [ "<color_light_green>/^\\", "<color_dark_gray>║ ║", "<color_white>║ ║", "~~~" ]
},
{
"type": "ascii_art",
"id": "40x46mm_m433",
"picture": [
"<color_yellow>/^\\",
"<color_light_gray>║ ║",
"<color_green>║ ║",
"~~~"
]
"picture": [ "<color_yellow>/^\\", "<color_light_gray>║ ║", "<color_green>║ ║", "~~~" ]
},
{
"type": "ascii_art",
"id": "40x46mm_m576",
"picture": [
"<color_dark_gray>í^ì",
"<color_green>║ ║",
"~~~"
]
"picture": [ "<color_dark_gray>í^ì", "<color_green>║ ║", "~~~" ]
},
{
"type": "ascii_art",
"id": "40x46mm_m651",
"picture": [
"<color_light_gray>.-.",
"│ │",
"║<color_red>─</color>║",
"║ ║",
"<color_green>║ ║",
"~~~"
]
"picture": [ "<color_light_gray>.-.", "│ │", "║<color_red>─</color>║", "║ ║", "<color_green>║ ║", "~~~" ]
},
{
"type": "ascii_art",
"id": "40x46mm_improvised",
"picture": [
"<color_light_gray>┌=┐",
"<color_green>║ ║",
"~~~"
]
"picture": [ "<color_light_gray>┌=┐", "<color_green>║ ║", "~~~" ]
}
]
Loading

0 comments on commit 26a7184

Please sign in to comment.