| Line 22: |
Line 22: |
| | dive_night_r2 = {image = 'Abyssal_Night_Dive_Bomber_582_Equipment.png', top = 1, left = 127, width = 35, height = 30}, | | dive_night_r2 = {image = 'Abyssal_Night_Dive_Bomber_582_Equipment.png', top = 1, left = 127, width = 35, height = 30}, |
| | flagship = {image = 'Battle Card Flagship Icon.png', top = 2, right = 2, width = 18}, | | flagship = {image = 'Battle Card Flagship Icon.png', top = 2, right = 2, width = 18}, |
| | + | fortress_ace_r1 = {image = 'Abyssal Sky Fortress Ace (Reconnaissance Model) 595 Equipment.png', top = 15, left = 104, width = 32, height = 24}, |
| | + | fortress_ace_r2 = {image = 'Abyssal Sky Fortress Ace (Reconnaissance Model) 595 Equipment.png', top = 3, left = 125, width = 32, height = 24}, |
| | + | fortress_heavy_ace_r1 = {image = 'Abyssal Sky Fortress Ace (Heavy Bomber Model) 598 Equipment.png', top = 15, left = 104, width = 32, height = 24}, |
| | + | fortress_heavy_ace_r2 = {image = 'Abyssal Sky Fortress Ace (Heavy Bomber Model) 598 Equipment.png', top = 3, left = 125, width = 32, height = 24}, |
| | + | fortress_heavy_r = {image = 'Abyssal Sky Fortress (Heavy Bomber Model) 597 Equipment.png', top = 10, left = 120, width = 32, height = 24}, |
| | + | fortress_heavy_r1 = {image = 'Abyssal Sky Fortress (Heavy Bomber Model) 597 Equipment.png', top = 15, left = 104, width = 32, height = 24}, |
| | + | fortress_heavy_r2 = {image = 'Abyssal Sky Fortress (Heavy Bomber Model) 597 Equipment.png', top = 3, left = 125, width = 32, height = 24}, |
| | + | fortress_r = {image = 'Abyssal Sky Fortress (Reconnaissance Model) 594 Equipment.png', top = 10, left = 120, width = 32, height = 24}, |
| | + | fortress_r1 = {image = 'Abyssal Sky Fortress (Reconnaissance Model) 594 Equipment.png', top = 15, left = 104, width = 32, height = 24}, |
| | + | fortress_r2 = {image = 'Abyssal Sky Fortress (Reconnaissance Model) 594 Equipment.png', top = 3, left = 125, width = 32, height = 24}, |
| | hell = {image = 'Hell plane 2.png', top = 5, left = 50, width = 30}, | | hell = {image = 'Hell plane 2.png', top = 5, left = 50, width = 30}, |
| | hell_cat_kai_r = {image = 'Abyssal_Cat_Fighter_Kai_556_Equipment.png', top = 8, left = 126, width = 35, height = 30}, | | hell_cat_kai_r = {image = 'Abyssal_Cat_Fighter_Kai_556_Equipment.png', top = 8, left = 126, width = 35, height = 30}, |
| Line 57: |
Line 67: |
| | status_heavy_damage = {image = 'Battle Card Status Heavy Damage.png', top = 0, left = 0, width = 160, height = 40}, | | status_heavy_damage = {image = 'Battle Card Status Heavy Damage.png', top = 0, left = 0, width = 160, height = 40}, |
| | status_heavy_damage_installation = {image = 'Battle Card Status Heavy Damage Installation.png', top = 0, left = 0, width = 160, height = 40}, | | status_heavy_damage_installation = {image = 'Battle Card Status Heavy Damage Installation.png', top = 0, left = 0, width = 160, height = 40}, |
| | + | status_heavy_fatigue = {image = 'Battle Card Status Heavy Fatigue.png', top = 0, right = 0, width = 60, height = 40}, |
| | + | status_heavy_fatigue_face = {image = 'Battle Card Status Heavy Fatigue Face.png', top = 12, left = 152, height = 17},--position not datamined |
| | status_light_damage = {image = 'Battle Card Status Light Damage.png', top = 0, left = 0, width = 160, height = 40}, | | status_light_damage = {image = 'Battle Card Status Light Damage.png', top = 0, left = 0, width = 160, height = 40}, |
| | status_light_damage_installation = {image = 'Battle Card Status Light Damage Installation.png', top = 0, left = 0, width = 160, height = 40}, | | status_light_damage_installation = {image = 'Battle Card Status Light Damage Installation.png', top = 0, left = 0, width = 160, height = 40}, |
| | status_medium_damage = {image = 'Battle Card Status Medium Damage.png', top = 0, left = 0, width = 160, height = 40}, | | status_medium_damage = {image = 'Battle Card Status Medium Damage.png', top = 0, left = 0, width = 160, height = 40}, |
| | status_medium_damage_installation = {image = 'Battle Card Status Medium Damage Installation.png', top = 0, left = 0, width = 160, height = 40}, | | status_medium_damage_installation = {image = 'Battle Card Status Medium Damage Installation.png', top = 0, left = 0, width = 160, height = 40}, |
| | + | status_medium_fatigue = {image = 'Battle Card Status Medium Fatigue.png', top = 0, right = 0, width = 60, height = 40}, |
| | + | status_medium_fatigue_face = {image = 'Battle Card Status Medium Fatigue Face.png', top = 12, left = 152, height = 17},--position not datamined |
| | status_repair = {image = 'Battle Card Status Repair.png', top = 0, left = 0, width = 160, height = 40}, | | status_repair = {image = 'Battle Card Status Repair.png', top = 0, left = 0, width = 160, height = 40}, |
| | status_retreat = {image = 'Battle Card Status Retreat.png', top = 0, left = 0, width = 160, height = 40}, | | status_retreat = {image = 'Battle Card Status Retreat.png', top = 0, left = 0, width = 160, height = 40}, |
| | + | status_sea_colored_ribbon = {image = 'Battle Card Sea-colored Ribbon.png', top = 0, left = 142, height = 40},--position not datamined. Asset cropped to fit properly. |
| | status_sunk = {image = 'Battle Card Status Sunk.png', top = 0, left = 0, width = 160, height = 40}, | | status_sunk = {image = 'Battle Card Status Sunk.png', top = 0, left = 0, width = 160, height = 40}, |
| | status_sunk_installation = {image = 'Battle Card Status Sunk Installation.png', top = 0, left = 0, width = 160, height = 40}, | | status_sunk_installation = {image = 'Battle Card Status Sunk Installation.png', top = 0, left = 0, width = 160, height = 40}, |
| − | takoyaki = {image = 'Hell plane 2.png', top = 5, left = 50, width = 30} | + | status_white_tasuki = {image = 'Battle Card White Tasuki.png', top = 0, left = 142, height = 40},--position not datamined. Asset cropped to fit properly. |
| | + | takoyaki = {image = 'Hell plane 2.png', top = 5, left = 50, width = 30}, |
| | } | | } |
| | } | | } |
| | | | |
| | function ShipBattleCardKai:get_source(ship, args) | | function ShipBattleCardKai:get_source(ship, args) |
| − | return args.damaged and ship:battle_card_damaged(true) or ship:battle_card(true) | + | return args.damaged and args.damaged ~= 'false' and ship:battle_card_damaged(true) or ship:battle_card(true) |
| | end | | end |
| | | | |
| Line 114: |
Line 130: |
| | if not args.size then | | if not args.size then |
| | args.size = args.hd and self._battle_card_size_hd or self._battle_card_size | | args.size = args.hd and self._battle_card_size_hd or self._battle_card_size |
| | + | end |
| | + | if args.marginLeft then |
| | + | self._image_wrapper_style['margin-left'] = args.marginLeft |
| | + | end |
| | + | if args.marginTop then |
| | + | self._image_wrapper_style['margin-top'] = args.marginTop |
| | end | | end |
| | local width, height = parseSize(args.size) | | local width, height = parseSize(args.size) |
| Line 124: |
Line 146: |
| | args.link = link | | args.link = link |
| | local image = Formatting:format_image(args) | | local image = Formatting:format_image(args) |
| | + | if args.no_layers then |
| | + | return image |
| | + | end |
| | local ship_layers = ship:battle_card_layers() | | local ship_layers = ship:battle_card_layers() |
| | if ship_layers or args.flagship or args.layers or args.grayscale then | | if ship_layers or args.flagship or args.layers or args.grayscale then |