diff --git a/global.gd b/global.gd index bb60cfe..c83b980 100644 --- a/global.gd +++ b/global.gd @@ -7,25 +7,25 @@ var mousepos var timelimit = 15000 var wait var bossready = false -const pcnames = ["Midori Asgardius", null, null, null, null, null, null, null, null, "Natasha Dostoyevsky"] +const pcnames = ["Midori Asgardius", "Diana Asgardius", null, null, null, null, null, null, null, "Natasha Dostoyevsky"] const npcnames = ["Lily", null, null, null, null, null, null, null, null, "Natasha Dostoyevsky"] -const pcfaces = [["res://sprites/common/midori/face.png"], [null], [null], [null], [null], [null], [null], [null], [null], ["res://sprites/common/natasha/face.png"]] -const hudfaces = [["res://sprites/common/midori/facehud.png"], [null], [null], [null], [null], [null], [null], [null], [null], ["res://sprites/common/natasha/facehud.png"]] +const pcfaces = [["res://sprites/common/midori/face.png"], ["res://sprites/common/tuna/face.png"], [null], [null], [null], [null], [null], [null], [null], ["res://sprites/common/natasha/face.png"]] +const hudfaces = [["res://sprites/common/midori/facehud.png"], ["res://sprites/common/tuna/facehud.png"], [null], [null], [null], [null], [null], [null], [null], ["res://sprites/common/natasha/facehud.png"]] const npcfaces = ["res://sprites/common/midori/face.png",null, null, null, null, null, null, null, null, "res://sprites/common/natasha/face.png"] -const basestats = [[100, 100, 2, 2, 100, 2, 500], [null], [null], [null], [null], [null], [null], [null], [null], [100, 100, 2, 2, 100, 2, 500]] -var cstats = [[100, 100, null, null, 100, null, null], [null], [null], [null], [null], [null], [null], [null], [null], [100, 100, null, null, 100, null, null]] -var dstats = [[100, 100, null, null, 100, null, null], [null], [null], [null], [null], [null], [null], [null], [null], [100, 100, null, null, 100, null, null]] +const basestats = [[100, 100, 2, 2, 100, 2, 500], [100, 100, 2, 2, 100, 2, 500], [null], [null], [null], [null], [null], [null], [null], [100, 100, 2, 2, 100, 2, 500]] +var cstats = [[100, 100, null, null, 100, null, null], [100, 100, null, null, 100, null, null], [null], [null], [null], [null], [null], [null], [null], [100, 100, null, null, 100, null, null]] +var dstats = [[100, 100, null, null, 100, null, null], [100, 100, null, null, 100, null, null], [null], [null], [null], [null], [null], [null], [null], [100, 100, null, null, 100, null, null]] var cdialog = [] const places = [[[[null, null, false], [null, null, false]], [["res://levels/Testrooms/bullethell.tscn", 11, true], ["res://levels/Testrooms/lilytest.tscn", 6, false]], [["res://levels/Testrooms/dialogtest.tscn", 19, false], ["res://levels/Testrooms/testspawn.tscn", 2 ,false]]]] var cplace = [0,2,1] var dplace = [null, null, null] -const pbbullets = ["res://sprites/common/bullet/fireball.tscn", null, null, null, null, null, null, null, null, "res://sprites/common/bullet/snowflake.tscn"] -const pcspecialities = [1, null, null, null, null, null, null, null, null, 0] -const pchars = [["res://sprites/common/midori/sprite.png"], [null], [null], [null], [null], [null], [null], [null], [null], ["res://sprites/common/natasha/sprite.png"]] +const pbbullets = ["res://sprites/common/bullet/fireball.tscn", "res://sprites/common/bullet/X11.tscn", null, null, null, null, null, null, null, "res://sprites/common/bullet/snowflake.tscn"] +const pcspecialities = [1, 2, null, null, null, null, null, null, null, 0] +const pchars = [["res://sprites/common/midori/sprite.png"], ["res://sprites/common/tuna/sprite.png"], [null], [null], [null], [null], [null], [null], [null], ["res://sprites/common/natasha/sprite.png"]] const npchars = ["res://sprites/common/midori/sprite.png", null, null, null, null, null, null, null, null, "res://sprites/common/natasha/sprite.png"] -var party = [[0,0], [9,0], [null,null], [null,null]] +var party = [[0,0], [1,0], [9,0], [null,null]] const specialities = [2, 0, 3, 1, 5, 4] -var dparty = [[0,0], [9,0], [null,null], [null,null]] +var dparty = [[0,0], [1,0], [9,0], [null,null]] var cpchar = 0 var dcpchar = 0 var mangohud = false diff --git a/levels/ui/credits.tscn b/levels/ui/credits.tscn index 06fe88f..7629559 100644 --- a/levels/ui/credits.tscn +++ b/levels/ui/credits.tscn @@ -57,6 +57,10 @@ Falcighol Arch / Mariana Kaizo Title screen background Frank Pi / Page Asgardius +Sword hit texture +Xorg Logo +The Open Group + Feedback Sakura Nakayama Tood diff --git a/sprites/common/bullet/X11.gd b/sprites/common/bullet/X11.gd index 1043238..c643bde 100644 --- a/sprites/common/bullet/X11.gd +++ b/sprites/common/bullet/X11.gd @@ -1,10 +1,11 @@ extends Area2D var velocity: Vector2 = Vector2() var direction -var speciality = 3 +var speciality var btype # Called when the node enters the scene tree for the first time. func _ready(): + speciality = Global.pcspecialities[Global.dparty[Global.dcpchar][0]] add_to_group(btype) #pass # Replace with function body. @@ -18,8 +19,8 @@ func _physics_process(delta): func _on_body_entered(body):if !body.is_in_group(btype): if body.is_in_group("players") || body.is_in_group("boss") || body.is_in_group("enemies"): - if body.weakness == 3: - print("weak to fire") + if body.weakness == speciality: + print("weakness") #if body.is_in_group("players"): # Global.live = 2 #elif body.is_in_group("enemies"): diff --git a/sprites/common/tuna/sprite.png b/sprites/common/tuna/sprite.png index ea4e00b..40f23d9 100644 Binary files a/sprites/common/tuna/sprite.png and b/sprites/common/tuna/sprite.png differ diff --git a/sprites/common/tuna/sprite.xcf b/sprites/common/tuna/sprite.xcf index dd128b6..5e504ba 100644 Binary files a/sprites/common/tuna/sprite.xcf and b/sprites/common/tuna/sprite.xcf differ