Kimberly Challenge RELOADED

.import/text.csv-f7bafd51ed4405bc3f45b54fa34fb92c.md5

@@ -1,3 +1,3 @@
-source_md5="a8b6ce39db08066ffa2d2bae062ed2be"
-dest_md5="ca6874ca48b2a3eee6c6656d9a3e3557"
+source_md5="409e38b21cb4d5e60f8fecc6275148a8"
+dest_md5="97cab6fb49a7b7aff8395d2c412169c3"
 

global.gd

@@ -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.5-beta"
+const release = "R0.3.5-dev"
 var sk = false
 var gamepad = 0
 var quest = [0, 0, 0, 0, 0, 0]

levels/Ceres/L20.gd

@@ -10,7 +10,11 @@ func _ready():
 	boss = $Kimberly
 	player = $Player
 	boss.add_to_group("boss")
-	Global.cdialog = [[tr("DIALOG_CERES_L20_0"), true, 0, 0], [tr("DIALOG_CERES_L20_1"), false, 3], [tr("DIALOG_CERES_L20_2"), true, 0, 0]]
+	if isreplay:
+		Global.cdialog = [[tr("DIALOG_CERES_L20_6"), true, 0, 0], [tr("DIALOG_CERES_L20_7"), false, 3], [tr("DIALOG_CERES_L20_8"), true, 0, 0]]
+	else:
+		Global.cdialog = [[tr("DIALOG_CERES_L20_0"), true, 0, 0], [tr("DIALOG_CERES_L20_1"), false, 3], [tr("DIALOG_CERES_L20_2"), true, 0, 0]]
+	
 	Global.live = 0
 	call_deferred("_talk")
 	if !Global.debug:
@@ -49,7 +53,7 @@ func _winner():
 func _winnerr():
 	Global.quest[3] = 3
 	Global.quest[4] = 1
-	Global.cdialog = [[tr("DIALOG_CERES_L20_3"), true, 0, 0], [tr("DIALOG_CERES_L20_4"), false, 3], [tr("DIALOG_CERES_L20_5"), true, 0, 0]]
+	Global.cdialog = [[tr("DIALOG_CERES_L20_9"), true, 0, 0], [tr("DIALOG_CERES_L20_10"), false, 3], [tr("DIALOG_CERES_L20_11"), true, 0, 0]]
 	Global.live = 3
 	Global.ccutscene = 25
 	#talk.queue_free()

levels/ui/charlist.gd

@@ -12,6 +12,8 @@ func _ready():
 		$HBoxContainer/VBoxContainer/Diana.visible = true
 		$HBoxContainer/VBoxContainer/Pamela.visible = true
 		$HBoxContainer/VBoxContainer/Lety.visible = true
+	if Global.quest[3] == 3:
+		$HBoxContainer/VBoxContainer/Kimberly.visible = true
 	$HBoxContainer/VBoxContainer/Midori.grab_focus()
 	#pass # Replace with function body.
 
@@ -64,3 +66,13 @@ func _on_Lety_pressed():
 		Global.party[Global.charswitch][1] = 0
 	_on_Return_pressed()
 
+
+
+func _on_Kimberly_pressed():
+	if Global.debug:
+		Global.dparty[Global.charswitch][0] = 3
+		Global.dparty[Global.charswitch][1] = 0
+	else:
+		Global.party[Global.charswitch][0] = 3
+		Global.party[Global.charswitch][1] = 0
+	_on_Return_pressed()

levels/ui/charlist.tscn

@@ -55,7 +55,7 @@ text = "Midori Asgardius"
 [node name="Diana" type="Button" parent="HBoxContainer/VBoxContainer"]
 visible = false
 margin_top = 58.0
-margin_right = 387.0
+margin_right = 360.0
 margin_bottom = 112.0
 custom_fonts/font = ExtResource( 2 )
 custom_styles/focus = SubResource( 1 )
@@ -63,45 +63,45 @@ text = "Diana Asgardius"
 
 [node name="Rikka" type="Button" parent="HBoxContainer/VBoxContainer"]
 visible = false
-margin_top = 58.0
-margin_right = 387.0
-margin_bottom = 112.0
+margin_top = 116.0
+margin_right = 360.0
+margin_bottom = 170.0
 custom_fonts/font = ExtResource( 2 )
 custom_styles/focus = SubResource( 1 )
 text = "Rikka Grub"
 
 [node name="Kimberly" type="Button" parent="HBoxContainer/VBoxContainer"]
 visible = false
-margin_top = 58.0
-margin_right = 387.0
-margin_bottom = 112.0
+margin_top = 174.0
+margin_right = 360.0
+margin_bottom = 228.0
 custom_fonts/font = ExtResource( 2 )
 custom_styles/focus = SubResource( 1 )
 text = "Kimberly Arch"
 
 [node name="Hu" type="Button" parent="HBoxContainer/VBoxContainer"]
 visible = false
-margin_top = 58.0
-margin_right = 387.0
-margin_bottom = 112.0
+margin_top = 174.0
+margin_right = 360.0
+margin_bottom = 228.0
 custom_fonts/font = ExtResource( 2 )
 custom_styles/focus = SubResource( 1 )
 text = "Hu Wei"
 
 [node name="Gurukosu" type="Button" parent="HBoxContainer/VBoxContainer"]
 visible = false
-margin_top = 58.0
-margin_right = 387.0
-margin_bottom = 112.0
+margin_top = 174.0
+margin_right = 360.0
+margin_bottom = 228.0
 custom_fonts/font = ExtResource( 2 )
 custom_styles/focus = SubResource( 1 )
 text = "Gurukōsu Tanaka"
 
 [node name="Momo" type="Button" parent="HBoxContainer/VBoxContainer"]
 visible = false
-margin_top = 58.0
-margin_right = 387.0
-margin_bottom = 112.0
+margin_top = 174.0
+margin_right = 360.0
+margin_bottom = 228.0
 custom_fonts/font = ExtResource( 2 )
 custom_styles/focus = SubResource( 1 )
 text = "Momo Tanaka"
@@ -134,6 +134,7 @@ text = "BUTTON_RETURN"
 
 [connection signal="pressed" from="HBoxContainer/VBoxContainer/Midori" to="." method="_on_Midori_pressed"]
 [connection signal="pressed" from="HBoxContainer/VBoxContainer/Diana" to="." method="_on_Diana_pressed"]
+[connection signal="pressed" from="HBoxContainer/VBoxContainer/Kimberly" to="." method="_on_Kimberly_pressed"]
 [connection signal="pressed" from="HBoxContainer/VBoxContainer/Pamela" to="." method="_on_Pamela_pressed"]
 [connection signal="pressed" from="HBoxContainer/VBoxContainer/Lety" to="." method="_on_Lety_pressed"]
 [connection signal="pressed" from="HBoxContainer/VBoxContainer/Return" to="." method="_on_Return_pressed"]

text.csv

@@ -122,6 +122,12 @@ DIALOG_CERES_L20_2;My magic wand VS your bow;Mi vara mágica contra tu arco;私
 DIALOG_CERES_L20_3;I'm tired;Estoy cansada;私は疲れている
 DIALOG_CERES_L20_4;You must study at Kaizo Magic School as you promised;Debes estudiar en la escuela de Magia Kaizo\ncomo prometiste;約束通りカイゾー魔法学校で勉強しなくちゃ
 DIALOG_CERES_L20_5;It seems I'm lucky;Parece que tengo suerte;私は幸運のようです
+DIALOG_CERES_L20_6;Why those knives?;¿Por qué esos cuchillos?;なぜあのナイフなのですか？
+DIALOG_CERES_L20_7;Get ready for a second chance;Prepárate para una segunda oportunidad;2度目のチャンスに備えよう
+DIALOG_CERES_L20_8;I have a new plan;Tengo un nuevo plan;新しい計画がある
+DIALOG_CERES_L20_9;I won;Yo gané;私は勝った
+DIALOG_CERES_L20_10;You are strong;Eres fuerte;あなたは強い
+DIALOG_CERES_L20_11;I haven't finished yet;No he terminado todavía;まだ終わってない
 DIALOG_TROUBLEMAKER_0;Hey, I just want to be your friend.;Oye, solamente quiero ser tu amiga;ねえ、私はただあなたと友達になりたいだけよ。
 DIALOG_TROUBLEMAKER_1;I hate rubber terrorists like you;Odio a las terroristas de hule como tu;あなたのようなゴムテロリストは嫌いです
 DIALOG_TROUBLEMAKER_2;I am not a terrorist;No soy una terrorista;私はテロリストではない