asgardius/midori-school
1
0
Fork 0
Code Issues Pull requests Projects Releases 20 Packages Wiki Activity

bidirectional damage

Browse source
This commit is contained in:
Page Asgardius 2024-06-17 14:08:25 -07:00
parent 0f970b3d7a
commit 7eb094280f
12 changed files with 74 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
levels/Ceres/L20.gd
View file

@ -26,6 +26,7 @@ func _physics_process(delta):
print("move down") print("move down")
func _input(event): func _input(event):
if Global.cdialog.size() == 0: if Global.cdialog.size() != 0 && Global.live == 1:
get_tree().root.remove_child(talk) get_tree().root.remove_child(talk)
Global.cdialog = []

3
levels/Testrooms/bullethell.gd
View file

@ -26,6 +26,7 @@ func _physics_process(delta):
print("move down") print("move down")
func _input(event): func _input(event):
if Global.cdialog.size() == 0: if Global.cdialog.size() != 0 && Global.live == 1:
get_tree().root.remove_child(talk) get_tree().root.remove_child(talk)
Global.cdialog = []

3
levels/Testrooms/dialogtest.gd
View file

@ -12,5 +12,6 @@ func _process(delta):
pass pass
func _input(event): func _input(event):
if Global.cdialog.size() == 0: if Global.cdialog.size() != 0 && Global.live == 1:
get_tree().root.remove_child(talk) get_tree().root.remove_child(talk)
Global.cdialog = []

1
levels/ui/gameplay.gd
View file

@ -132,6 +132,7 @@ func _pausemenu():
get_tree().root.remove_child(pmenu) get_tree().root.remove_child(pmenu)
get_tree().root.add_child.call_deferred(bhud) get_tree().root.add_child.call_deferred(bhud)
ispaused = false ispaused = false
pmenu = load("res://levels/ui/pause.tscn").instantiate()
Global.live = 1 Global.live = 1
func _exit(): func _exit():
Global.exitgame = false Global.exitgame = false

2
levels/ui/pause.gd
View file

@ -10,8 +10,8 @@ func _ready():
cnf = $CanvasLayer/HBoxContainer/VBoxContainer/Cname cnf = $CanvasLayer/HBoxContainer/VBoxContainer/Cname
chealthf = $CanvasLayer/HBoxContainer/VBoxContainer/HBoxContainer/Label2 chealthf = $CanvasLayer/HBoxContainer/VBoxContainer/HBoxContainer/Label2
clevel = $CanvasLayer/HBoxContainer/VBoxContainer/HBoxContainer2/Label2 clevel = $CanvasLayer/HBoxContainer/VBoxContainer/HBoxContainer2/Label2
_fetchdata()
$CanvasLayer/HBoxContainer2/VBoxContainer2/Exit.grab_focus() $CanvasLayer/HBoxContainer2/VBoxContainer2/Exit.grab_focus()
_fetchdata()
#pass # Replace with function body. #pass # Replace with function body.

1
levels/ui/talk.gd
View file

@ -45,5 +45,4 @@ func _input(event):
if isboss: if isboss:
Global.bossready = true Global.bossready = true
Global.live = 1 Global.live = 1
Global.cdialog = []
press = false press = false

17
sprites/common/bullet/X11.gd
View file

@ -25,7 +25,7 @@ func _on_body_entered(body):
if body.is_in_group("players") && Global.dificulty != 1: if body.is_in_group("players") && Global.dificulty != 1:
if body.weakness == speciality: if body.weakness == speciality:
print("weakness") print("weakness")
Input.start_joy_vibration(0,0,1,3) #Input.start_joy_vibration(0,0,1,3)
if Global.debug: if Global.debug:
if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > (attack * crit): if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > (attack * crit):
Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack * crit Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack * crit
@ -37,7 +37,7 @@ func _on_body_entered(body):
else: else:
Global.cstats[Global.party[Global.cpchar][0]][0] = 0 Global.cstats[Global.party[Global.cpchar][0]][0] = 0
else: else:
Input.start_joy_vibration(0,1,0,2) #Input.start_joy_vibration(0,1,0,2)
if Global.debug: if Global.debug:
if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > attack: if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > attack:
Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack
@ -49,10 +49,19 @@ func _on_body_entered(body):
else: else:
Global.cstats[Global.party[Global.cpchar][0]][0] = 0 Global.cstats[Global.party[Global.cpchar][0]][0] = 0
elif body.is_in_group("boss") && Global.dificulty != 1: elif body.is_in_group("boss") && Global.dificulty != 1:
if body.weakness == 0: if body.weakness == speciality:
print("weakness") print("weakness")
if Global.cboss[1] > (attack * crit):
Global.cboss[1] -= attack * crit
else:
Global.cboss[1] = 0
else:
if Global.cboss[1] > (attack):
Global.cboss[1] -= attack
else:
Global.cboss[1] = 0
elif body.is_in_group("enemies") && Global.dificulty != 1: elif body.is_in_group("enemies") && Global.dificulty != 1:
if body.weakness == 0: if body.weakness == speciality:
print("weakness") print("weakness")
#if body.is_in_group("players"): #if body.is_in_group("players"):
# Global.live = 2 # Global.live = 2

17
sprites/common/bullet/arrow.gd
View file

@ -37,7 +37,7 @@ func _on_body_entered(body):
if body.is_in_group("players") && Global.dificulty != 1: if body.is_in_group("players") && Global.dificulty != 1:
if body.weakness == speciality: if body.weakness == speciality:
print("weakness") print("weakness")
Input.start_joy_vibration(0,0,1,3) #Input.start_joy_vibration(0,0,1,3)
if Global.debug: if Global.debug:
if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > (attack * crit): if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > (attack * crit):
Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack * crit Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack * crit
@ -49,7 +49,7 @@ func _on_body_entered(body):
else: else:
Global.cstats[Global.party[Global.cpchar][0]][0] = 0 Global.cstats[Global.party[Global.cpchar][0]][0] = 0
else: else:
Input.start_joy_vibration(0,1,0,2) #Input.start_joy_vibration(0,1,0,2)
if Global.debug: if Global.debug:
if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > attack: if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > attack:
Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack
@ -61,10 +61,19 @@ func _on_body_entered(body):
else: else:
Global.cstats[Global.party[Global.cpchar][0]][0] = 0 Global.cstats[Global.party[Global.cpchar][0]][0] = 0
elif body.is_in_group("boss") && Global.dificulty != 1: elif body.is_in_group("boss") && Global.dificulty != 1:
if body.weakness == 0: if body.weakness == speciality:
print("weakness") print("weakness")
if Global.cboss[1] >= (attack * crit):
Global.cboss[1] -= attack * crit
else:
Global.cboss[1] = 0
else:
if Global.cboss[1] >= (attack):
Global.cboss[1] -= attack
else:
Global.cboss[1] = 0
elif body.is_in_group("enemies") && Global.dificulty != 1: elif body.is_in_group("enemies") && Global.dificulty != 1:
if body.weakness == 0: if body.weakness == speciality:
print("weakness") print("weakness")
#if body.is_in_group("players"): #if body.is_in_group("players"):
# Global.live = 2 # Global.live = 2

20
sprites/common/bullet/fireball.gd
View file

@ -2,6 +2,7 @@ extends Area2D
var velocity: Vector2 = Vector2() var velocity: Vector2 = Vector2()
var direction var direction
var speed = 100 var speed = 100
var speciality
var btype var btype
var isvisible var isvisible
var attack var attack
@ -30,7 +31,7 @@ func _on_body_entered(body):
if body.is_in_group("players") && Global.dificulty != 1: if body.is_in_group("players") && Global.dificulty != 1:
if body.weakness == 3: if body.weakness == 3:
print("weakness") print("weakness")
Input.start_joy_vibration(0,0,1,3) #Input.start_joy_vibration(0,0,1,3)
if Global.debug: if Global.debug:
if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > (attack * crit): if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > (attack * crit):
Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack * crit Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack * crit
@ -42,7 +43,7 @@ func _on_body_entered(body):
else: else:
Global.cstats[Global.party[Global.cpchar][0]][0] = 0 Global.cstats[Global.party[Global.cpchar][0]][0] = 0
else: else:
Input.start_joy_vibration(0,1,0,2) #Input.start_joy_vibration(0,1,0,2)
if Global.debug: if Global.debug:
if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > attack: if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > attack:
Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack
@ -53,11 +54,20 @@ func _on_body_entered(body):
Global.cstats[Global.party[Global.cpchar][0]][0] -= attack Global.cstats[Global.party[Global.cpchar][0]][0] -= attack
else: else:
Global.cstats[Global.party[Global.cpchar][0]][0] = 0 Global.cstats[Global.party[Global.cpchar][0]][0] = 0
elif body.is_in_group("boss") && Global.dificulty != 1: elif body.is_in_group("boss") && Global.dificulty != 1 && Global.cboss[1] != null:
if body.weakness == 0: if body.weakness == 3:
print("weakness") print("weakness")
if Global.cboss[1] >= (attack * crit):
Global.cboss[1] -= attack * crit
else:
Global.cboss[1] = 0
else:
if Global.cboss[1] >= (attack):
Global.cboss[1] -= attack
else:
Global.cboss[1] = 0
elif body.is_in_group("enemies") && Global.dificulty != 1: elif body.is_in_group("enemies") && Global.dificulty != 1:
if body.weakness == 0: if body.weakness == 3:
print("weakness") print("weakness")
#if body.is_in_group("players"): #if body.is_in_group("players"):
# Global.live = 2 # Global.live = 2

14
sprites/common/bullet/snowflake.gd
View file

@ -4,6 +4,7 @@ var direction
var speed = 100 var speed = 100
var btype var btype
var isvisible var isvisible
var speciality
var attack var attack
var crit var crit
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
@ -30,7 +31,7 @@ func _on_body_entered(body):
if body.is_in_group("players") && Global.dificulty != 1: if body.is_in_group("players") && Global.dificulty != 1:
if body.weakness == 0: if body.weakness == 0:
print("weakness") print("weakness")
Input.start_joy_vibration(0,0,1,3) #Input.start_joy_vibration(0,0,1,3)
if Global.debug: if Global.debug:
if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > (attack * crit): if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > (attack * crit):
Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack * crit Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack * crit
@ -42,7 +43,7 @@ func _on_body_entered(body):
else: else:
Global.cstats[Global.party[Global.cpchar][0]][0] = 0 Global.cstats[Global.party[Global.cpchar][0]][0] = 0
else: else:
Input.start_joy_vibration(0,1,0,2) #Input.start_joy_vibration(0,1,0,2)
if Global.debug: if Global.debug:
if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > attack: if Global.dstats[Global.dparty[Global.dcpchar][0]][0] > attack:
Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack Global.dstats[Global.dparty[Global.dcpchar][0]][0] -= attack
@ -56,6 +57,15 @@ func _on_body_entered(body):
elif body.is_in_group("boss") && Global.dificulty != 1: elif body.is_in_group("boss") && Global.dificulty != 1:
if body.weakness == 0: if body.weakness == 0:
print("weakness") print("weakness")
if Global.cboss[1] >= (attack * crit):
Global.cboss[1] -= attack * crit
else:
Global.cboss[1] = 0
else:
if Global.cboss[1] >= (attack):
Global.cboss[1] -= attack
else:
Global.cboss[1] = 0
elif body.is_in_group("enemies") && Global.dificulty != 1: elif body.is_in_group("enemies") && Global.dificulty != 1:
if body.weakness == 0: if body.weakness == 0:
print("weakness") print("weakness")

1
sprites/common/kimberly/kimberly.gd
View file

@ -93,6 +93,7 @@ func shoot(angle):
new_bullet.btype = "boss" new_bullet.btype = "boss"
new_bullet.attack = attack new_bullet.attack = attack
new_bullet.crit = crit new_bullet.crit = crit
new_bullet.speciality = 3
get_parent().call_deferred("add_child",new_bullet) get_parent().call_deferred("add_child",new_bullet)

12
sprites/common/player/player.gd
View file

@ -8,10 +8,13 @@ var sprite
var anim var anim
var speed var speed
var csprite var csprite
var attack
var crit
var bpress = false var bpress = false
# Get the gravity from the project settings to be synced with RigidBody nodes. # Get the gravity from the project settings to be synced with RigidBody nodes.
var gravity = ProjectSettings.get_setting("physics/2d/default_gravity") var gravity = ProjectSettings.get_setting("physics/2d/default_gravity")
var weakness var weakness
var speciality
func _ready(): func _ready():
add_to_group("players") add_to_group("players")
@ -72,6 +75,9 @@ func _input(event):
bullet = load(Global.pbbullets[Global.party[Global.cpchar][0]]) bullet = load(Global.pbbullets[Global.party[Global.cpchar][0]])
var new_pbullet = bullet.instantiate() var new_pbullet = bullet.instantiate()
new_pbullet.btype = "players" new_pbullet.btype = "players"
new_pbullet.attack = attack
new_pbullet.crit = crit
new_pbullet.speciality = speciality
new_pbullet.velocity = Vector2(0, -speed).rotated(deg_to_rad(angle * 90)) new_pbullet.velocity = Vector2(0, -speed).rotated(deg_to_rad(angle * 90))
var rposition = Vector2(0, -96).rotated(deg_to_rad(angle * 90)) var rposition = Vector2(0, -96).rotated(deg_to_rad(angle * 90))
if angle == 2: if angle == 2:
@ -86,10 +92,14 @@ func _input(event):
func _charinit(): func _charinit():
if Global.debug: if Global.debug:
speed = Global.mstats[Global.dparty[Global.dcpchar][0]][6] speed = Global.mstats[Global.dparty[Global.dcpchar][0]][6]
attack = Global.mstats[Global.dparty[Global.dcpchar][0]][2]
crit = Global.mstats[Global.dparty[Global.dcpchar][0]][3]
#print(Global.dparty[Global.dcpchar][0]) #print(Global.dparty[Global.dcpchar][0])
#print(speed) #print(speed)
else: else:
speed = Global.mstats[Global.party[Global.cpchar][0]][6] speed = Global.mstats[Global.party[Global.cpchar][0]][6]
attack = Global.mstats[Global.party[Global.cpchar][0]][2]
crit = Global.mstats[Global.party[Global.cpchar][0]][3]
#print(Global.dparty[Global.cpchar][0]) #print(Global.dparty[Global.cpchar][0])
#print(speed) #print(speed)
_charswitch() _charswitch()
@ -105,6 +115,7 @@ func _charswitch():
csprite = Global.dcpchar csprite = Global.dcpchar
sprite.texture = load(Global.pchars[Global.dparty[Global.dcpchar][0]][Global.dparty[Global.dcpchar][1]]) sprite.texture = load(Global.pchars[Global.dparty[Global.dcpchar][0]][Global.dparty[Global.dcpchar][1]])
weakness = Global.specialities[Global.pcspecialities[Global.dparty[Global.dcpchar][0]]] weakness = Global.specialities[Global.pcspecialities[Global.dparty[Global.dcpchar][0]]]
speciality = Global.pcspecialities[Global.dparty[Global.dcpchar][0]]
print(Global.dparty[Global.dcpchar][0]) print(Global.dparty[Global.dcpchar][0])
print(speed) print(speed)
else: else:
@ -117,3 +128,4 @@ func _charswitch():
csprite = Global.cpchar csprite = Global.cpchar
sprite.texture = load(Global.pchars[Global.party[Global.cpchar][0]][Global.party[Global.cpchar][1]]) sprite.texture = load(Global.pchars[Global.party[Global.cpchar][0]][Global.party[Global.cpchar][1]])
weakness = Global.specialities[Global.pcspecialities[Global.party[Global.cpchar][0]]] weakness = Global.specialities[Global.pcspecialities[Global.party[Global.cpchar][0]]]
speciality = Global.pcspecialities[Global.party[Global.cpchar][0]]