diff --git a/res/sprite/heroinejane.png b/res/sprite/heroinejane.png new file mode 100644 index 0000000..7c8f75a Binary files /dev/null and b/res/sprite/heroinejane.png differ diff --git a/res/sprite/heroinejane_dead.png b/res/sprite/heroinejane_dead.png new file mode 100644 index 0000000..9bc1006 Binary files /dev/null and b/res/sprite/heroinejane_dead.png differ diff --git a/res/sprite/heroinejane_low.png b/res/sprite/heroinejane_low.png new file mode 100644 index 0000000..d1a6a3a Binary files /dev/null and b/res/sprite/heroinejane_low.png differ diff --git a/res/sprite/herojoe.png b/res/sprite/herojoe.png new file mode 100644 index 0000000..417efbb Binary files /dev/null and b/res/sprite/herojoe.png differ diff --git a/res/sprite/herojoe_dead.png b/res/sprite/herojoe_dead.png new file mode 100644 index 0000000..92b728f Binary files /dev/null and b/res/sprite/herojoe_dead.png differ diff --git a/res/sprite/herojoe_low.png b/res/sprite/herojoe_low.png new file mode 100644 index 0000000..dd32a25 Binary files /dev/null and b/res/sprite/herojoe_low.png differ diff --git a/src/assets.py b/src/assets.py index 77f48eb..032714a 100644 --- a/src/assets.py +++ b/src/assets.py @@ -4,13 +4,19 @@ import pygame pygame.mixer.init() sprites = { - "kefka" : arcade.load_texture("res/sprite/kefka.png"), - "cursor" : arcade.load_texture("res/sprite/handcursor.png"), - "font" : arcade.load_spritesheet("res/sprite/font.png"), - "panel" : arcade.load_spritesheet("res/sprite/panel.png"), - "podium" : arcade.load_spritesheet("res/sprite/podium.png"), - "balthasar": arcade.load_spritesheet("res/sprite/balthasar.png"), - "overworld": arcade.load_spritesheet("res/sprite/overworld_sheet.png"), + "kefka" : arcade.load_texture("res/sprite/kefka.png"), + "cursor" : arcade.load_texture("res/sprite/handcursor.png"), + "herojoe" : arcade.load_texture("res/sprite/herojoe.png"), + "herojoe_low" : arcade.load_texture("res/sprite/herojoe_low.png"), + "herojoe_dead" : arcade.load_texture("res/sprite/herojoe_dead.png"), + "heroinejane" : arcade.load_texture("res/sprite/heroinejane.png"), + "heroinejane_low" : arcade.load_texture("res/sprite/heroinejane_low.png"), + "heroinejane_dead" : arcade.load_texture("res/sprite/heroinejane_dead.png"), + "font" : arcade.load_spritesheet("res/sprite/font.png"), + "panel" : arcade.load_spritesheet("res/sprite/panel.png"), + "podium" : arcade.load_spritesheet("res/sprite/podium.png"), + "balthasar" : arcade.load_spritesheet("res/sprite/balthasar.png"), + "overworld" : arcade.load_spritesheet("res/sprite/overworld_sheet.png"), } sounds = { diff --git a/src/battle_data.py b/src/battle_data.py index ba6c705..f5d897f 100644 --- a/src/battle_data.py +++ b/src/battle_data.py @@ -247,9 +247,9 @@ battles = [ ], "enemy_sprites": [ # normál, kritikus , halott - ["cursor", "cursor", "cursor"], - ["cursor", "cursor", "cursor"], - ["cursor", "cursor", "cursor"] + ["herojoe" , "herojoe_low" , "herojoe_dead" ], + ["heroinejane", "heroinejane_low", "heroinejane_dead"], + ["herojoe" , "herojoe_low" , "herojoe_dead" ], ], "party_members": [ Combatant("Mordrak, a Sötét Úr", 400, 50, 80, 30, 20, 20, False, False), @@ -298,14 +298,24 @@ battles = [ # Nincs kőátok, a hősök sem kövesítenek. # ----------------------------------------------------------------------- { "enemies": [ - Combatant("Korom, a Tűzbűvölő", 110, 20, 95, 10, 60, 0, False, False), - Combatant("Fagyi, a Jégmágus", 110, 20, 100, 10, 0, 60, False, False), + Combatant("Korom, a Tűzbűvölő", 110, 20, 85, 10, 60, 0, False, False), + Combatant("Fagyi, a Jégmágus", 110, 20, 70, 10, 0, 60, False, False), Combatant("Szikla, a Pajzsos", 220, 30, 50, 60, 10, 10, False, False), ], - "party_members": [ - Combatant("Ignisza, a Sárkányúrnő", 450, 45, 85, 25, 999, -60, True, False), - Combatant("Parázs Sárkánykölyök", 180, 40, 100, 30, 999, -50, True, False), + "enemy_sprites": [ + # normál, kritikus , halott + ["herojoe" , "herojoe_low" , "herojoe_dead" ], + ["heroinejane", "heroinejane_low", "heroinejane_dead"], + ["herojoe" , "herojoe_low" , "herojoe_dead" ], ], + "party_members": [ + Combatant("Ignisza, a Sárkányúrnő", 450, 45, 95, 25, 999, -20, True, False), + Combatant("Parázs Sárkánykölyök", 180, 40, 100, 30, 999, -40, True, False), + ], + "party_sprites": [ + ["kefka", "kefka", "kefka"], + ["cursor", "cursor", "cursor"] + ], "enemy_turn_func": hero_turn_elemental, "mus_id": "mus_fnafsux", "init_ai_data": _hero_moves(can_petrify=False), @@ -349,11 +359,22 @@ battles = [ Combatant("Garat, a Harcos", 240, 45, 70, 40, 0, 0, False, False), Combatant("Réka, a Fürge Tolvaj", 100, 40, 140, 10, 0, 0, False, False), ], + "enemy_sprites": [ + # normál, kritikus , halott + ["heroinejane", "heroinejane_low", "heroinejane_dead"], + ["herojoe" , "herojoe_low" , "herojoe_dead" ], + ["heroinejane", "heroinejane_low", "heroinejane_dead"], + ], "party_members": [ Combatant("Vorik, a Nekromanta", 320, 35, 90, 15, 10, 10, False, False), Combatant("Zombi Szolga", 140, 30, 40, 25, -30, 20, False, False), Combatant("Csontmágus", 90, 20, 95, 5, 0, 0, False, False), ], + "party_sprites": [ + ["kefka", "kefka", "kefka"], + ["cursor", "cursor", "cursor"], + ["cursor", "cursor", "cursor"] + ], "enemy_turn_func": hero_turn_healers, "mus_id": "mus_fnafsux", "init_ai_data": _hero_moves(can_petrify=True), @@ -408,11 +429,23 @@ battles = [ Combatant("Eszter, a Nagymágus", 130, 22, 105, 10, 50, 50, False, False), Combatant("Domonkos, a Gyógyító", 140, 14, 95, 15, 30, 30, False, False), ], + "enemy_sprites": [ + # normál, kritikus , halott + ["herojoe" , "herojoe_low" , "herojoe_dead" ], + ["herojoe" , "herojoe_low" , "herojoe_dead" ], + ["heroinejane", "heroinejane_low", "heroinejane_dead"], + ["herojoe" , "herojoe_low" , "herojoe_dead" ], + ], "party_members": [ Combatant("Sötét Úr Zagorath", 600, 55, 80, 35, 30, 30, False, False), Combatant("Árnyboszorkány Nyx", 300, 30, 110, 10, 60, 60, False, False), Combatant("Csontlovag Gorm", 380, 50, 60, 70, -20, 40, False, False), ], + "party_sprites": [ + ["kefka", "kefka", "kefka"], + ["cursor", "cursor", "cursor"], + ["cursor", "cursor", "cursor"] + ], "enemy_turn_func": hero_turn_final, "mus_id": "mus_fnafsux", "init_ai_data": _hero_moves(can_petrify=True), diff --git a/src/gamestates/battle.py b/src/gamestates/battle.py index f45d721..3364c19 100644 --- a/src/gamestates/battle.py +++ b/src/gamestates/battle.py @@ -41,10 +41,10 @@ panel = renderers.NineSlicesPanel(0,0,230,100) battle_id = 0 def enemy_pos(i): - return (185, 195 - i * 40) + return (185, 195 - i * 20) def party_pos(i): - return (40 + (i % 2) * 30, 165 - i * 35) + return (40 + (i % 2) * 30, 165 - i * 25) def switch(game): global enemies, party_members, battle_music, enemy_turn, enemy_ai_data, party_menus, spells, inventory, enemy_sprites, party_sprites