From 540619356604325e7901fc1d6970db7e849db049 Mon Sep 17 00:00:00 2001 From: MisterMikah Date: Tue, 24 Mar 2026 17:45:45 -0700 Subject: [PATCH 1/2] Created Regenerate Status Effects 1 and 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regenerate • Heal a little every turn Level 2 • Heal Increase --- .../fortune/regenerate/regenerate_1.tres | 30 +++++++++++++++++++ .../fortune/regenerate/regenerate_2.tres | 30 +++++++++++++++++++ workspaces/artemis/artemis-main.tscn | 8 ++--- 3 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 resources/abilities/fortune/regenerate/regenerate_1.tres create mode 100644 resources/abilities/fortune/regenerate/regenerate_2.tres diff --git a/resources/abilities/fortune/regenerate/regenerate_1.tres b/resources/abilities/fortune/regenerate/regenerate_1.tres new file mode 100644 index 0000000..74464f4 --- /dev/null +++ b/resources/abilities/fortune/regenerate/regenerate_1.tres @@ -0,0 +1,30 @@ +[gd_resource type="Resource" script_class="StatusEffect" format=3 uid="uid://dnx5kk4jemlol"] + +[ext_resource type="Script" uid="uid://c4rwprj6d61c0" path="res://scripts/status_effects/status_effect.gd" id="1_3lxtv"] +[ext_resource type="Script" uid="uid://c2ci25gmhnb4w" path="res://scripts/status_effects/status_effect_stack.gd" id="2_seamv"] +[ext_resource type="Script" uid="uid://w6h7oqtjl61k" path="res://scripts/status_effects/status_effect_modifier.gd" id="3_qvorr"] +[ext_resource type="Script" uid="uid://d0uvf6jnorxpw" path="res://scripts/status_effects/status_effect_trigger.gd" id="4_663xp"] +[ext_resource type="Script" uid="uid://c84i4tkx4t6au" path="res://scripts/ability/action/heal_action.gd" id="5_u1w0k"] + +[sub_resource type="Resource" id="Resource_nr16a"] +script = ExtResource("5_u1w0k") +heal_amount = 10 +metadata/_custom_type_script = "uid://c84i4tkx4t6au" + +[sub_resource type="Resource" id="Resource_kwfm3"] +script = ExtResource("4_663xp") +action = SubResource("Resource_nr16a") +metadata/_custom_type_script = "uid://d0uvf6jnorxpw" + +[sub_resource type="Resource" id="Resource_c1t11"] +script = ExtResource("2_seamv") +description = "Heals you 10hp each turn." +triggers = Array[ExtResource("4_663xp")]([SubResource("Resource_kwfm3")]) +metadata/_custom_type_script = "uid://c2ci25gmhnb4w" + +[resource] +script = ExtResource("1_3lxtv") +stacks = Array[ExtResource("2_seamv")]([SubResource("Resource_c1t11")]) +limited_duration = false +name = "Regenerate" +metadata/_custom_type_script = "uid://c4rwprj6d61c0" diff --git a/resources/abilities/fortune/regenerate/regenerate_2.tres b/resources/abilities/fortune/regenerate/regenerate_2.tres new file mode 100644 index 0000000..c64eba1 --- /dev/null +++ b/resources/abilities/fortune/regenerate/regenerate_2.tres @@ -0,0 +1,30 @@ +[gd_resource type="Resource" script_class="StatusEffect" format=3 uid="uid://drofrxl7aww0y"] + +[ext_resource type="Script" uid="uid://c4rwprj6d61c0" path="res://scripts/status_effects/status_effect.gd" id="1_btp7v"] +[ext_resource type="Script" uid="uid://c2ci25gmhnb4w" path="res://scripts/status_effects/status_effect_stack.gd" id="2_a3qf0"] +[ext_resource type="Script" uid="uid://w6h7oqtjl61k" path="res://scripts/status_effects/status_effect_modifier.gd" id="3_4hhlr"] +[ext_resource type="Script" uid="uid://d0uvf6jnorxpw" path="res://scripts/status_effects/status_effect_trigger.gd" id="4_vxtwa"] +[ext_resource type="Script" uid="uid://c84i4tkx4t6au" path="res://scripts/ability/action/heal_action.gd" id="5_gqngc"] + +[sub_resource type="Resource" id="Resource_nr16a"] +script = ExtResource("5_gqngc") +heal_amount = 20 +metadata/_custom_type_script = "uid://c84i4tkx4t6au" + +[sub_resource type="Resource" id="Resource_kwfm3"] +script = ExtResource("4_vxtwa") +action = SubResource("Resource_nr16a") +metadata/_custom_type_script = "uid://d0uvf6jnorxpw" + +[sub_resource type="Resource" id="Resource_c1t11"] +script = ExtResource("2_a3qf0") +description = "Heals you 20hp each turn." +triggers = Array[ExtResource("4_vxtwa")]([SubResource("Resource_kwfm3")]) +metadata/_custom_type_script = "uid://c2ci25gmhnb4w" + +[resource] +script = ExtResource("1_btp7v") +stacks = Array[ExtResource("2_a3qf0")]([SubResource("Resource_c1t11")]) +limited_duration = false +name = "Regenerate Level 2" +metadata/_custom_type_script = "uid://c4rwprj6d61c0" diff --git a/workspaces/artemis/artemis-main.tscn b/workspaces/artemis/artemis-main.tscn index 5a5ef29..f64e8d2 100644 --- a/workspaces/artemis/artemis-main.tscn +++ b/workspaces/artemis/artemis-main.tscn @@ -4,11 +4,11 @@ [ext_resource type="Script" uid="uid://c2dcuh7wij0sh" path="res://scripts/battle_logic/battle_character.gd" id="1_ha2wl"] [ext_resource type="Script" uid="uid://ny1mjfoo1mqc" path="res://scripts/ability/ability.gd" id="2_dq3ge"] [ext_resource type="Script" uid="uid://doviul66xwvvb" path="res://workspaces/artemis/health_label.gd" id="3_dq3ge"] -[ext_resource type="Resource" uid="uid://b6mlqpxywhb6g" path="res://resources/abilities/heal.tres" id="3_lhvlb"] +[ext_resource type="Resource" uid="uid://b6mlqpxywhb6g" path="res://resources/abilities/umi/heal.tres" id="3_lhvlb"] [ext_resource type="Resource" uid="uid://c71y0pm2tt1g" path="res://resources/abilities/fortune/pierce/pierce_1.tres" id="4_lhvlb"] -[ext_resource type="Resource" uid="uid://bnv8ckim477pc" path="res://resources/abilities/strength.tres" id="6_vmnyc"] -[ext_resource type="Resource" uid="uid://y06qhqwsm5s3" path="res://resources/abilities/burn.tres" id="7_ra02i"] -[ext_resource type="Resource" uid="uid://sg2oek573oja" path="res://resources/abilities/bleed.tres" id="8_6onex"] +[ext_resource type="Resource" uid="uid://bnv8ckim477pc" path="res://resources/abilities/fortune/strength.tres" id="6_vmnyc"] +[ext_resource type="Resource" uid="uid://y06qhqwsm5s3" path="res://resources/abilities/umi/burn.tres" id="7_ra02i"] +[ext_resource type="Resource" uid="uid://sg2oek573oja" path="res://resources/abilities/fortune/bleed.tres" id="8_6onex"] [ext_resource type="Script" uid="uid://b1qn3ek7b7ps4" path="res://workspaces/artemis/turn_label.gd" id="8_h88bq"] [node name="Node2D" type="Node2D" unique_id=217755439 node_paths=PackedStringArray("player_team", "boss_team")] From 47b302a1711122b100afc734d9cba044d3d3268e Mon Sep 17 00:00:00 2001 From: MisterMikah Date: Thu, 26 Mar 2026 16:58:04 -0700 Subject: [PATCH 2/2] Regenerate Level 3 and 4 and Added to heal_action.gd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Level 3 (Antidote) • Chance to cure an ailment Level 4 • Heal Increase • Can heal Fortune past Max HP Both need some tweaks further along for curing ailment (which status effect) and also if max health should be only touched by regenerate. heal_action.gd • Added overheal boolean and if set to true, player can heal past max hp. --- .DS_Store | Bin 0 -> 10244 bytes resources/abilities/fortune/.DS_Store | Bin 0 -> 6148 bytes .../fortune/regenerate/regenerate_3.tres | 47 +++++++++++++++++ .../fortune/regenerate/regenerate_4.tres | 48 ++++++++++++++++++ scripts/.DS_Store | Bin 0 -> 16388 bytes scripts/ability/.DS_Store | Bin 0 -> 10244 bytes scripts/ability/action/.DS_Store | Bin 0 -> 10244 bytes scripts/ability/action/heal_action.gd | 9 +++- scripts/status_effects/.DS_Store | Bin 0 -> 8196 bytes workspaces/.DS_Store | Bin 0 -> 6148 bytes 10 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 .DS_Store create mode 100644 resources/abilities/fortune/.DS_Store create mode 100644 resources/abilities/fortune/regenerate/regenerate_3.tres create mode 100644 resources/abilities/fortune/regenerate/regenerate_4.tres create mode 100644 scripts/.DS_Store create mode 100644 scripts/ability/.DS_Store create mode 100644 scripts/ability/action/.DS_Store create mode 100644 scripts/status_effects/.DS_Store create mode 100644 workspaces/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6f64a99887c95d5706de21c8ba2ca64ba96dbbce GIT binary patch literal 10244 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 literal 0 HcmV?d00001 diff --git a/scripts/ability/action/.DS_Store b/scripts/ability/action/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3f23402da75004b1a1a02b630bd73c9f5b9a36ad GIT binary patch literal 10244 zcmeHMU2Ggz6+UO;#Iwo99y{xJop{ofHx+5)xW;K4r)kCdC$w&pIC$fFojBRd?o8}S zW@k1tvv!P0Wg+p>5)gf9#ZLv|fuD*Z6$%wEfS^#2-~j?s5dx_dh#v_m0S`c>a_+se z&g^;;+Y*XE*}IxK_wRi7>^b+|nfna@;BZBMFF*YtzFe@J0)X^Vp=_C+ z-{1c$lr}YO-qI|`wr-1W?|$^LvB%@b@=E)>X)KJFebceMCk@vlnO9o9IcH(4=-4M+ zgSAf;9jj8Zy}Z&^)U0B~(tKmcva;p}4XSJPimqc>CmqjZFw;5TxZ<<6RZY3mp5yu> z94xOW70;M32+N!|MhVf&nKUF*Ow{=vV{f#yDsAmM5*<4`Q+MBc-~EG+4CRVWsbtu` zH)&}F!zP0uV?#QyDX$p#aGE@X!=Pv79o`)CV>+l-<0N#K%;ScaO zyn~1>xC4{;9_+_K9LC4+1diiL%;F@T!#tkH0_s>o8y&oi9)1X~;#0VcAI4|!qj(KJ zj-S9!;-~P__yT?bzldML7x63j4g4m)ir>QT;rH=1{2~4be~drJU*qraPxxnHpTy=a zOUH$%-tq5eXiyC=ii(wPYPExq=#h+`_9J52Z^}kbdvz)|eL6n#e>3f0YU#Xd@4f>A zhaS!x9XtMk>wFQ=pAY;e*FEoR-P9;GJkapK9q9qKKcwhlG84#UA^FxpH}(p_+Sw}v zPn4%~0Iy30G84#UA-O8)a8;5*6@w!N3U#VavF;=@fm{|+r~?Xhz+hwyPAJGnC%qK! z4ww*zORa3d?WEH|nSK^5LY|)zG&Y*4mhm`+k-FB86m1)e z8McIC)=9I*p!w^-Jogpj(KfWgYS4CX3@zG57S|e7g`<}F++xucEZqV3_adny#WB<+Glvc{rWZ<9s&wf2(L`y+<& zx;Kg!Z6}Xk7`Jm}-!{qK4O+>g8AjW^F|=qKd2GX|EwDhI6uZY7^NYtctlNGo-RSXo zEdLUUC2faySh@-KS2su5Gba3;i+E!wEO-H12(MOYlV1jGVRLiyw&t^0q64$O=2yI7 z%{{|PryR#BRP$QlNg@gJN@B#Zea*BDmn)dML0x91h&Xc=hMkJ7dt5gw8e)|4N^)sw z;P8XJsr&m6UhPdS9UkbX{J{sWUX95e>HCgMfnThCKh`D;N56I&g--paXcRTV_`4TWmgT%}-Mu9*I! zl9px8F{ad>cnxn(L^k0N1%J2NqlPK=K;a&Bf1I=JL~)CbeewP{XWNO`7BvUs52%8x zC(>MuGZ=qJtrGV{or}sx;vMP=xgQgCL+XfH$Ji4oF52EtZKu6C%{9gsXzvLudYo$c zmkg?BH2+cE^c~(v-Z;^ts?+QPz>uyRI%(`mcD1Tmby8M-CexP*)1EhJzoV}iV%z&~ zaqqu?-@qT?Z}3mz-nU>gZpCewz+JdESOkN3n0R=`!A}qiKZA2<;zeTKuizps5&!-X ze44oTYxpsI4nISz`)BcU_+@+HHk|tf09H}g3-U{h{HZ&6{D=mi4hK=Wct#@v7X|otF z#rXfDH~;>Bo2_aL*YH5Y1Gm!y*fg3QWv}?v7vuWD=?D%fy3W(Z66?1tBv+vu>%tRd s7!}W7{iwb_sAf7DmM6I^B;_dG_74HIU+f#t|Hkv5699ZN-a)tj089Wa*Z=?k literal 0 HcmV?d00001 diff --git a/scripts/ability/action/heal_action.gd b/scripts/ability/action/heal_action.gd index 5fbd3ed..08e81e9 100644 --- a/scripts/ability/action/heal_action.gd +++ b/scripts/ability/action/heal_action.gd @@ -2,7 +2,14 @@ extends TargetAction class_name HealAction @export var heal_amount: int +@export var overheal: bool func run(context: ActionContext) -> void: for target in resolve_targets(context): - BattleManager.apply_healing(heal_amount, context.source, target) + if overheal: + var overflow = maxi(0, target.current_health + heal_amount - target.max_health) + target.max_health += overflow + BattleManager.apply_healing(heal_amount, context.source, target) + + else: + BattleManager.apply_healing(heal_amount, context.source, target) diff --git a/scripts/status_effects/.DS_Store b/scripts/status_effects/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5d918795109a238b2da250eb6c0cbbfa9346dc20 GIT binary patch literal 8196 zcmeHMOK!q25FJw%NR=uU{m>tZShPE&-XKDB(RB|%`2>VYLE^K|8G3*oq8Du6*jD8v zPD)y-s$d3rCfJ^r$+KfKhKN*WGrA*c5K#?d}hU)JNH5 zdP{{cAPfit!hkR!4EzTMuxGQ>a`t`GDq0v22KJHxULOJ!wxPALv3lu%(kTFJ71dgB z&FKL91lESu#>S!rqKqr7aaA_OP{tkgf$bMs8yjofN!jE>**hznp(uTK;0L-psnA%_ z!hkT4Wq@Co6B;0AUs06E-&gn+(HNhIhREpKG@;SMY%v_n76W*(X9uPIp#@h&=i4Iz zZ$r}z;(H3QiF+?-4jnarn=5OZP+4Obpz~MC)(C;u>J9?*Hrvx;IB_3Jn0<# zm5jK;i=4~vWjQo|jFn{yweFnSY{O#<%j=QD&{Il*01Ir{|!H*(i*U-}@=vpGh8*yb>km(p6bJf1Et#30w@Ah%m4d3>=uJXmI|2 zpMUilo~w6;uZ(Pbe(hFE&=YKyeqY*XcOy*B^$s4s2U! cZEP%BAb)-ku*R=&&+iG@|MhT)+7kvo0a00BN&o-= literal 0 HcmV?d00001 diff --git a/workspaces/.DS_Store b/workspaces/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9108e86c8e0544caf375b5f00ee204b06fda6d4a GIT binary patch literal 6148 zcmeHKPfrs;6n_InS`b;F1&o?(?8Ss8B4Ctwa48r=JV022C4gnO9m>jfrtWU3NJx6s zFW?9819@J@^H@c-A+68qn(17@e2Q{NBDlGxL6%o!J2ZQfyXl09XK!#wIW| zfZZ=d_(kiI9&PDGByx;>zZEz9ko#S+#$XsQ4E%izh;O$K>JY#IcyRXned9O6AWo*I zKa!r_RNuLNl)?TTcb~W1#7mlS(Tldk(>mv&-_bpPBcQFam0jd4@d8F8nGjSdhHO6! zSe3VmyveGu%ypF`gHpC8j*sVN3--+H?URCiJU=sCu;=DyPEIoET>koE(}{Eqhll4kz6h}J~4T5^wQ5RT9W~)Rz3|Dy^Bmrle+j91V)|c5H#~H;6RvN+;Z_p@4 z?8+%^dQs%D8Z92}gq}~s6;|X)!t12~s}L)fQ@RbW60lnS?ia;lChuHRng#g|wdrg} z(@64f{kGKC8D|ueR+T63JkTL&n1TgxVH=)68(zXIcn$C11AKf}K8&r6P{vNo-QkXA1?<(b!gq78LU%AZak2 JVc?H4@EuS=$#eh! literal 0 HcmV?d00001