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

fix

Browse source
This commit is contained in:
Page Asgardius 2025-01-15 17:07:10 -07:00
parent e51e46cc1a
commit 766ed980e9
6 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.import/text.csv-f7bafd51ed4405bc3f45b54fa34fb92c.md5
View file

@ -1,3 +1,3 @@
source_md5="9c1d310bfd8c31ce010263a8d8790bed"
dest_md5="64d4b23378225e65e9e2012d0a884d03"
dest_md5="1c7392a52b856fb4ec77688be6d880fb"

2
global.gd
View file

@ -51,7 +51,7 @@ var owlocation = [[null, null], [null, null]]
const musictracks = ["res://music/midorinoyume.ogg", "res://music/seahorse.ogg", "res://music/chinesegoat.ogg", "res://music/doyoufeelold.ogg", "res://music/doyiuneedahealer.ogg", "res://music/adayatceres.ogg", "res://music/twintroublemakers.ogg", "res://music/easyquiz.ogg", "res://music/neowave.ogg", "res://music/multivectorsubmarines.ogg", "res://music/halfgeniegirls.ogg", "res://music/rusianmaverickfairy.ogg", "res://music/blacksmithofdestruction.ogg", "res://music/shininglikefireworks.ogg", "res://music/sadtrashcan.ogg", "res://music/akikonotegami.ogg", "res://music/asadcat.ogg", "res://music/lilydesire.ogg", "res://music/scholartrip.ogg", "res://music/quantumice.ogg", "res://music/unreeeal.ogg", "res://music/alsa.ogg", "res://music/silverblue.ogg"]
const sfxtracks = ["res://sfx/braindamage.wav", "res://sfx/gaugefill.wav", "res://sfx/boomboombakudan.wav"]
var debug = false
const release = "R0.3.4-beta"
const release = "R0.3.4-dev"
var sk = false
var gamepad = 0
var quest = [0, 0, 0, 0, 0, 0]

2
levels/Ceres/troublemakersp2.gd
View file

@ -28,7 +28,7 @@ func _input(event):
func _winner():
Global.result[0] = 2
if Global.quest[1] != 3:
if Global.quest[2] != 3:
Global.quest[2] = 3
Global.quest[3] = 1
Global.cdialog = [[tr("DIALOG_TROUBLEMAKER_7"), true, 0, 0], ["...", true, 8, 0], ["...", true, 0, 0]]

2
levels/ui/charlist.tscn
View file

@ -44,7 +44,7 @@ margin_right = 360.0
margin_bottom = 54.0
custom_fonts/font = ExtResource( 2 )
custom_styles/focus = SubResource( 1 )
text = "Miidori Asgardius"
text = "Midori Asgardius"
[node name="Diana" type="Button" parent="HBoxContainer/VBoxContainer"]
visible = false

4
levels/ui/pause.gd
View file

@ -29,11 +29,15 @@ func _input(event):
func _fetchdata():
if Global.debug:
if Global.dplace == [1, 8, 28]:
teammenu.visible = true
if Global.dplace != [1, 11, 19] && (Global.dplace[0] == 1 || Global.dplace[0] == 2):
warpmenu.visible = true
else:
warpmenu.visible = false
else:
if Global.cplace == [1, 8, 28]:
teammenu.visible = true
if Global.cplace != [1, 11, 19] && (Global.cplace[0] == 1 || Global.dplace[0] == 2):
warpmenu.visible = true
else:

2
levels/ui/teams.gd
View file

@ -38,7 +38,7 @@ func _ready():
#func _process(delta):
func _input(event):
if Input.is_action_just_pressed("Pause"):
queue_free()
get_tree().change_scene("res://levels/ui/gameplay.tscn")
func _charsel():
get_tree().change_scene("res://levels/ui/charlist.tscn")