From 6632344afeda3d0fc0beccc6dc0c0d1ce0334bbb Mon Sep 17 00:00:00 2001 From: markojozsef Date: Sat, 17 Oct 2026 14:32:16 +0200 Subject: [PATCH] =?UTF-8?q?H=C5=91s=20spritok?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- res/sprite/heroinejane.png | Bin 0 -> 200 bytes res/sprite/heroinejane_dead.png | Bin 0 -> 192 bytes res/sprite/heroinejane_low.png | Bin 0 -> 202 bytes res/sprite/herojoe.png | Bin 0 -> 197 bytes res/sprite/herojoe_dead.png | Bin 0 -> 193 bytes res/sprite/herojoe_low.png | Bin 0 -> 206 bytes src/assets.py | 20 ++++++++----- src/battle_data.py | 49 ++++++++++++++++++++++++++------ src/gamestates/battle.py | 4 +-- 9 files changed, 56 insertions(+), 17 deletions(-) create mode 100644 res/sprite/heroinejane.png create mode 100644 res/sprite/heroinejane_dead.png create mode 100644 res/sprite/heroinejane_low.png create mode 100644 res/sprite/herojoe.png create mode 100644 res/sprite/herojoe_dead.png create mode 100644 res/sprite/herojoe_low.png diff --git a/res/sprite/heroinejane.png b/res/sprite/heroinejane.png new file mode 100644 index 0000000000000000000000000000000000000000..7c8f75af64a5691e249c5455330749c52e284b66 GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!3-pi)b-i{DV_kI5LX}#1plvZ-@9zGS;OB) zKn_bukY6yv|Ns9t>pFA*`RSf6jv*3LV<$KY9WdZviv9V2zV*dx31>B}J2G5EkLVQ% zD;SF2JbG3Bq=1m;^egi}>v?!AZQgc=i#>JK$BN~b9;&5p6{rZg-7a6jF8yNv_AL&l tH<`_vc5160i<*T)(631A*Sn18A7wUdVyxo0&>;kJkf*Dk%Q~loCIHxxNDu%3 literal 0 HcmV?d00001 diff --git a/res/sprite/heroinejane_dead.png b/res/sprite/heroinejane_dead.png new file mode 100644 index 0000000000000000000000000000000000000000..9bc10069364d3c636578696902019956ba82c691 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA@dWsUxB_V)_s`aE4x*>BvZ-%%BuML zEU(WlZ@v2>{eGwG0lnNwQcQ+>H>{joc=p7C{dSB}0`g}bus#v(-5cR_&1}J=-)`;( lk60Uwcx;S|L)PAVZNKUuW85||K3|YSJYD@<);T3K0RSdmN7(=X literal 0 HcmV?d00001 diff --git a/res/sprite/heroinejane_low.png b/res/sprite/heroinejane_low.png new file mode 100644 index 0000000000000000000000000000000000000000..d1a6a3ad4030a27c945dbb79f36e49281424c6ad GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!3-pi)b-i{DgFST5LX}#1plvZ-@9z`e+Gu- zqF=8A`K%>De!&d?fk5Vh8c1`hr;B5V#MIsi2L%}vIhgMr`Io)VQN}TzUH@7`qhTG} z9tRsHm*9mwUh(_QrbEv$FF)YO&qTy4}vMqb`18 s*Y+g`uAfMKwxwciwEClc$JwGkGV*jWmai56XasVSr>mdKI;Vst01shB!vFvP literal 0 HcmV?d00001 diff --git a/res/sprite/herojoe.png b/res/sprite/herojoe.png new file mode 100644 index 0000000000000000000000000000000000000000..417efbb2141e494695b184cd92c48972a833bf95 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!3-pi)b-i{DV_kI5LX}#1plvZ-@9zGS;OB) zKn_bukY6yv|Ns9t>pFA*`6-?*jv*3LTPHXQ9WdZv+Wg_aeYuI>s+SAz+);Fj(Pqu& z@?}~vJD}^Ce|L96PIIV=`{U0XoGGONR^Ep$I_7ci^}SJ*p5A@!4gUw$iKi-rX6{OM p@Bj0zbWz@k$iHi*7SF9*U%?cR+#1iS=FmbJi7UYQJOa*Yqout-a61 zU}vfMaGnfbtlXB6))|q)o?OBXEW5hr-3DH~1+mbt{w lakaYFW3rw#o!dwJ8^fB}jA2b1qT4|(@pScbS?83{1OQIdK}G-o literal 0 HcmV?d00001 diff --git a/res/sprite/herojoe_low.png b/res/sprite/herojoe_low.png new file mode 100644 index 0000000000000000000000000000000000000000..dd32a250ae0d7a02723c5e599a0401f67505cb23 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!3-pi)b-i{DgFST5LX}#1plvZ-@9z`|Gd0! ziT@V@`K%>De!&d?fk5Vh8c1`dr;B5V#MIUajzSFv9L#r@{IB2Kv|@{u@|Qz?4Ht5M z^F=g9u&n3~VDp_XB!2J)+iH$7yWT9PiGlr0&QrfnVD!`r2!3;%Gu>wEW!K_w>=n&B w`c|rzWyMm_^<&=9IaA=>a**)78&qol`;+05z9Of&c&j literal 0 HcmV?d00001 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